From 4d8ef5d02421b1bb60f575e56b75d43a1ea4c2bb Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Tue, 15 Jun 2021 14:56:47 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/pyhmap

---
 widgets/searchTabaPopup/Widget.html |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/widgets/searchTabaPopup/Widget.html b/widgets/searchTabaPopup/Widget.html
index ae9c38b..5273bde 100644
--- a/widgets/searchTabaPopup/Widget.html
+++ b/widgets/searchTabaPopup/Widget.html
@@ -1,11 +1,11 @@
 <div>
 	<div class="popup">
 		<div class="p-main two" id="twovideo">
-			<!-- <div class="cloce"><i class="layui-icon">&#x1006;</i></div>
+			 <div class="cloce"><i class="layui-icon">&#x1006;</i></div>
 			<div class="header">江豚湾--实时视频</div>
 			<div id="poput-m-t-video">
-				<video id="poput-m-t-video-video" ></video>
-			</div> -->
+				<!-- <video id="poput-m-t-video-video" ></video> -->
+			</div> 
 		</div>
 		<div class="p-main three">
 			<div class="cloce"><i class="layui-icon">&#x1006;</i></div>
@@ -23,8 +23,8 @@
 					<div class="layui-tab-item ">
 						<div class="shishishuju">
 							<div class="heard">
-								<div>当前站点:<span class="myOUrtitle">南矶山备战湖</span> </div>
-								<div>监测时间:<span class="myOUrtime">2021-05-06 10:07:00</span> </div>
+								<div class="lefts">当前站点:<span class="myOUrtitle">南矶山备战湖</span> </div>
+								<div class="rights">监测时间:<span class="myOUrtime">2021-05-06 10:07:00</span> </div>
 							</div>
 							<div class="layui-tab">
 								<ul class="layui-tab-title">
@@ -76,19 +76,19 @@
 								</ul>
 								<div class="layui-tab-content">
 									<div class="layui-tab-item layui-show">
-										<div style="width: 1080px;height:380px;" class="popup-threse-shuiwenEcharts"
+										<div style="width: 870px;height:380px;" class="popup-threse-shuiwenEcharts"
 											id="popup-threse-shuiwenEcharts">
 
 										</div>
 									</div>
 									<div class="layui-tab-item">
-										<div style="width: 1080px;height:380px;" class="popup-threse-shuiwenEcharts"
+										<div style="width: 870px;height:380px;" class="popup-threse-shuiwenEcharts"
 											id="popup-threse-shuiwenEcharts1">
 
 										</div>
 									</div>
 									<div class="layui-tab-item">
-										<div style="width: 1080px;height:380px;" class="popup-threse-shuiwenEcharts"
+										<div style="width: 870px;height:380px;" class="popup-threse-shuiwenEcharts"
 											id="popup-threse-shuiwenEcharts2">
 
 										</div>

--
Gitblit v1.9.3