From 1e114a012e2abab1162ab8004f86694834f07449 Mon Sep 17 00:00:00 2001
From: ChenZeping02609 <chenzeping02609@163.com>
Date: 星期四, 13 五月 2021 18:12:56 +0800
Subject: [PATCH] 企业应急
---
src/conf/layers/LayerSurroundings.js | 12 ++++++------
src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/ResourcesQuery.vue | 37 +++++++++++++++++--------------------
2 files changed, 23 insertions(+), 26 deletions(-)
diff --git a/src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/ResourcesQuery.vue b/src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/ResourcesQuery.vue
index 4a7ece9..0c379e1 100644
--- a/src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/ResourcesQuery.vue
+++ b/src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/ResourcesQuery.vue
@@ -30,7 +30,7 @@
v-for="item in subItems"
:key="item.code"
:label="item.name"
- :value="item.name">
+ :value="item">
</el-option>
</el-select>
</el-form-item>
@@ -57,13 +57,17 @@
import WfsHelper from '@components/helpers/WfsHelper'
import AjaxUtils from '@utils/AjaxUtils'
+// import { LayerEmergency } from '../../../../../conf/LayerEmergency'
+import { LayerEmergencySource } from '../../../../../conf/layers/LayerEmergencySource'
+import { LayerSurroundings } from '../../../../../conf/layers/LayerSurroundings'
+
export default {
name: 'ResourcesQuery',
data () {
return {
form: {
eventName: '',
- pipelineType: '璧勬簮绫诲瀷',
+ pipelineType: '搴旀�ヨ祫婧�',
dataType: '',
keyword: '',
eventNameList: [
@@ -73,11 +77,10 @@
},
activeNum: -1,
list: [],
- // items: [LayerEntEmer],
- items: [{ name: '搴旀�ヨ祫婧�' }, { name: '鍛ㄨ竟鐜' }],
- // subItems: LayerEntEmer.layers,
- subItems: [{ name: '鍏ㄩ儴璧勬簮' }, { name: '搴旀�ョ墿璧�' }, { name: '搴旀�ヨ溅杈�(鑸�)' }, { name: '搴旀�ラ槦浼�(鍚秷闃插崟浣�)' }],
- subItemsT: [{ name: '鍏ㄩ儴鐜' }, { name: '鍖婚櫌' }, { name: '瀛︽牎' }, { name: '姘翠綋' }, { name: '鑷劧淇濇姢鍖�' }, { name: '鏁忔劅鐩爣' }],
+ items: [LayerEmergencySource, LayerSurroundings],
+ subItems: LayerEmergencySource.layers || LayerSurroundings.layers,
+ // subItems: [{ name: '鍏ㄩ儴璧勬簮' }, { name: '搴旀�ョ墿璧�' }, { name: '搴旀�ヨ溅杈�(鑸�)' }, { name: '搴旀�ラ槦浼�(鍚秷闃插崟浣�)' }],
+ // subItemsT: [{ name: '鍏ㄩ儴鐜' }, { name: '鍖婚櫌', icon: 'sewers/鍖婚櫌.png' }, { name: '瀛︽牎' }, { name: '姘翠綋' }, { name: '鑷劧淇濇姢鍖�' }, { name: '鏁忔劅鐩爣' }],
WfsHelper: null
}
},
@@ -87,24 +90,23 @@
methods: {
getImgSrc () {
const icon = this.form.dataType.icon
+ // console.log(this.form.dataType)
return icon ? 'assets/images/map/' + icon : ''
},
handlePipelineType (val) {
- console.log(val)
+ // console.log(val)
this.list = []
for (let i = 0; i < this.items.length; i++) {
const item = this.items[i].name
if (val === item.name) {
- this.subItems = item
+ this.subItems = item.layers
return
}
}
- // console.log('item')
if (this.form.pipelineType === '搴旀�ヨ祫婧�') {
- this.form.pipelineType = '璧勬簮绫诲瀷'
- }
- if (this.form.pipelineType === '鍛ㄨ竟鐜') {
- this.subItems = this.subItemsT
+ this.subItems = LayerEmergencySource.layers
+ } else {
+ this.subItems = LayerSurroundings.layers // (this.form.pipelineType === '鍛ㄨ竟鐜')
}
},
handleDataType (val) {
@@ -118,17 +120,12 @@
// this.wfsHelper.setTypeName([this.form.dataType.typeName])
this.wfsHelper.setTypeName(['sewer:emergency'])
if (this.form.dataType) {
- if (this.form.dataType === '鍏ㄩ儴鐜' || this.form.dataType === '鍏ㄩ儴璧勬簮' || this.form.dataType === '') {
-
- } else {
- this.wfsHelper.addEquals('type', '\'' + this.form.dataType + '\'')
- }
+ this.wfsHelper.addEquals('type', '\'' + this.form.dataType.name + '\'')
}
if (this.form.keyword) {
this.wfsHelper.addLike('name', this.form.keyword)
}
const res = await AjaxUtils.GetDataAsynByUrl(this.wfsHelper.getUrl(), {})
- console.log(res)
if (res instanceof Object && Object.prototype.hasOwnProperty.call(res, 'features')) {
this.list = res.features
}
diff --git a/src/conf/layers/LayerSurroundings.js b/src/conf/layers/LayerSurroundings.js
index a872133..9b55d72 100644
--- a/src/conf/layers/LayerSurroundings.js
+++ b/src/conf/layers/LayerSurroundings.js
@@ -5,7 +5,7 @@
*/
export const LayerSurroundings = {
code: 'sewersSurroundings',
- name: '搴旀�ヨ祫婧�',
+ name: '鍛ㄨ竟鐜',
checked: false,
layers: [
{
@@ -14,7 +14,7 @@
sname: '鍖婚櫌',
checked: false,
type: SERVICE_TYPE.WMS,
- icon: 'sewers/闆ㄦ按鎺掑彛.png',
+ icon: 'sewers/鍖婚櫌.png',
typeName: 'sewer:hospital',
minZoom: 10 // 鍦ㄦ寚瀹氱骇鍒樉绀�
},
@@ -22,7 +22,7 @@
code: 'sewersXx',
name: '瀛︽牎',
sname: '瀛︽牎',
- icon: 'sewers/闆ㄦ按鎺掑彛.png',
+ icon: 'sewers/鍖婚櫌.png',
checked: false, // 榛樿閫変腑鐘舵��
type: SERVICE_TYPE.WMS,
minZoom: 10
@@ -31,7 +31,7 @@
code: 'sewersSt',
name: '姘翠綋',
sname: '姘翠綋',
- icon: 'sewers/闆ㄦ按鎺掑彛.png',
+ icon: 'sewers/姘翠綋.png',
checked: false, // 榛樿閫変腑鐘舵��
type: SERVICE_TYPE.WMS,
typeName: 'sewer:pointhydrology',
@@ -41,7 +41,7 @@
code: 'sewersZrbhq',
name: '鑷劧淇濇姢鍖�',
sname: '鑷劧淇濇姢鍖�',
- icon: 'sewers/闆ㄦ按鎺掑彛.png',
+ icon: 'sewers/鍖婚櫌.png',
checked: false, // 榛樿閫変腑鐘舵��
type: SERVICE_TYPE.WMS,
wfs: 'sewer:pointpreservationzone',
@@ -51,7 +51,7 @@
code: 'sewersMgmb',
name: '鏁忔劅鐩爣',
sname: '鏁忔劅鐩爣',
- icon: 'sewers/闆ㄦ按鎺掑彛.png',
+ icon: 'sewers/鍖婚櫌.png',
checked: false, // 榛樿閫変腑鐘舵��
type: SERVICE_TYPE.WMS,
wfs: 'sewer:sensitivetarget',
--
Gitblit v1.8.0