From cfd54ca33a4cecba88307b5fc14f1b0851098b27 Mon Sep 17 00:00:00 2001
From: qinbo <qinbo@shsening.com>
Date: 星期一, 01 十一月 2021 18:06:09 +0800
Subject: [PATCH] 局部查询设定时间范围
---
js/function.js | 21 ++++++++++++++++++---
widgetsTS/dataTime/widget.js | 26 +++++++++++++-------------
widgetsTS/widget_detail/widget.js | 9 +++++----
3 files changed, 36 insertions(+), 20 deletions(-)
diff --git a/js/function.js b/js/function.js
index 553ab68..91f042a 100644
--- a/js/function.js
+++ b/js/function.js
@@ -4,7 +4,7 @@
function getDefaultDateTime() {
- return "2021-07-01 12:00:00";
+ // return "2021-07-01 12:00:00";
var date = new Date;
date.setHours(date.getHours() - 2);
var year = date.getFullYear();//骞�
@@ -18,7 +18,7 @@
}
function getDefaultDateTimeEnd() {
- return "2021-07-01 12:15:00";
+ // return "2021-07-01 12:15:00";
var date = new Date;
date.setHours(date.getHours() - 2);
var year = date.getFullYear();//骞�
@@ -30,6 +30,20 @@
(day > 9 ? day : ("0" + day)) + " " +
(hours > 9 ? hours : ("0" + hours)) + ":15:00";
}
+
+function getDefaultDateTimeStart() {
+ var date = new Date;
+ date.setHours(date.getHours() - 10);
+ var year = date.getFullYear();//骞�
+ var month = date.getMonth();//鏈�
+ var day = date.getDate();//鏃�
+ var hours = date.getHours();//鏃�
+ return year + "-" +
+ ((month + 1) > 9 ? (month + 1) : "0" + (month + 1)) + "-" +
+ (day > 9 ? day : ("0" + day)) + " " +
+ (hours > 9 ? hours : ("0" + hours)) + ":00:00";
+}
+
function getDefaultDateTimeGeo() {
var date = new Date;
date.setHours(date.getHours() - 2);
@@ -46,6 +60,7 @@
mars3d.global_variables.queryDataTStart = getDefaultDateTime();
mars3d.global_variables.queryDataTStartGeo = getDefaultDateTimeGeo();
mars3d.global_variables.queryDataTEnd = getDefaultDateTimeEnd();
+mars3d.global_variables.DefaultDateTimeStart = getDefaultDateTimeStart();
// for tmp hight light graphic and
//mars3d.global_variables.tmpHighlightGraphic;
//mars3d.global_variables.tmpHighlightGraphicLayer;
@@ -80,7 +95,7 @@
function reLoadLayers() {
var layers = map.getLayers({ layers: true });
layers.forEach((layer) => {
- console.log(layer.name + ":" + layer.type);
+ // console.log(layer.name + ":" + layer.type);
if ([layer.type] == 'wms') {
layer.options.layers = "konglu_58:" + layer.options.geoname_prefix + mars3d.global_variables.queryDataType;
diff --git a/widgetsTS/dataTime/widget.js b/widgetsTS/dataTime/widget.js
index 3a530da..93ee8ab 100644
--- a/widgetsTS/dataTime/widget.js
+++ b/widgetsTS/dataTime/widget.js
@@ -13,18 +13,6 @@
(hours > 9 ? hours : ("0" + hours)) + ":00:00";
}
-function getDefaultDateTimeLocal01() {
- var date = new Date;
- date.setHours(date.getHours() - 10);
- var year = date.getFullYear();//骞�
- var month = date.getMonth();//鏈�
- var day = date.getDate();//鏃�
- var hours = date.getHours();//鏃�
- return year + "-" +
- ((month + 1) > 9 ? (month + 1) : "0" + (month + 1)) + "-" +
- (day > 9 ? day : ("0" + day)) + " " +
- (hours > 9 ? hours : ("0" + hours)) + ":00:00";
-}
function getDefaultDateLocal() {
var date = new Date;
@@ -68,8 +56,18 @@
create() {
this.defaultDate = getDefaultDateLocal();
this.defaultDateTime = getDefaultDateTimeLocal();
- this.defaultDateTime01 = getDefaultDateTimeLocal01();
+
+ // var queryDataTStartGeoday = this.defaultDate
+ // queryDataTStartGeoday = this.defaultDate.replace(/\:/g,"").replace(/-/g,"").replace(/\s+/g,"");
+ // mars3d.global_variables.queryDataTStartGeo = queryDataTStartGeoday
+ // reLoadLayers();
+
+ // var queryDataTStartGeohour = this.defaultDateTime
+ // queryDataTStartGeohour = this.defaultDateTime.replace(/\:/g,"").replace(/-/g,"").replace(/\s+/g,"");
+ // mars3d.global_variables.queryDataTStartGeo = queryDataTStartGeohour
+ // console.log(mars3d.global_variables.queryDataTStartGeo)
+ reLoadLayers();
}
//姣忎釜绐楀彛鍒涘缓瀹屾垚鍚庤皟鐢�
@@ -109,6 +107,7 @@
mars3d.global_variables.queryDataTStart = $('#appDate').val() + " 00:00:00";
mars3d.global_variables.queryDataTEnd = $('#appDate').val()+ " 00:15:00";
+ mars3d.global_variables.DefaultDateTimeStart = $('#appDate').val().substring(0,9)+"01 00:00:00";
mars3d.global_variables.queryDataTStartGeo = tmpDatetime;
reLoadLayers();
@@ -137,6 +136,7 @@
mars3d.global_variables.queryDataTStart = $('#appDateHour').val();
mars3d.global_variables.queryDataTEnd = $('#appDateHour').val().substring(0,14)+"15:00";
+ mars3d.global_variables.DefaultDateTimeStart = $('#appDateHour').val().substring(0,11)+"00:00:00";
mars3d.global_variables.queryDataTStartGeo = tmpDatetime;
reLoadLayers();
diff --git a/widgetsTS/widget_detail/widget.js b/widgetsTS/widget_detail/widget.js
index e85a527..0168380 100644
--- a/widgetsTS/widget_detail/widget.js
+++ b/widgetsTS/widget_detail/widget.js
@@ -32,8 +32,9 @@
this.config.params.layerid = params.layerid;
- this.appDateHourStart = mars3d.global_variables.queryDataTStart;
- this.appDateHourEnd = mars3d.global_variables.queryDataTEnd;
+ this.appDateHourStart = mars3d.global_variables.DefaultDateTimeStart;
+ this.appDateHourEnd = mars3d.global_variables.queryDataTStart;
+ console.log(this.appDateHourEnd)
}
@@ -49,8 +50,8 @@
this.config.params.layerid = this.config.params.layerid;
this.viewWindow.resetStartQueryHistoryText(this.config.params.layerid);
- this.appDateHourStart = mars3d.global_variables.queryDataTStart;
- this.appDateHourEnd = mars3d.global_variables.queryDataTEnd;
+ this.appDateHourStart = mars3d.global_variables.DefaultDateTimeStart;
+ this.appDateHourEnd = mars3d.global_variables.queryDataTStart;
}
//鎵撳紑婵�娲�
activate() {
--
Gitblit v1.9.1