dedsudiyu 3 månader sedan
förälder
incheckning
dc6eb3f4ed

+ 13 - 12
api/request/config.js

@@ -5,27 +5,28 @@ const config = {
     // base_url: 'http://192.168.1.8:8080',//高升
 	// base_url: 'http://192.168.1.29:8080',//何成
     // base_url: 'http://192.168.1.43:9800',//43服务器
-	// base_url: 'https://demo.sxitdlc.com/xzgd/',
+	// base_url: 'https://demo.zjznai.com/xzgd/',
 
-	// base_url: 'https://lab.sxitdlc.com/labNhSystem/',//43服务器高升测试
-	// base_url: 'https://lab.sxitdlc.com/labAppTest/',//43服务器线上
-    //base_url: 'https://lab.sxitdlc.com/appTest/',//88服务器线上
-	//base_url: 'https://lab.sxitdlc.com/labSystem/', //矿大地址
-	// base_url: 'https://lab.sxitdlc.com/jdlabSystem/', //交大地址
-     base_url: 'https://lab.sxitdlc.com/jndxlabSystem/', //暨大地址
-      // base_url: 'https://lab.sxitdlc.com/kdwclabSystem/', //矿大文昌地址
+	// base_url: 'https://lab.zjznai.com/labNhSystem/',//43服务器高升测试
+	// base_url: 'https://lab.zjznai.com/labAppTest/',//43服务器线上
+    //base_url: 'https://lab.zjznai.com/appTest/',//88服务器线上
+	//base_url: 'https://lab.zjznai.com/labSystem/', //矿大地址
+	// base_url: 'https://lab.zjznai.com/jdlabSystem/', //交大地址
+     base_url: 'https://lab.zjznai.com/jndxlabSystem/', //暨大地址
+      // base_url: 'https://lab.zjznai.com/kdwclabSystem/', //矿大文昌地址
 
 	//视频地址
-	video_url:'https://lab.sxitdlc.com',
+	video_url:'https://lab.zjznai.com',
 
 	//MQTT
 	// mqtt_url :'192.168.1.43:1883', //43MQTT
-	// mqtt_url: 'lab.sxitdlc.com/nhmqtt', //矿大MQTT
-	// mqtt_url: 'lab.sxitdlc.com/jdmqtt', //交大MQTT
+	// mqtt_url: 'lab.zjznai.com/nhmqtt', //矿大MQTT
+	// mqtt_url: 'lab.zjznai.com/jdmqtt', //交大MQTT
 	//mqtt_url:'ws://192.168.1.43:1884',
-	 mqtt_url: 'lab.sxitdlc.com/jndxmqtt', //暨大MQTT
+	 mqtt_url: 'lab.zjznai.com/jndxmqtt', //暨大MQTT
 	// mqtt_url: 'lab.sxitdlc.com/kdwcmqtt',  //矿大文昌MQTT
     username: 'mqtt',
     password: 'mqtt@zd1883',
 }
 export { config }
+

+ 11 - 11
pages/alarmInfo/alarmInfoMonitor.vue

@@ -20,7 +20,7 @@
 			</view>
 		</view>
 	</view>
-	
+
 </template>
 
 <script>
@@ -32,7 +32,7 @@
 				videoCover:uni.getStorageSync('videoCover'),
 				currentTab: 0,
 				form:{
-				
+
 				},
 				urlList:[],
 				barNameList:[
@@ -55,14 +55,14 @@
 						name:'实验室监控1',
 					},
 				],
-				
+
             }
         },
         onLoad(option) {
 			this.jinanGetStartList();
         },
         onShow(){
-			
+
         },
 		methods:{
 			//点击tab切换
@@ -78,7 +78,7 @@
 				// 	  _this.jinanGetStartList(_this.hardwareNUM[index])
 				// 	}
 				// })
-				
+
 			},
 			//查询摄像头地址(交大)
 			async jinanGetStartList(deviceIds){
@@ -92,7 +92,7 @@
 			  if(data.code == 200){
 				let list = [];
 				for(let i=0;i<data.data.length;i++){
-				  let text = 'https://lab.sxitdlc.com/jinandaxue/stream/';
+				  let text = 'https://lab.zjznai.com/jinandaxue/stream/';
 				  let url = data.data[i].result.body.data.hls;
 				  url = url.split("rtp/");
 				  let newUrl = text+'rtp/'+url[1];
@@ -107,7 +107,7 @@
 			  }
 			},
 		},
-	
+
 	}
 </script>
 
@@ -128,7 +128,7 @@
 					width: 100%;
 					white-space: nowrap;
 					border-bottom: 1px solid #e0e0e0;
-			 
+
 					& view {
 						white-space: normal;
 						display: inline-block;
@@ -143,7 +143,7 @@
 					& view:first-child:before {
 						display: none;
 					}
-			 
+
 					.select {
 						font-size: 28rpx;
 						font-family: PingFang SC;
@@ -151,7 +151,7 @@
 						color: #0183FA;
 						line-height: 60rpx;
 					}
-			 
+
 					.select1 {
 						color: #333333;
 					}
@@ -167,7 +167,7 @@
 				}
 			}
 		}
-	}	
+	}
 	/deep/.input-value-border{
 		display :none !important;
 	}

+ 1 - 1
pages/emergencyEvacuationBig.vue

@@ -341,7 +341,7 @@
 				if(data.code == 200){
                     let list = [];
                     for(let i=0;i<data.data.length;i++){
-                        let text = 'https://lab.sxitdlc.com/jinandaxue/stream/';
+                        let text = 'https://lab.zjznai.com/jinandaxue/stream/';
                         let url = data.data[i].result.body.data.hls;
                         url = url.split("rtp/");
                         let newUrl = text+'rtp/'+url[1];

+ 2 - 2
pages_manage/workbench/laboratory/monitor.vue

@@ -96,7 +96,7 @@ export default {
     this.deptId = JSON.parse(decodeURIComponent(option.deptId));
     console.log(this.itemData)
     console.log(this.deptId)
-	
+
 	 this.jndxGetStartList();//暨南大学调用摄像头列表
     this.getDeviceListBySub();
     // this.getChannels();
@@ -357,7 +357,7 @@ export default {
 	  if(data.code == 200){
 	    let list = [];
 	    for(let i=0;i<data.data.length;i++){
-	      let text = 'https://lab.sxitdlc.com/jinandaxue/stream/';
+	      let text = 'https://lab.zjznai.com/jinandaxue/stream/';
 	      let url = data.data[i].result.body.data.hls;
 	      url = url.split("rtp/");
 	      let newUrl = text+'rtp/'+url[1];