From c4044fb60e53e5c83da4ee645d5160f914e422a3 Mon Sep 17 00:00:00 2001
From: YANGDL <114714267@qq.com>
Date: 星期五, 05 三月 2021 16:17:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/conf/LayerSewers.js |   47 ++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 46 insertions(+), 1 deletions(-)

diff --git a/src/conf/LayerSewers.js b/src/conf/LayerSewers.js
index c0bfc8f..d925383 100644
--- a/src/conf/LayerSewers.js
+++ b/src/conf/LayerSewers.js
@@ -16,7 +16,7 @@
       sname: '绠$綉', // 琛ㄥ悕
       checked: true, // 榛樿閫変腑鐘舵��
       filter: {},
-      zoom: 10, // 鍦ㄦ寚瀹氱骇鍒樉绀�
+      minZoom: 10, // 鍦ㄦ寚瀹氱骇鍒樉绀�
       childLayer: 'fsss,hbss' // 鍏宠仈PointLayers
     },
     {
@@ -25,6 +25,7 @@
       sname: '鍚补姹℃按',
       checked: true, // 榛樿閫変腑鐘舵��
       filter: {},
+      minZoom: 10,
       childLayer: 'fsss,hbss' // 鍏宠仈PointLayers
     },
     {
@@ -33,6 +34,7 @@
       sname: '鍚洂姹℃按',
       checked: true, // 榛樿閫変腑鐘舵��
       filter: {},
+      minZoom: 10,
       childLayer: 'fsss,hbss' // 鍏宠仈PointLayers
     },
     {
@@ -41,6 +43,7 @@
       sname: '鍚⒈姹℃按',
       checked: true, // 榛樿閫変腑鐘舵��
       filter: {},
+      minZoom: 10,
       childLayer: 'fsss,hbss' // 鍏宠仈PointLayers
     },
     {
@@ -49,6 +52,7 @@
       sname: '鎺掑彛',
       checked: true, // 榛樿閫変腑鐘舵��
       filter: {},
+      minZoom: 10,
       childLayer: 'pk' // 鍏宠仈PointLayers
     },
     {
@@ -57,6 +61,7 @@
       sname: '浜嬫晠姘�',
       checked: true, // 榛樿閫変腑鐘舵��
       filter: {},
+      minZoom: 10,
       childLayer: 'fsss,hbss' // 鍏宠仈PointLayers
     },
     {
@@ -65,6 +70,7 @@
       sname: '寰幆姘�',
       checked: true, // 榛樿閫変腑鐘舵��
       filter: {},
+      minZoom: 10,
       childLayer: 'fsss,hbss' // 鍏宠仈PointLayers
     },
     {
@@ -73,6 +79,7 @@
       sname: '鍑�鍖栨按',
       checked: true, // 榛樿閫変腑鐘舵��
       filter: {},
+      minZoom: 10,
       childLayer: 'fsss,hbss' // 鍏宠仈PointLayers
     },
     {
@@ -81,6 +88,7 @@
       sname: '鐢熸椿姹℃按',
       checked: true, // 榛樿閫変腑鐘舵��
       filter: {},
+      minZoom: 10,
       childLayer: 'fsss,hbss' // 鍏宠仈PointLayers
     },
     {
@@ -89,6 +97,7 @@
       sname: '鍖哄煙淇℃伅',
       checked: true, // 榛樿閫変腑鐘舵��
       filter: {},
+      minZoom: 10,
       childLayer: 'qyxx' // 鍏宠仈PointLayers
     }
   ]
@@ -107,6 +116,7 @@
         name: '鍥涢��',
         sname: '鍥涢��',
         checked: true,
+        minZoom: 10,
         icon: 'sewers/鍥涢��.png'
       },
       {
@@ -114,18 +124,21 @@
         name: '涓夐��',
         sname: '涓夐��',
         checked: false,
+        minZoom: 10,
         icon: 'sewers/涓夐��.png'
       },
       {
         code: 'piperack',
         name: '绠℃灦(澧�)',
         sname: 'PipeRack',
+        minZoom: 10,
         checked: false
       },
       {
         code: 'pipegallery',
         name: '绠″粖(甯�)',
         sname: 'PipeGallery',
+        minZoom: 10,
         checked: false
       },
       {
@@ -137,12 +150,14 @@
       {
         code: 'pipeline',
         name: '绠$綉',
+        minZoom: 10,
         sname: 'pipeline',
         checked: false
       },
       {
         code: 'valve',
         name: '闃�闂�',
+        minZoom: 10,
         sname: 'valve',
         checked: false,
         icon: 'sewers/闃�闂�.png'
@@ -151,6 +166,7 @@
         code: 'elbow',
         name: '寮ご',
         sname: 'Elbow',
+        minZoom: 10,
         checked: false,
         icon: 'sewers/寮ご.png'
       }
@@ -166,6 +182,7 @@
       {
         code: 'manhole',
         name: '绐ㄤ簳',
+        minZoom: 10,
         sname: '绐ㄤ簳',
         checked: false,
         icon: 'sewers/绐ㄤ簳.png'
@@ -174,6 +191,7 @@
         code: 'firedike',
         name: '闃茬伀鍫�',
         sname: '闃茬伀鍫�',
+        minZoom: 10,
         checked: false
       },
       {
@@ -181,24 +199,28 @@
         name: '闆ㄧ瀛�',
         sname: '闆ㄧ瀛�',
         checked: false,
+        minZoom: 10,
         icon: 'sewers/闆ㄧ瀛�.png'
       },
       {
         code: 'overflowweir',
         name: '婧㈡祦鍫�',
         sname: '婧㈡祦鍫�',
+        minZoom: 10,
         checked: false
       },
       {
         code: 'chokevalve',
         name: '鎴祦闂�',
         sname: '鎴祦闂�',
+        minZoom: 10,
         checked: false
       },
       {
         code: 'collectingbasin',
         name: '闆嗘按姹�(缃�)',
         sname: '闆嗘按姹�',
+        minZoom: 10,
         checked: false,
         icon: 'sewers/闆嗘按姹�.png'
       },
@@ -206,6 +228,7 @@
         code: 'oilseparator',
         name: '闅旀补姹�',
         sname: '闅旀补姹�',
+        minZoom: 10,
         checked: false,
         icon: 'sewers/闅旀补姹�.png'
       }
@@ -221,6 +244,7 @@
       {
         code: 'dischargeport',
         name: '鎺掓斁鍙�',
+        minZoom: 10,
         sname: '鎺掓斁鍙�',
         checked: false
       }
@@ -236,6 +260,7 @@
       {
         code: 'thirdpartypipe',
         name: '绗笁鏂圭閬�',
+        minZoom: 10,
         sname: '绗笁鏂圭閬�',
         checked: false
       },
@@ -243,6 +268,7 @@
         code: 'firefightingunit',
         name: '娑堥槻鍗曚綅',
         sname: '娑堥槻鍗曚綅',
+        minZoom: 10,
         checked: false,
         icon: 'sewers/娑堥槻鍗曚綅.png'
       },
@@ -250,6 +276,7 @@
         code: 'emergencyesources',
         name: '搴旀�ョ墿璧�',
         sname: '搴旀�ョ墿璧�',
+        minZoom: 10,
         checked: false
       },
       {
@@ -257,6 +284,7 @@
         name: '绀句細涓撲笟搴旀�ユ晳鎻撮槦浼�',
         sname: '涓撲笟搴旀�ユ晳鎻�',
         checked: false,
+        minZoom: 10,
         icon: 'sewers/绀句細涓撲笟搴旀�ユ晳鎻�.png'
       },
       {
@@ -264,6 +292,7 @@
         name: '缁存姠淇槦浼�',
         sname: '缁存姠淇槦浼�',
         checked: false,
+        minZoom: 10,
         icon: 'sewers/绀句細涓撲笟搴旀�ユ晳鎻�.png'
       },
       {
@@ -271,6 +300,7 @@
         name: '鍖婚櫌',
         sname: '鍖婚櫌',
         checked: false,
+        minZoom: 10,
         icon: 'sewers/鍖婚櫌.png'
       },
       {
@@ -278,6 +308,7 @@
         name: '鑷劧淇濇姢鍖�',
         sname: '鑷劧淇濇姢鍖�',
         checked: false,
+        minZoom: 10,
         icon: 'sewers/鑷劧淇濇姢鍖�.png'
       },
       {
@@ -285,6 +316,7 @@
         name: '姘翠綋',
         sname: '姘翠綋',
         checked: false,
+        minZoom: 10,
         icon: 'sewers/姘翠綋.png'
       },
       {
@@ -292,6 +324,7 @@
         name: '鏁忔劅鐩爣',
         sname: '鏁忔劅鐩爣',
         checked: false,
+        minZoom: 10,
         icon: 'sewers/鏁忔劅鐩爣.png'
       },
       {
@@ -299,18 +332,21 @@
         name: '鐜鐩戞祴鍗曚綅',
         sname: '鐜鐩戞祴鍗曚綅',
         checked: false,
+        minZoom: 10,
         icon: 'sewers/鐜鐩戞祴鍗曚綅.png'
       },
       {
         code: 'pointcontaminants',
         name: '鐩戞祴鐐规薄鏌撶墿鎸囨爣淇℃伅',
         sname: '姹℃煋鐗╂寚鏍�',
+        minZoom: 10,
         checked: false
       },
       {
         code: 'dischargeportaround',
         name: '鎺掓斁鍙e懆杈圭幆澧冩晱鎰熶俊鎭�',
         sname: '鎺掓斁鍙e懆杈圭幆澧�',
+        minZoom: 10,
         checked: false,
         iconN: 'sewers/鎺掓斁鍙e懆杈规晱鎰熶俊鎭�.png'
       },
@@ -318,6 +354,7 @@
         code: 'pump',
         name: '娉�',
         sname: '娉�',
+        minZoom: 10,
         checked: false,
         icon: 'sewers/娉�.png'
       },
@@ -326,12 +363,14 @@
         name: '娑蹭綅璁�',
         sname: '娑蹭綅璁�',
         checked: false,
+        minZoom: 10,
         icon: 'sewers/娑蹭綅璁�.png'
       },
       {
         code: 'flowmeter',
         name: '娴侀噺璁�',
         sname: '娴侀噺璁�',
+        minZoom: 10,
         checked: false,
         icon: 'sewers/娴侀噺璁�.png'
       },
@@ -339,30 +378,35 @@
         code: 'video',
         name: '瑙嗛鐩戞帶閰嶇疆',
         sname: '瑙嗛鐩戞帶',
+        minZoom: 10,
         checked: false
       },
       {
         code: 'onlinemonitoring',
         name: '鍦ㄧ嚎鐩戞祴璁惧閰嶇疆',
         sname: '鍦ㄧ嚎鐩戞祴',
+        minZoom: 10,
         checked: false
       },
       {
         code: 'combustiblegas',
         name: '鍙噧姘斾綋鎶ヨ璁惧閰嶇疆',
         sname: '鍙噧姘斾綋鎶ヨ',
+        minZoom: 10,
         checked: false
       },
       {
         code: 'hydrogensulfide',
         name: 'H2S娴撳害鎶ヨ璁惧閰嶇疆',
         sname: 'H2S娴撳害鎶ヨ',
+        minZoom: 10,
         checked: false
       },
       {
         code: 'controlpoint',
         name: '绠$嚎鐐�',
         sname: '绠$嚎鐐�',
+        minZoom: 10,
         checked: false,
         icon: 'sewers/绠$嚎鐐�.png'
       },
@@ -370,6 +414,7 @@
         code: 'pipesegment',
         name: '绠℃',
         sname: '绠℃',
+        minZoom: 10,
         checked: false
       }
     ]

--
Gitblit v1.8.0