From 4f35a8b56c12315c82fd5bd136f32da2dcadc5e2 Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期二, 27 四月 2021 09:27:22 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop

---
 src/conf/Constants.js |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/conf/Constants.js b/src/conf/Constants.js
index d4c087e..8384fca 100644
--- a/src/conf/Constants.js
+++ b/src/conf/Constants.js
@@ -9,7 +9,7 @@
 export const logicMapper = {
   wasteGasPfk: 'WasteGas.js',
   wasteWaterPfk: 'WasteWater.js',
-  wasteSolidCcd: 'SolidWaste.js',
+  wasteSolidCcd: 'WasteSolid.js',
   sewersAreaGs: 'Company.js',
   pipesegment: 'PipeLineAnimal.js'
 }
@@ -17,7 +17,7 @@
 export const STYLES = {
   FILL: true,
   WEIGHT: 3,
-  FILL_COLOR: '#73b2ff',
+  FILL_COLOR: '#0070ff',
   COLOR: '#73b2ff',
   FILL_OPACITY: 0.2,
   OPACITY: 1,
@@ -27,12 +27,16 @@
 }
 
 export const props = {
+  code: '缂栧彿',
+  name: '鍚嶇О',
+  pfktype: '鎺掓斁鍙ｇ被鍨�',
+  level: '绾у埆',
+  length: '闀垮害(m)',
+  unitname: '鍗曚綅鍚嶇О',
   pipename: '绠＄嚎鍚嶇О',
-  pipecode: '绠＄嚎缂栫爜',
   subchaname: '鏀嚎鍚嶇О',
   subchacode: '鏀嚎缂栫爜',
   mediumtype: '杈撻�佷粙璐�',
-  length: '闀垮害(m)',
   startposname: '璧风偣浣嶇疆鍚嶇О',
   endposname: '缁堢偣浣嶇疆鍚嶇О',
   pressureating: '璁捐鍘嬪姏锛圡Pa锛�',
@@ -50,8 +54,6 @@
   pipetrenchtype: '绠℃矡绫诲瀷',
   datecollected: '鎺㈡祴鏃堕棿',
   operationalstatus: '杩愯鐘舵��',
-  acquisitionpeople: '閲囬泦浜�',
-  acquisitiondate: '閲囬泦鏃ユ湡',
   fourtype: '鍥涢�氱被鍨�',
   fourm: '鍥涢�氭潗鏂�'
 }

--
Gitblit v1.8.0