heyang

api/request/config.js

@@ -11,7 +11,8 @@ 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/labSaasSystem/', //矿大化工
 	// base_url: 'https://lab.sxitdlc.com/jdlabSystem/', //交大地址
     // base_url: 'https://lab.sxitdlc.com/jndxlabSystem/', //暨大地址
     //  base_url: 'https://lab.sxitdlc.com/kdwclabSystem/', //矿大文昌地址

pages/manageWorkbench.vue

@@ -245,6 +245,7 @@ export default {
     },
     //获取报警信息详情
     async laboratoryInfo(item){
+		let self=this;
       const {data} = await laboratoryInfo(item.subDiyVo.id);
       if(data.code == 200){
         let obj = data.data[0];
@@ -253,6 +254,16 @@ export default {
         obj.subTypeLable = item.subDiyVo.subTypeLable;
         obj.deptName = item.subDiyVo.deptName;
         obj.subAddrrStr = item.subDiyVo.subAddrrStr;
+		//循环判断如果是排风扇的话,启动的时候是人工还是预案还是定时
+		for(let i=0;i<obj.labHardwareVOList.length;i++){
+		 if(obj.labHardwareVOList[i].hardwareTypeEnum.hardwareTypeCode == '2'){
+		 	for(let b=0;b<self.fanList.length;b++){
+		 	  if(self.fanList[b].dictValue==obj.labHardwareVOList[i].triggerModes){
+		 		obj.labHardwareVOList[i].dictLabel=self.fanList[b].dictLabel
+		 	  }
+		 	}
+		 }
+		}
         uni.navigateTo({
           url: '/pages_manage/workbench/laboratory/laboratoryInfo?item='+encodeURIComponent(JSON.stringify(obj))+'&deptId='+obj.deptId
         });

pages_manage/workbench/laboratory/laboratoryInfo.vue

@@ -646,7 +646,7 @@ export default {
     //监听设备信息
     getMqttDeviceData(val){
       let self = this;
-       //console.log('页面获取的-设备信息',val)
+       console.log('页面获取的-设备信息',val)
       for(let i=0;i<val.length;i++){
         for(let k=0;k<self.itemData.labHardwareVOList.length;k++){
           if(val[i].num == self.itemData.labHardwareVOList[k].id){
@@ -670,9 +670,6 @@ export default {
 		  }
 		  
         }
-		
-		
-		
       }
     },
     infoMaxBoxClick(){