heyang

api/index.js

@@ -1698,6 +1698,14 @@ export const getCameraByFloor  = (data) => {
         data: data,
     })
 };
+//获取疏散硬件
+export const sparseHardwareList  = (data) => {
+    return apiResquest({
+        url: `/laboratory/sparseHardware/list`,
+        method: 'GET',
+        data: data,
+    })
+};
 
 //获取当前用户认证头像
 export const mystudent  = (data) => {

pages/earlyWarningManage/earlyWarningDetail.vue

@@ -147,18 +147,18 @@
 			</view>
 		</view>
 		<view  class="bottom_btn" v-if="timeStatus && (form.warningSubType!=2 && form.warningSubType!=3 && form.warningSubType!=4)" @click="handleClick('','monitor')">查看监控</view>
-	</scroll-view>	
+	</scroll-view>
   </view>
 
 </template>
 
 <script>
 import { config } from '@/api/request/config.js'
-import {checkManageList,conditionCollegeInfo,warningNoticeLogDetail} from '@/api/index.js'
+import {warningNoticeLogDetail} from '@/api/index.js'
 export default {
   name: "rectifyList",
   components: {
-   
+
   },
   data() {
     return {
@@ -173,12 +173,12 @@ export default {
 		form:{},
 		currentTime:'',
 		timeStatus:false,
-		
+
 	}
   },
   onLoad(option) {
 	  let self = this;
-	  
+
 	  //先判断是否是通过点击列表进入
 	  if(option.warningId){
 		  this.warningId=option.warningId;
@@ -196,24 +196,24 @@ export default {
 			}else{
 				this.warningId = option.id;
 				uni.removeStorageSync('warningId');
-		    } 	
-		}  
+		    }
+		}
 	  }
-	 
+
   },
   onShow() {
-	
+
   },
   mounted(){
-	this.getInfo(); 
-	
+	this.getInfo();
+
   },
   methods: {
-		
+
 		//滚动事件
 		scrollGet(){
 			let self=this;
-			
+
 		},
 		//判断预警时间是否超过30分钟
 		compareTime (gettime){
@@ -227,7 +227,7 @@ export default {
 				console.log('预警没超过30分钟')
 				this.timeStatus=true;
 			}
-			
+
 		},
 		//查看图片
 		lockImg(list){
@@ -248,8 +248,8 @@ export default {
 		},
 		//视频全屏播放
 		lockVideo(){
-			this.videoContext = uni.createVideoContext("myvideo", this);    
-			this.videoContext.requestFullScreen({ direction: 90 });  
+			this.videoContext = uni.createVideoContext("myvideo", this);
+			this.videoContext.requestFullScreen({ direction: 90 });
 			this.videoContext.play();
 		},
 		//计算两个日期差值（天）
@@ -270,7 +270,7 @@ export default {
 				let res=data.data
 				this.form=res;
 				if(this.form.startTime!='' && this.form.startTime!=null && this.form.endTime !=''&& this.form.endTime !=null){
-	
+
 					if(this.form.startTime.split(' ')[0] != this.form.endTime.split(' ')[0]){
 						this.form.everyDay=true;
 						this.form.everyDayNum=this.datedifference(this.form.endTime.split(' ')[0],this.form.startTime.split(' ')[0])
@@ -286,15 +286,15 @@ export default {
 				}else if(res.warningType==2){
 					uni.setNavigationBarTitle({
 						title:'化学品预警信息'
-					}) 
+					})
 				}else if(res.warningType==3){
 					uni.setNavigationBarTitle({
 						title:'气瓶预警信息'
-					}) 
+					})
 				}else if(res.warningType==4){
 					uni.setNavigationBarTitle({
 						title:'预案报警信息'
-					}) 
+					})
 				}
 				this.compareTime(res.warningTime);
 			}
@@ -306,10 +306,10 @@ export default {
 			    url: '/pages/earlyWarningManage/videoMonitoring?subId='+this.form.subId+'&floorId='+this.form.floorId//我的实验室
 			  });
 		  }
-		  
+
 		},
-		
-	  
+
+
   }
 }
 </script>
@@ -478,7 +478,7 @@ export default {
 				line-height: 28rpx;
 			}
 		}
-		
+
 	}
 	.small_title{
 		height: 90rpx;
@@ -567,7 +567,7 @@ export default {
 				font-weight: 400;
 				color: #0183FA;
 				line-height: 60rpx;
-				
+
 			}
 		}
 	}
@@ -584,7 +584,7 @@ export default {
 			flex-wrap: wrap;
 			padding: 40rpx 30rpx 10rpx;
 			box-sizing: border-box;
-			
+
 			.video{
 				position: relative;
 				width: 150rpx;
@@ -621,7 +621,7 @@ export default {
 					margin-right: 0;
 				}
 			}
-			
+
 		}
 	}
 	.bottom_btn{
@@ -638,7 +638,7 @@ export default {
 		text-align: center;
 		background: #F5F5F5;
 		margin: 90rpx 30rpx 30rpx;
-		
+
 	}
 }
 </style>

pages/earlyWarningManage/earlyWarningList.vue

@@ -27,18 +27,18 @@
 			</view>
 		</viw>
 		<img class="null-img" v-if="!dataList[0]" src="@/images/null-data-1.png">
-	</scroll-view>	
+	</scroll-view>
   </view>
 
 </template>
 
 <script>
 import { config } from '@/api/request/config.js'
-import {checkManageList,conditionCollegeInfo,warningNoticeLogList} from '@/api/index.js'
+import {warningNoticeLogList} from '@/api/index.js'
 export default {
   name: "rectifyList",
   components: {
-   
+
   },
   data() {
     return {
@@ -51,20 +51,20 @@ export default {
 		dataArr:[],//临时存储
 		total:0,
 		timeStatus:false,//判断是否超过当前时间30分钟
-		
+
 	}
   },
   onLoad(option) {
-	  
+
   },
   onShow() {
-	
+
   },
   mounted(){
-	 this.getList();  
+	 this.getList();
   },
   methods: {
-		
+
 		//滚动事件
 		scrollGet(){
 			let self=this;
@@ -73,21 +73,21 @@ export default {
 			}else{
 					setTimeout(function(){
 						self.getData.pageNum += 1;
-						self.getList(); 
+						self.getList();
 					},1000)
-						 
+
 			}
-			
+
 		},
-		
+
 		handleClick(row,doType){
 		  let self=this;
-		  if( doType=='detail'){//详情	
+		  if( doType=='detail'){//详情
 			  uni.navigateTo({
 			    url: '/pages/earlyWarningManage/earlyWarningDetail?warningId='+row.id,//安全警报
 			  });
 		  }
-		  
+
 		},
 		//排序
 		sortClass(sortData){
@@ -95,7 +95,7 @@ export default {
 		    let groups = {};
 		    array.forEach((o) => {
 		      let group = JSON.stringify(f(o));
-			  
+
 		      groups[group] = groups[group] || [];
 		      groups[group].push(o);
 		    });
@@ -118,7 +118,7 @@ export default {
 				this.total=data.data.total;
 			}
 		},
-	  
+
   }
 }
 </script>
@@ -155,7 +155,7 @@ export default {
 			font-weight: 400;
 			color: #666666;
 			line-height: 80rpx;
-		}	
+		}
 		.list_li{
 			width: 690rpx;
 			height:auto;
@@ -190,7 +190,7 @@ export default {
 					border-radius: 20rpx;
 					padding: 0 20rpx;
 					box-sizing: border-box;
-					
+
 				}
 				.list_li_t_c2{
 					font-size: 30rpx;
@@ -216,7 +216,7 @@ export default {
 			.list_li_b{
 				margin: 0 30rpx;
 				border-top: 1rpx dotted #D8D8D8;
-				
+
 				.list_li_b_t{
 					display: flex;
 					justify-content: space-between;
@@ -258,7 +258,7 @@ export default {
 					}
 				}
 			}
-		}	
+		}
 	}
 	.info-max-box{
 		flex: 1;