From 4adfa4774e09f3b388335bb8dee5dea518856e5b Mon Sep 17 00:00:00 2001
From: yangdelong <828900aaa>
Date: 星期日, 30 五月 2021 19:23:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop

---
 src/conf/Constants.js |   25 ++++++++++++++++++++-----
 1 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/conf/Constants.js b/src/conf/Constants.js
index 20c3f29..af7e312 100644
--- a/src/conf/Constants.js
+++ b/src/conf/Constants.js
@@ -17,12 +17,12 @@
 }
 
 export const logicMapper = {
-  wasteGasPfk: 'WasteGas.js',
-  wasteWaterPfk: 'WasteWater.js',
-  wasteSolidCcd: 'WasteSolid.js',
+  wasteGasPfk: 'WasteGas.js', // 搴熸皵
+  wasteWaterPfk: 'WasteWater.js', // 搴熸按
+  wasteSolidCcd: 'WasteSolid.js', // 鍥哄簾
   sewersAreaGs: 'Company.js',
   pipesegment: 'PipeLineAnimal.js',
-  pollutionSources: 'SourcesPollution.js',
+  pollutionSourcesZlss: 'GovernEquipment.js', // 姹℃煋婧�-娌荤悊璁炬柦
   envRiskChart: 'EnvironmentRisk.js', // 椋庨櫓缁熻鍥�
   envRiskMajor: 'RiskSource.js', // 閲嶅ぇ椋庨櫓婧�
   envRiskFirst: 'RiskSource.js', // 涓�绾ч闄╂簮
@@ -65,7 +65,8 @@
   emergencyesources: '搴旀�ョ墿璧�',
   firefightingunit: '娑堥槻鍗曚綅',
   unitareaboundary: '瑁呯疆鍖鸿竟鐣�',
-  sensitivetarget: '鏁忔劅鐩爣'
+  sensitivetarget: '鏁忔劅鐩爣',
+  chokevalve: '鎴祦闂�'
 }
 
 export const LAYERPROPS = {
@@ -92,6 +93,7 @@
     name: '绠＄綉鍚嶇О',
     linenumtype: '绠＄嚎绫诲瀷',
     pipename: '绠＄嚎鍚嶇О',
+    subchaname: '鏀嚎鍚嶇О',
     mediumtype: '杈撻�佷粙璐�',
     length: '闀垮害(m)',
     startposname: '璧风偣浣嶇疆鍚嶇О',
@@ -414,5 +416,18 @@
     huncount: '甯歌浜哄彛鏁伴噺',
     structureoridsitearea: '鍗犲湴闈㈢Н',
     adminzonename: '琛屾斂闅跺睘'
+  },
+  // 鎴祦闂�
+  chokevalve: {
+    closurename: '鍚嶇О',
+    closurecode: '缂栫爜',
+    pointnumber: '娴嬬偣缂栧彿',
+    mediumtype: '浠嬭川',
+    size: '灏哄(m)',
+    operatingtype: '鎺у埗鏂瑰紡',
+    telephone: '鑱旂郴鐢佃瘽',
+    resperson: '璐熻矗浜�',
+    startdate: '鎶曠敤鏃ユ湡',
+    operationalstatus: '杩愯鐘舵��'
   }
 }

--
Gitblit v1.8.0