heyang

.env.development

@@ -12,12 +12,14 @@ VUE_APP_ENV = 'development'
 #VUE_APP_BASE_API =  'http://192.168.1.17:8080'
 # 88服务器
 # VUE_APP_BASE_API = 'http://192.168.1.88/labSystem'
+# 43服务器
+ VUE_APP_BASE_API = 'http://192.168.1.43/labSystem'
 # 柴
 # VUE_APP_BASE_API = 'http://192.168.1.9:8080'
 # 暨大
 # VUE_APP_BASE_API = 'http://lab.sxitdlc.com/jndxlabSystem/'
 # 矿大-文昌
-VUE_APP_BASE_API = 'http://lab.sxitdlc.com/kdwclabSystem/'
+#VUE_APP_BASE_API = 'http://lab.sxitdlc.com/kdwclabSystem/'
 
 
 
@@ -31,12 +33,12 @@ VUE_APP_BASE_VIDEO_API = 'http://lab.sxitdlc.com'
 
 
 # MQTT地址
-#VUE_APP_BASE_MQTT_API = 'ws://192.168.1.43:1884'
+VUE_APP_BASE_MQTT_API = 'ws://192.168.1.43:1884'
 # 暨大MQTT地址
 #VUE_APP_BASE_MQTT_API = 'ws://192.168.8.3:1884'
 # VUE_APP_BASE_MQTT_API = 'wss://lab.sxitdlc.com/jndxmqtt'
 #矿大-文昌
-VUE_APP_BASE_MQTT_API = 'wss://lab.sxitdlc.com/kdwcmqtt'
+#VUE_APP_BASE_MQTT_API = 'wss://lab.sxitdlc.com/kdwcmqtt'
 VUE_APP_BASE_MQTT_USERNAME = 'mqtt'
 VUE_APP_BASE_MQTT_PASSWORD = 'mqtt@zd1883'
 

.env.production

@@ -16,42 +16,40 @@ VUE_APP_ENV = 'development'
 # VUE_APP_BASE_API = 'http://lab.sxitdlc.com/jndxlabSystem/'
 # 矿大
 # VUE_APP_BASE_API = 'http://192.168.1.248/labSystem/'
-
 # 矿大-文昌
-# VUE_APP_BASE_API = 'http://lab.sxitdlc.com/kdwclabSystem/'
-
+ VUE_APP_BASE_API = 'http://lab.sxitdlc.com/kdwclabSystem/'
 # 矿大-文昌(本地)
-VUE_APP_BASE_API = 'http://192.168.1.248/labSystem/'
+#VUE_APP_BASE_API = 'http://192.168.1.248/labSystem/'
 
 # ####################视频地址####################
 # 矿大-文昌
-# VUE_APP_BASE_VIDEO_API = 'http://lab.sxitdlc.com'
+ VUE_APP_BASE_VIDEO_API = 'http://lab.sxitdlc.com'
 
 # 矿大-文昌(本地)
-VUE_APP_BASE_VIDEO_API = 'http://192.168.1.248/labSystem'
+#VUE_APP_BASE_VIDEO_API = 'http://192.168.1.248/labSystem'
 
 # ####################MQTT配置####################
 
 # 暨大MQTT地址
 # VUE_APP_BASE_MQTT_API = 'ws://192.168.8.3:1884'
 # VUE_APP_BASE_MQTT_API = 'wss://lab.sxitdlc.com/jndxmqtt'
-
+#88地址
+#VUE_APP_BASE_MQTT_API = 'ws://192.168.1.43:1884'
 #矿大-文昌
-# VUE_APP_BASE_MQTT_API = 'wss://lab.sxitdlc.com/kdwcmqtt'
-
+ VUE_APP_BASE_MQTT_API = 'wss://lab.sxitdlc.com/kdwcmqtt'
 # 矿大-文昌(本地)
-VUE_APP_BASE_MQTT_API = 'ws://192.168.1.248:1884'
+#VUE_APP_BASE_MQTT_API = 'ws://192.168.1.248:1884'
 
 VUE_APP_BASE_MQTT_USERNAME = 'mqtt'
 VUE_APP_BASE_MQTT_PASSWORD = 'mqtt@zd1883'
 
 # #####################后台跳转地址#####################
-
+# 88后台地址
+# VUE_APP_ADMIN_SCREEN_CAMPUS_BASE_API = 'http://192.168.1.88/labSystem/admin/#/login'
 # 暨大后台地址
 # VUE_APP_ADMIN_SCREEN_CAMPUS_BASE_API = 'http://lab.sxitdlc.com/jndxlabSystem/admin/#/login'
-
 # 矿大文昌后台地址
-# VUE_APP_ADMIN_SCREEN_CAMPUS_BASE_API = 'http://lab.sxitdlc.com/kdwclabSystem/admin/#/login'
+VUE_APP_ADMIN_SCREEN_CAMPUS_BASE_API = 'http://lab.sxitdlc.com/kdwclabSystem/admin/#/login'
 # 矿大文昌后台地址(内网)
-VUE_APP_ADMIN_SCREEN_CAMPUS_BASE_API = 'http://192.168.1.248/labSystem/admin/#/login'
+#VUE_APP_ADMIN_SCREEN_CAMPUS_BASE_API = 'http://192.168.1.248/labSystem/admin/#/login'
 

src/api/http.js

@@ -88,7 +88,7 @@ export const mangerControl = data => post("/laboratory/subject/manger/control/"+
 //预案- 获取开关状态
 export const controllerList = data => get("/laboratory/onemachine/"+data+'/controller/list',)
 //预案-获取摄像头列表
-export const startListDeviceIds = data => get("/jinandaxue/api/play/startList",data,'video')
+export const startListDeviceIds = data => get("/wenchang/api/play/startList",data,'video')
 //预案-获取报警详情
 export const abnormalLogOrderByList = data => get("/laboratory/plan/log/abnormalLogOrderByList",data)
 //预案-实验室简要信息

src/utils/request.js

@@ -21,8 +21,8 @@ axios.defaults.withCredentials = false;
 
 // 允许跨域
 axios.defaults.headers.post["Access-Control-Allow-Origin-Type"] = "*";
-// axios.defaults.headers.common["Authorization"] = 'Bearer c104a214-2655-4a2e-9230-78e9d8c778e1';//`Bearer ${localStorage.getItem('access_token')`;
-axios.defaults.headers.common["Authorization"] = 'Bearer '+localStorage.getItem('Authorization')+''
+axios.defaults.headers.common["Authorization"] = 'Bearer 96e3ef57-4dcb-4a20-9395-07981c0bd721';//`Bearer ${localStorage.getItem('access_token')`;
+//axios.defaults.headers.common["Authorization"] = 'Bearer '+localStorage.getItem('Authorization')+''
 
 //设置超时
 axios.defaults.timeout = 15000;

src/views/home.vue

@@ -6,7 +6,7 @@
       <div class="header_c">实验室安全智能监测与控制系统</div>
       <div class="header_r1">
         <img class="header_r1_l" src="@/assets/image/index_icon3.png"/>
-        <i>安全学院</i>
+        <i>安全工程学院</i>
         <img class="header_r1_r" src="@/assets/image/index_icon4.png" @click="openBackManageUrl()"/>
       </div>
     </div>

src/views/warningDetail.vue

@@ -228,23 +228,9 @@ export default {
       startListDeviceIds(obj).then((res) =>{
         if(res.code==200){
           let data=res
-          // for(let i=0;i<data.data.length;i++){
-          //   let list = {
-          //     divId:'divId'+i,
-          //     hasAudio:false,
-          //     height:false,
-          //     videoError:"",
-          //     videoUrl:data.data[i].result.body.data.flv,
-          //   }
-          //   _this.videoList.push(list)
-          //   _this.$forceUpdate();
-          //   setTimeout(function(){
-          //     _this.leftVideoFunction();
-          //   },2000);
-          // }
           let list = [];
           for(let i=0;i<data.data.length;i++){
-            let text = 'http://lab.sxitdlc.com/jinandaxue/stream/';
+            let text = 'http://lab.sxitdlc.com/wenchang/stream/';
             let url = data.data[i].result.body.data.fmp4;
             url = url.split("rtp/");
             let newUrl = text+'rtp/'+url[1];