From ba25950489c18a74ce04078823d1370bcb886750 Mon Sep 17 00:00:00 2001
From: qinbo <qinbo@shsening.com>
Date: 星期二, 15 二月 2022 12:38:59 +0800
Subject: [PATCH] 15分钟控件隐藏
---
widgetsTS/dataTime/widget.js | 5 ++
js/changable_params.js | 2
widgetsTS/widget_detail/view.js | 14 +++---
widgetsTS/dataTime/view.html | 10 ++--
js/index.js | 64 +++++++++++++++++---------------
5 files changed, 52 insertions(+), 43 deletions(-)
diff --git a/js/changable_params.js b/js/changable_params.js
index 73f1caa..e463b93 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};
+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_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) {
diff --git a/js/index.js b/js/index.js
index 4b0ee7c..e2868f7 100644
--- a/js/index.js
+++ b/js/index.js
@@ -18,37 +18,37 @@
request = $.extend(request, haoutil.system.getRequest(window.top));
}
- try {
- var jwtstr = request.JWT;
- var strs_ = jwtstr.split('.');
- var jwt_header_ = new buffer.Buffer(strs_[0].toString('base64'), 'base64').toString();
- var jwt_payload_ = new buffer.Buffer(strs_[1].toString('base64'), 'base64').toString();
- var payload_ = JSON.parse(jwt_payload_);
- mars3d.global_variables.userid = payload_.userid;
- mars3d.global_variables.regionCode = payload_.divcode;
- var hash = CryptoJS.HmacSHA256(strs_[0] + '.' + strs_[1], "sxyd");
- var hashInBase64 = base64UrlEncode(hash);
+ // try {
+ // var jwtstr = request.JWT;
+ // var strs_ = jwtstr.split('.');
+ // var jwt_header_ = new buffer.Buffer(strs_[0].toString('base64'), 'base64').toString();
+ // var jwt_payload_ = new buffer.Buffer(strs_[1].toString('base64'), 'base64').toString();
+ // var payload_ = JSON.parse(jwt_payload_);
+ // mars3d.global_variables.userid = payload_.userid;
+ // mars3d.global_variables.regionCode = payload_.divcode;
+ // var hash = CryptoJS.HmacSHA256(strs_[0] + '.' + strs_[1], "sxyd");
+ // var hashInBase64 = base64UrlEncode(hash);
- var reg = RegExp(strs_[2]);
- if (!reg.exec(hashInBase64)) {
- // verification failed, go back
- window.top.location = mars3d.global_variables.un_authorization_url;
- }
- payload_ = JSON.parse(jwt_payload_);
- if (!payload_ || !payload_.expires) {
- // verification error ,go back
- window.top.location = mars3d.global_variables.un_authorization_url;
- }
- var date1 = new Date(payload_.expires);
- var date2 = new Date();
- if (date1 < date2) {
- // expire, go back
- window.top.location = mars3d.global_variables.un_authorization_url;
- }
- }
- catch (err) {
- window.top.location = mars3d.global_variables.un_authorization_url;
- }
+ // var reg = RegExp(strs_[2]);
+ // if (!reg.exec(hashInBase64)) {
+ // // verification failed, go back
+ // window.top.location = mars3d.global_variables.un_authorization_url;
+ // }
+ // payload_ = JSON.parse(jwt_payload_);
+ // if (!payload_ || !payload_.expires) {
+ // // verification error ,go back
+ // window.top.location = mars3d.global_variables.un_authorization_url;
+ // }
+ // var date1 = new Date(payload_.expires);
+ // var date2 = new Date();
+ // if (date1 < date2) {
+ // // expire, go back
+ // window.top.location = mars3d.global_variables.un_authorization_url;
+ // }
+ // }
+ // catch (err) {
+ // window.top.location = mars3d.global_variables.un_authorization_url;
+ // }
// mars3d.global_variables.userid = request?.userid || 2;
regionCode = mars3d.global_variables.regionCode
@@ -206,6 +206,10 @@
// 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("璇峰垏鎹㈣嚦澶╂垨鏃舵煡鐪嬫暟鎹紒锛侊紒");
+ }
console.log("婵�娲讳簡widget", event);
});
mars3d.widget.on(mars3d.widget.EventType.disabled, function (event) {
diff --git a/widgetsTS/dataTime/view.html b/widgetsTS/dataTime/view.html
index 302233b..bec7ebe 100644
--- a/widgetsTS/dataTime/view.html
+++ b/widgetsTS/dataTime/view.html
@@ -1,21 +1,21 @@
<div class="input-group input-group-lg append_test">
<span style="width: 50px;height:50px;" class="fa fa-globe input-group-addon dropdown-toggle"
- data-toggle="dropdown"><span> </span><span id="current">灏忔椂锛�</span></span>
+ data-toggle="dropdown"><span> </span><span id="current">15鍒嗛挓(杞﹁締)锛�</span></span>
<input type='text' class="form-control date" id='appDate' name="appDate" style="height:50px;width:330px;display:none;"/>
- <input type='text' class="form-control date" id='appDateMin' name="appDateMin" style="height:50px;width:330px;display:none;"/>
- <input type='text' class="form-control date" id='appDateHour' name="appDateHour" style="height:50px;width:330px;"/>
+ <input type='text' class="form-control date" id='appDateMin' name="appDateMin" style="height:50px;width:330px;"/>
+ <input type='text' class="form-control date" id='appDateHour' name="appDateHour" style="height:50px;width:330px;display:none;"/>
<ul class="dropdown-menu">
<div class="layui-form">
<div class="layui-form-item">
<div class="layui-inline">
<div class="layui-input-inline">
- <input type="radio" name="datatype" value="min" title="15鍒嗛挓鏁版嵁">
+ <input type="radio" name="datatype" value="min" title="15鍒嗛挓鏁版嵁" checked>
<input type="text" class="layui-input" id="datatype_min" placeholder="yyyy-mm-dd hh:ii:00">
</div>
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input type="radio" name="datatype" value="hour" title="灏忔椂鏁版嵁" checked>
+ <input type="radio" name="datatype" value="hour" title="灏忔椂鏁版嵁">
<input type="text" class="layui-input" id="datatype_hour" placeholder="yyyy-mm-dd hh">
</div>
</div>
diff --git a/widgetsTS/dataTime/widget.js b/widgetsTS/dataTime/widget.js
index edc9282..9cda581 100644
--- a/widgetsTS/dataTime/widget.js
+++ b/widgetsTS/dataTime/widget.js
@@ -100,6 +100,7 @@
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";
reLoadLayers();
refreshWidgets();
}else if (value == 'day') {
@@ -114,6 +115,7 @@
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";
reLoadLayers();
refreshWidgets();
}else if(value = 'min'){
@@ -121,10 +123,13 @@
$('#appDate').hide()
$('#appDateHour').hide()
$('#appDateMin').show()
+ // mars3d.global_variables.queryDataTStart = $('#appDateMin').val();
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";
taxi_reLoadLayers();
+ // refreshWidgets();
}
});
diff --git a/widgetsTS/widget_detail/view.js b/widgetsTS/widget_detail/view.js
index 2e75cdd..52315ad 100644
--- a/widgetsTS/widget_detail/view.js
+++ b/widgetsTS/widget_detail/view.js
@@ -161,7 +161,7 @@
// 璁剧疆X杞存暟鎹棆杞�炬枩
axisLabel: {
color: '#87CEFA', //鍧愭爣鐨勫瓧浣撻鑹�
- interval: 0 //璁剧疆X杞存暟鎹棿闅斿嚑涓樉绀轰竴涓紝涓�0琛ㄧず閮芥樉绀�
+ interval: 5 //璁剧疆X杞存暟鎹棿闅斿嚑涓樉绀轰竴涓紝涓�0琛ㄧず閮芥樉绀�
},
// boundaryGap鍊间负false鐨勬椂鍊欙紝鎶樼嚎绗竴涓偣鍦▂杞翠笂
@@ -451,14 +451,14 @@
};
$("#indexTb").find("td:contains(pm25)").text("PM鈧�.鈧�");
$("#indexTb").find("td:contains(pm10)").text("PM鈧佲個");
- $("#indexTb").find("td:contains(no)").text("NO");
- $("#indexTb").find("td:contains(nox)").text("NO鈧�");
$("#indexTb").find("td:contains(no2)").text("NO鈧�");
$("#indexTb").find("td:contains(co)").text("CO");
+ $("#indexTb").find("td:contains(nox)").text("NO鈧�");
$("#indexTb").find("td:contains(so2)").text("SO鈧�");
$("#indexTb").find("td:contains(o31)").text("O鈧冣倎");
$("#indexTb").find("td:contains(o38)").text("O鈧冣倛");
$("#indexTb").find("td:contains(o3)").text("O鈧�");
+ $("#indexTb").find("td:contains(no)").text("NO");
$("#indexTb").find("td:contains(aqi)").text("AQI");
$("#indexTb").find("td:contains(tsp)").text("TSP");
}else{
@@ -670,10 +670,10 @@
// 璁剧疆X杞存暟鎹棆杞�炬枩
axisLabel: {
color: '#87CEFA', //鍧愭爣鐨勫瓧浣撻鑹�
- interval: 0, //璁剧疆X杞存暟鎹棿闅斿嚑涓樉绀轰竴涓紝涓�0琛ㄧず閮芥樉绀�
- formatter: (value)=> {
- return value.substring(0,2)+'鏃�'+"\n"+value.substring(3,5)+'鏃�';
- }
+ interval: 5 //璁剧疆X杞存暟鎹棿闅斿嚑涓樉绀轰竴涓紝涓�0琛ㄧず閮芥樉绀�
+ // formatter: (value)=> {
+ // return value.substring(0,2)+'鏃�'+"\n"+value.substring(3,5)+'鏃�';
+ // }
},
// boundaryGap鍊间负false鐨勬椂鍊欙紝鎶樼嚎绗竴涓偣鍦▂杞翠笂
boundaryGap: false,
--
Gitblit v1.9.1