guoxiaohuan 5 anos atrás
pai
commit
c16d70012f
4 arquivos alterados com 69 adições e 41 exclusões
  1. 1 1
      package.json
  2. 34 6
      src/App.vue
  3. 31 31
      src/router/index.js
  4. 3 3
      src/store/index.js

+ 1 - 1
package.json

@@ -21,7 +21,7 @@
         "leaflet": "^1.6.0",
         "leaflet-contextmenu": "^1.4.0",
         "lodash": "^4.17.19",
-        "meri-design": "^1.2.8",
+        "meri-design": "^1.3.4",
         "moment": "^2.24.0",
         "quill": "^1.3.7",
         "vue": "^2.6.10",

+ 34 - 6
src/App.vue

@@ -17,7 +17,8 @@ export default {
             canvasID: '',
             key: '23f30a832a862c58637a4aadbf50a566',
             appName: '万达可视化系统',
-            mapServerURL: `http://map.wanda.cn/editor`
+            mapServerURL: `http://map.wanda.cn/editor`,
+            mapthemeUrl: `http://map.wanda.cn/editor/webtheme`
         }
     },
     mounted() {
@@ -26,7 +27,7 @@ export default {
         // 页面加载完成后,移除session里的存储的信息
         window.addEventListener('load', this.load)
         // 请求该项目下的楼层数据
-        // this.getFengMap();
+        this.getFengMap()
     },
     computed: {
         ...mapGetters(['plazaId', 'fmapID', 'haveFengMap'])
@@ -38,6 +39,36 @@ export default {
             // const { userInfo, projectId, menuStatus,manualAutoMode } = this.$store.state;
             const state = this.$store.state
             sessionStorage.setItem('state', JSON.stringify(state))
+        },
+        load() {
+            sessionStorage.clear()
+        },
+        getFengMap() {
+            if (!this.fmapID) {
+                this.getfmapID().then(() => {
+                    this.getMap()
+                })
+                return
+            }
+            this.getMap()
+        },
+        getMap() {
+            if (!window.fengmapData) {
+                window.fengmapData = new SFengParser(
+                    `fengMap${this.id}`,
+                    `${this.mapServerURL}/fmap/${this.fmapID}`,
+                    this.key,
+                    this.appName,
+                    null,
+                    this.mapthemeUrl
+                )
+                window.fengmapData.loadMap(this.fmapID, () => {
+                    // 获取主题数据
+                    window.fengmapData.loadTheme(`${this.mapServerURL}/webtheme/${this.fmapID}/${this.fmapID}.theme`).then(res => {
+                        this.SETHAVEFENGMAP()
+                    })
+                })
+            }
         }
     }
 }
@@ -236,8 +267,5 @@ body {
         line-height: 26px;
         width: 8%;
     }
-    .el-date-editor .el-range__close-icon {
-        line-height: 26px;
-    }
 }
-</style>
+</style>

+ 31 - 31
src/router/index.js

@@ -74,36 +74,36 @@ const router = new VueRouter({
 //不需要token的路由
 const ignore = ['/404', '/legendLibrary', '/legendRules']
 router.beforeEach(async (to, from, next) => {
-    if (!ignore.includes(to.path)) {
-        const token = query().token
-        const ssoToken = store.getters['ssoToken']
-        if (ssoToken) {
-            store.commit('SETSSOTOKEN', ssoToken)
-            await store.dispatch('getUserInfo', router)
-            await store.dispatch('getFloors')
-            await store.dispatch('getBrand')
-            next()
-        } else if (token) {
-            store.commit('SETSSOTOKEN', token)
-            await store.dispatch('getUserInfo', router)
-            next()
-        } else {
-            let lastRoute = {
-                path: to.path,
-                params: to.params,
-                query: to.query,
-            }
-            store.commit('SETLASTROUTER', lastRoute)
-            let ssoServer = 'http://oauth.wanda-dev.cn'
-            let systemcode = 'CAD156',
-                signal = new Date().getTime(),
-                version = '1.0.0'
-            window.location.href = `${ssoServer}/login?systemcode=${systemcode}&signal=${signal}&version=${version}`
-        }
-    } else {
-        await store.dispatch('getBrand')
-        next()
-        return
-    }
+    // if (!ignore.includes(to.path)) {
+    //     const token = query().token
+    //     const ssoToken = store.getters['ssoToken']
+    //     if (ssoToken) {
+    //         store.commit('SETSSOTOKEN', ssoToken)
+    //         await store.dispatch('getUserInfo', router)
+    await store.dispatch('getFloors')
+    await store.dispatch('getBrand')
+    //         next()
+    //     } else if (token) {
+    //         store.commit('SETSSOTOKEN', token)
+    //         await store.dispatch('getUserInfo', router)
+    //         next()
+    //     } else {
+    //         let lastRoute = {
+    //             path: to.path,
+    //             params: to.params,
+    //             query: to.query,
+    //         }
+    //         store.commit('SETLASTROUTER', lastRoute)
+    //         let ssoServer = 'http://oauth.wanda-dev.cn'
+    //         let systemcode = 'CAD156',
+    //             signal = new Date().getTime(),
+    //             version = '1.0.0'
+    //         window.location.href = `${ssoServer}/login?systemcode=${systemcode}&signal=${signal}&version=${version}`
+    //     }
+    // } else {
+    //     // await store.dispatch('getBrand')
+    next()
+    //     return
+    // }
 })
 export default router

+ 3 - 3
src/store/index.js

@@ -8,8 +8,8 @@ import router from '../router'
 Vue.use(Vuex)
 export default new Vuex.Store({
     state: {
-        // ssoToken: 'admin:lengqiang',
-        ssoToken: null,
+        ssoToken: 'admin:lengqiang',
+        // ssoToken: null,
         isPreview: false,
         lastRoute: '',
         isrequestAuth: true, // 是否请求登录校验接口
@@ -115,7 +115,7 @@ export default new Vuex.Store({
             await login({}).then((res) => {
                 if (res.result == 'success') {
                     // token校验成功 拿到权限
-                    //commit("SETISREQUESTtAUTH", true)
+                    commit('SETISREQUESTtAUTH', true)
                     if (res.permissions.length == 0) {
                         router.push('/404')
                     }