zc

.env.development

@@ -2,65 +2,52 @@
 VUE_APP_TITLE = 实验室安全智慧化管控系统
 
 # 开发环境配置
-NODE_ENV=development
-VUE_APP_ENV = 'development'
+NODE_ENV=production
+VUE_APP_ENV = 'production'
 
 # #######################版本编码#######################
 
 VUE_APP_RENEWAL_ENCODING = ''
 
 # ####################外网接口配置####################
-# 现场
-# VUE_APP_BASE_API = '172.16.0.65/api'
-# 1.8
-# VUE_APP_BASE_API =  '192.168.1.8/api'
-# 韩
-# VUE_APP_BASE_API =  '192.168.1.20:8080'
-# 飞
-# VUE_APP_BASE_API =  '192.168.1.17:8080'
-# 高升
-# VUE_APP_BASE_API =  '192.168.1.39:8080'
-# 88服务器
-VUE_APP_BASE_API = '192.168.1.88/labSystem'
-# 43服务器
-# VUE_APP_BASE_API = '192.168.1.43/api'
-# 柴
-# VUE_APP_BASE_API = '192.168.1.9:8080'
-# 韩
-# VUE_APP_BASE_API = '192.168.1.20:8080'
-# 暨大
-# VUE_APP_BASE_API = 'lab.sxitdlc.com/jndxlabSystem/'
-# 矿大-文昌
-# VUE_APP_BASE_API = 'lab.sxitdlc.com/kdwclabSystem/'
-# 苏大
-# 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/zhlabSystem/'
+
+# 山西农大
+VUE_APP_BASE_API = 'lasfl.sxau.edu.cn/api'
+
+# 1.8外网地址
+# VUE_APP_BASE_API = 'lab.zjznai.com/labTest'
+
+# 1.88外网地址
+# VUE_APP_BASE_API = 'lab.zjznai.com/appTest'
+
+# 43外网地址
+# VUE_APP_BASE_API = 'lab.zjznai.com/labapp'
+
+# 开发人员地址
+# VUE_APP_BASE_API = '192.168.1.24:8080'
 
 # ####################内网接口配置####################
 
-# 现场
-# VUE_APP_BASE_LOCAL_API = '172.16.0.65/api'
+# 山西农大
+VUE_APP_BASE_LOCAL_API = 'lasfl.sxau.edu.cn/api'
 
-# 1.8
+# 1.8内网地址
 # VUE_APP_BASE_LOCAL_API = '192.168.1.8/api'
 
-# 1.8
-VUE_APP_BASE_LOCAL_API = '192.168.1.88/labSystem'
+# 1.88内网地址
+# VUE_APP_BASE_LOCAL_API = '192.168.1.88/labSystem'
 
-# 43
+# 43内网地址
 # VUE_APP_BASE_LOCAL_API = '192.168.1.43/api'
 
-# 柴
-# VUE_APP_BASE_LOCAL_API = '192.168.1.9:8080'
-
-# 韩
-# VUE_APP_BASE_LOCAL_API = '192.168.1.20:8080'
+# 开发人员地址
+# VUE_APP_BASE_LOCAL_API = '192.168.1.24:8080'
 
 
 # #################### 认证平台版本退出接口-PC端 ####################
 
 VUE_APP_OUT_URL = 'https://labcontrol.nwafu.edu.cn/api/auth/cas/logout'
+
+
+
+

src/views/emergencyManagement/newPageComponent/newVideoComponent.vue

@@ -7,7 +7,7 @@
     <div class="video-max-big-box">
       <H5PlayerVideo class="sub-video-box" :videoProps="item"
        v-for="(item,index) in videoList" :key="index"></H5PlayerVideo>
-      <p class="null-text-p">该实验室未配置监控设备</p>
+      <p class="null-text-p" v-if="!videoList[0]">该实验室未配置监控设备</p>
     </div>
     <div class="button-box">
       <p class="right-button-p el-icon-arrow-right" v-if="dataList[2]" @click="rightButton()"></p>
@@ -47,6 +47,8 @@
       //初始化 查询实验室摄像头
       initialize(data){
         let self = this;
+        this.$set(this,'dataList',[])
+        this.$set(this, 'videoList', [])
         // type 1.楼栋 2.楼层 3.楼道 4.实验室
         let obj = {
           page:1,
@@ -81,32 +83,40 @@
         });
       },
       leftButton(){
+        let self = this;
         if(this.showIndex>1){
           let videoList = [];
-          if(this.dataList[this.showIndex-2]){
-            videoList.push(this.dataList[this.showIndex-2])
-          }
-          if(this.dataList[this.showIndex-1]){
-            videoList.push(this.dataList[this.showIndex-1])
+          if(self.dataList[self.showIndex-2]){
+            videoList.push(self.dataList[self.showIndex-2])
           }
-          if(videoList[0]){
-            this.$set(this,'showIndex',this.showIndex-2);
-            this.$set(this,'videoList',videoList);
+          if(self.dataList[self.showIndex-1]){
+            self.$set(self,'videoList',[]);
+            videoList.push(self.dataList[self.showIndex-1])
           }
+          setTimeout(function(){
+            if(videoList[0]){
+              self.$set(self,'showIndex',self.showIndex-2);
+              self.$set(self,'videoList',videoList);
+            }
+          },200);
         }
       },
       rightButton(){
+        let self = this;
         let videoList = [];
-        if(this.dataList[this.showIndex+2]){
-          videoList.push(this.dataList[this.showIndex+2])
+        if(self.dataList[self.showIndex+2]){
+          self.$set(self,'videoList',[]);
+          videoList.push(self.dataList[self.showIndex+2])
         }
-        if(this.dataList[this.showIndex+3]){
-          videoList.push(this.dataList[this.showIndex+3])
-        }
-        if(videoList[0]){
-          this.$set(this,'showIndex',this.showIndex+2);
-          this.$set(this,'videoList',videoList);
+        if(self.dataList[self.showIndex+3]){
+          videoList.push(self.dataList[self.showIndex+3])
         }
+        setTimeout(function(){
+          if(videoList[0]){
+            self.$set(self,'showIndex',self.showIndex+2);
+            self.$set(self,'videoList',videoList);
+          }
+        },200);
       },
       //全屏开启-关闭轮播
       stopTime(cameraIndexCode){

src/views/login.vue

@@ -158,7 +158,7 @@
                     let outerNet = window.location.href.indexOf(obj.ipIdentify) == -1//true外网 false 内网
                     if(outerNet){//外网
                         //MQTT地址
-                        localStorage.setItem('mqttUrl','wss://'+Decrypt(obj.mqttExtranetUrl))
+                        localStorage.setItem('mqttUrl','ws://'+Decrypt(obj.mqttExtranetUrl))
                         //MQTT账号
                         localStorage.setItem('mqttUser',Decrypt(obj.mqttExtranetUser))
                         //MQTT密码