From 4876b42b3e559170636fa61e3a7a26e6c5e3c7d6 Mon Sep 17 00:00:00 2001
From: qinbo <qinbo@shsening.com>
Date: 星期日, 26 九月 2021 09:34:32 +0800
Subject: [PATCH] Merge branch 'master' of http://www.shsening.com:10000/r/template/shanghai
---
widgetsTS/dataTime/widget.js | 32 +++++++++++++++++---------------
1 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/widgetsTS/dataTime/widget.js b/widgetsTS/dataTime/widget.js
index 8589b3a..e9eb4ec 100644
--- a/widgetsTS/dataTime/widget.js
+++ b/widgetsTS/dataTime/widget.js
@@ -24,21 +24,12 @@
(day > 9 ? day : ("0" + day)) + " 00:00:00";
}
-function applyDateType(){
+function applyDateType() {
var dateType = $('input[type=radio][name=datatype]').val();
return dateType;
}
-function reloadTop10(){
- var leftAndRight = mars3d.widget.getClass("widgetsTS/widget_Overall/widget.js");
- if(leftAndRight){
- if(leftAndRight.viewWindowLeft){
- leftAndRight.viewWindowLeft.loadTop10();
- }
- }
-}
-
-function getAppDateTime(){
+function getAppDateTime() {
return $('#appDate').val();
}
@@ -65,9 +56,11 @@
this.defaultDateTime = getDefaultDateTime();
// 鍒濆鍖� 鍙傛暟
let request = haoutil.system.getRequest();
+
if (window.top) {
request = $.extend(request, haoutil.system.getRequest(window.top));
}
+<<<<<<< HEAD
console.log( mars3d.global_variables);
mars3d.global_variables = { geoserver_url_predix:'http://58.246.27.194:7011/',userid: request.userid || 2, queryDataType: 'hour' };
mars3d.global_variables.queryDataTStart = this.defaultDateTime;
@@ -88,10 +81,11 @@
聽聽mars3d.global_variables.layer1000_conifg={name:'缃戞牸鍥惧眰1000',styleoptions:['pm25','pm10','no','no2','nox','co'],selectedstyle:'pm25',show:false};
聽聽mars3d.global_variables.layer5000_conifg={name:'缃戞牸鍥惧眰5000',styleoptions:['pm25','pm10','no','no2','nox','co'],selectedstyle:'pm25',show:false};
console.log( mars3d.global_variables);
+=======
+ mars3d.global_variables.userid = request?.userid || 2;
+>>>>>>> ac8a0efbbe8ae8ccba1bb7ecfb8098b780eca010
}
-
-
//姣忎釜绐楀彛鍒涘缓瀹屾垚鍚庤皟鐢�
winCreateOK(opt, result) {
@@ -126,6 +120,7 @@
}).on("changeDate", function () {
mars3d.global_variables.queryDataTStart = $('#appDate').val() + " 00:00:00";
+<<<<<<< HEAD
console.log(mars3d.global_variables.queryDataTStart);
// 鍦� function.js 涓畾涔夌殑 function
@@ -149,6 +144,8 @@
reloadTop10();
+=======
+>>>>>>> ac8a0efbbe8ae8ccba1bb7ecfb8098b780eca010
reLoadLayers();
// refreshWidgets();
@@ -171,6 +168,7 @@
}).on("changeDate", function () {
mars3d.global_variables.queryDataTStart = $('#appDateHour').val();
+<<<<<<< HEAD
console.log(mars3d.global_variables.queryDataTStart);
// 鍦� function.js 涓畾涔夌殑 function
addguokongLayers();
@@ -195,15 +193,19 @@
// reLoadLayers();
// refreshWidgets();
+=======
+ reLoadLayers();
+ refreshWidgets();
+>>>>>>> ac8a0efbbe8ae8ccba1bb7ecfb8098b780eca010
});
$("#appDateHour").datetimepicker("setDate", new Date(this.defaultDateTime));
$('#appDateHour').datetimepicker('setEndDate', new Date(this.defaultDateTime));
}
-
+
//婵�娲绘彃浠�
activate() {
-
+
}
//閲婃斁鎻掍欢
--
Gitblit v1.9.1