From eb94cf0875f1178843182ba470066027f8cb4a59 Mon Sep 17 00:00:00 2001
From: qinbo <qinbo@shsening.com>
Date: 星期四, 17 二月 2022 19:21:58 +0800
Subject: [PATCH] add Time switch control hidden
---
widgetsTS/dataTime/widget.js | 19 ++++++++-
widgetsTS/logoAndMenu/view.html | 10 ++--
js/changable_params.js | 6 +-
js/function_wind.js | 1
js/function_1001.js | 34 +++++++++++++++++
js/index.js | 13 +++---
6 files changed, 66 insertions(+), 17 deletions(-)
diff --git a/js/changable_params.js b/js/changable_params.js
index 38ccc6c..0d9b957 100644
--- a/js/changable_params.js
+++ b/js/changable_params.js
@@ -52,7 +52,7 @@
, 3000: ['#00EE00', '#FF9F7F', '#FFD700', '#ff6600', '#ff0066', '#ff6666']
}
-var default_system_params = { geoserver_url_predix: 'http://58.246.27.194:7011/', nodejs_url_predix: 'http://58.246.27.194:7012/', userid: 2, queryDataType: 'hour', weathercitycode: '101020100', wind360: 0, windSpeed: 10, is_single_taxi_replaying: false,summary_topN_count :50, un_authorization_url: 'http://223.167.111.168:8016/PollutionData/loginpage.aspx?returnurl=http://223.167.111.168:8004/shanghai/index.html',regionCode:0,timetype_change:"min"};
+var default_system_params = { geoserver_url_predix: 'http://58.246.27.194:7011/', nodejs_url_predix: 'http://58.246.27.194:7012/', userid: 2, queryDataType: 'hour', weathercitycode: '101020100', wind360: 0, windSpeed: 10, is_single_taxi_replaying: false,summary_topN_count :50, un_authorization_url: 'http://223.167.111.168:8016/PollutionData/loginpage.aspx?returnurl=http://223.167.111.168:8004/shanghai/index.html',regionCode:0,timetype:"min"};
var default_grid_camerview = {grid5000:{"lat":30.367931,"lng":121.518409,"alt":128482,"heading":2,"pitch":-57},grid3000:{"lat":30.902475,"lng":121.487751,"alt":38716,"heading":2,"pitch":-57},grid1000:{"lat":31.066346,"lng":121.462529,"alt":10026,"heading":2,"pitch":-57},grid500:{"lat":31.112561,"lng":121.458433,"alt":2483,"heading":2,"pitch":-57}};
function bindPopupFunction(event) {
@@ -60,6 +60,7 @@
let layerid = event.layer.options.id;
let item = event.graphic?.attr;
let qindex = event.layer.options.style_selected;
+ // console.log(event)
if (!item) {
return "";
}
@@ -117,9 +118,8 @@
item["code"] +
"<br />鏃堕棿锛�" +
item["datatime"] +
- "<br />杞﹂�燂細" +
- item["speed"] +
"<table>" +
+ "<tr><td>杞﹂�燂細</td><td align= right>" + item["speed"] + ' ' + "</td><td>km/h</td></tr>" +
"<tr><td>PM鈧�.鈧咃細</td><td align= right>" + item["pm25"] + ' ' + "</td><td>渭g/m鲁</td></tr>" +
"<tr><td>PM鈧佲個锛�</td><td align= right>" + item["pm10"] + ' ' + "</td><td>渭g/m鲁</td></tr>" +
"<tr><td>NO锛�</td><td align= right>" + item["no"] + ' ' + "</td><td>渭g/m鲁</td></tr>" +
diff --git a/js/function_1001.js b/js/function_1001.js
index 3e7af16..98dccf8 100644
--- a/js/function_1001.js
+++ b/js/function_1001.js
@@ -195,3 +195,37 @@
}
return json_in;
}
+
+function timetype_change1(){
+ if(mars3d.global_variables.timetype == "min"){
+ $(".menu1").attr('onclick'," "); //$("#鍚嶇О").attr("灞炴�у悕","灞炴�у��");
+ haoutil.msg("璇峰垏鎹㈣嚦澶╂垨鏃舵煡鐪嬫暟鎹紒锛侊紒");
+ }else{
+ $(".menu1").attr('onclick',"javascript:activateWidget('widgetsTS/widget_summary/widget.js')"); //$("#鍚嶇О").attr("灞炴�у悕","灞炴�у��");
+ }
+}
+function timetype_change2(){
+ if(mars3d.global_variables.timetype == "min"){
+ $(".menu2").attr('onclick'," "); //$("#鍚嶇О").attr("灞炴�у悕","灞炴�у��");
+ haoutil.msg("璇峰垏鎹㈣嚦澶╂垨鏃舵煡鐪嬫暟鎹紒锛侊紒");
+ }else{
+ $(".menu2").attr('onclick',"javascript:activateWidget('widgetsTS/widget_search/widget.js')"); //$("#鍚嶇О").attr("灞炴�у悕","灞炴�у��");
+ }
+}
+function timetype_change3(){
+ if(mars3d.global_variables.timetype == "min"){
+ $(".menu3").attr('onclick'," "); //$("#鍚嶇О").attr("灞炴�у悕","灞炴�у��");
+ haoutil.msg("璇峰垏鎹㈣嚦澶╂垨鏃舵煡鐪嬫暟鎹紒锛侊紒");
+ }else{
+ $(".menu3").attr('onclick',"javascript:activateWidget('widgetsTS/widget_grid/widget.js')"); //$("#鍚嶇О").attr("灞炴�у悕","灞炴�у��");
+ }
+}
+
+function timetype_change4(){
+ if(mars3d.global_variables.timetype == "min"){
+ $(".menu4-Wind").attr('onclick'," "); //$("#鍚嶇О").attr("灞炴�у悕","灞炴�у��");
+ haoutil.msg("璇峰垏鎹㈣嚦澶╂垨鏃舵煡鐪嬫暟鎹紒锛侊紒");
+ }else{
+ $(".menu4-Wind").attr('onclick',"javascript:activateWidget('widgetsTS/windsetting/widget.js');javascript:$('#menu4Child').toggle()"); //$("#鍚嶇О").attr("灞炴�у悕","灞炴�у��");
+ }
+}
diff --git a/js/function_wind.js b/js/function_wind.js
index fea5db5..93bb3c6 100644
--- a/js/function_wind.js
+++ b/js/function_wind.js
@@ -86,6 +86,7 @@
popup: "all",
show: true
});
+ // mars3d.global_variables.tmpHighlightGraphicLayer.bindPopup(bindPopupFunction);
map.addLayer(mars3d.global_variables.tmpHighlightGraphicLayer);
}
function addMaskShanghai() {
diff --git a/js/index.js b/js/index.js
index e2868f7..3672a43 100644
--- a/js/index.js
+++ b/js/index.js
@@ -202,13 +202,14 @@
// mars3d.widget.on(mars3d.widget.EventType.load, function (event) {
// console.log("寮曞叆鍔犺浇浜唚idget鐨刯s", event);
// })
- // mars3d.widget.on(mars3d.widget.EventType.created, function (event) {
- // console.log("鍒涘缓浜唚idet", event);
- // })
+ // mars3d.widget.on(mars3d.widget.EventType.beforeCreate, function (event) {
+ // console.log("涓嶅垱寤簑idet", event);
+ // })
+
mars3d.widget.on(mars3d.widget.EventType.activated, function (event) {
- console.log(mars3d.global_variables.timetype_change)
- if(mars3d.global_variables.timetype_change == "min" && (event.sourceTarget.config.name == "鐩戞帶鎬昏" || event.sourceTarget.config.name == "鍒嗙被鏌ヨ" || event.sourceTarget.config.name == "鐩戞帶缃戞牸" || event.sourceTarget.config.name == "椋庡満鍙傛暟" || event.sourceTarget.config.name == "鐩戞祴涓氬姟")){
- haoutil.alert("璇峰垏鎹㈣嚦澶╂垨鏃舵煡鐪嬫暟鎹紒锛侊紒");
+ if(mars3d.global_variables.timetype == "min" && event.sourceTarget.config.name == "鐩戞祴涓氬姟"){
+ $(".layui-layer").css("display", "none");
+ haoutil.msg("璇峰垏鎹㈣嚦澶╂垨鏃舵煡鐪嬫暟鎹紒锛侊紒");
}
console.log("婵�娲讳簡widget", event);
});
diff --git a/widgetsTS/dataTime/widget.js b/widgetsTS/dataTime/widget.js
index 9cda581..a4810fa 100644
--- a/widgetsTS/dataTime/widget.js
+++ b/widgetsTS/dataTime/widget.js
@@ -100,9 +100,13 @@
mars3d.global_variables.DefaultDateTimeStart = $('#appDateHour').val().substring(0,11)+"00:00:00";
mars3d.global_variables.queryDataTStartGeo = tmpDatetime;
mars3d.global_variables.queryDataType = value;
- mars3d.global_variables.timetype_change = "hour";
+ mars3d.global_variables.timetype = "hour";
reLoadLayers();
refreshWidgets();
+ timetype_change1();
+ timetype_change2();
+ timetype_change3();
+ timetype_change4();
}else if (value == 'day') {
$('#current').text("澶╋細");
$('#appDateMin').hide()
@@ -115,9 +119,14 @@
mars3d.global_variables.DefaultDateTimeStart = $('#appDate').val().substring(0,8)+"01 00:00:00";
mars3d.global_variables.queryDataTStartGeo = tmpDatetime;
mars3d.global_variables.queryDataType = value;
- mars3d.global_variables.timetype_change = "day";
+ mars3d.global_variables.timetype = "day";
reLoadLayers();
refreshWidgets();
+ timetype_change1();
+ timetype_change2();
+ timetype_change3();
+ timetype_change4();
+
}else if(value = 'min'){
$('#current').text("15鍒嗛挓(杞﹁締)锛�");
$('#appDate').hide()
@@ -127,8 +136,12 @@
mars3d.global_variables.queryDataTStartTaxi = $('#appDateMin').val();
mars3d.global_variables.queryDataTEnd = $('#appDateMin').val().substring(0,14) + (Number($('#appDateMin').val().substring(14,16)) + 14).toString() +":59";
mars3d.global_variables.DefaultDateTimeStart = $('#appDateMin').val().substring(0,11)+"00:00:00";
- mars3d.global_variables.timetype_change = "min";
+ mars3d.global_variables.timetype = "min";
taxi_reLoadLayers();
+ timetype_change1();
+ timetype_change2();
+ timetype_change3();
+ timetype_change4();
// refreshWidgets();
}
});
diff --git a/widgetsTS/logoAndMenu/view.html b/widgetsTS/logoAndMenu/view.html
index 28d12a8..b5316d8 100644
--- a/widgetsTS/logoAndMenu/view.html
+++ b/widgetsTS/logoAndMenu/view.html
@@ -2,14 +2,14 @@
<div class="logoImg"><img class="logo1 animated bounceInDown" src="./img/logo.png"> <img
class="logo2 animated lightSpeedIn" src="./img/logoText.png"></div>
<div class="logoMenu">
- <div class="menu1 widget-btn" title="鐩戞帶鎬昏" onclick="javascript:activateWidget('widgetsTS/widget_summary/widget.js')">
+ <div class="menu1 widget-btn" title="鐩戞帶鎬昏" onclick=timetype_change1()>
<span></span>
<div class="menuMask"></div>
</div>
- <div class="menu2 widget-btn" title="鐩戞帶鍒嗘瀽" onclick="javascript:activateWidget('widgetsTS/widget_search/widget.js')"><span></span>
+ <div class="menu2 widget-btn" title="鐩戞帶鍒嗘瀽" onclick=timetype_change2()><span></span>
<div class="menuMask"></div>
</div>
- <div class="menu3" title="缃戞牸鐩戞帶" onclick="javascript:activateWidget('widgetsTS/widget_grid/widget.js')"><span></span>
+ <div class="menu3" title="缃戞牸鐩戞帶" onclick=timetype_change3()><span></span>
<div class="menuMask"></div>
</div>
<div class="menu4" title="璁剧疆" onclick="javascript:$('#menu4Child').toggle()"><span></span>
@@ -26,8 +26,8 @@
</ul> -->
<ul id="menu4Child" class="menu4-ul">
- <li class="widget-btn"
- onclick="javascript:activateWidget('widgetsTS/windsetting/widget.js');javascript:$('#menu4Child').toggle()">
+ <li class="widget-btn menu4-Wind"
+ onclick=timetype_change4()>
<i class="fa fa-gear"></i>椋庡満鍙傛暟
</li>
<li class="widget-btn"
--
Gitblit v1.9.1