2 Commits 53f7a6e01d ... 2139aada3f

Author SHA1 Message Date
  xicheng79 2139aada3f bug fixed 3 years ago
  xicheng79 51018ed930 1 3 years ago

+ 4 - 0
.gitignore

@@ -1 +1,5 @@
 node_modules
+dist/static/js/app.1c926c4cedf88825dfe0.js
+dist.7z
+dist/static/js/manifest.*.js.map
+dist/static/js/app.*.js

+ 1 - 1
dist/index.html

@@ -1,4 +1,4 @@
-<!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=0,shrink-to-fit=no"><meta name=apple-mobile-web-app-capable content=yes><meta name=apple-mobile-web-app-status-bar-style content=black><meta name=format-detection content="telephone=no"><meta http-equiv=X-UA-Compatible content="ie=edge"><link rel=icon href=static/img/logo.svg><link rel=stylesheet href="https://fonts.googleapis.com/css?family=Noto+Sans+SC:100,300,400,500,700,900"><title>成理青年</title><link href=./static/css/app.b5bdf979f934b4471d5400da0bbeb750.css rel=stylesheet></head><body><div class=scroll><div id=app></div></div><script type=text/javascript src=./static/js/manifest.9beacb73ba6d0692f259.js></script><script type=text/javascript src=./static/js/vendor.a6c31f9f03e3d815c061.js></script><script type=text/javascript src=./static/js/app.97f08f6e958cf48b8b5d.js></script></body><style>body,html{
+<!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=0,shrink-to-fit=no"><meta name=apple-mobile-web-app-capable content=yes><meta name=apple-mobile-web-app-status-bar-style content=black><meta name=format-detection content="telephone=no"><meta http-equiv=X-UA-Compatible content="ie=edge"><link rel=icon href=static/img/logo.svg><link rel=stylesheet href="https://fonts.googleapis.com/css?family=Noto+Sans+SC:100,300,400,500,700,900"><title>成理青年</title><link href=./static/css/app.7726511f5b893bdff789a9006f7a8817.css rel=stylesheet></head><body><div class=scroll><div id=app></div></div><script type=text/javascript src=./static/js/manifest.9beacb73ba6d0692f259.js></script><script type=text/javascript src=./static/js/vendor.a6c31f9f03e3d815c061.js></script><script type=text/javascript src=./static/js/app.1c926c4cedf88825dfe0.js></script></body><style>body,html{
       width:100%;
       height:100%;
       margin: 0px;

File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.7726511f5b893bdff789a9006f7a8817.css


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.7726511f5b893bdff789a9006f7a8817.css.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.1c926c4cedf88825dfe0.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.97f08f6e958cf48b8b5d.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.97f08f6e958cf48b8b5d.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/manifest.9beacb73ba6d0692f259.js.map


+ 17 - 17
src/components/map.vue

@@ -216,8 +216,8 @@ export default {
      */
     initMap: function () {
       // PNG范围
-      let leftTop = [11592187.449797414, 3592590.200040145]
-      let rightBottom = [11594508.118271504, 3587434.465393465]
+      let leftTop = [11592187.538105225, 3592590.111732335]
+      let rightBottom = [11594513.693708975, 3587420.877057335]
       // 经纬度
       // let leftTop = [104.13439162531515, 30.690273107307597]
       // let rightBottom = [104.15523854491164, 30.650437034690334]
@@ -579,12 +579,12 @@ export default {
      * @param {int} zoom: 缩放级别
      * @return {void}
      */
-    locateAtFeature: function (feature, type, zoom = 17) {
+    locateAtFeature: function (feature, type, zoom = 17.5) {
       let view = map.getView()
       view.setZoom(zoom)
       if (this.$store.state.isMobile && type !== 'relate') {
         let coord = Extent.getCenter(feature.getGeometry().getExtent())
-        coord[1] = coord[1] * 1.00008
+        coord[1] = coord[1] * 1.000065
         view.setCenter(coord)
       } else {
         view.setCenter(Extent.getCenter(feature.getGeometry().getExtent()))
@@ -595,40 +595,40 @@ export default {
     },
 
     /**
-     * @description:获取并渲染最近若干天的报道
+     * @description:获取并渲染最近若干天的通知
      * @param {int} day: 天数
      * @returns {void}
      */
-    loadRecentReports: function (day) {
+    loadRecentNotices: function (day) {
       var that = this
       this.$axios
-        .post('/report/recent', {
+        .post('/notice/recent', {
           day: day
         })
         .then(res => {
           res.data.forEach(item => {
-            that.printFeature('reportLayer', item, 'report')
+            that.printFeature('noticeLayer', item, 'notice')
           })
-          this.addCluster('reportLayer', this.reportStyles.Point)
+          this.addCluster('noticeLayer', this.noticeStyles.Point)
         })
     },
 
     /**
-     * @description:获取并渲染最近若干天的通知
+     * @description:获取并渲染最近若干天的报道
      * @param {int} day: 天数
      * @returns {void}
      */
-    loadRecentNotices: function (day) {
+    loadRecentReports: function (day) {
       var that = this
       this.$axios
-        .post('/notice/recent', {
+        .post('/report/recent', {
           day: day
         })
         .then(res => {
           res.data.forEach(item => {
-            that.printFeature('noticeLayer', item, 'notice')
+            that.printFeature('reportLayer', item, 'report')
           })
-          this.addCluster('noticeLayer', this.noticeStyles.Point)
+          this.addCluster('reportLayer', this.reportStyles.Point)
         })
     },
 
@@ -1013,10 +1013,10 @@ export default {
         map.removeLayer(that.getLayerByTitle('cultureLayer'))
         map.removeLayer(that.getLayerByTitle('otherLayer'))
         map.removeLayer(that.getLayerByTitle('markLayer'))
-        that.loadRecentNotices(7)
-        that.loadRecentReports(7)
-        that.loadCulture()
         that.loadOthers()
+        that.loadCulture()
+        that.loadRecentReports(7)
+        that.loadRecentNotices(7)
         that.closePopup()
       })
 

+ 1 - 1
src/components/pcBar.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <!-- 侧边栏 -->
-    <b-list-group id="list" v-show="isShow" app>
+    <b-list-group id="list" v-show="isShow">
       <!-- header -->
       <b-list-group-item id="header">
           <i class="fa fa-list" aria-hidden="true"></i>&nbsp; 列表

Some files were not shown because too many files changed in this diff