From 9707e3f2b23cacaa6d219f7a000865cda4ecb99c Mon Sep 17 00:00:00 2001
From: wangzhibo <wangzhibo@shsening.com>
Date: 星期五, 17 十二月 2021 16:46:53 +0800
Subject: [PATCH] Merge branch 'master' of http://www.shsening.com:10000/r/template/shanghai
---
js/function.js | 11 ++---------
1 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/js/function.js b/js/function.js
index 36301a8..062bfe1 100644
--- a/js/function.js
+++ b/js/function.js
@@ -103,7 +103,8 @@
layer.options.parameters.viewparams = "userid:" + mars3d.global_variables.userid + ";regiontype:" + layer.options.regiontype + ";datetime:" + mars3d.global_variables.queryDataTStartGeo
layer.options.getFeatureInfoParameters.viewparams = "userid:" + mars3d.global_variables.userid + ";regiontype:" + layer.options.regiontype + ";datetime:" + mars3d.global_variables.queryDataTStartGeo
layer.reload();
- } else if ([layer.id] == 1001 && layer.options.show) {
+ // } else if ([layer.id] == 1001 && layer.options.show) {
+ } else if ([layer.id] == 1001) {
var tmpguokong = map.getLayerById(1001);
tmpguokong.clear(true);
getGuokongPointFromServer(tmpguokong);
@@ -182,11 +183,3 @@
}
}
-function changeNullAndundefinedToEmpty(json_in) {
- for (var key in json_in) {
- if (json_in[key] == null || json_in[key] == 'null' || json_in[key] == undefined || json_in[key] == 'undefined') {
- json_in[key] = "/";
- }
- }
- return json_in;
-}
\ No newline at end of file
--
Gitblit v1.9.1