heyang 1 年間 前
コミット
e3769f1801
共有1 個のファイルを変更した6 個の追加50 個の削除を含む
  1. 6 50
      pages/earlyWarningManage/earlyWarningDetail.vue

+ 6 - 50
pages/earlyWarningManage/earlyWarningDetail.vue

@@ -137,49 +137,18 @@
 		<view v-if="form.warningSubType!=2 && form.warningSubType!=3 && form.warningSubType!=4" class="picture">
 			<view class="small_title"><text></text><text>报警抓拍</text></view>
 			<view class="picture_b" >
-				<!-- 西北农林演示报警抓拍预案的时候-判断不显示视频 -->
-				<!-- <view class="video" v-if="form.warningType!=1">
+				<view class="video" v-if="form.warningType!=1">
 					<video id="myvideo" class="video_t" :bindloadedmetada="onLoadedMetadata" :src="configUrl+form.recordVideo"></video>
 					<img  class="video_b" @click="lockVideo()" src="@/images/icon_bjzp_spbof.png"/>
 					<canvas id="myCanvas" canvas-id="myCanvas"></canvas>
-				</view> -->
-				<!-- <view v-if="form.warningType==1" class="img" @click="lockImg(form.warningDetailList)">
+				</view>
+				<view v-if="form.warningType==1" class="img" @click="lockImg(form.warningDetailList)">
 					<img v-for="item in form.warningDetailList"  :src="configUrl+item.photoUrl"/>
-				</view> -->
-				<!-- 西北农林演示报警抓拍预案的时候-改为图片 -->
-				<!-- <view v-if="form.warningType==4" class="img" @click="lockImgTow(form.recordPhoto)">
-					<img  :src="configUrl+form.recordPhoto"/>
-				</view> -->
-				<!-- 
-				 
-				 :show-fullscreen-btn="true"
-				 :show-play-btn="false"
-				 :show-center-play-btn="false"
-				 :enable-progress-gesture="false"
-					:controls="false"
-				 -->
-				<video 
-					id="myvideo" :class="videoType?'videoOpacity1':'videoOpacity0'"
-					:muted="true" 
-					:autoplay="true"
-					:controls="true"
-					 :show-fullscreen-btn="true"
-					 :show-play-btn="false"
-					 :show-center-play-btn="false"
-					 :show-progress="false"
-					 :show-bottom-progress="false"
-					 :enable-progress-gesture="false"
-					 :page-gesture="false"
-					 :vslide-gesture="false"
-					 :vslide-gesture-in-fullscreen="false"
-					style="height:356rpx;width:640rpx;margin-bottom:15rpx;" 
-					:src="configUrl+form.recordVideo">
-				</video>
+				</view>
 			</view>
 		</view>
-		<!-- <view  class="bottom_btn" v-if="timeStatus && (form.warningSubType!=2 && form.warningSubType!=3 && form.warningSubType!=4)" @click="handleClick('','monitor')">查看监控</view> -->
-		<!-- 西北农林演示临时 -->
-		<view  class="bottom_btn" v-if="form.warningSubType!=2 && form.warningSubType!=3 && form.warningSubType!=4" @click="handleClick('','monitor')">查看监控</view>
+		<view  class="bottom_btn" v-if="timeStatus && (form.warningSubType!=2 && form.warningSubType!=3 && form.warningSubType!=4)" @click="handleClick('','monitor')">查看监控</view>
+		
 	</scroll-view>
   </view>
 
@@ -315,19 +284,6 @@ export default {
 				complete: function(res) {},
 			})
 		},
-		//查看图片-单张
-		lockImgTow(list){
-			
-			let urlList=[];
-			urlList.push(this.configUrl+list)
-			wx.previewImage({
-				urls: urlList, //需要预览的图片http链接列表,多张的时候,url直接写在后面就行了
-				current: '', // 当前显示图片的http链接,默认是第一个
-				success: function(res) {},
-				fail: function(res) {},
-				complete: function(res) {},
-			})
-		},
 		//视频全屏播放
 		lockVideo(){
 			let videoContext = uni.createVideoContext("myvideo", this);