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 | 119 ++++++++++++++++++-----------------------------------------
1 files changed, 36 insertions(+), 83 deletions(-)
diff --git a/widgets/searchTabaPopup/Widget.html b/widgets/searchTabaPopup/Widget.html
index 9381609..544d395 100644
--- a/widgets/searchTabaPopup/Widget.html
+++ b/widgets/searchTabaPopup/Widget.html
@@ -1,17 +1,17 @@
<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">ဆ</i></div>
+ <div class="header">江豚湾--实时视频</div>
<div id="poput-m-t-video">
- <!-- <div class="title">名称：江豚湾</div>
- <video id="video1" class="video-js vjs-default-skin" width="640" height="480"
- data-setup='{"controls" : true, "autoplay" : true, "preload" : "auto"}'>
- <source src="http://171.34.197.243:701/rtp/34020000001110000104_34020000001310000006.flv" type="video/x-flv">
- </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="cloce"><i class="layui-icon">ဆ</i></div>
<div class="layui-tab layui-tab-brief" lay-filter="popup-main">
<ul class="layui-tab-title">
<li class="layui-this">测站详情</li>
@@ -26,8 +26,8 @@
<div class="layui-tab-item ">
<div class="shishishuju">
<div class="heard">
- <div>当前站点：<span>南矶山备战湖</span> </div>
- <div>监测时间：<span>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">
@@ -36,68 +36,11 @@
<li>气象数据</li>
</ul>
<div class="layui-tab-content">
- <div class="layui-tab-item layui-show">
- <table class="layui-table">
- <colgroup>
- <col width="150">
- <col width="150">
- <col width="200">
- <col>
- </colgroup>
- <thead>
- <tr>
- <th>名称</th>
- <th>数值</th>
- <th>单位</th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td>水温</td>
- <td>0</td>
- <td>℃</td>
- </tr>
- <tr>
- <td>PH值</td>
- <td>0</td>
- <td>无量纲</td>
- </tr>
- <tr>
- <td>溶解氧</td>
- <td>0</td>
- <td>ppm</td>
- </tr>
- <tr>
- <td>电导率</td>
- <td>0</td>
- <td>S/m</td>
- </tr>
- <tr>
- <td>叶绿素a</td>
- <td>0</td>
- <td>ug/L</td>
- </tr>
- <tr>
- <td>浑浊度</td>
- <td>0</td>
- <td>NTU</td>
- </tr>
- <tr>
- <td>化学需氧量</td>
- <td>0</td>
- <td>无量纲</td>
- </tr>
- <tr>
- <td>总磷</td>
- <td>0</td>
- <td>mg/L</td>
- </tr>
-
- </tbody>
- </table>
+ <div class="layui-tab-item layui-show" id="shuiwenshishi">
+ <!-- js数据 -->
</div>
- <div class="layui-tab-item">空气质量数据</div>
- <div class="layui-tab-item">气象数据</div>
+ <div class="layui-tab-item" id="kongqishishi">空气质量数据</div>
+ <div class="layui-tab-item" id="qixiangshishi">气象数据</div>
</div>
</div>
</div>
@@ -105,29 +48,28 @@
<div class="layui-tab-item">
<div class="lishijilv">
<div class="heard">
- <div class="left">
+ <div class="left" id="leftTimesdom">
<div class="layui-form">
<div class="layui-form-item">
<div class="layui-inline">
- <!-- <label class="layui-form-label">日期范围</label> -->
- <div class="layui-inline" id="test6">
+ <div class="layui-inline" id="time6">
<div class="layui-input-inline">
<input type="text" autocomplete="off" id="test-startDate-1"
- class="layui-input" placeholder="开始日期">
+ 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" placeholder="结束日期">
+ class="layui-input myCHosetimeinput" placeholder="结束日期">
</div>
</div>
</div>
</div>
</div>
- <button type="button" class="layui-btn layui-btn-normal">查询</button>
- <button type="button" class="layui-btn layui-btn-danger">清空</button>
+ <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>南矶山备战湖</span> </div>
+ <div class="rights">当前站点：<span class="myOUrtitle">南矶山备战湖</span> </div>
</div>
<div class="layui-tab">
<ul class="layui-tab-title">
@@ -137,12 +79,23 @@
</ul>
<div class="layui-tab-content">
<div class="layui-tab-item layui-show">
- <div style="width: 1100px;height:380px;" class="popup-threse-shuiwenEcharts" id="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>
- <div class="layui-tab-item">气象数据</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>
--
Gitblit v1.9.3