heyang

pages/earlyWarningManage/earlyWarningDetail.vue

@@ -117,18 +117,18 @@
 				<view class="note_li_r" v-if="item.isSuccess==1"><img  src="@/images/icon_yjxx_ytz.png"/><text>已通知</text></view>
 			</view>
 		</view>
-		<view class="note" v-if="(form.warningType==2 || form.warningType==3) && form.warningSubType==1">
+		<view class="note" v-if="(form.warningType==2 || form.warningType==3) && form.warningSubType==1 && form.voiceBroadcast==1">
 			<view class="small_title"><text></text><text>预警通知</text></view>
 			<view class="note_li" style="margin-top:20rpx;" >
 				<text>声光报警通知</text>
-				<view class="note_li_r" v-if="form.voiceBroadcast==1"><img  src="@/images/icon_yjxx_ytz.png"/><text>已通知</text></view>
+				<view class="note_li_r" ><img  src="@/images/icon_yjxx_ytz.png"/><text>已通知</text></view>
 			</view>
 		</view>
-		<view class="note" v-if="(form.warningType==1 || form.warningType==4) && form.warningSubType==1">
+		<view class="note" v-if="(form.warningType==1 || form.warningType==4) && form.warningSubType==1 && form.voiceBroadcast==1">
 			<view class="small_title"><text></text><text>预警通知</text></view>
 			<view class="note_li" style="margin-top:20rpx;" >
 				<text>语音播报</text>
-				<view class="note_li_r" v-if="form.voiceBroadcast==1"><img  src="@/images/icon_yjxx_ytz.png"/><text>已通知</text></view>
+				<view class="note_li_r"><img  src="@/images/icon_yjxx_ytz.png"/><text>已通知</text></view>
 			</view>
 		</view>
 		<view class="picture">
@@ -140,7 +140,7 @@
 				</view>
 			</view>
 		</view>
-		<view class="bottom_btn" @click="handleClick('','monitor')">查看监控</view>
+		<view class="bottom_btn" v-if="timeStatus" @click="handleClick('','monitor')">查看监控</view>
 	</scroll-view>	
   </view>
 
@@ -166,6 +166,7 @@ export default {
 		warningId:'',
 		form:{},
 		currentTime:'',
+		timeStatus:false,
 		
 	}
   },
@@ -211,11 +212,12 @@ export default {
 			let endTime = new Date(gettime).getTime() //预警时间
 			if(currentTime-endTime>timeOut){
 				console.log('预警时间超过30分钟')
-				this.timeStatus=true;
+				this.timeStatus=false;
 			}else{
 				console.log('预警没超过30分钟')
-				this.timeStatus=false;
-			}	
+				this.timeStatus=true;
+			}
+				console.log(this.timeStatus)
 			
 		},
 		//查看图片

pages/earlyWarningManage/videoMonitoring.vue

@@ -48,7 +48,7 @@
 
 <script>
 import { config } from '@/api/request/config.js'
-import {laboratoryInfo,getCameraByFloor,GetStartList,getDeviceListBySub,sparseHardwareList} from '@/api/index.js'
+import {laboratoryInfo,getCameraByFloor,GetStartList,getDeviceListBySub,sparseHardwareList,textParseUrlIps} from '@/api/index.js'
 export default {
   name: "rectifyList",
   components: {