dedsudiyu 3 mesi fa
parent
commit
5c2fda107c
3 ha cambiato i file con 20 aggiunte e 5 eliminazioni
  1. 4 4
      .env.development
  2. 14 1
      src/App.vue
  3. 2 0
      src/api/request.js

+ 4 - 4
.env.development

@@ -25,7 +25,7 @@ VUE_APP_VERSION_DIFFERENCE_FIELD = 'kuangYeDaXue_nanHu'
 # ####################内网接口配置####################
 
 # 现场
-# VUE_APP_BASE_LOCAL_API = '172.16.0.65/api'
+VUE_APP_BASE_LOCAL_API = '172.16.0.65/api'
 # 现场开发
 # VUE_APP_BASE_LOCAL_API = '10.129.55.200:8080'
 # 43内网
@@ -33,7 +33,7 @@ VUE_APP_VERSION_DIFFERENCE_FIELD = 'kuangYeDaXue_nanHu'
 # 43内网V3地址
 # VUE_APP_BASE_LOCAL_API = '192.168.1.43/api'
 # 1.8内网V3地址
-VUE_APP_BASE_LOCAL_API = '192.168.1.8/api'
+# VUE_APP_BASE_LOCAL_API = '192.168.1.8/api'
 # 88内网
 # VUE_APP_BASE_LOCAL_API = '192.168.1.88/labSystem'
 # 柴
@@ -51,12 +51,12 @@ VUE_APP_BASE_LOCAL_API = '192.168.1.8/api'
 # ####################外网接口配置####################
 
 # 现场
-# VUE_APP_BASE_API = '172.16.0.65/api'
+VUE_APP_BASE_API = '172.16.0.65/api'
 # 现场开发
 # VUE_APP_BASE_API = '10.129.55.200:8080'
 # 实验室安全管理系统/开发环境
 # 1.8内网V3地址
-VUE_APP_BASE_API = '192.168.1.8/api'
+# VUE_APP_BASE_API = '192.168.1.8/api'
 # 43内网V3地址
 # VUE_APP_BASE_API = '192.168.1.43/api'
 # 林总

+ 14 - 1
src/App.vue

@@ -41,16 +41,29 @@
             getUrl() {
                 let self = this;
                 let text = window.location.href;
+                if(text.indexOf('touken') != -1){
+                    this.$set(this,'nullType','参数异常,请联系管理员');
+                    return
+                }
+                if(text.indexOf('source') != -1){
+                    this.$set(this,'nullType','参数异常,请联系管理员');
+                    return
+                }
+                if(text.indexOf('type') != -1){
+                    this.$set(this,'nullType','参数异常,请联系管理员');
+                    return
+                }
                 let urlList = text.split("?")[1].split("&");
                 let urlData = {};
                 urlList.forEach((item) => {
                     urlData[item.split("=")[0]] = item.split("=")[1];
                 });
+                localStorage.setItem('touken',urlData.touken)
                 // type 1.楼栋 2.楼层 3.楼道 4.实验室 5.楼道+实验室
                 let obj = {
                     page:'1',
                     pageSize:'4',
-                    protocol:window.location.href.indexOf('https') !== -1?'wss':'ws'
+                    protocol:window.location.href.indexOf('https') !== -1?'wss':'ws',
                 };
                 if(urlData.type == 1){
                     obj.buildId = urlData.buildId;

+ 2 - 0
src/api/request.js

@@ -14,6 +14,8 @@ const service = axios.create({
 })
 // request拦截器
 service.interceptors.request.use(config => {
+  //写入touken
+  config.headers['Authorization'] = localStorage.getItem('touken');
   // get请求映射params参数
   if (config.method === 'get' && config.params) {
     let url = config.url + '?' + tansParams(config.params);