From 022e02466285107b4d7c47a22d672dbce7a2de29 Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期五, 21 五月 2021 11:29:49 +0800
Subject: [PATCH] 配置图层线、面顺序
---
src/conf/layers/LayerPipeLines.js | 22 +++++++++++-----------
src/conf/layers/LayerFsss.js | 6 +++---
src/conf/layers/LayerHbss.js | 2 +-
src/conf/图层配置说明.md | 8 ++++++++
src/conf/layers/LayerArea.js | 1 +
src/conf/layers/LayerPk.js | 4 ++--
src/components/panel/topicSearch/SewersSearch.vue | 10 +++++-----
7 files changed, 31 insertions(+), 22 deletions(-)
diff --git a/src/components/panel/topicSearch/SewersSearch.vue b/src/components/panel/topicSearch/SewersSearch.vue
index 1948348..3976569 100644
--- a/src/components/panel/topicSearch/SewersSearch.vue
+++ b/src/components/panel/topicSearch/SewersSearch.vue
@@ -38,10 +38,9 @@
:class="activeNum===index?'hover':''">
<img class="state" :src="getImgSrc()" style="background: none"/>
<div>
- <h3 @click="handleLocation(item,index)">{{ item.properties.pipename }}
- {{item.properties.companyname }}</h3>
+ <h3 @click="handleLocation(item,index)">{{ item.properties.name || item.properties.code }}</h3>
<p>鎵�灞炰紒涓氾細<span>{{ item.properties.orgname }}</span>
- <p>璁炬柦绫诲瀷锛�<span>{{form.pipelineType}}</span>
+ <p>璁炬柦绫诲瀷锛�<span>{{ item.properties.type }}</span>
<el-button v-if="fuShuSheShiShow" class="rt btn00fff6" size="mini"
style="margin-right: 0.04rem;"
@click="btnAffiliatedFacilities(item,index)">
@@ -174,11 +173,11 @@
this.list = []
this.wfsHelper.clearFilter()
// todo 鐜板湪绠＄綉杩樻病鍖哄垎寮�绫诲瀷锛屽悗闈㈡敼
- this.wfsHelper.setTypeName([this.form.dataType.typeName])
+ this.wfsHelper.setTypeName(['sewer:view_pipeline'])
if (this.form.keyword) {
this.wfsHelper.addLike('name', this.form.keyword)
- this.wfsHelper.setFilter(this.form.keyword)
}
+ this.wfsHelper.addEquals('type', '\'' + this.form.dataType.sname + '\'')
// const filter = this.form.dataType.filter
// if (filter) {
// this.wfsHelper.setFilter(filter)
@@ -189,6 +188,7 @@
this.total = res.totalFeatures
this.list = res.features
}
+ this.wfsHelper = new WfsHelper()
},
// 鐐瑰嚮鎼滅储鍒扮殑鏁版嵁 瀹炵幇鍔熻兘 = 瀹氫綅 楂樹寒 寮规
handleLocation (val, index) {
diff --git a/src/conf/layers/LayerArea.js b/src/conf/layers/LayerArea.js
index f7afbe5..a6b0837 100644
--- a/src/conf/layers/LayerArea.js
+++ b/src/conf/layers/LayerArea.js
@@ -32,6 +32,7 @@
type: SERVICE_TYPE.WMS,
checked: false, // 榛樿閫変腑鐘舵��
icon: 'sewers/.png',
+ index: 1,
typeName: 'sewer:unitareaboundary'
}
]
diff --git a/src/conf/layers/LayerFsss.js b/src/conf/layers/LayerFsss.js
index e1a6600..caaea37 100644
--- a/src/conf/layers/LayerFsss.js
+++ b/src/conf/layers/LayerFsss.js
@@ -43,7 +43,7 @@
{
code: 'piperack',
name: '绠℃灦(澧�)',
- sname: 'PipeRack',
+ sname: '绠℃灦(澧�)',
minZoom: 16,
type: SERVICE_TYPE.WMS,
typeName: 'sewer:piperack',
@@ -53,7 +53,7 @@
{
code: 'pipegallery',
name: '绠″粖(甯�)',
- sname: 'PipeGallery',
+ sname: '绠″粖(甯�)',
minZoom: 16,
type: SERVICE_TYPE.WMS,
typeName: 'sewer:pipegallery',
@@ -70,7 +70,7 @@
name: '娴佸悜',
sname: 'ywslx',
type: SERVICE_TYPE.WMS,
- icon: 'sewers/娴佸悜.png',
+ typeName: 'sewer:pipesegment_flow',
checked: false
},
{
diff --git a/src/conf/layers/LayerHbss.js b/src/conf/layers/LayerHbss.js
index 99be80b..7b19e8e 100644
--- a/src/conf/layers/LayerHbss.js
+++ b/src/conf/layers/LayerHbss.js
@@ -41,7 +41,7 @@
{
code: 'jsc',
name: '闆嗘按姹�',
- sname: '闆嗘按姹�',
+ sname: '闆嗘按姹�(缃�)',
minZoom: 16,
typeName: 'sewer:collectingbasin',
checked: false,
diff --git a/src/conf/layers/LayerPipeLines.js b/src/conf/layers/LayerPipeLines.js
index 113d1a0..5fd131f 100644
--- a/src/conf/layers/LayerPipeLines.js
+++ b/src/conf/layers/LayerPipeLines.js
@@ -16,7 +16,7 @@
{
code: 'rainline',
name: '闆ㄦ按绾�',
- sname: '绠＄綉',
+ sname: '闆ㄦ按',
checked: true,
type: SERVICE_TYPE.WMS,
layerGroup: 'sewer:pipeline_group',
@@ -30,7 +30,7 @@
FILL_COLOR: '#0070ff'
},
filter: 'mediumtype = \'闆ㄦ按\'',
- index: 1
+ index: 20
},
{
code: 'accidentline',
@@ -49,7 +49,7 @@
FILL_COLOR: '#E64C00'
},
filter: 'mediumtype = \'浜嬫晠姘碶'',
- index: 1
+ index: 20
},
{
code: 'oilline',
@@ -67,7 +67,7 @@
COLOR: '#ffaa00',
FILL_COLOR: '#ffaa00'
},
- index: 1
+ index: 20
},
{
code: 'saltline',
@@ -85,7 +85,7 @@
COLOR: '#FF7F7F',
FILL_COLOR: '#FF7F7F'
},
- index: 1
+ index: 20
},
{
code: 'alkaliline',
@@ -103,7 +103,7 @@
COLOR: '#E8BEFF',
FILL_COLOR: '#E8BEFF'
},
- index: 1
+ index: 20
},
{
code: 'sulfurline',
@@ -121,7 +121,7 @@
COLOR: '',
FILL_COLOR: ''
},
- index: 1
+ index: 20
},
{
code: 'lifeline',
@@ -139,7 +139,7 @@
COLOR: '#A8A800',
FILL_COLOR: '#A8A800'
},
- index: 1
+ index: 20
},
{
code: 'purifyline',
@@ -157,7 +157,7 @@
COLOR: '#55FF00',
FILL_COLOR: '#55FF00'
},
- index: 1
+ index: 20
},
{
code: 'loopline',
@@ -175,7 +175,7 @@
COLOR: '#73FFDF',
FILL_COLOR: '#73FFDF'
},
- index: 1
+ index: 20
},
{
code: 'buildline',
@@ -193,7 +193,7 @@
COLOR: '#a8a800',
FILL_COLOR: '#a8a800'
},
- index: 1
+ index: 20
}
]
}
diff --git a/src/conf/layers/LayerPk.js b/src/conf/layers/LayerPk.js
index edcb323..ab105be 100644
--- a/src/conf/layers/LayerPk.js
+++ b/src/conf/layers/LayerPk.js
@@ -13,7 +13,7 @@
{
code: 'sewersNpk',
name: '鍐呮帓鍙�',
- sname: '鍐呮帓鍙�',
+ sname: '鍐呮帓',
checked: false,
type: SERVICE_TYPE.WMS,
icon: 'sewers/闆ㄦ按鎺掑彛.png',
@@ -24,7 +24,7 @@
{
code: 'sewersWpk',
name: '澶栨帓鍙�',
- sname: '澶栨帓鍙�',
+ sname: '澶栨帓',
icon: 'sewers/闆ㄦ按鎺掑彛.png',
checked: false, // 榛樿閫変腑鐘舵��
type: SERVICE_TYPE.WMS,
diff --git "a/src/conf/\345\233\276\345\261\202\351\205\215\347\275\256\350\257\264\346\230\216.md" "b/src/conf/\345\233\276\345\261\202\351\205\215\347\275\256\350\257\264\346\230\216.md"
new file mode 100644
index 0000000..a133066
--- /dev/null
+++ "b/src/conf/\345\233\276\345\261\202\351\205\215\347\275\256\350\257\264\346\230\216.md"
@@ -0,0 +1,8 @@
+##閰嶇疆wms
+
+ type: SERVICE_TYPE.WMS, //琛ㄦ槑杩欐槸涓�涓獁ms鏈嶅姟閰嶇疆
+ layerGroup: 'sewer:pipeline_group', //鍥惧眰缁勶紝濡傛灉娌℃湁灏变笉瑕佹椤癸紝涓嶈閰嶇疆绌猴紒锛侊紒
+ typeName: 'sewer:pipeline', //geoserver閰嶇疆鐨勫浘灞傚悕绉�
+ filter: 'mediumtype = \'鍑�鍖栨按\'', //绛夊悓浜巜ms鐨刢ql_filter
+ index: 5 //閰嶇疆鏄剧ず鍦ㄥ湴鍥句笂鐨勫眰绾э紝濡傛灉鏄潰鍒欓厤缃�1>=涓�<20,濡傛灉鏄嚎鐞嗚涓婂彲浠ラ厤缃�>=20锛岀浉鍚宭ayerGroup鐨勫彲浠ラ噸澶嶏紝涓嶅悓鐨勪笉鑳介噸澶嶏紒锛侊紒
+
--
Gitblit v1.8.0