heyang

api/index.js

@@ -1233,6 +1233,7 @@ export const jinanGetStartList  = (data) => {
     })
 };
 
+
 //扫码兑换调用
 export const exchangePoints  = (data) => {
     return apiResquest({

api/request/config.js

@@ -1,5 +1,5 @@
 const config = {
-	base_url: 'http://192.168.1.9:8080',//柴
+	//base_url: 'http://192.168.1.9:8080',//柴
 	// base_url: 'http://192.168.1.7:8080',//刘波
 	// base_url: 'http://192.168.1.17:8080',//周攀
     // base_url: 'http://192.168.1.8:8080',//高升
@@ -10,9 +10,10 @@ const config = {
 	// 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/labSystem/', //矿大地址
 	// base_url: 'https://lab.sxitdlc.com/jdlabSystem/', //交大地址
     // base_url: 'https://lab.sxitdlc.com/jndxlabSystem/', //暨大地址
+     base_url: 'https://lab.sxitdlc.com/kdwclabSystem/', //矿大文昌地址
 
 	//视频地址
 	video_url:'https://lab.sxitdlc.com',
@@ -20,9 +21,10 @@ const config = {
 	//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:'ws://192.168.1.43:1884',
+	// mqtt_url: 'lab.sxitdlc.com/jdmqtt', //交大MQTT
+	//mqtt_url:'ws://192.168.1.43:1884',
 	// mqtt_url: 'lab.sxitdlc.com/jndxmqtt', //暨大MQTT
+	 mqtt_url: 'lab.sxitdlc.com/kdwcmqtt',  //矿大文昌MQTT
     username: 'mqtt',
     password: 'mqtt@zd1883',
 }

pages/emergencyEvacuationBig.vue

@@ -6,22 +6,28 @@
 				<view class="picker-max-box">
 					<view class="picker-title-box">
 						<view></view>
-						<view>所属学院</view>
-					</view>
-					<view class="picker-min-box" style="background:#f5f5f5;">
-						<view>{{collegeArray[deptIndex].name}}</view>
-						<img src="@/images/icon_06.png">
+						<view>学院楼栋</view>
 					</view>
+					<picker @change="buildingChange"
+						:range-key="'label'" :value="value" :range="buildingList">
+						<view class="picker-min-box">
+							<view>{{buildingName?buildingName:'请选择学院楼栋'}}</view>
+							<img src="@/images/icon_06.png">
+						</view>
+					</picker>
 				</view>
 				<view class="picker-max-box">
 					<view class="picker-title-box">
 						<view></view>
-						<view>楼层楼栋</view>
-					</view>
-					<view class="picker-min-box" style="background:#f5f5f5;">
-						<view>{{deptArray[deptIndex].name}}</view>
-						<img src="@/images/icon_06.png">
+						<view>楼层</view>
 					</view>
+					<picker @change="floorChange"
+						:range-key="'name'" :value="id" :range="floorList">
+						<view class="picker-min-box">
+							<view>{{floorName?floorName:'请选择楼层'}}</view>
+							<img src="@/images/icon_06.png">
+						</view>
+					</picker>
 				</view>
 				<view class="picker-max-box">
 					<view class="picker-title-box">
@@ -31,7 +37,7 @@
 					<picker @change="fjListChange"
 						:range-key="'subjectName'" :value="id" :range="fjListArray">
 						<view class="picker-min-box">
-							<view>{{fjListIndex?fjListArray[fjListIndex].subjectName:'请选择实验室'}}</view>
+							<view>{{subName?subName:'请选择实验室'}}</view>
 							<img src="@/images/icon_06.png">
 						</view>
 					</picker>
@@ -57,7 +63,7 @@
 				<!-- 头部 -->
 				<view class="evacuation-title-box">
 					<view class="evacuation-title-name-box">{{subName}}</view>
-					<view class="site"><img src="@/images/icon_14.png">环境学院-祈福楼 环境与气象研究所</view>
+					<view class="site"><img src="@/images/icon_14.png">{{address}}</view>
 				</view>
 				<!-- 视频监控-选择疏散路径 -->
 				<view class="monito">
@@ -112,10 +118,10 @@
 						</view>
 						</view>
 					<view class="evacuation-map-box">
-						<view class="evacuation-map-big-box">
+						<view class="evacuation-map-big-box" :class="floorId==5?'map-1':(floorId==6?'map-2':(floorId==7?'map-3':''))">
 							<view class="evacuation-map-min-for-box" :class="subId == item.subjectId?'evacuation-map-min-for-box-color':''"
 							v-for="(item,index) in fjList" :key="index">{{item.room}}</view>
-							<img class="map-min-img" src="@/images/Version2.3/icon_sjt.gif" v-show="lightList[0].type">
+							<img class="map-min-img" src="@/images/Version2.3/icon_zjt.gif" v-show="lightList[0].type">
 							<img class="map-min-img" src="@/images/Version2.3/icon_yjt.gif" v-show="lightList[1].type">
 							<img class="map-min-img" src="@/images/Version2.3/icon_zjt.gif" v-show="lightList[2].type">
 							<img class="map-min-img" src="@/images/Version2.3/icon_yjt.gif" v-show="lightList[3].type">
@@ -178,20 +184,24 @@
 
 <script>
     import { config } from '@/api/request/config.js'
-    import { lablayout,evacuate,closure,lineEvacuate,getRedis,getDeviceList,textParseUrlIps,getCameraByFloor,jinanGetStartList,nanhuGetStartList,lineEvacuateTow} from '@/api/index.js'
+    import { lablayout,evacuate,closure,lineEvacuate,getRedis,getDeviceList,textParseUrlIps,
+	getCameraByFloor,jinanGetStartList,nanhuGetStartList,wenchangGetStartList,lineEvacuateTow,treeselectByUser,getBuilding} from '@/api/index.js'
     export default {
         data() {
             return {
 				//页面状态
 				pageType:"",
-				//学院
-				collegeArray:[{name:"环境学院-祈福楼",id:"113"}],
-				//楼栋
-				deptArray:[{name:"环境与气象研究所",id:"137"}],
 				deptIndex:0,
+				//院系楼栋数据
+				buildingList:[],
+				buildingName:"",
+				buildingId:"",
+				//楼层数据
+				floorList:[],
+				floorName:"",
+				floorId:"",
 				//实验室
 				fjListArray:[],
-				fjListIndex:"",
 				//疏散方向
 				buttonArray:[
 					{name:"向左疏散",id:"1"},
@@ -250,6 +260,7 @@
 					name:'',
 				},
 				broadcastType:false,
+				address:"",
 			}
 		},
         onLoad(option) {
@@ -267,12 +278,99 @@
 			}
 		},
 		onShow(){
+			this.treeselectByUser();
 			this.getAppExitLine();
 			this.lablayout();
-            getApp().watch(this.getMqttLineData,'lineData');
+			getApp().watch(this.getMqttLineData,'lineData');
 			this.getCameraByFloor();
 		},
 		methods: {
+			//根据账户信息查询学院楼栋数据
+			async treeselectByUser(){
+				const {data} = await treeselectByUser()
+				let list = [];
+				for(let i=0;i<data.data.length;i++){
+					for(let o=0;o<data.data[i].children.length;o++){
+						let obj = {
+							label:data.data[i].label+'-'+data.data[i].children[o].label,
+							value:data.data[i].children[o].id,
+						}
+						list.push(obj);
+						if(i==0&&o==0){
+							this.$set(this,'buildingId',obj.value);
+							this.$set(this,'buildingName',obj.label);
+						}
+					}
+				}
+				this.$set(this,'buildingList',list);
+				this.getBuilding(this.buildingId);
+			},
+			//根据账户信息查询学院楼栋数据
+			async getBuilding(buildingId){
+				const {data} = await getBuilding(buildingId)
+				// 过滤了三楼
+				let list = [];
+				for(let i=0;i<data.data.length;i++){
+					if(data.data[i].id != 7){
+						list.push(data.data[i]);
+					}
+				}
+				this.$set(this,'floorList',list);
+				if(data.data[0]){
+					this.$set(this,'floorName',data.data[0].name);
+					this.$set(this,'floorId',data.data[0].id);
+					this.lablayout(this.buildingId,this.floorId);
+				}
+			},
+			//获取实验室布局
+			async lablayout(buildingId,floorId){
+				console.log('buildingId',buildingId)
+				console.log('floorId',floorId)
+				let self = this;
+				const {data} = await lablayout(buildingId)
+				if(data.code == 200){
+				  for(let i=0;i<data.data.length;i++){
+					if(data.data[i].id == floorId){
+					  let newList = [];
+					  self.fjList = data.data[i].list;
+					  for(let o=0;o<data.data[i].list.length;o++){
+						if(data.data[i].list[o].subjectId != -1){
+							newList.push(data.data[i].list[o]);
+						}
+					  }
+					  this.$set(this,'fjListArray',newList);
+					  if(newList[0]){
+						  console.log("newList",newList[0])
+						this.$set(this,'subName',newList[0].subjectName);
+						this.$set(this,'subId',newList[0].subjectId);
+					  }
+					}
+				  }
+				}
+			},
+			//学院楼栋选中
+			buildingChange(e){
+				this.$set(this,'buildingIndex',e.detail.value);
+				this.$set(this,'buildingName',this.buildingList[e.detail.value].label);
+				this.$set(this,'buildingId',this.buildingList[e.detail.value].value);
+				this.getBuilding(this.buildingList[e.detail.value].value);
+			},
+			//楼层选中
+			floorChange(e){
+				this.$set(this,'floorIndex',e.detail.value);
+				this.$set(this,'floorName',this.floorList[e.detail.value].name);
+				this.$set(this,'floorId',this.floorList[e.detail.value].id);
+				this.lablayout(this.buildingId,this.floorList[e.detail.value].id);
+			},
+			//实验室选择
+			fjListChange(e){
+				this.$set(this,'subName',this.fjListArray[e.detail.value].subjectName);
+				this.$set(this,'subId',this.fjListArray[e.detail.value].subjectId);
+				this.$set(this,'deptId',this.fjListArray[e.detail.value].deptId);
+				this.itemData.name=this.fjListArray[e.detail.value].subjectName
+				this.itemData.floorId=this.fjListArray[e.detail.value].floorId
+				this.itemData.id=this.fjListArray[e.detail.value].id
+			},
 			getAppExitLine(){
 				let list = [{type:"lab/exit/line"}];
 				getApp().appMqttOn(1,list);
@@ -303,7 +401,7 @@
 			},
 			//获取楼层摄像头列表
 			async getCameraByFloor(){
-				const {data} = await getCameraByFloor({floorId:5})
+				const {data} = await getCameraByFloor({floorId:this.floorId})
 				if(data.code == 200){
 					if(data.data[0]){
 						//this.nanhuGetStartList(data.data);
@@ -312,7 +410,7 @@
 					}
 				}
 			},
-			async nanhuGetStartList(rows){
+			async wenchangGetStartList(rows){
 				let self = this;
 				let list = "";
 				for(let i=0;i<rows.length;i++){
@@ -543,8 +641,12 @@
 					if(data.data){
 						this.isEvacuate=false;
 						this.deptId = data.data.deptId;
+						this.buildingId = data.data.buildId;
+						this.floorId = data.data.floorId;
 						this.subId = data.data.subId;
 						this.subName = data.data.subName;
+						this.address = data.data.deptName+'-'+data.data.buildName+'-'+data.data.floorName
+						// this.lablayout(data.data.buildId,data.data.floorId);
 						this.evacuate();
 					}else{
 						this.pageType = 1;
@@ -553,17 +655,6 @@
 				}
 
 			},
-			//实验室选择
-			fjListChange(e){
-				this.fjListIndex = e.detail.value;
-				this.$set(this,'subName',this.fjListArray[this.fjListIndex].subjectName);
-				this.$set(this,'subId',this.fjListArray[e.detail.value].subjectId);
-				this.$set(this,'deptId',this.fjListArray[e.detail.value].deptId);
-
-				this.itemData.name=this.fjListArray[e.detail.value].subjectName
-				this.itemData.floorId=this.fjListArray[e.detail.value].floorId
-				this.itemData.id=this.fjListArray[e.detail.value].id
-			},
 			//疏散路线选择
 			buttonChangeTwo(e){
 				this.buttonArrayIndex = e.detail.value;
@@ -625,7 +716,7 @@
 					});
 					return
 				}
-
+				this.address = this.buildingName+''+this.floorName
 				this.lineEvacuateTow();
 			},
 			/* 2.5获取疏散线路 */
@@ -737,7 +828,7 @@
 			},
 			async getDeviceList(){
 				let obj ={
-					floorId:5,
+					floorId:this.floorId,
 					page:1,
 					pageSize:100,
 				};
@@ -753,26 +844,6 @@
 			scrollBoxClick(index){
 				this.videoIndex = index;
 			},
-			//获取实验室布局
-			async lablayout(){
-				let self = this;
-				const {data} = await lablayout(137)
-				if(data.code == 200){
-				  for(let i=0;i<data.data.length;i++){
-					if(data.data[i].id == 5){
-					  self.fjList = data.data[i].list;
-					  let newList = [];
-					  for(let o=0;o<data.data[i].list.length;o++){
-						if(data.data[i].list[o].subjectId != -1){
-							newList.push(data.data[i].list[o]);
-						}
-					  }
-					  this.$set(this,'fjListArray',newList);
-					}
-				  }
-
-				}
-			},
 		},
         beforeDestroy(){
 			//断开mqtt连接
@@ -1048,151 +1119,209 @@
 						overflow:hidden;
 						border:1rpx solid #E0E0E0;
 						margin-top:20rpx;
-						.evacuation-map-big-box{
-							height:285rpx;
-							width:641rpx;
-							background:url(../images/Version2.3/icon_bj_syspmtcy_jinan.png);
-							background-size 100%
-							margin:28rpx 13rpx ;
-							position relative
-							.evacuation-map-min-for-box{
-								overflow: hidden;
-								display: inline-block;
-								line-height:70rpx;
-								text-align: center;
-								font-size:14rpx;
-							}
-							.evacuation-map-min-for-box-color{
-								background: rgba(0,189,255,0.3);
-							}
+						.map-1{
+							background:url(../images/kuangdaMap/map1.png);
 							.evacuation-map-min-for-box:nth-child(1){
-								margin:4rpx 82rpx 0 0;
-								width:91rpx;
-								height:91rpx;
+								margin:4rpx 0 0 0;
+								width:54rpx;
+								height:102rpx;
 							}
 							.evacuation-map-min-for-box:nth-child(2){
-								margin:4rpx 0 0 0;
-								width:57rpx;
-								height:91rpx;
+								margin:4rpx 54rpx 0 0;
+								width:54rpx;
+								height:102rpx;
 							}
 							.evacuation-map-min-for-box:nth-child(3){
-								margin:4rpx 0 0 0;
-								width:57rpx;
-								height:91rpx;
+								margin:4rpx 54rpx 0 0;
+								width:100rpx;
+								height:102rpx;
 							}
 							.evacuation-map-min-for-box:nth-child(4){
 								margin:4rpx 0 0 0;
-								width:57rpx;
-								height:91rpx;
+								width:135rpx;
+								height:102rpx;
 							}
 							.evacuation-map-min-for-box:nth-child(5){
 								margin:4rpx 0 0 0;
-								width:58rpx;
-								height:91rpx;
+								width:95rpx;
+								height:102rpx;
 							}
 							.evacuation-map-min-for-box:nth-child(6){
 								margin:4rpx 0 0 0;
-								width:57rpx;
-								height:91rpx;
+								width:54rpx;
+								height:102rpx;
 							}
 							.evacuation-map-min-for-box:nth-child(7){
-								margin:4rpx 0 0 0;
-								width:57rpx;
-								height:91rpx;
+								margin:78rpx 0 0 0;
+								width:130rpx;
+								height:102rpx;
 							}
 							.evacuation-map-min-for-box:nth-child(8){
-								margin:4rpx 40rpx 0 0;
-								width:57rpx;
-								height:91rpx;
+								margin:78rpx 0 0 0;
+								width:149rpx;
+								height:102rpx;
 							}
 							.evacuation-map-min-for-box:nth-child(9){
-								margin:47rpx 0 0 0;
-								width:51rpx;
-								height:136rpx;
-								line-height:140rpx;
+								margin:78rpx 0 0 0;
+								width:84rpx;
+								height:102rpx;
 							}
 							.evacuation-map-min-for-box:nth-child(10){
-								margin:47rpx 0 0 0;
-								width:60rpx;
-								height:136rpx;
-								line-height:140rpx;
+								margin:78rpx 0 0 0;
+								width:84rpx;
+								height:102rpx;
 							}
 							.evacuation-map-min-for-box:nth-child(11){
-								margin:47rpx 0 0 0;
-								width:62rpx;
-								height:136rpx;
-								line-height:140rpx;
+								margin:78rpx 0 0 0;
+								width:94rpx;
+								height:102rpx;
 							}
 							.evacuation-map-min-for-box:nth-child(12){
-								margin:47rpx 0 0 0;
-								width:58rpx;
-								height:136rpx;
-								line-height:140rpx;
+								margin:78rpx 0 0 0;
+								width:44rpx;
+								height:102rpx;
 							}
 							.evacuation-map-min-for-box:nth-child(13){
-								margin:47rpx 0 0 0;
-								width:57rpx;
-								height:136rpx;
-								line-height:140rpx;
+								margin:78rpx 0 0 0;
+								width:64rpx;
+								height:102rpx;
 							}
-							.evacuation-map-min-for-box:nth-child(14){
-								margin:47rpx 0 0 0;
-								width:57rpx;
-								height:136rpx;
-								line-height:140rpx;
+							.map-min-img:nth-child(14){
+								top: 134rpx;
+								left: 80rpx;
 							}
-							.evacuation-map-min-for-box:nth-child(15){
-								margin:47rpx 0 0 0;
-								width:57rpx;
-								height:136rpx;
-								line-height:140rpx;
+							.map-min-img:nth-child(15){
+								top: 134rpx;
+								left: 160rpx;
 							}
-							.evacuation-map-min-for-box:nth-child(16){
-								margin:47rpx 0 0 0;
-								width:57rpx;
-								height:136rpx;
-								line-height:140rpx;
+							.map-min-img:nth-child(16){
+								top: 134rpx;
+								left:280rpx;
 							}
-							.evacuation-map-min-for-box:nth-child(17){
-								margin:47rpx 0 0 0;
-								width:57rpx;
-								height:136rpx;
-								line-height:140rpx;
+							.map-min-img:nth-child(17){
+								top: 134rpx;
+								left:340rpx;
 							}
-							.evacuation-map-min-for-box:nth-child(18){
-								margin:47rpx 0 0 0;
-								width:57rpx;
-								height:136rpx;
-								line-height:140rpx;
-							}
-							.map-min-img{
-								position: absolute;
-								width:34rpx;
-								height:22rpx;
+							.map-min-img:nth-child(18){
+								top: 134rpx;
+								left:460rpx;
 							}
 							.map-min-img:nth-child(19){
-								top: 64rpx;
-								left: 94rpx;
+								top: 134rpx;
+								left:540rpx;
+							}
+						}
+						.map-2{
+							background:url(../images/kuangdaMap/map2.png);
+							.evacuation-map-min-for-box:nth-child(1){
+								margin:4rpx 0 0 0;
+								width:54rpx;
+								height:102rpx;
+							}
+							.evacuation-map-min-for-box:nth-child(2){
+								margin:4rpx 54rpx 0 0;
+								width:54rpx;
+								height:102rpx;
 							}
-							.map-min-img:nth-child(20){
-								top: 109rpx;
-								left: 134rpx;
+							.evacuation-map-min-for-box:nth-child(3){
+								margin:4rpx 54rpx 0 0;
+								width:100rpx;
+								height:102rpx;
 							}
-							.map-min-img:nth-child(21){
-								top: 109rpx;
-								left:290rpx;
+							.evacuation-map-min-for-box:nth-child(4){
+								margin:4rpx 0 0 0;
+								width:135rpx;
+								height:102rpx;
 							}
-							.map-min-img:nth-child(22){
-								top: 109rpx;
-								left:350rpx;
+							.evacuation-map-min-for-box:nth-child(5){
+								margin:4rpx 0 0 0;
+								width:145rpx;
+								height:102rpx;
 							}
-							.map-min-img:nth-child(23){
-								top: 109rpx;
-								left:520rpx;
+							.evacuation-map-min-for-box:nth-child(6){
+								margin:4rpx 0 0 0;
+								width:106rpx;
+								height:102rpx;
+							}
+							.evacuation-map-min-for-box:nth-child(7){
+								margin:78rpx 0 0 0;
+								width:106rpx;
+								height:102rpx;
 							}
-							.map-min-img:nth-child(24){
-								top: 109rpx;
-								left:580rpx;
+							.evacuation-map-min-for-box:nth-child(8){
+								margin:78rpx 0 0 0;
+								width:100rpx;
+								height:102rpx;
+							}
+							.evacuation-map-min-for-box:nth-child(9){
+								margin:78rpx 0 0 0;
+								width:100rpx;
+								height:102rpx;
+							}
+							.evacuation-map-min-for-box:nth-child(10){
+								margin:78rpx 0 0 0;
+								width:92rpx;
+								height:102rpx;
+							}
+							.evacuation-map-min-for-box:nth-child(11){
+								margin:78rpx 0 0 0;
+								width:90rpx;
+								height:102rpx;
+							}
+							.evacuation-map-min-for-box:nth-child(12){
+								margin:78rpx 0 0 0;
+								width:53rpx;
+								height:102rpx;
+							}
+							.map-min-img:nth-child(13){
+								top: 134rpx;
+								left: 80rpx;
+							}
+							.map-min-img:nth-child(14){
+								top: 134rpx;
+								left: 160rpx;
+							}
+							.map-min-img:nth-child(15){
+								top: 134rpx;
+								left:280rpx;
+							}
+							.map-min-img:nth-child(16){
+								top: 134rpx;
+								left:340rpx;
+							}
+							.map-min-img:nth-child(17){
+								top: 134rpx;
+								left:460rpx;
+							}
+							.map-min-img:nth-child(18){
+								top: 134rpx;
+								left:540rpx;
+							}
+						}
+						.map-3{
+							background:url(../images/kuangdaMap/map3.png);
+						}
+						.evacuation-map-big-box{
+							height:293rpx;
+							width:644rpx;
+							// background:url(../images/Version2.3/icon_bj_syspmtcy_jinan.png);
+							background-size 100%
+							margin:28rpx 13rpx ;
+							position relative
+							.evacuation-map-min-for-box{
+								overflow: hidden;
+								display: inline-block;
+								line-height:70rpx;
+								text-align: center;
+								font-size:14rpx;
+							}
+							.evacuation-map-min-for-box-color{
+								background: rgba(0,189,255,0.3);
+							}
+							.map-min-img{
+								position: absolute;
+								width:34rpx;
+								height:22rpx;
 							}
 						}
 					}

pages/login.vue

@@ -336,14 +336,14 @@ export default {
       .supplier_l{
         font-size: 24rpx;
         font-family: PingFang SC;
-        font-weight: bold;
+        font-weight: 400;
         color: #333333;
         line-height: 24rpx;
       }
       .supplier_r{
         font-size: 24rpx;
         font-family: PingFang SC;
-        font-weight: bold;
+        font-weight: 400;
         color: #333333;
         line-height: 24rpx;
         >text{
@@ -358,7 +358,7 @@ export default {
       align-items: center;
       font-size: 24rpx;
       font-family: PingFang SC;
-      font-weight: bold;
+      font-weight: 400;
       color: #0183FA;
       line-height: 24rpx;
       margin-top: 60rpx;

pages/saoCode/hazardousChemicalsDescription.vue

@@ -1,15 +1,17 @@
 <!--危险化学品说明-->
 <template>
     <view id="hazardousChemicalsDescription">
-        <web-view :src="'https://lab.sxitdlc.com/jndxlabSystem/admin/#/codeHtml?code='+code+'&type==1'"></web-view>
+        <web-view :src="baseUrl+'admin/#/codeHtml?code='+code+'&type==1'"></web-view>
     </view>
 </template>
 
 <script>
+	import { config } from '@/api/request/config.js'
     export default {
         name: "hazardousChemicalsDescription",
         data() {
             return {
+				baseUrl:config.base_url,
                 code:"",
             }
         },

pages/saoCode/safetyManagement.vue

@@ -1,15 +1,17 @@
 <!--安全管理制度-->
 <template>
     <view id="safetyManagement">
-        <web-view :src="'https://lab.sxitdlc.com/jndxlabSystem/admin/#/codeHtml?code='+code+'&type==2'"></web-view>
+        <web-view :src="baseUrl+'admin/#/codeHtml?code='+code+'&type==2'"></web-view>
     </view>
 </template>
 
 <script>
+	import { config } from '@/api/request/config.js'
     export default {
         name: "safetyManagement",
         data() {
             return {
+				baseUrl:config.base_url,
                 code:"",
             }
         },

pages/saoCode/saoCode.vue

@@ -1,15 +1,18 @@
 <!--扫描二维码页面-->
 <template>
     <view id="saoCode">
-        <web-view :src="'https://lab.sxitdlc.com/jndxlabSystem/admin/#/codeHtml?code='+code+'&type='+type"></web-view>
+        <web-view :src="baseUrl+'admin/#/codeHtml?code='+code+'&type='+type"></web-view>
     </view>
 </template>
 
 <script>
+	import { config } from '@/api/request/config.js'
     export default {
+		
         name: "saoCode",
         data() {
             return {
+				baseUrl:config.base_url,
                 code:"",
                 type:"",
             }

pages_manage/gasManage/gasManage.vue

@@ -77,14 +77,14 @@
             }
         },
         onLoad(option) {
-			
+
         },
-        onShow(){	
-			
+        onShow(){
+
         },
-		
+
         methods: {
-			
+
 			handleClick(doType) {
 				let _this=this;
 				if(doType=='examination'){//资格申请
@@ -119,10 +119,10 @@
 							_this.getInfo()
 						}
 					});
-					
+
 				}
-				
-				
+
+
 			},
 			//使用记录跳转详情
 			goInfo(d){
@@ -142,7 +142,7 @@
 				if(data.code==200){
 					let res = data.data;
 					let userId=uni.getStorageSync('userId');
-					
+
 					if(res.currentStatus==4 && res.currentUserId==userId){
 						uni.navigateTo({
 						    url:'/pages_manage/useRegister/giveRegister?code='+_this.electronicTag
@@ -154,7 +154,7 @@
 					}
 				}
 			},
-			
+
 			//获取使用记录列表
 			async getList(){
 				let _this = this;
@@ -185,7 +185,7 @@
 					_this.userApplyNumberZg=res.userApplyNumberZg;
 				}
 			},
-			
+
         },
 		mounted() {
 			this.getList();
@@ -233,7 +233,7 @@
 					width: 12rpx;
 					height: 24rpx;
 				}
-			}	
+			}
 		}
 		.small_title{
 			font-size: 30rpx;
@@ -250,7 +250,7 @@
 				height: 24rpx;
 			}
 		}
-		
+
 		.register_li2{
 			background #fff;
 			border-radius:20rpx;
@@ -279,7 +279,7 @@
 						margin-right: 10rpx;
 					}
 					>view{
-						font-size: 26rpx;
+						font-size: 24rpx;
 						font-family: PingFang SC;
 						font-weight: 500;
 						color: #666666;
@@ -296,7 +296,7 @@
 					justify-content: flex-start;
 					align-items: center;
 					padding-bottom: 28rpx;
-					
+
 					>img{
 						width: 28rpx;
 						height: 28rpx;
@@ -317,7 +317,7 @@
 					}
 				}
 			}
-			
+
 		}
 		/* 按钮 */
 		.btn{

pages_manage/workbench/laboratory/monitor.vue

@@ -100,7 +100,7 @@ export default {
     // }else if(this.deptId == 113){
     //   this.nanhuGetStartList();
     // }
-	this.jinanGetStartList();
+	this.GetVideoList();
     this.getDeviceListBySub();
     // this.getChannels();
   },
@@ -334,7 +334,7 @@ export default {
     //获取喇叭列表
     async getDeviceListBySub(){
       let obj = {
-        floorId:this.itemData.floorId,
+        floorId:5,
         subId:this.itemData.id,
         page:1,
         pageSize:100
@@ -348,33 +348,8 @@ export default {
         // console.log(data);
       }
     },
-    //查询摄像头地址(暨南大学)
-    async jinanGetStartList(){
-      let obj = {
-        page:'1',
-        count:'2',
-        deviceIds:this.itemData.hardwareNUM
-      };
-      const {data} = await jinanGetStartList(obj);
-      if(data.code == 200){
-        let list = [];
-        for(let i=0;i<data.data.length;i++){
-          let text = 'https://lab.sxitdlc.com/jinandaxue/stream/';
-          let url = data.data[i].result.body.data.fmp4;
-          url = url.split("rtp/");
-          let newUrl = text+'rtp/'+url[1];
-          let obj = {
-            id:data.data[i].result.body.data.deviceID,
-            url:newUrl,
-          }
-          list.push(obj)
-          console.log("obj",obj)
-        }
-        this.urlList = list;
-      }
-    },
-    //查询摄像头地址(文昌)
-    async wenchangGetStartList(){
+    //查询摄像头地址(矿大文昌大学)
+    async GetVideoList(){
       let obj = {
         page:'1',
         count:'2',
@@ -398,32 +373,8 @@ export default {
         this.urlList = list;
       }
     },
-    //查询摄像头地址(南湖)
-    async nanhuGetStartList(){
-      let obj = {
-        page:'1',
-        count:'2',
-        deviceIds:this.itemData.hardwareNUM
-      };
-      const {data} = await nanhuGetStartList(obj);
-      if(data.code == 200){
-        let list = [];
-        for(let i=0;i<data.data.length;i++){
-          let text = 'https://lab.sxitdlc.com/nanhu/stream/';
-          let url = data.data[i].result.body.data.fmp4;
-          url = url.split("rtp/");
-          let newUrl = text+'rtp/'+url[1];
-          let obj = {
-            id:data.data[i].result.body.data.deviceID,
-            url:newUrl,
-          }
-          list.push(obj)
-          console.log("obj",obj)
-        }
-        this.urlList = list;
-      }
-    },
-    videoErrorCallback(e){
+  
+	videoErrorCallback(e){
       console.log("播放失败",e);
       // uni.showToast({
       //     title: '视频播放失败',