From a57c6e7fbcb80806a42d774d69e9fe821c1afbfc Mon Sep 17 00:00:00 2001
From: qinbo <qinbo@shsening.com>
Date: 星期五, 18 二月 2022 11:24:14 +0800
Subject: [PATCH] Layer display level bug fix

---
 data/getLayerListByUserid.json |   66 ++++++++++++++++++++++++---------
 js/function_1001.js            |    3 +
 js/index.js                    |    4 --
 3 files changed, 50 insertions(+), 23 deletions(-)

diff --git a/data/getLayerListByUserid.json b/data/getLayerListByUserid.json
index 450c2af..6a5ab66 100644
--- a/data/getLayerListByUserid.json
+++ b/data/getLayerListByUserid.json
@@ -9,7 +9,8 @@
             "style_prefix":"",
             "style_selected":"pm25",
             "styleoptions": ["pm25", "pm10", "no2", "co","so2","o31"],
-            "show":false
+            "show":false,
+            "zIndex":20
 
         },
         {
@@ -22,7 +23,8 @@
             "style_selected":"pm25",
             "styleoptions": ["pm25", "pm10","no2", "co","so2","o3"],
             "regiontype":"00",
-            "show":false
+            "show":false,
+            "zIndex":19
         },
         {
             "id": 1003,
@@ -34,7 +36,8 @@
             "style_selected":"tsp",
             "styleoptions": ["tsp"],
             "regiontype":"00",
-            "show":false
+            "show":false,
+            "zIndex":18
         },
         {
             "id": 1004,
@@ -45,7 +48,8 @@
             "style_prefix":"",
             "style_selected":"pm25",
             "styleoptions": ["pm25", "pm10", "no", "no2", "nox", "co"],
-            "show":true
+            "show":true,
+            "zIndex":17
         },
         {
             "id": 1005,
@@ -57,7 +61,8 @@
             "style_selected":"pm25",
             "styleoptions": ["pm25", "pm10", "no", "no2", "nox", "co"],
             "regiontype":"00",
-            "show":false
+            "show":false,
+            "zIndex":16
         },
         {
             "id": 100600,
@@ -69,7 +74,8 @@
             "style_selected":"pm10",
             "styleoptions": ["pm25", "pm10", "no", "no2", "nox", "co"],
             "regiontype":"00",
-            "show":false
+            "show":false,
+            "zIndex":15
         },
         {
             "id": 100601,
@@ -81,7 +87,9 @@
             "style_selected":"pm10",
             "styleoptions": ["pm25", "pm10", "no", "no2", "nox", "co"],
             "regiontype":"01",
-            "show":false
+            "show":false,
+            "zIndex":14
+
         },
         {
             "id": 100602,
@@ -93,7 +101,9 @@
             "style_selected":"pm25",
             "styleoptions": ["pm25", "pm10", "no", "no2", "nox", "co"],
             "regiontype":"02",
-            "show":false
+            "show":false,
+            "zIndex":13
+
         },
         {
             "id": 100603,
@@ -105,7 +115,9 @@
             "style_selected":"pm25",
             "styleoptions": ["pm25", "pm10", "no", "no2", "nox", "co"],
             "regiontype":"03",
-            "show":false
+            "show":false,
+            "zIndex":12
+
         },
         {
             "id": 100604,
@@ -117,7 +129,9 @@
             "style_selected":"pm25",
             "styleoptions": ["pm25", "pm10", "no", "no2", "nox", "co"],
             "regiontype":"04",
-            "show":false
+            "show":false,
+            "zIndex":11
+
         },
         {
             "id": 100605,
@@ -129,7 +143,9 @@
             "style_selected":"pm25",
             "styleoptions": ["pm25", "pm10", "no", "no2", "nox", "co"],
             "regiontype":"05",
-            "show":false
+            "show":false,
+            "zIndex":9
+
         },
         {
             "id": 100607,
@@ -141,7 +157,9 @@
             "style_selected":"pm25",
             "styleoptions": ["pm25", "pm10", "no", "no2", "nox", "co"],
             "regiontype":"07",
-            "show":false
+            "show":false,
+            "zIndex":8
+
         },
         {
             "id": 100610,
@@ -153,7 +171,9 @@
             "style_selected":"pm25",
             "styleoptions": ["pm25", "pm10", "no", "no2", "nox", "co"],
             "regiontype":"10",
-            "show":false
+            "show":false,
+            "zIndex":1
+
         },
         {
             "id": 100611,
@@ -165,7 +185,9 @@
             "style_selected":"pm25",
             "styleoptions": ["pm25", "pm10", "no", "no2", "nox", "co"],
             "regiontype":"11",
-            "show":false
+            "show":false,
+            "zIndex":2
+
         },
         {
             "id": 3000,
@@ -179,7 +201,9 @@
             "regiontype":"00",
             "minimumLevel":15,
             "maximumLevel":19,
-            "show":false
+            "show":false,
+            "zIndex":4
+
         },
         {
             "id": 3001,
@@ -193,7 +217,9 @@
             "regiontype":"00",
             "minimumLevel":13,
             "maximumLevel":14,
-            "show":false
+            "show":false,
+            "zIndex":5
+
         },
         {
             "id": 3002,
@@ -207,7 +233,9 @@
             "regiontype":"00",
             "minimumLevel":11,
             "maximumLevel":12,
-            "show":false
+            "show":false,
+            "zIndex":6
+
         },
         {
             "id": 3003,
@@ -221,7 +249,9 @@
             "regiontype":"00",
             "minimumLevel":8,
             "maximumLevel":10,
-            "show":false
+            "show":false,
+            "zIndex":7
+
         },
         {
             "id": 2001,
diff --git a/js/function_1001.js b/js/function_1001.js
index 98dccf8..967c708 100644
--- a/js/function_1001.js
+++ b/js/function_1001.js
@@ -46,7 +46,8 @@
     style_selected: item.style_selected,
     style_options: item.styleoptions,
     regiontype:item.regiontype,
-    flyTo: false
+    flyTo: false,
+    zIndex:item.zIndex
   });
 
   
diff --git a/js/index.js b/js/index.js
index 3672a43..69237c6 100644
--- a/js/index.js
+++ b/js/index.js
@@ -207,10 +207,6 @@
   // }) 
 
   mars3d.widget.on(mars3d.widget.EventType.activated, function (event) {
-    if(mars3d.global_variables.timetype == "min" && event.sourceTarget.config.name == "鐩戞祴涓氬姟"){
-      $(".layui-layer").css("display", "none");
-      haoutil.msg("璇峰垏鎹㈣嚦澶╂垨鏃舵煡鐪嬫暟鎹紒锛侊紒");
-    }
     console.log("婵�娲讳簡widget", event);
   });
   mars3d.widget.on(mars3d.widget.EventType.disabled, function (event) {

--
Gitblit v1.9.1