zc

component/topWarn.vue

@@ -2,7 +2,7 @@
 <template>
 	<view class="top-warn" v-if="pageType">
 		<view>{{text}}</view>
-		<view @click="buttonClick" v-if="whetherRoute">查看</view>
+		<!-- <view @click="buttonClick" v-if="whetherRoute">查看</view> -->
 	</view>
 </template>
 
@@ -112,15 +112,18 @@
 			//预案预警
 			async planWarnFun(){
 				const {data} = await selectTriggerInfo();
+				let list = [];
 				if(data.data[0]){
-				  this.warnList=this.warnList.concat(data.data)
+				  list = data.data
 				}
-				this.gasWarnFun();
+				this.gasWarnFun(list);
 			},
 			//气瓶预警
-			async gasWarnFun(){
+			async gasWarnFun(list){
 				const {data} = await airbottleBluetoothGetBeaconNotice();
-				this.warnList=this.warnList.concat(data.data)
+				let newList = list.concat(data.data)
+				this.$set(this,'warnList',newList);
+				// this.warnList=this.warnList.concat(data.data)
 				if(this.warnList[0]){
 				  this.$set(this,'text',this.warnList.length>1?'有多个实验室发生预案':'有实验室发生预案');
 				  this.$set(this,'buildId',this.warnList[0].buildId);
@@ -132,20 +135,20 @@
 				  }
 				  this.$set(this,'pageType',true);
 				  //没有火焰预案并且没有查看过
-				  for(let i=0;i<this.warnList.length;i++){
-					if(this.warnList[i].riskAttribute != '1'&&this.warnList[i].ifCheck != '1'){
-						let obj = {
-						  buildId: this.warnList[i].buildId,
-						  floorId:this.warnList[i].floorId,
-						  subId:this.warnList[i].subId,
-						  groupId:this.warnList[i].groupId,
-						}
-						uni.navigateTo({
-							url:'/pages_manage/emergencyEvacuationBig?item='+encodeURIComponent(JSON.stringify(obj))
-						});
-						return
-					}
-				  }
+				 //  for(let i=0;i<this.warnList.length;i++){
+					// if(this.warnList[i].riskAttribute != '1'&&this.warnList[i].ifCheck != '1'){
+					// 	let obj = {
+					// 	  buildId: this.warnList[i].buildId,
+					// 	  floorId:this.warnList[i].floorId,
+					// 	  subId:this.warnList[i].subId,
+					// 	  groupId:this.warnList[i].groupId,
+					// 	}
+					// 	uni.navigateTo({
+					// 		url:'/pages_manage/emergencyEvacuationBig?item='+encodeURIComponent(JSON.stringify(obj))
+					// 	});
+					// 	return
+					// }
+				 //  }
 				}else{
 				  this.$set(this,'pageType',false);
 				}

pages/manageWorkbench.vue

@@ -259,29 +259,33 @@ export default {
     },
     //获取报警信息详情
     async laboratoryInfo(item){
-		let self=this;
-      const {data} = await laboratoryInfo(item.subDiyVo.id);
-      if(data.code == 200){
-        let obj = data.data[0];
-        obj.subClassVO = item.subDiyVo.subClassVO;
-        obj.name = item.subDiyVo.name;
-        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
+          url: '/pages/earlyWarningManage/earlyWarningList'
         });
-      }
+		
+		// let self=this;
+  //     const {data} = await laboratoryInfo(item.subDiyVo.id);
+  //     if(data.code == 200){
+  //       let obj = data.data[0];
+  //       obj.subClassVO = item.subDiyVo.subClassVO;
+  //       obj.name = item.subDiyVo.name;
+  //       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
+  //       });
+  //     }
     },
     //获取实验室详情
     async laboratoryInfoOne(item){
@@ -303,7 +307,7 @@ export default {
 		 		obj.labHardwareVOList[i].dictLabel=self.fanList[b].dictLabel
 		 	  }
 		 	}
-		 }
+		  }
 		}
         uni.navigateTo({
           url: '/pages_manage/workbench/laboratory/laboratoryInfo?item='+encodeURIComponent(JSON.stringify(obj))+'&deptId='+item.deptId
@@ -320,18 +324,21 @@ export default {
       };
       const {data} = await getSafeWarnList(obj);
       if(data.code == 200){
-        this.alarmList = data.rows;
-        if(data.rows[0]){
-          this.securityAlertNum = data.rows[0].todayHappenCount;
-        }else{
-          this.securityAlertNum = 0;
-        }
+        this.alarmList = data.data.list;
+        this.securityAlertNum = data.data.count;
+        // if(data.rows[0]){
+        //   this.securityAlertNum = data.rows[0].todayHappenCount;
+        // }else{
+        //   this.securityAlertNum = 0;
+        // }
       }
     },
     //获取实验室列表
     async laboratoryList(){
       let self = this;
       let obj = {
+		pageNum:1,
+		pageSize:10,
         deptId:this.facultyIndex?this.facultyList[this.facultyIndex].deptId:'',
         subDept:this.subjectIndex?this.subjectList[this.subjectIndex].dictValue:'',
         level:this.levelIndex?this.levelList[this.levelIndex].dictValue:'',
@@ -587,8 +594,6 @@ export default {
 		.big-icon-button-box_bg{
 			width:372rpx;
 			height:260rpx;
-			position: absolute;
-			z-index: 100;
 		}
 		.big-icon-button-box_t1{
 			width: 149rpx;
@@ -604,7 +609,6 @@ export default {
 			position:absolute;
 			right: 42rpx;
 			top: 94rpx;
-			z-index: 200;
 			
 		}
 		.big-icon-button-box_t2{
@@ -618,7 +622,6 @@ export default {
 			position:absolute;
 			right: 28rpx;
 			top: 148rpx;
-			z-index: 200;
 			
 		}
 	}
@@ -781,7 +784,7 @@ export default {
     background #fff
     padding-left:25rpx;
     display flex
-    margin:0 20rpx;
+    margin:20rpx 20rpx 0;
     border-bottom:1rpx solid #e0e0e0;
     .left-img{
       height:34rpx;
@@ -823,7 +826,6 @@ export default {
     .for-box{
       border-top:4rpx solid #dedede;
       background #fff
-      margin-bottom:20rpx;
       overflow: hidden
       .title-box{
         margin:20rpx 20rpx 0;

pages_manage/emergencyEvacuationBig.vue

@@ -80,6 +80,8 @@
                           v-for="(minItem,minIndex) in item.doorList" :key="minIndex"
                           :style="'top:'+minItem.y+'rpx;left:'+minItem.x+'rpx;width:'+minItem.w+'rpx;height:'+minItem.h+'rpx;'">
                     </view>
+					<view class="gas-img-position">
+					</view>
                   </view>
                 </view>
                 <view class="map-max-for-box for-map-box-one" v-if="item.type == 2" v-for="(item,index) in mapList"
@@ -150,9 +152,9 @@
         </view>
         <view class="bottom-button-box">
           <view class="voice" @click="shadeTypeClick()">语音广播</view>
-          <view class="plan" v-if="planStatus"  @click="closePlan()">结束预案</view>
+          <!-- <view class="plan" v-if="planStatus"  @click="closePlan()">结束预案</view>
           <view class="evacuate" @click="evacuationButton(1)" v-if="isEvacuate">执行疏散</view>
-          <view class="evacuate" @click="evacuationButton(2)" v-if="!isEvacuate">结束疏散</view>
+          <view class="evacuate" @click="evacuationButton(2)" v-if="!isEvacuate">结束疏散</view> -->
         </view>
       </view>
       <!-- 语音广播-->
@@ -1862,7 +1864,15 @@ export default {
 
                 .map-max-for-min-box {
                   position: relative;
-
+				  .gas-img-position{
+					z-index:999;
+					position: absolute;
+					bottom:2rpx;
+					right:2rpx;
+					width:14rpx;
+					height:36rpx;
+					background: url("../images/evacuation3_2/gasBottleAlarm_a.png") !important;
+				  }
                   .position-box {
                     position: absolute;
                   }
@@ -2022,7 +2032,7 @@ export default {
         margin: 20rpx;
 
         view {
-          width: 335rpx;
+          width: 670rpx;
           height: 100rpx;
           line-height: 100rpx;
           text-align: center;
@@ -2031,8 +2041,10 @@ export default {
         }
 
         .voice {
-          border-top-left-radius: 50rpx;
-          border-bottom-left-radius: 50rpx;
+          // border-top-left-radius: 50rpx;
+          // border-bottom-left-radius: 50rpx;
+          border-radius: 50rpx;
+          borderradius: 50rpx;
           background: #FF9C00;
         }
 		.plan{