heyang

.env.development

@@ -13,7 +13,7 @@ VUE_APP_ENV = 'development'
 # 飞
 # VUE_APP_BASE_API =  '192.168.1.17:8080'
 # 高升
- VUE_APP_BASE_API =  '192.168.1.39:8080'
+# VUE_APP_BASE_API =  '192.168.1.39:8080'
 # 88服务器
 # VUE_APP_BASE_API = '192.168.1.88/labSystem'
 # 43服务器
@@ -28,7 +28,7 @@ VUE_APP_ENV = 'development'
 # VUE_APP_BASE_API = 'znyj.labcenter.suda.edu.cn/labSystem/'
 # VUE_APP_BASE_API = 'lab.sxitdlc.com/sudalabSystem/'
 # 矿大
-# VUE_APP_BASE_API = 'lab.zjznai.com/labSystem/'
+ VUE_APP_BASE_API = 'lab.zjznai.com/labSystem/'
 
 #VUE_APP_BASE_API = 'lab.zjznai.com/zhlabSystem/'
 

.env.production

@@ -8,10 +8,10 @@ VUE_APP_ENV = 'production'
 
 # ####################内网接口配置####################
 
- VUE_APP_BASE_LOCAL_API = '192.168.1.43/labSystem/'
+ VUE_APP_BASE_LOCAL_API = '192.168.251.2/labSystem/'
 
 
 # ####################外网接口配置####################
 
- VUE_APP_BASE_API = 'lab.zjznai.com/labAppTest/'
+ VUE_APP_BASE_API = 'lab.zjznai.com/labSystem/'
 

src/utils/request.js

@@ -37,7 +37,7 @@ axios.defaults.withCredentials = false;
 
 // 允许跨域
 axios.defaults.headers.post["Access-Control-Allow-Origin-Type"] = "*";
-//axios.defaults.headers.common["Authorization"] = 'Bearer 510c9abb-eec3-44ef-8e09-f8a0007a92b9';//`Bearer ${localStorage.getItem('access_token')`;
+//axios.defaults.headers.common["Authorization"] = 'Bearer 69fc2e9e-1c98-426c-b3b6-9ec3591fe23b';//`Bearer ${localStorage.getItem('access_token')`;
 axios.defaults.headers.common["Authorization"] = 'Bearer '+localStorage.getItem('Authorization')+''
 
 //设置超时

src/views/home.vue

@@ -320,6 +320,7 @@ export default {
       chartReload4: null,//定时器
       chartReload5: null,//定时器
       chartReload6: null,//定时器
+      labPersonTimer:null,//进入实验室人员定时器
       dataList:[],
       labList:[],//实验室人员
       infoList:[],//工作通知
@@ -637,14 +638,6 @@ export default {
 
         }
       })
-      //实验室人员
-      onlineSumByBigView({pageNumStr:1,pageSizeStr:50}).then((res) =>{
-        if(res.code==200){
-          let data=res.data.list;
-          _this.labResultCount=res.data.resultCount
-          _this.labList=data
-        }
-      })
       //实验室分类
       getTypeCount({}).then((res) =>{
         if(res.code==200){
@@ -714,7 +707,17 @@ export default {
         }
       })
     },
-
+    //实验室人员
+    onlineSumByBigView:function () {
+      let self=this;
+      onlineSumByBigView({pageNumStr:1,pageSizeStr:50}).then((res) =>{
+        if(res.code==200){
+          let data=res.data.list;
+          self.labResultCount=res.data.resultCount
+          self.labList=data
+        }
+      })
+    },
     //工作通知
     infoFun:function(){
       let _this=this;
@@ -1402,6 +1405,7 @@ export default {
     _this.workPlanFun();
     _this.safetyInspectFun();
     _this.safetyInspectTitle();
+    _this.onlineSumByBigView();
     _this.initSwiper();
     _this.subscriptionMQTT();
     _this.timer = setInterval(() => {
@@ -1410,6 +1414,10 @@ export default {
         _this.workPlanFun();
         _this.safetyInspectFun();
     },1000*300)
+    _this.labPersonTimer = setInterval(() => {
+      _this.onlineSumByBigView();
+    },5000)
+
     //中间部分点击方法
     $(".left_t_c li").click(function(){
       let index = $(".left_t_c li").index(this);
@@ -1421,6 +1429,7 @@ export default {
   },
   beforeDestroy(){
     clearInterval(this.timer);
+    clearInterval(this.labPersonTimer);
   },