From d7f724edb01dfba9f2e0365c8e9769579f017de0 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Mon, 24 May 2021 17:45:27 +0800
Subject: [PATCH]   小程序地图

---
 public/xcxjingqingmap/xcxmap.html |   65 ++++++++++++++++++++++++++++++--
 1 files changed, 60 insertions(+), 5 deletions(-)

diff --git a/public/xcxjingqingmap/xcxmap.html b/public/xcxjingqingmap/xcxmap.html
index 04d0cba..3bab1ec 100644
--- a/public/xcxjingqingmap/xcxmap.html
+++ b/public/xcxjingqingmap/xcxmap.html
@@ -35,7 +35,7 @@
 	<script src="../map/lib/jquery.js" charset="utf-8"></script>
 
 	<!-- 微信支持 -->
-	<script type="text/javascript" src="https://res.wx.qq.com/open/js/jweixin-1.3.2.js"></script>
+	<script type="text/javascript" src="https://res.wx.qq.com/open/js/jweixin-1.4.0.js"></script>
 	<!-- <script src="./js/wx.js"></script> -->
 
 	<!-- omyself支持 -->
@@ -43,6 +43,9 @@
 
 	<!-- myDomMove -->
 	<script src="./js/move.js"></script>
+	<!-- sha1加密 -->
+	<!-- <script src="./js/sha1.js"></script> -->
+
 </head>
 
 <body>
@@ -91,9 +94,9 @@
 				<div class="f-m-once">
 					<div class="f-m-o-title">
 						<img class="f-m-o-t-img" src="./img/leixing.png" alt="">
-						报警类型:
+						报警类型&&编号:
 					</div>
-					<div class="f-m-o-center">{{seedata.alarmType}}</div>
+					<div class="f-m-o-center">{{seedata.alarmType}}&&{{seedata.id}}</div>
 				</div>
 				<el-divider></el-divider>
 				<div class="f-m-once">
@@ -104,12 +107,64 @@
 					<div class="f-m-o-center">{{seedata.bz}}</div>
 				</div>
 				<div class="but">
-					<div class="buta">
+					<div class="buta" @click="shipingClick(true)">
 						<img class="b-b-img" src="./img/shiping.png" alt="">
 					</div>
-					<div class="butb">结果反馈</div>
+					<!-- 加上display: none不会闪烁 -->
+					<div class="shipingPopup" v-show="shipingPopupShow" style="display: none;">
+						<div class="s-p-main">
+							<div @click="shipingClick(false)">
+								<img src="./img/gaunbi.png" alt="" class="s-p-gaunbi">
+							</div>
+							<!-- <video style="height: 550px; width: 100%" controls="controls"
+								id="real_video_shipingPopup" src=""></video> -->
+							<video style="height: 550px; width: 100%" controls="controls" :src="shipingM3u8Url"></video>
+						</div>
+					</div>
+					<div class="butb" @click="resultFeedbackClick">结果反馈</div>
+					<!-- 加上display: none不会闪烁 -->
+					<!-- <div class="resultFeedback" v-show="resultFeedbackPopupShow" style="display: none;">
+						<div class="b-r-main">
+							<div @click="resultFeedbackClick">
+								<img src="./img/gaunbi.png" alt="" class="s-p-gaunbi">
+							</div>
+							<div class="b-r-main-in">
+								<div class="b-r-m-i-once">
+									<div class="b-r-m-i-o-title">
+										警情反馈:
+									</div>
+									<div class="b-r-m-i-o-center">
+										<textarea rows="9" cols="27" placeholder="请输入警情反馈。"></textarea>
+									</div>
+								</div>
+								<div class="b-r-m-i-once b-r-i-o-ups">
+									<div class="b-r-m-i-o-title">
+										照片上传:
+									</div>
+									<div class="b-r-m-i-o-center">
+										<img class="b-r-m-i-o-c-img" src="./img/xiangji.png" alt="">
+										<div>2522</div>
+									</div>
+								</div>
+								<el-divider></el-divider>
+								<div class="b-r-m-i-once b-r-i-o-ups">
+									<div class="b-r-m-i-o-title">
+										视频上传:
+									</div>
+									<div class="b-r-m-i-o-center">
+										<img class="b-r-m-i-o-c-img" src="./img/shiping11.png" alt="">
+										<div>2522</div>
+									</div>
+								</div>
+								<div class="butb b-r-m-but" @click="upData">结果反馈</div>
+							</div>
+						</div>
+					</div> -->
 					<div class="butc">
 						<img class="b-b-img" src="./img/huifang.png" alt="">
+						<!-- <div class="huifangPopup">
+							回放
+						</div> -->
 					</div>
 				</div>
 			</div>

--
Gitblit v1.9.3