zc

README.md

@@ -4,6 +4,7 @@
     ├─master基础分支
     ├─VERSIONS-JichuGouJia/GuoZiShuJu(基础构架/国资数据版本分支)
 		├─VERSIONS-video/iot-quanXian(合并了以上所有版本内容-修改了实验室列表的视频/IOT操作权限)
-    │  └─SCHOOL-XiBeiNongLinSCHOOL-XiBeiNongLin(西农线上分支)
     │  └─SCHOOL-zhongGuoHaiGuan(用于中国海关实验室项目)
+		├─VERSIONS-UnifiedCertification(增加统一认证入口)
+    │  └─SCHOOL-XiBeiNongLinSCHOOL-XiBeiNongLin(西农线上分支)
     ├─lab-xcx-dev(当前正在开发的分支)

pages_basics/views/earlyWarningManage/earlyWarningDetail.vue

@@ -17,7 +17,12 @@
 			<!-- 气瓶 -->
 			<view class="header_three" v-if="form.warnType==2">{{form.warnContent}}</view>
 			<!-- 算法识别 -->
-			<view class="header_four" v-if="form.warnType==3">未穿戴实验服</view>
+			<view class="header_four" v-if="form.warnType==3">
+				{{form.algorithmType == 1?'未穿戴护目镜':(
+				form.algorithmType == 2?'未穿戴实验服':(
+				form.algorithmType == 3?'未穿戴手套':(
+				form.algorithmType == 4?'倒地预警':'')))}}
+			</view>
 			<!-- 预案报警 -->
 			<view class="site" v-if="form.warnType==4">
 				<img :src="imagesUrl('commonality/icon_wtzg_xx.png')" />
@@ -172,7 +177,7 @@
 				</view>
 			</view>
 			<!-- 通知短信 -->
-			<view class="note" v-if="form.warnType==4 || form.warnType==3 || (form.warnType==1 && form.chemicalWarnType ==6)">
+			<view class="note" v-if="(form.warnType==4 && form.userLogVoList[0]) || (form.warnType==3 && form.userLogVoList[0]) || (form.warnType==1 && form.chemicalWarnType ==6 && form.userLogVoList[0])">
 				<view class="small_title">
 					<text></text>
 					<text>报警通知</text>
@@ -202,7 +207,7 @@
 							:src="imagesUrl('commonality/icon_yjxx_ytz.png')" /><text>{{form.voiceBroadcast == 1?'已通知':''}}</text></view>
 				</view>
 			</view>
-			<!-- 报警抓拍 -->
+			<!-- 报警抓拍-视频 -->
 			<view v-if="(form.warnType==1&&form.chemicalWarnType==1&&videoType) || (form.warnType!=1&&videoType)"
 				class="picture">
 				<view class="small_title" style="border-bottom: none !important;">
@@ -210,13 +215,20 @@
 					<text style="flex:1;">报警抓拍</text>
 					<text style="width:100rpx;color:#0183fa;" @click="goVideoPage()">查看</text>
 				</view>
-				<!-- <web-view style="width:200rpx;height:200rpx;" :src="webViewUrl" v-if="videoType"></web-view> -->
-				<!-- <view class="picture_b">
+			</view>
+			<!-- 报警抓拍-图片 -->
+			<view v-if="snapImg[0]&&!videoType"
+				class="picture">
+				<view class="small_title" style="border-bottom: none !important;">
+					<text></text>
+					<text style="flex:1;">报警抓拍</text>
+				</view>
+				<view class="picture_b">
 					<view class="img">
-						<img v-for="(item,index) in form.recordPhoto" @click="lockImg(form.recordPhoto)" :key="index"
+						<img v-for="(item,index) in snapImg" @click="lockImg(form.recordPhoto)" :key="index"
 							:src="item" />
 					</view>
-				</view> -->
+				</view>
 			</view>
 			<!-- 查看监控 -->
 			<view class="bottom_btn"
@@ -260,6 +272,8 @@
 				//报警预案视频相关
 				webViewUrl:'',
 				videoType: false,
+				//图片相关
+				snapImg:[],
 
 			}
 		},
@@ -431,11 +445,11 @@
 								alarmType:item.alarmType,
 								isSuccess: 1,
 							})
-
 						})
 					})
 					data.data.userLogVoList = list;
 					this.$set(this, 'form', data.data);
+					this.$set(this, 'snapImg', data.data.snapImg);
 					if(data.data.recordVideo){
 						let newData = JSON.parse(data.data.recordVideo);
 						if(!newData.endTime){
@@ -479,7 +493,6 @@
 								alarmType:item.alarmType,
 								isSuccess: 1,
 							})
-
 						})
 					})
 					data.data.userLogVoList = list;