From 98000edbcfa42765fdae87d5bdb9f11382fad0c4 Mon Sep 17 00:00:00 2001
From: wangzhibo <wangzhibo@shsening.com>
Date: 星期日, 26 九月 2021 01:02:18 +0800
Subject: [PATCH] 移到 function.js 中统一处理
---
widgetsTS/dataTime/widget.js | 78 ++++----------------------------------
widgets/manageLayers_style/view.js | 15 +++++--
2 files changed, 19 insertions(+), 74 deletions(-)
diff --git a/widgets/manageLayers_style/view.js b/widgets/manageLayers_style/view.js
index a61a210..290887d 100644
--- a/widgets/manageLayers_style/view.js
+++ b/widgets/manageLayers_style/view.js
@@ -243,7 +243,7 @@
// add map style selection radio
- if (!layer.hasOpacity && !layer.options.hasMapStyleOptions) {
+ if (!layer.hasOpacity && !layer.options.style_options) {
return;
}
@@ -271,15 +271,15 @@
},
});
}
- if (layer.options.hasMapStyleOptions) {
+ if (layer.options.style_options) {
var view = $("#" + tNode.tId);
var radio_html = '<div id="' + tNode.tId + '_style" style="color: white;">';
- let item = layer.options.hasMapStyleOptions;
+ let item = layer.options.style_options;
for (var i = 0, len = item.length; i < len; i++) {
- radio_html += '<span class="button level1 switch center_docu" ></span><label><input type="radio" name="' + tNode.tId + '_style" value="'+item[i]+'" ' + (item[i] == layer.options.selectedMapStyleOptions ? "checked" : "") + '/>' + item[i].toUpperCase() + '</label></br>';
+ radio_html += '<span class="button level1 switch center_docu" ></span><label><input type="radio" name="' + tNode.tId + '_style" value="'+item[i]+'" ' + (i == 0 ? "checked" : "") + '/>' + item[i].toUpperCase() + '</label></br>';
}
radio_html += '</div>';
@@ -292,7 +292,12 @@
$('input[type=radio][name=' + tNode.tId + '_style]').change(function () {
var layer = layersObj[tNode.uuid];
- layer.options.reloadLayers(tmpValue);
+ if (layer.options.type =='wms'){
+ layer.options.parameters.styles = layer.options.style_prefix+this.value;
+ layer.reload();
+ }
+ //TODO
+
});
}
diff --git a/widgetsTS/dataTime/widget.js b/widgetsTS/dataTime/widget.js
index 2974be9..0dd95c0 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,19 +56,13 @@
this.defaultDateTime = getDefaultDateTime();
// 鍒濆鍖� 鍙傛暟
let request = haoutil.system.getRequest();
+
if (window.top) {
request = $.extend(request, haoutil.system.getRequest(window.top));
}
- console.log( mars3d.globel_variables);
- mars3d.globel_variables = { geoserver_url_predix:'http://58.246.27.194:7011/',userid: request.userid || 2, queryDataType: 'hour' };
- mars3d.globel_variables.queryDataTStart = this.defaultDateTime;
- mars3d.globel_variables.queryDataTEnd = this.defaultDateTime;
- mars3d.globel_variables.layer100600_conifg={name:'琛楅亾',styleoptions:['pm25','pm10'],selectedstyle:'pm25'};
- console.log( mars3d.globel_variables);
+ mars3d.global_variables.userid = request?.userid || 2;
}
-
-
//姣忎釜绐楀彛鍒涘缓瀹屾垚鍚庤皟鐢�
winCreateOK(opt, result) {
@@ -94,7 +79,7 @@
$('#appDate').show()
$('#appDateHour').hide()
}
- mars3d.globel_variables.queryDataType = value;
+ mars3d.global_variables.queryDataType = value;
});
$("#appDate").datetimepicker({
@@ -111,30 +96,7 @@
todayHighlight: 1 //濡傛灉涓簍rue, 楂樹寒褰撳墠鏃ユ湡
}).on("changeDate", function () {
- mars3d.globel_variables.queryDataTStart = $('#appDate').val() + " 00:00:00";
- console.log(mars3d.globel_variables.queryDataTStart);
-
- // 鍦� function.js 涓畾涔夌殑 function
- addguokongLayers();
- addWeizhanLayer();
- addJianceLayer();
- addRoadLayer();
- // addRegionLayer();
- addJichangLayer();
- addMatouLayer();
- addHuanxianLayer();
- addYuanyuLayer();
- addJinboLayer();
- addBianjieLayer();
- addQuanLayer();
- addXinzhenquLayer();
- addJiedaoLayer();
- // addWindLayer();
- addGrid5Layers();
- addGrid1Layers();
-
- reloadTop10();
-
+ mars3d.global_variables.queryDataTStart = $('#appDate').val() + " 00:00:00";
reLoadLayers();
refreshWidgets();
@@ -156,29 +118,7 @@
todayHighlight: 1 //濡傛灉涓簍rue, 楂樹寒褰撳墠鏃ユ湡
}).on("changeDate", function () {
- mars3d.globel_variables.queryDataTStart = $('#appDateHour').val();
- console.log(mars3d.globel_variables.queryDataTStart);
- // 鍦� function.js 涓畾涔夌殑 function
- addguokongLayers();
- addWeizhanLayer();
- addJianceLayer();
- addRoadLayer();
- // addRegionLayer();
- addJichangLayer();
- addMatouLayer();
- addHuanxianLayer();
- addYuanyuLayer();
- addJinboLayer();
- addBianjieLayer();
- addQuanLayer();
- addXinzhenquLayer();
- addJiedaoLayer();
- // addWindLayer();
- addGrid5Layers();
- addGrid1Layers();
-
- reloadTop10();
-
+ mars3d.global_variables.queryDataTStart = $('#appDateHour').val();
reLoadLayers();
refreshWidgets();
});
@@ -186,10 +126,10 @@
$('#appDateHour').datetimepicker('setEndDate', new Date(this.defaultDateTime));
}
-
+
//婵�娲绘彃浠�
activate() {
-
+
}
//閲婃斁鎻掍欢
--
Gitblit v1.9.1