guoxiaohuan 4 年之前
父节点
当前提交
136813054d
共有 5 个文件被更改,包括 21 次插入15 次删除
  1. 4 4
      public/systemConf.js
  2. 10 2
      src/App.vue
  3. 2 1
      src/components/menuList.vue
  4. 1 1
      src/store/index.js
  5. 4 7
      src/views/statistics/index.vue

+ 4 - 4
public/systemConf.js

@@ -24,11 +24,11 @@ var __systemConf = {
     systemCode: 'wandaBmGuide',
     conf: {
         // 阿里云
-        // editerUrl: 'http://60.205.177.43:80/wandaEditer/', // 编辑器地址
-        // wandaBmGuideUrl: 'http://60.205.177.43:80/wandaBmGuide/', //管理书地址
+        editerUrl: 'http://60.205.177.43:80/wandaEditer/', // 编辑器地址
+        wandaBmGuideUrl: 'http://60.205.177.43:80/wandaBmGuide/', //管理书地址
         // http://glsms.wanda-dev.cn/ 测试服
-        editerUrl: 'http://glsms.wanda-dev.cn/wandaEditer/', // 编辑器地址
-        wandaBmGuideUrl: 'http://glsms.wanda-dev.cn/wandaBmGuide/', //管理书地址
+        // editerUrl: 'http://glsms.wanda-dev.cn/wandaEditer/', // 编辑器地址
+        // wandaBmGuideUrl: 'http://glsms.wanda-dev.cn/wandaBmGuide/', //管理书地址
         // editerUrl: 'http://localhost:8091/wandaEditer/', // 编辑器地址
         // wandaBmGuideUrl: 'http://localhost:8090/wandaBmGuide/', //管理书地址
     },

+ 10 - 2
src/App.vue

@@ -18,7 +18,8 @@ export default {
             key: '23f30a832a862c58637a4aadbf50a566',
             appName: '万达可视化系统',
             mapServerURL: `http://map.wanda.cn/editor`,
-            mapthemeUrl: `http://map.wanda.cn/editor/webtheme`
+            mapthemeUrl: `http://map.wanda.cn/editor/webtheme`,
+            isMounted: false
         }
     },
     /**
@@ -34,7 +35,9 @@ export default {
             localStorage.setItem('beforeunload', state)
         })
     },
-    mounted() {},
+    mounted() {
+        this.isMounted = true
+    },
     computed: {
         ...mapGetters(['plazaId', 'fmapID', 'haveFengMap', 'accessLevel'])
     },
@@ -74,6 +77,11 @@ export default {
             } else {
                 window.fengmapData = null
             }
+        },
+        isMounted(isMounted) {
+            if (isMounted && this.plazaId) {
+                this.getFengMap()
+            }
         }
     }
 }

+ 2 - 1
src/components/menuList.vue

@@ -194,7 +194,8 @@ export default {
     box-shadow: 0px 2px 10px 0px rgba(31, 35, 41, 0.1);
     // overflow: hidden;
     .home {
-        width: 265px;
+        min-width: 265px;
+        max-width: 320px;
         height: 48px;
         // line-height: 48px;
         text-align: center;

+ 1 - 1
src/store/index.js

@@ -170,7 +170,7 @@ export default new Vuex.Store({
         },
         getFloors(context) {
             queryFloor({
-                plazaId: context.state.plazaId,
+                plazaId: context.state.plazaId || localStorage.getItem('PLAZAID'),
             }).then((res) => {
                 if (res.result == 'success') {
                     context.commit('SETFLOORS', res.data)

+ 4 - 7
src/views/statistics/index.vue

@@ -1,7 +1,7 @@
 <template>
     <div class='overview'>
         <!-- 顶部路由 -->
-        <div class='menu'>
+        <!-- <div class='menu'>
             <div class='home' @click='$emit("update:modelNum", 0)'>
                 <div class='downright'></div>
                 <div class='home-box'>
@@ -14,7 +14,7 @@
                     <span class='span3'>{{times}}</span>
                 </span>
             </div>
-        </div>
+        </div> -->
         <!-- 面包屑 -->
         <nav class='navigation'>
             <section class='crumbs'>
@@ -324,8 +324,6 @@ export default {
         },
         // 获取 区域/中心/项目
         selectProjectItem(ids, data) {
-             localStorage.setItem('PLAZAID', '')
-             this.$store.commit('STOREPLAZAID', '') 
             this.currentLevel = data.level
             if (data.level === 0) {  //  level=0时 plazaId必填
                 this.queryPlazaInfoCount(data.ccode, data.level, data.cid)
@@ -887,8 +885,6 @@ export default {
                 className: 'my-leaflet-div-icon',
                 iconSize: 30
             })
-             localStorage.setItem('PLAZAID', '')
-             this.$store.commit('STOREPLAZAID', '') 
             setTimeout(()=>{
                 let zoom = myMaps.getZoom()
                 let sizes = this.circleSize[zoom]
@@ -1003,7 +999,8 @@ export default {
         box-shadow: 0px 2px 10px 0px rgba(31, 35, 41, 0.1);
         overflow: hidden;
         .home {
-            width: 265px;
+           min-width: 265px;
+           max-width: 320px;
             height: 48px;
             // line-height: 48px;
             text-align: center;