From 075165e4730500466675c093b63768f3343a1ee2 Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期三, 07 四月 2021 17:29:31 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/conf/layers/LayerWasteSolid.js | 16 ++++------------
src/conf/layers/LayerWasteWater.js | 14 +++++++-------
src/conf/layers/LayerWasteGas.js | 2 +-
src/conf/Constants.js | 6 +++---
4 files changed, 15 insertions(+), 23 deletions(-)
diff --git a/src/conf/Constants.js b/src/conf/Constants.js
index 98f7fa1..6784be5 100644
--- a/src/conf/Constants.js
+++ b/src/conf/Constants.js
@@ -5,9 +5,9 @@
}
export const logicMapper = {
- wasteGasJcd: 'WasteGas.js',
- wasteWaterJcd: 'WasteWater.js',
- solidWasteJcd: 'SolidWaste.js',
+ wasteGasPfk: 'WasteGas.js',
+ wasteWaterPfk: 'WasteWater.js',
+ wasteSolidCcd: 'SolidWaste.js',
sewersAreaGs: 'Company.js'
}
diff --git a/src/conf/layers/LayerWasteGas.js b/src/conf/layers/LayerWasteGas.js
index c87de74..a516977 100644
--- a/src/conf/layers/LayerWasteGas.js
+++ b/src/conf/layers/LayerWasteGas.js
@@ -8,7 +8,7 @@
checked: true,
layers: [
{
- code: 'wasteGasQy',
+ code: 'wasteGasPfk',
name: '鎺掓斁鍙�',
sname: '鎺掓斁鍙�', // 琛ㄥ悕
checked: true, // 榛樿閫変腑鐘舵��
diff --git a/src/conf/layers/LayerWasteSolid.js b/src/conf/layers/LayerWasteSolid.js
index 1610672..f75e58e 100644
--- a/src/conf/layers/LayerWasteSolid.js
+++ b/src/conf/layers/LayerWasteSolid.js
@@ -4,22 +4,14 @@
*/
export const LayerWasteSolid = {
- code: 'solidWaste',
+ code: 'wasteSolid',
name: '鍥哄簾',
checked: true,
layers: [
{
- code: 'solidWasteQy',
- name: '浼佷笟',
- sname: '浼佷笟', // 琛ㄥ悕
- checked: true, // 榛樿閫変腑鐘舵��
- url: 'http://www.baidu.com', // 璇锋眰涓氬姟鏁版嵁鎺ュ彛
- minZoom: 10 // 鍦ㄦ寚瀹氱骇鍒樉绀�
- },
- {
- code: 'solidWasteJcd',
- name: '鐩戞祴鐐�',
- sname: '鐩戞祴鐐�',
+ code: 'wasteSolidCcd',
+ name: '璐瓨鐐�',
+ sname: '璐瓨鐐�',
checked: true, // 榛樿閫変腑鐘舵��
url: 'http://www.baidu2.com',
minZoom: 10
diff --git a/src/conf/layers/LayerWasteWater.js b/src/conf/layers/LayerWasteWater.js
index 013da1a..13ffea0 100644
--- a/src/conf/layers/LayerWasteWater.js
+++ b/src/conf/layers/LayerWasteWater.js
@@ -8,25 +8,25 @@
checked: true,
layers: [
{
- code: 'wasteWaterqy',
- name: '浼佷笟',
- sname: '浼佷笟', // 琛ㄥ悕
+ code: 'wasteWaterPfk',
+ name: '鎺掓斁鍙�',
+ sname: '鎺掓斁鍙�', // 琛ㄥ悕
checked: true, // 榛樿閫変腑鐘舵��
url: 'http://www.baidu.com', // 璇锋眰涓氬姟鏁版嵁鎺ュ彛
minZoom: 10 // 鍦ㄦ寚瀹氱骇鍒樉绀�
},
{
code: 'wasteWaterJcd',
- name: '鐩戞祴鐐�',
- sname: '鐩戞祴鐐�',
+ name: '娴侀噺',
+ sname: '娴侀噺',
checked: true, // 榛樿閫変腑鐘舵��
url: 'http://www.baidu2.com',
minZoom: 10
},
{
code: 'wasteWaterfk',
- name: '鎺掓斁鍙�',
- sname: '鎺掓斁鍙�',
+ name: '娑蹭綅',
+ sname: '娑蹭綅',
checked: true, // 榛樿閫変腑鐘舵��
url: '',
minZoom: 10
--
Gitblit v1.8.0