zc

pages_basics/views/earlyWarningManage/earlyWarningDetail.vue

@@ -48,7 +48,7 @@
 				</view>
 				<view class="basics_li">
 					<text>持续时间：</text>
-					<text>{{form.riskDuration?form.riskDuration:'-'}}秒</text>
+					<text>{{form.riskDuration?form.riskDuration:'-'}}分钟</text>
 				</view>
 				<view class="basics_li">
 					<text>风险响应人员：</text>
@@ -173,11 +173,16 @@
 			</view>
 			<!-- 通知短信 -->
 			<view class="note" v-if="form.warnType==4 || form.warnType==3 || (form.warnType==1 && form.chemicalWarnType ==6)">
-				<view class="small_title"><text></text><text>报警通知</text></view>
+				<view class="small_title">
+					<text></text>
+					<text>报警通知</text>
+				</view>
 				<view class="note_li" style="margin-top:20rpx;" v-for="(item,index) in form.userLogVoList" :key="index">
 					<text>{{item.name}}</text>
-					<view class="note_li_r" v-if="item.isSuccess==1"><img
-							:src="imagesUrl('commonality/icon_yjxx_ytz.png')" /><text>已通知</text></view>
+					<view class="note_li_r-2" v-if="item.isSuccess==1">
+						<img :src="imagesUrl('commonality/icon_yjxx_ytz.png')" />
+						<text>{{item.alarmType==1?'电话':'短信'}}已通知</text>
+					</view>
 				</view>
 			</view>
 			<!-- 语音播报 预案/算法 -->
@@ -423,6 +428,7 @@
 						minList.forEach((minItem) => {
 							list.push({
 								name: minItem,
+								alarmType:item.alarmType,
 								isSuccess: 1,
 							})
 
@@ -470,6 +476,7 @@
 						minList.forEach((minItem) => {
 							list.push({
 								name: minItem,
+								alarmType:item.alarmType,
 								isSuccess: 1,
 							})
 
@@ -795,6 +802,27 @@
 				}
 
 				.note_li_r {
+					width:140rpx;
+					display: flex;
+					justify-content: flex-start;
+					align-items: center;
+
+					>img {
+						width: 28rpx;
+						height: 28rpx;
+						margin-right: 10rpx;
+					}
+
+					font-size: 28rpx;
+					font-family: PingFang SC-Medium,
+					PingFang SC;
+					font-weight: 400;
+					color: #0183FA;
+					line-height: 60rpx;
+
+				}
+				.note_li_r-2 {
+					width:220rpx;
 					display: flex;
 					justify-content: flex-start;
 					align-items: center;