From 25ce610f6ecca7325e7a743dc032c4a76559c63d Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Fri, 02 Jul 2021 09:10:26 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/pyhmap

---
 widgets/searchTabaPopup/Widget.html |  134 +++++++++++++++++++++++++++++---------------
 1 files changed, 88 insertions(+), 46 deletions(-)

diff --git a/widgets/searchTabaPopup/Widget.html b/widgets/searchTabaPopup/Widget.html
index 1b90c82..544d395 100644
--- a/widgets/searchTabaPopup/Widget.html
+++ b/widgets/searchTabaPopup/Widget.html
@@ -1,12 +1,18 @@
 <div>
 	<div class="popup">
-		<div class="p-main two">
-			<div class="cloce"></div>
-			视频
+		<div class="p-main two" id="twovideo">
+			<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>
+			<div id="poput-m-t-quanjing">
+				<!-- <iframe id="poput-m-t-quanjing-iframe" src="http://vr.jxpskj.com/pyhyjpt/wxbhxz/QJ1/" frameborder="0"></iframe> -->
+			</div>
 		</div>
 		<div class="p-main three">
-			<div class="cloce"></div>
-			<div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
+			<div class="cloce"><i class="layui-icon">&#x1006;</i></div>
+			<div class="layui-tab layui-tab-brief" lay-filter="popup-main">
 				<ul class="layui-tab-title">
 					<li class="layui-this">测站详情</li>
 					<li>实时数据</li>
@@ -15,49 +21,85 @@
 				<div class="layui-tab-content">
 					<div class="layui-tab-item layui-show">
 						<div class="xiangqing">
-							<table border="1" cellpadding="10">
-								<tr>
-									<th>测站名称</th>
-									<td>南矶山战备湖</td>
-									<th>建设类型</th>
-									<td>建设</td>
-								</tr>
-								<tr>
-									<th>经度</th>
-									<td>116.280167</td>
-									<th>纬度</th>
-									<td>28.918818</td>
-								</tr>
-								<tr>
-									<th>建站时间</th>
-									<td>2021-05-23 09:52:48</td>
-									<th>纬度</th>
-									<td>2021-05-23 09:52:48</td>
-								</tr>
-								<tr>
-									<th>所属保护区</th>
-									<td>鄱阳湖南矶湿地国家级自然保护区</td>
-									<th>地址</th>
-									<td>暂无</td>
-								</tr>
-								<tr>
-									<th>全景地址</th>
-									<td colspan="3">北深湖(http://vr.jxpskj.com/pyhyjpt/njsdgjzrbhq/bshenh/</td>
-								</tr>
-								<tr>
-									<th>测站简介</th>
-									<td  colspan="3">南矶山保护区为国家级湿地自然保护区。位于江西省南昌市新建县南矶乡境内,由南矶山自然保护区管理站管理。南矶山省级自然保护区成立于1997年,2005年晋升为国家级自然保护区。保护对象为候乌及湿地生态系统。南矶山省级自然保护区成立于1997年,2005年晋升为国家级自然保护区。保护对象为候鸟及湿地生态系统。保护区总面积333平方千米,其中核心区面积175平方千米,缓冲区面积55平方千米,实验区面积103平方千米。
-									</td>
-								</tr>
-								<tr>
-									<th>图片</th>
-									<td  colspan="3">北深湖(http://vr.jxpskj.com/pyhyjpt/njsdgjzrbhq/bshenh/</td>
-								</tr>
-							</table>
 						</div>
 					</div>
-					<div class="layui-tab-item">内容2</div>
-					<div class="layui-tab-item">内容3</div>
+					<div class="layui-tab-item ">
+						<div class="shishishuju">
+							<div class="heard">
+								<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">
+									<li class="layui-this">水文与水资源数据</li>
+									<li>空气质量数据</li>
+									<li>气象数据</li>
+								</ul>
+								<div class="layui-tab-content">
+									<div class="layui-tab-item layui-show" id="shuiwenshishi">
+										<!-- js数据 -->
+									</div>
+									<div class="layui-tab-item" id="kongqishishi">空气质量数据</div>
+									<div class="layui-tab-item" id="qixiangshishi">气象数据</div>
+								</div>
+							</div>
+						</div>
+					</div>
+					<div class="layui-tab-item">
+						<div class="lishijilv">
+							<div class="heard">
+								<div class="left" id="leftTimesdom">
+									<div class="layui-form">
+										<div class="layui-form-item">
+											<div class="layui-inline">
+												<div class="layui-inline" id="time6">
+													<div class="layui-input-inline">
+														<input type="text" autocomplete="off" id="test-startDate-1"
+															class="layui-input myCHosetimeinput" placeholder="开始日期">
+													</div>
+													<div class="layui-form-mid">-</div>
+													<div class="layui-input-inline">
+														<input type="text" autocomplete="off" id="test-endDate-1"
+															class="layui-input myCHosetimeinput" placeholder="结束日期">
+													</div>
+												</div>
+											</div>
+										</div>
+									</div>
+									<button type="button" id="query" class="layui-btn layui-btn-normal">查询</button>
+									<button type="button" id="empty" class="layui-btn layui-btn-danger">清空</button>
+								</div>
+								<div class="rights">当前站点:<span class="myOUrtitle">南矶山备战湖</span> </div>
+							</div>
+							<div class="layui-tab">
+								<ul class="layui-tab-title">
+									<li class="layui-this">水文与水资源数据</li>
+									<li>空气质量数据</li>
+									<li>气象数据</li>
+								</ul>
+								<div class="layui-tab-content">
+									<div class="layui-tab-item layui-show">
+										<div style="width: 870px;height:380px;" class="popup-threse-shuiwenEcharts"
+											id="popup-threse-shuiwenEcharts">
+
+										</div>
+									</div>
+									<div class="layui-tab-item">
+										<div style="width: 870px;height:380px;" class="popup-threse-shuiwenEcharts"
+											id="popup-threse-shuiwenEcharts1">
+
+										</div>
+									</div>
+									<div class="layui-tab-item">
+										<div style="width: 870px;height:380px;" class="popup-threse-shuiwenEcharts"
+											id="popup-threse-shuiwenEcharts2">
+
+										</div>
+									</div>
+								</div>
+							</div>
+						</div>
+					</div>
 				</div>
 			</div>
 		</div>

--
Gitblit v1.9.3