up

web/src/views/gui/compomemt/mapNav.vue

@@ -188,6 +188,7 @@ export default {
     }
     .noneAc {
       pointer-events: none;
+      opacity: .5;
     }
   }
   .close {

webM/src/views/gui/component/antique.vue

@@ -301,7 +301,7 @@ export default {
 
   position: fixed;
   width: 100vw;
-  height: calc(100vh - 50px);
+  height: calc(100% - 50px);
   bottom: 0;
   left: 0;
   z-index: 9998;

webM/src/views/gui/component/hotspot.vue

@@ -58,7 +58,7 @@ export default {
 .hotspot {
   position: fixed;
   width: 100vw;
-  height: calc(100vh - 50px);
+  height: calc(100% - 50px);
   bottom: 0;
   left: 0;
   z-index: 9998;

webM/src/views/gui/component/mapNav.vue

@@ -73,7 +73,7 @@ export default {
 .mapNav {
   position: fixed;
   width: 100vw;
-  height: calc(100vh - 50px);
+  height: calc(100% - 50px);
   bottom: 0;
   left: 0;
   z-index: 9998;
@@ -117,15 +117,8 @@ export default {
       }
     }
     .noneAc{
-      background-color: #fff6d2;
       pointer-events: none;
-      &>p{
-        color: #774926;
-        &>i{
-          background: url('../../../assets/img/mapUpAc.png');
-          background-size: 100% 100%;
-        }
-      }
+      opacity: .5;
     }
   }
   .close {

webM/src/views/gui/component/share.vue

@@ -70,7 +70,7 @@ export default {
 .share {
   position: fixed;
   width: 100vw;
-  height: calc(100vh - 50px);
+  height: calc(100% - 50px);
   bottom: 0;
   left: 0;
   z-index: 9998;

webM/src/views/gui/menu.vue

@@ -475,7 +475,7 @@ export default {
   }
 }
 .topMeanOpen {
-  height: 100vh;
+  height: 100%;
 }
 // ---------------顶部固定栏👆
 .packDoCla {

万物墙后台/src/configue/http.js

@@ -8,8 +8,8 @@ let loading = ''
 
 // 配置请求域名
 let layoutBoxIsShow
-const serverName = isProduction ? '/zhoushan' : 'http://192.168.0.135:8017/zhoushan'
-// http://192.168.0.135:8017
+const serverName = isProduction ? '/zhoushan' : 'http://project.4dage.com:8018'
+// http://192.168.0.135:8018
 const exceptUrls = ['/login']
 
 axios.defaults.baseURL = serverName
@@ -22,7 +22,7 @@ axios.interceptors.request.use(function (config) {
       config.baseURL = serverName.replace('/zhoushan', '')
     }
   }
-  config.headers['token'] = window.localStorage.getItem('token')
+  config.headers['token'] = window.localStorage.getItem('WXWWQtoken')
   loading = vue.$loading({
     lock: true,
     text: 'Loading',
@@ -51,7 +51,7 @@ axios.interceptors.response.use(
       case 5001:
         if (!layoutBoxIsShow) {
           layoutBoxIsShow = true
-          window.localStorage.setItem('token', '')
+          window.localStorage.setItem('WXWWQtoken', '')
           vue.$alert('登录状态失效，请重新登录', '提示', {
             confirmButtonText: '确定',
             callback: function () {
@@ -68,19 +68,19 @@ axios.interceptors.response.use(
   },
   error => {
     loading.close()
-    // if (error.response) {
-    //   switch (error.response.code) {
-    //     case 5001:
-    //       window.localStorage.setItem('token', '')
-    //       vue.$alert('登录状态失效，请重新登录', '提示', {
-    //         confirmButtonText: '确定',
-    //         callback: function () {
-    //           router.push('/login')
-    //         }
-    //       })
-    //       break
-    //   }
-    // }
+    if (error.response) {
+      switch (error.response.code) {
+        case 5001:
+          window.localStorage.setItem('WXWWQtoken', '')
+          vue.$alert('登录状态失效，请重新登录', '提示', {
+            confirmButtonText: '确定',
+            callback: function () {
+              router.push('/login')
+            }
+          })
+          break
+      }
+    }
     return Promise.reject(error)
   }
 )

万物墙后台/src/pages/editPages/cultural-relic/index.vue

@@ -310,7 +310,7 @@ export default {
       plist: [],
       tlist: [],
       realType: '',
-      token: window.localStorage.getItem('token'),
+      token: window.localStorage.getItem('WXWWQtoken'),
       uploadUrl: `${this.$serverName}/collection/upload`,
       type: this.$route.params.type
     }

万物墙后台/src/pages/editPages/display/index.vue

@@ -232,7 +232,7 @@ export default {
       type: this.$route.params.type,
       id: this.$route.params.id,
       loading: false,
-      token: window.localStorage.getItem('token'),
+      token: window.localStorage.getItem('WXWWQtoken'),
       uploadUrl: `${this.$serverName}/exhibition/upload`
     }
   },
@@ -434,7 +434,7 @@ export default {
       let result = await this.$http({
         method: 'post',
         headers: {
-          token: window.localStorage.getItem('token')
+          token: window.localStorage.getItem('WXWWQtoken')
         },
         url: `/exhibition/getExhibitionById`,
         data: {

万物墙后台/src/pages/editPages/message/index.vue

@@ -215,7 +215,7 @@ export default {
       type: this.$route.params.type,
       radioActive: [],
       uploadUrl: `${this.$serverName}/exhibition/upload`,
-      token: window.localStorage.getItem('token'),
+      token: window.localStorage.getItem('WXWWQtoken'),
       uploadList: []
     }
   },

万物墙后台/src/pages/editPages/role/index.vue

@@ -175,7 +175,7 @@ export default {
       let result = await this.$http({
         method: 'post',
         headers: {
-          token: window.localStorage.getItem('token')
+          token: window.localStorage.getItem('WXWWQtoken')
         },
         url: `/role/findUserListByRoleId`,
         data: {
@@ -282,7 +282,7 @@ export default {
       let result = await this.$http({
         method: 'post',
         headers: {
-          token: window.localStorage.getItem('token')
+          token: window.localStorage.getItem('WXWWQtoken')
         },
         url: `/role/findRoleById`,
         data: {

万物墙后台/src/pages/layout/head.vue

@@ -34,7 +34,7 @@ export default {
   methods: {
     logout () {
       window.localStorage.setItem('userInfo', '')
-      window.localStorage.setItem('token', '')
+      window.localStorage.setItem('WXWWQtoken', '')
       this.$router.push({name: 'login'})
     }
   },

万物墙后台/src/pages/login/index.vue

@@ -90,7 +90,7 @@ export default {
           this.$http.post('/login', data).then(res => {
             if (res.code === 0) {
               window.localStorage.setItem('userInfo', JSON.stringify(res.data))
-              window.localStorage.setItem('token', res.data.token)
+              window.localStorage.setItem('WXWWQtoken', res.data.token)
               this.$router.push('/')
             } else {
               this.$notify.error({

万物墙后台/src/pages/modify/index.vue

@@ -102,7 +102,7 @@ export default {
             duration: 2000,
             onClose: () => {
               window.localStorage.setItem('userInfo', '')
-              window.localStorage.setItem('token', '')
+              window.localStorage.setItem('WXWWQtoken', '')
               this.$router.push({name: 'login'})
             }
           })

万物墙后台/src/pages/user/index.vue

@@ -187,7 +187,7 @@ export default {
       type: 'add',
       editTitle: '新增用户',
       uploadUrl: `${this.$serverName}/user/uploadHead`,
-      token: window.localStorage.getItem('token'),
+      token: window.localStorage.getItem('WXWWQtoken'),
       roleList: [],
       rules: {
         userName: [

万物墙后台/src/pages/video/addVideo.vue

@@ -86,7 +86,7 @@ export default {
   data () {
     // 这里存放数据
     return {
-      token: window.localStorage.getItem('token'),
+      token: window.localStorage.getItem('WXWWQtoken'),
       contentUrlList: [],
       uploadUrl: `${this.$serverName}/video/upload`,
       ruleForm: {

万物墙后台/src/pages/video/editVideo.vue

@@ -86,7 +86,7 @@ export default {
   data () {
     // 这里存放数据
     return {
-      token: window.localStorage.getItem('token'),
+      token: window.localStorage.getItem('WXWWQtoken'),
       contentUrlList: [],
       uploadUrl: `${this.$serverName}/video/upload`,
       ruleForm: {

万物墙后台/src/router/index.js

@@ -12,12 +12,12 @@ import WorkLog from '@/pages/work-log'
 import Modify from '@/pages/modify'
 import Role from '@/pages/role'
 import Device from '@/pages/device'
-import Scene from '@/pages/scene'
-import AddScene from '../pages/scene/addScene.vue'
-import EditScene from '../pages/scene/editScene.vue'
-import Video from '@/pages/video'
-import AddVideo from '@/pages/video/addVideo.vue'
-import EditVideo from '@/pages/video/editVideo.vue'
+// import Scene from '@/pages/scene'
+// import AddScene from '../pages/scene/addScene.vue'
+// import EditScene from '../pages/scene/editScene.vue'
+// import Video from '@/pages/video'
+// import AddVideo from '@/pages/video/addVideo.vue'
+// import EditVideo from '@/pages/video/editVideo.vue'
 
 import editInformation from '@/pages/editPages/message'
 import editDisplay from '@/pages/editPages/display'
@@ -27,7 +27,7 @@ import editRole from '@/pages/editPages/role'
 
 import showCulturalRelic from '@/pages/showPages/cultural-relic'
 
-import User from '@/pages/user'
+// import User from '@/pages/user'
 
 // import Home from '@/pages/home'