From dbd6b0242bc8d652c8db9040d4a7a2dc092c403d Mon Sep 17 00:00:00 2001
From: wangzhibo <wangzhibo@shsening.com>
Date: 星期六, 04 十二月 2021 14:59:46 +0800
Subject: [PATCH] Merge branch 'master' of http://www.shsening.com:10000/r/template/shanghai
---
img/tuglie/wz_pm25.png | 0
widgetsTS/tuglie/view.html | 8 ++++++--
widgetsTS/taxiRouteReplay/view.html | 11 +++++++----
img/tuglie/gk_pm25.png | 0
img/tuglie/wz_pm10.png | 0
img/tuglie/gk_o3.png | 0
js/function.js | 3 ++-
widgetsTS/widget_search/widget.js | 1 +
img/tuglie/gk_pm10.png | 0
img/tuglie/wz_so2.png | 0
widgets/manageLayers_style/view.js | 2 +-
widgetsTS/widget_summary/view.css | 5 +++++
img/tuglie/wz_co.png | 0
img/tuglie/wz_no2.png | 0
img/tuglie/other_co.png | 0
img/tuglie/wz_o3.png | 0
widgets/manageLayers_style/widget.js | 6 +++---
widgetsTS/widget_summary/view.js | 12 +++++++++++-
widgetsTS/widget_search/view.css | 4 ++++
img/tuglie/gk_co.png | 0
img/tuglie/gk_so2.png | 0
img/tuglie/gk_no2.png | 0
22 files changed, 40 insertions(+), 12 deletions(-)
diff --git a/img/tuglie/gk_co.png b/img/tuglie/gk_co.png
index 9132d52..03563d1 100644
--- a/img/tuglie/gk_co.png
+++ b/img/tuglie/gk_co.png
Binary files differ
diff --git a/img/tuglie/gk_no2.png b/img/tuglie/gk_no2.png
index 5aeee00..7dfc92f 100644
--- a/img/tuglie/gk_no2.png
+++ b/img/tuglie/gk_no2.png
Binary files differ
diff --git a/img/tuglie/gk_o3.png b/img/tuglie/gk_o3.png
new file mode 100644
index 0000000..ff221ca
--- /dev/null
+++ b/img/tuglie/gk_o3.png
Binary files differ
diff --git a/img/tuglie/gk_pm10.png b/img/tuglie/gk_pm10.png
index 712ed03..fcc9766 100644
--- a/img/tuglie/gk_pm10.png
+++ b/img/tuglie/gk_pm10.png
Binary files differ
diff --git a/img/tuglie/gk_pm25.png b/img/tuglie/gk_pm25.png
index cbf6da4..3e08ee5 100644
--- a/img/tuglie/gk_pm25.png
+++ b/img/tuglie/gk_pm25.png
Binary files differ
diff --git a/img/tuglie/gk_so2.png b/img/tuglie/gk_so2.png
new file mode 100644
index 0000000..423bbdd
--- /dev/null
+++ b/img/tuglie/gk_so2.png
Binary files differ
diff --git a/img/tuglie/other_co.png b/img/tuglie/other_co.png
index 4acf388..ba4178f 100644
--- a/img/tuglie/other_co.png
+++ b/img/tuglie/other_co.png
Binary files differ
diff --git a/img/tuglie/wz_co.png b/img/tuglie/wz_co.png
index 4e77b36..e81c356 100644
--- a/img/tuglie/wz_co.png
+++ b/img/tuglie/wz_co.png
Binary files differ
diff --git a/img/tuglie/wz_no2.png b/img/tuglie/wz_no2.png
index ae86d98..e5d5e69 100644
--- a/img/tuglie/wz_no2.png
+++ b/img/tuglie/wz_no2.png
Binary files differ
diff --git a/img/tuglie/wz_o3.png b/img/tuglie/wz_o3.png
new file mode 100644
index 0000000..3169e13
--- /dev/null
+++ b/img/tuglie/wz_o3.png
Binary files differ
diff --git a/img/tuglie/wz_pm10.png b/img/tuglie/wz_pm10.png
index fb227ed..4885880 100644
--- a/img/tuglie/wz_pm10.png
+++ b/img/tuglie/wz_pm10.png
Binary files differ
diff --git a/img/tuglie/wz_pm25.png b/img/tuglie/wz_pm25.png
index 12024fb..16abbd6 100644
--- a/img/tuglie/wz_pm25.png
+++ b/img/tuglie/wz_pm25.png
Binary files differ
diff --git a/img/tuglie/wz_so2.png b/img/tuglie/wz_so2.png
new file mode 100644
index 0000000..1d9ff1e
--- /dev/null
+++ b/img/tuglie/wz_so2.png
Binary files differ
diff --git a/js/function.js b/js/function.js
index 54b45b0..36301a8 100644
--- a/js/function.js
+++ b/js/function.js
@@ -141,9 +141,10 @@
mars3d.global_variables.tmpHighlightGraphics.forEach((item) => {
mars3d.global_variables.tmpHighlightGraphicLayer.addGraphic(item);
});
-
}
+
+
function addHighlightLayerClearButton() {
let clearButton = new mars3d.control.ToolButton({
title: "娓呴櫎楂樹寒鍥惧眰",
diff --git a/widgets/manageLayers_style/view.js b/widgets/manageLayers_style/view.js
index f30bc20..7fba87f 100644
--- a/widgets/manageLayers_style/view.js
+++ b/widgets/manageLayers_style/view.js
@@ -52,7 +52,7 @@
var item = layer.options;
- if (!item.name) {
+ if (!item.name || item.name == "") {
console.log("鏈懡鍚嶅浘灞備笉鍔犲叆鍥惧眰绠＄悊", layer);
return;
}
diff --git a/widgets/manageLayers_style/widget.js b/widgets/manageLayers_style/widget.js
index ff92cf0..60cce50 100644
--- a/widgets/manageLayers_style/widget.js
+++ b/widgets/manageLayers_style/widget.js
@@ -108,9 +108,9 @@
this.map.on(mars3d.EventType.addLayer, this._onAddLayerHandler, this);
}
} else {
- if (layer.options.type=="wms" && layer.isAdded) {
- this.map.removeLayer(layer)
- }
+ // if (layer.options.type=="wms" && layer.isAdded) {
+ // this.map.removeLayer(layer)
+ // }
}
}
}
diff --git a/widgetsTS/taxiRouteReplay/view.html b/widgetsTS/taxiRouteReplay/view.html
index aff4a65..1a22c2a 100644
--- a/widgetsTS/taxiRouteReplay/view.html
+++ b/widgetsTS/taxiRouteReplay/view.html
@@ -55,15 +55,14 @@
</tr>
<tr>
<td>
- <button type="button" id="SprinkleQueryTaxiData" class="btn btn-primary" style="width:80px;"><span
- id="SprinkleQueryTaxiDataText">鎾掔偣鏌ヨ</span></button>
- </td>
- <td>
<button type="button" id="startQueryTaxiData" class="btn btn-primary" style="width:130px;"><span
id="startQueryTaxiDataText">杞ㄨ抗鏌ヨ</span></button>
</td>
</tr>
</table>
+ <div>
+
+ </div>
<div class="line"></div>
<div class="route_box" id="route_box" style="display: none">
@@ -78,6 +77,10 @@
id="btnSuspendDHText">鏆傚仠鍥炴斁</span></button>
</td>
<td>
+ <button type="button" id="SprinkleQueryTaxiData" class="btn btn-primary" style="width:80px;"><span
+ id="SprinkleQueryTaxiDataText">鎾掔偣鏄剧ず</span></button>
+ </td>
+ <td>
<span class="span_sjgs"><input class="sjgs" id="checkbox_sjgs" type="checkbox">瑙嗚璺熼殢</span>
</td>
</tr>
diff --git a/widgetsTS/tuglie/view.html b/widgetsTS/tuglie/view.html
index 3d42ba4..3fee3a4 100644
--- a/widgetsTS/tuglie/view.html
+++ b/widgetsTS/tuglie/view.html
@@ -35,7 +35,7 @@
}
#day04 {
- width: 100px;
+ width: 130px;
}
.showTime {
@@ -72,7 +72,7 @@
<li id="day01">鍥芥帶鐐�</li>
<li id="day02">寰珯</li>
<li id="day03">鐩戞祴鐐�</li>
- <li id="day04">閬撹矾涓庡尯鍩�</li>
+ <li id="day04">杞﹁締 | 閬撹矾 | 鍖哄煙</li>
</ul>
<div class="showTime">
@@ -81,12 +81,16 @@
<img src="../../img/tuglie/gk_pm10.png" alt="">
<img src="../../img/tuglie/gk_no2.png" alt="">
<img src="../../img/tuglie/gk_co.png" alt="">
+ <img src="../../img/tuglie/gk_so2.png" alt="">
+ <img src="../../img/tuglie/gk_o3.png" alt="">
</p>
<p id="content02">
<img src="../../img/tuglie/wz_pm25.png" alt="">
<img src="../../img/tuglie/wz_pm10.png" alt="">
<img src="../../img/tuglie/wz_no2.png" alt="">
<img src="../../img/tuglie/wz_co.png" alt="">
+ <img src="../../img/tuglie/wz_so2.png" alt="">
+ <img src="../../img/tuglie/wz_o3.png" alt="">
</p>
<p id="content03">
<img src="../../img/tuglie/jc_tsp.png" alt="">
diff --git a/widgetsTS/widget_search/view.css b/widgetsTS/widget_search/view.css
index 0f61b96..187df98 100644
--- a/widgetsTS/widget_search/view.css
+++ b/widgetsTS/widget_search/view.css
@@ -36,6 +36,10 @@
border-bottom: 1px solid rgba(77,255,255,.5);
}
+.top_10_table td,
+.top_10_table th{
+ padding: 9px 10px;
+}
.cnt_div{
color: #fff;
diff --git a/widgetsTS/widget_search/widget.js b/widgetsTS/widget_search/widget.js
index 304268a..df29082 100644
--- a/widgetsTS/widget_search/widget.js
+++ b/widgetsTS/widget_search/widget.js
@@ -122,6 +122,7 @@
var primitive = new mars3d.graphic.PolygonEntity({
positions: positions,
style: {
+ opacity:0.3,
height: 50,
diffHeight: 200,
materialType: mars3d.MaterialType.PolyGradient,
diff --git a/widgetsTS/widget_summary/view.css b/widgetsTS/widget_summary/view.css
index 263452c..5bda8dd 100644
--- a/widgetsTS/widget_summary/view.css
+++ b/widgetsTS/widget_summary/view.css
@@ -16,6 +16,11 @@
/* border-radius: 10px; */
}
+.top_10_table td,
+.top_10_table th{
+ padding: 9px 9px;
+}
+
.no_bgc_table{
width: 100%;
height: 50%;
diff --git a/widgetsTS/widget_summary/view.js b/widgetsTS/widget_summary/view.js
index c2d262f..f3d03c2 100644
--- a/widgetsTS/widget_summary/view.js
+++ b/widgetsTS/widget_summary/view.js
@@ -19,7 +19,7 @@
current_selected_monitor_type = $(this).attr("_code");
current_selected_monitor_name = $(this).attr("_name");
changeQindexSelection();
- reloadData();
+ throttling()
});
$("#selectedALL").click(function() {
@@ -37,6 +37,16 @@
}
+// 鑺傛祦锛岄槻姝㈢敤鎴风偣鍑诲娆¤姹傚娆�
+let timeout;
+//闇�瑕佸畾涔夊湪鏂规硶澶�
+function throttling(){
+ //鍏堟竻鐞�
+ clearTimeout(timeout)
+ timeout = setTimeout(() => {
+ reloadData()
+ }, 500)
+}
//鍔犺浇count
function loadCountByUserid() {
var backend_url = thisWidget.nodejs_url_predix + "dataapi/Bdata?bid=get_all_count_by_id&userid=" + thisWidget.userid;
--
Gitblit v1.9.1