From 9ad1ef1d8d480df117cb7577128fb22d237ff838 Mon Sep 17 00:00:00 2001
From: cshenfu <men883234@gmail.com>
Date: 星期二, 25 十月 2022 12:13:34 +0800
Subject: [PATCH] 更改轨迹回放时间选择bug
---
widgetsTS/taxiRouteReplay2/view.js | 11 +++++++++++
widgetsTS/widget_detail/view.js | 4 ++--
js/function_1001.js | 2 +-
mobile/js/widget_search_view.js | 7 +++----
widgetsTS/widget_summary/view.js | 6 +++---
widgetsTS/widget_search/view.js | 6 ++++--
widgetsTS/widget_grid/view.js | 2 +-
7 files changed, 25 insertions(+), 13 deletions(-)
diff --git a/js/function_1001.js b/js/function_1001.js
index 5ecfa38..406ef56 100644
--- a/js/function_1001.js
+++ b/js/function_1001.js
@@ -120,7 +120,7 @@
function getGuokongPointFromServer(tmplayer) {
- $.getJSON(mars3d.global_variables.nodejs_url_predix + "dataapi/Bdata?bid=get_1001_list&datatype=" + mars3d.global_variables.queryDataType + "&datatime=" + mars3d.global_variables.queryDataTStart + "&qindex=pm25&pageno=1&pagesize=1000", (result) => {
+ $.getJSON(mars3d.global_variables.nodejs_url_predix + "dataapi/Bdata?bid=get_1001_list&datatype=" + mars3d.global_variables.queryDataType + "&datatime=" + mars3d.global_variables.queryDataTStart + "®ionCode="+mars3d.global_variables.regionCode+"&qindex=pm25&pageno=1&pagesize=1000", (result) => {
data_list_1001 = result.data.result;
addGuokongPointResutToLayer(tmplayer, result.data.result);
});
diff --git a/mobile/js/widget_search_view.js b/mobile/js/widget_search_view.js
index 090158b..5d6a323 100644
--- a/mobile/js/widget_search_view.js
+++ b/mobile/js/widget_search_view.js
@@ -29,9 +29,9 @@
}
monitortype();
-//鍔犺浇count,"regionCode":mars3d.global_variables.regionCode
+//鍔犺浇count
function loadCountByUserid() {
- var backend_url = default_system_params.nodejs_url_predix_url_predix + "dataapi/Bdata?bid=get_all_count_by_id&userid=" + default_system_params.userid+"®ionCode="+mars3d.global_variables.regionCode;
+ var backend_url = default_system_params.nodejs_url_predix_url_predix + "dataapi/Bdata?bid=get_all_count_by_id&userid=" + default_system_params.userid;
$.ajax({
type: 'get',
dataType: 'json',
@@ -92,8 +92,7 @@
}
var avgnam = 50; //姣忛〉鏄剧ず涓暟
var backend_url = default_system_params.nodejs_url_predix + "dataapi/Bdata?bid=get_" + current_selected_monitor_type + "_list_keyword&datatype=" + querytype_ + "&datatime=" + datatime_
- + "&qindex=" + current_selected_monitor_qindex + "&keyword=" + current_selected_monitor_keyword + "&pageno="+page+"&pagesize="+avgnam
- + "®ionCode="+mars3d.global_variables.regionCode;
+ + "&qindex=" + current_selected_monitor_qindex + "&keyword=" + current_selected_monitor_keyword + "&pageno="+page+"&pagesize="+avgnam;
$.ajax({
type: "GET",
url: backend_url,
diff --git a/widgetsTS/taxiRouteReplay2/view.js b/widgetsTS/taxiRouteReplay2/view.js
index 8f1fe8d..f221a6b 100644
--- a/widgetsTS/taxiRouteReplay2/view.js
+++ b/widgetsTS/taxiRouteReplay2/view.js
@@ -161,6 +161,7 @@
todayHighlight: 1, //濡傛灉涓簍rue, 楂樹寒褰撳墠鏃ユ湡
endDate: new Date()
}).on('changeDate', function (ev) {
+<<<<<<< HEAD
ev.preventDefault();
ev.stopPropagation();
var startTime = ev.date;
@@ -171,6 +172,13 @@
// } else {
// $(endSelector).datetimepicker('setStartDate', null);
// }
+=======
+ if (ev.date) {
+ $(endSelector).datetimepicker('setStartDate', new Date(ev.date.valueOf()))
+ } else {
+ $(endSelector).datetimepicker('setStartDate', null);
+ }
+>>>>>>> 7d8b1bf5fbfff1e8e3b4284b9b84b6774b95c8a0
thisWidget.appDateHourStart = $(beginSelector).val();
})
$(endSelector).datetimepicker(
@@ -187,10 +195,13 @@
todayHighlight: 1, //濡傛灉涓簍rue, 楂樹寒褰撳墠鏃ユ湡
endDate: new Date()
}).on('changeDate', function (ev) {
+<<<<<<< HEAD
ev.preventDefault();
ev.stopPropagation();
var endTime = ev.date;
$(beginSelector).datetimepicker('setEndDate',endTime);
+=======
+>>>>>>> 7d8b1bf5fbfff1e8e3b4284b9b84b6774b95c8a0
thisWidget.appDateHourEnd = $(endSelector).val();
})
}
diff --git a/widgetsTS/widget_detail/view.js b/widgetsTS/widget_detail/view.js
index 29a974e..526ca6e 100644
--- a/widgetsTS/widget_detail/view.js
+++ b/widgetsTS/widget_detail/view.js
@@ -26,8 +26,8 @@
}
var backend_url = tmpQueryParams.nodejs_url_predix + "dataapi/Bdata?bid=get_" + tmpQueryParams.layerid + "_single_path&datatype=" + tmpQueryParams.datatype
+ "&siteid=" + tmpQueryParams.siteid + "&datatime1=" + tmpQueryParams.appDateHourStart + "&datatime2=" + tmpQueryParams.appDateHourEnd
- + "®ionCode="+mars3d.global_variables.regionCode+"&count=10";
- // all 1006xx layer has the same legend 锛侊紒 "regionCode":mars3d.global_variables.regionCode
+ +"&count=10";
+ // all 1006xx layer has the same legend 锛侊紒
console.log(tmpQueryParams)
echart_show(backend_url,tmpQueryParams)
diff --git a/widgetsTS/widget_grid/view.js b/widgetsTS/widget_grid/view.js
index 4e5e8be..72b7a6c 100644
--- a/widgetsTS/widget_grid/view.js
+++ b/widgetsTS/widget_grid/view.js
@@ -187,7 +187,7 @@
return new Promise(function (resolve, reject) {
$.ajax({
url: thisWidget.nodejs_url_predix + "dataapi/Bdata?bid=get_grid_heatmap&gridlevel=" + grid_item.level + "&datatype=" + thisWidget.datatype
- + "&datatime=" + thisWidget.datatime+ "®ionCode="+mars3d.global_variables.regionCode,
+ + "&datatime=" + thisWidget.datatime,
type: "get",
dataType: "json",
success: function (result) {
diff --git a/widgetsTS/widget_search/view.js b/widgetsTS/widget_search/view.js
index 3af59b9..517290f 100644
--- a/widgetsTS/widget_search/view.js
+++ b/widgetsTS/widget_search/view.js
@@ -62,7 +62,7 @@
//鍔犺浇count
function loadCountByUserid() {
- var backend_url = thisWidget.nodejs_url_predix + "dataapi/Bdata?bid=get_all_count_by_id&userid=" + thisWidget.userid;
+ var backend_url = thisWidget.nodejs_url_predix + "dataapi/Bdata?bid=get_all_count_by_id&userid=" + thisWidget.userid ;
$.ajax({
type: 'get',
dataType: 'json',
@@ -153,7 +153,9 @@
function reloadData(page){
$("#searchInfo").empty();
var avgnam = 30; //姣忛〉鏄剧ず涓暟
- var backend_url = thisWidget.nodejs_url_predix + "dataapi/Bdata?bid=get_" + current_selected_monitor_type + "_list_keyword&datatype=" + thisWidget.datatype + "&datatime=" + thisWidget.datatime +"&userid=" + thisWidget.userid+ "&qindex=" + current_selected_monitor_qindex +"&keyword=" + current_selected_monitor_keyword + "&pageno="+page+"&pagesize="+avgnam;
+ var backend_url = thisWidget.nodejs_url_predix + "dataapi/Bdata?bid=get_" + current_selected_monitor_type + "_list_keyword&datatype=" + thisWidget.datatype
+ + "&datatime=" + thisWidget.datatime +"&userid=" + thisWidget.userid+ "&qindex=" + current_selected_monitor_qindex
+ + "&keyword=" + current_selected_monitor_keyword + "&pageno="+page+"&pagesize="+avgnam;
$.ajax({
type:"GET",
url:backend_url,
diff --git a/widgetsTS/widget_summary/view.js b/widgetsTS/widget_summary/view.js
index a963a7b..eb7aedd 100644
--- a/widgetsTS/widget_summary/view.js
+++ b/widgetsTS/widget_summary/view.js
@@ -50,7 +50,7 @@
}
//鍔犺浇count
function loadCountByUserid() {
- var backend_url = thisWidget.nodejs_url_predix + "dataapi/Bdata?bid=get_all_count_by_id&userid=" + thisWidget.userid+"regionCode="+mars3d.global_variables.regionCode;
+ var backend_url = thisWidget.nodejs_url_predix + "dataapi/Bdata?bid=get_all_count_by_id&userid=" + thisWidget.userid;
$.ajax({
type: 'get',
dataType: 'json',
@@ -77,7 +77,7 @@
}
});
var backend_url_taxi = thisWidget.nodejs_url_predix + "dataapi/Bdata?bid=get_count_all&datatype=" + thisWidget.datatype
- + "&datatime="+ thisWidget.datatime+"®ionCode="+mars3d.global_variables.regionCode;
+ + "&datatime="+ thisWidget.datatime;
$.ajax({
type: 'get',
dataType: 'json',
@@ -146,7 +146,7 @@
$("#top10Tb").empty();
var backend_url = thisWidget.nodejs_url_predix + "dataapi/Bdata?bid=get_" + current_selected_monitor_type + "_list&datatype=" + thisWidget.datatype
+ "&datatime=" + thisWidget.datatime+ "&userid=" + thisWidget.userid + "&qindex=" + current_selected_monitor_qindex
- + "&pageno=1&pagesize=" + default_system_params.summary_topN_count+"regionCode="+mars3d.global_variables.regionCode;
+ + "&pageno=1&pagesize=" + default_system_params.summary_topN_count;
//鍔犲叆cntId
$.ajax({
type: 'get',
--
Gitblit v1.9.1