From c074d3bf22a735722b5e1b6659863393f2fb1e41 Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期四, 13 五月 2021 15:37:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/conf/layers/LayerResources.js | 41 +++
src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/EventQuery.vue | 112 +++++----
src/conf/Constants.js | 1
src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/ResourcesQuery.vue | 84 +++---
src/components/LayerController/logic/EnterpriseEmergency.js | 7
src/components/panel/topicSearch/SewersSearch.vue | 2
src/components/panel/topicSearch/DischargeSearch.vue | 256 ++++++++++++----------
src/conf/layers/LayerEvent.js | 41 +++
src/conf/layers/LayerEntEmer.js | 76 ++++--
9 files changed, 383 insertions(+), 237 deletions(-)
diff --git a/src/components/LayerController/logic/EnterpriseEmergency.js b/src/components/LayerController/logic/EnterpriseEmergency.js
new file mode 100644
index 0000000..6ebead1
--- /dev/null
+++ b/src/components/LayerController/logic/EnterpriseEmergency.js
@@ -0,0 +1,7 @@
+/**
+ * 浼佷笟搴旀��
+ */
+
+module.exports = function () {
+
+}
diff --git a/src/components/panel/topicSearch/DischargeSearch.vue b/src/components/panel/topicSearch/DischargeSearch.vue
index e71a71c..f0fd797 100644
--- a/src/components/panel/topicSearch/DischargeSearch.vue
+++ b/src/components/panel/topicSearch/DischargeSearch.vue
@@ -1,124 +1,126 @@
<template>
- <div class="sewers-search" v-if="gdVisible">
- <div class="panel-title">{{title}}</div>
- <div class="search-panel ">
- <el-form ref="form" :model="form" label-width="90px" class="search-form">
- <el-form-item label="鍖哄煙锛�" size="mini" class="search-panel-item">
- <el-select style="width: 100%" v-model="form.areaVal" @change="areaType" :popper-class="'select-down'">
- <el-option
- v-for="item in areaTypeOptions"
- :key="item.value"
- :label="item.label"
- :value="item.value">
- </el-option>
- </el-select>
- </el-form-item>
- <!-- <el-form-item label="浼佷笟鍚嶇О" size="mini">
- <el-select style="width: 100%" v-model="form.enterpriseVal" @change="enterpriseType" :popper-class="'select-down'">
- <el-option
- v-for="item in enterpriseTypeOptions"
- :key="item.value"
- :label="item.label"
- :value="item.value">
- </el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="浜岀骇鍗曚綅" size="mini">
- <el-select style="width: 100%" v-model="form.enterpriseSubunitsVal" @change="enterpriseSubunitsType" :popper-class="'select-down'">
- <el-option
- v-for="item in enterpriseSubunitsTypeOptions"
- :key="item.value"
- :label="item.label"
- :value="item.value">
- </el-option>
- </el-select>
- </el-form-item> -->
- <!-- <el-form-item label="椋庨櫓绾у埆" size="mini"></el-form-item>
- <el-radio-group v-model="form.type" class="levelOfRisk">
- <el-radio v-for="(item,index) in levelOfRisk" :label="item.value" :key="index"><span class="levelOfRisk-type">{{item.name}}<i :style="'background:'+item.color"></i></span></el-radio>
- </el-radio-group> -->
- <!-- <el-form-item >-->
- <div class="rightButtonSearch">
- <el-input v-model="form.keyword" size="mini" placeholder="鍦ㄦ杈撳叆鍏抽敭瀛楁悳绱�"></el-input>
- <el-button class="el-icon-search" @click="handleSearch"></el-button>
+ <div class="sewers-search" v-if="gdVisible">
+ <div class="panel-title">{{title}}</div>
+ <div class="search-panel ">
+ <el-form ref="form" :model="form" label-width="90px" class="search-form">
+ <el-form-item label="鍖哄煙锛�" size="mini" class="search-panel-item">
+ <el-select style="width: 100%" v-model="form.areaVal" @change="areaType"
+ :popper-class="'select-down'">
+ <el-option
+ v-for="item in areaTypeOptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <!-- <el-form-item label="浼佷笟鍚嶇О" size="mini">
+ <el-select style="width: 100%" v-model="form.enterpriseVal" @change="enterpriseType" :popper-class="'select-down'">
+ <el-option
+ v-for="item in enterpriseTypeOptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="浜岀骇鍗曚綅" size="mini">
+ <el-select style="width: 100%" v-model="form.enterpriseSubunitsVal" @change="enterpriseSubunitsType" :popper-class="'select-down'">
+ <el-option
+ v-for="item in enterpriseSubunitsTypeOptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item> -->
+ <!-- <el-form-item label="椋庨櫓绾у埆" size="mini"></el-form-item>
+ <el-radio-group v-model="form.type" class="levelOfRisk">
+ <el-radio v-for="(item,index) in levelOfRisk" :label="item.value" :key="index"><span class="levelOfRisk-type">{{item.name}}<i :style="'background:'+item.color"></i></span></el-radio>
+ </el-radio-group> -->
+ <!-- <el-form-item >-->
+ <div class="rightButtonSearch">
+ <el-input v-model="form.keyword" size="mini" placeholder="鍦ㄦ杈撳叆鍏抽敭瀛楁悳绱�"></el-input>
+ <el-button class="el-icon-search" @click="handleSearch"></el-button>
+ </div>
+ </el-form>
</div>
- </el-form>
+ <el-scrollbar style="height:416.44px">
+ <div class="environmental-risk-list hover"><!-- v-for="(item,index) in list" :key="index" -->
+ <i class="state"></i>
+ <div>
+ <h3 @click="flyto">###鐐煎寲閮�</h3>
+ <p>鎵�灞為儴闂細<span>鐐煎寲閮�</span></p>
+ <p>椋庨櫓绾у埆锛�<span>涓夌骇</span></p>
+ </div>
+ </div>
+ <div class="environmental-risk-list"><!-- v-for="(item,index) in list" :key="index" -->
+ <i class="state"></i>
+ <div>
+ <h3>###鐐煎寲閮�</h3>
+ <p>鎵�灞為儴闂細<span>鐐煎寲閮�</span></p>
+ <p>椋庨櫓绾у埆锛�<span>涓夌骇</span></p>
+ </div>
+ </div>
+ <div class="environmental-risk-list"><!-- v-for="(item,index) in list" :key="index" -->
+ <i class="state"></i>
+ <div>
+ <h3>###鐐煎寲閮�</h3>
+ <p>鎵�灞為儴闂細<span>鐐煎寲閮�</span></p>
+ <p>椋庨櫓绾у埆锛�<span>涓夌骇</span></p>
+ </div>
+ </div>
+ <div class="environmental-risk-list"><!-- v-for="(item,index) in list" :key="index" -->
+ <i class="state"></i>
+ <div>
+ <h3>###鐐煎寲閮�</h3>
+ <p>鎵�灞為儴闂細<span>鐐煎寲閮�</span></p>
+ <p>椋庨櫓绾у埆锛�<span>涓夌骇</span></p>
+ </div>
+ </div>
+ <div class="environmental-risk-list"><!-- v-for="(item,index) in list" :key="index" -->
+ <i class="state"></i>
+ <div>
+ <h3>###鐐煎寲閮�</h3>
+ <p>鎵�灞為儴闂細<span>鐐煎寲閮�</span></p>
+ <p>椋庨櫓绾у埆锛�<span>涓夌骇</span></p>
+ </div>
+ </div>
+ <div class="environmental-risk-list"><!-- v-for="(item,index) in list" :key="index" -->
+ <i class="state"></i>
+ <div>
+ <h3>###鐐煎寲閮�</h3>
+ <p>鎵�灞為儴闂細<span>鐐煎寲閮�</span></p>
+ <p>椋庨櫓绾у埆锛�<span>涓夌骇</span></p>
+ </div>
+ </div>
+ </el-scrollbar>
+ <!-- <span class="location-btn" @click="handleLocation(item)">588</span> -->
+ <el-card class="footer-page" v-if="total > 10">
+ <el-pagination
+ small
+ @current-change="handlePage"
+ :page-size=pageSize
+ layout="prev, pager, next"
+ :total=total
+ :current-page=current
+ class="warnPagination"
+ >
+ </el-pagination>
+ </el-card>
</div>
- <el-scrollbar style="height:416.44px">
- <div class="environmental-risk-list hover" ><!-- v-for="(item,index) in list" :key="index" -->
- <i class="state"></i>
- <div>
- <h3>###鐐煎寲閮�</h3>
- <p>鎵�灞為儴闂細<span>鐐煎寲閮�</span></p>
- <p>椋庨櫓绾у埆锛�<span>涓夌骇</span></p>
- </div>
- </div>
- <div class="environmental-risk-list" ><!-- v-for="(item,index) in list" :key="index" -->
- <i class="state"></i>
- <div>
- <h3>###鐐煎寲閮�</h3>
- <p>鎵�灞為儴闂細<span>鐐煎寲閮�</span></p>
- <p>椋庨櫓绾у埆锛�<span>涓夌骇</span></p>
- </div>
- </div>
- <div class="environmental-risk-list" ><!-- v-for="(item,index) in list" :key="index" -->
- <i class="state"></i>
- <div>
- <h3>###鐐煎寲閮�</h3>
- <p>鎵�灞為儴闂細<span>鐐煎寲閮�</span></p>
- <p>椋庨櫓绾у埆锛�<span>涓夌骇</span></p>
- </div>
- </div>
- <div class="environmental-risk-list" ><!-- v-for="(item,index) in list" :key="index" -->
- <i class="state"></i>
- <div>
- <h3>###鐐煎寲閮�</h3>
- <p>鎵�灞為儴闂細<span>鐐煎寲閮�</span></p>
- <p>椋庨櫓绾у埆锛�<span>涓夌骇</span></p>
- </div>
- </div>
- <div class="environmental-risk-list" ><!-- v-for="(item,index) in list" :key="index" -->
- <i class="state"></i>
- <div>
- <h3>###鐐煎寲閮�</h3>
- <p>鎵�灞為儴闂細<span>鐐煎寲閮�</span></p>
- <p>椋庨櫓绾у埆锛�<span>涓夌骇</span></p>
- </div>
- </div>
- <div class="environmental-risk-list" ><!-- v-for="(item,index) in list" :key="index" -->
- <i class="state"></i>
- <div>
- <h3>###鐐煎寲閮�</h3>
- <p>鎵�灞為儴闂細<span>鐐煎寲閮�</span></p>
- <p>椋庨櫓绾у埆锛�<span>涓夌骇</span></p>
- </div>
- </div>
- </el-scrollbar>
- <!-- <span class="location-btn" @click="handleLocation(item)">588</span> -->
- <el-card class="footer-page" v-if="total > 10">
- <el-pagination
- small
- @current-change="handlePage"
- :page-size=pageSize
- layout="prev, pager, next"
- :total=total
- :current-page=current
- class="warnPagination"
- >
- </el-pagination>
- </el-card>
- </div>
- <!-- <div class="monitor2" v-if="hbVisible">-->
- <!-- <env-protect-search></env-protect-search>-->
- <!-- </div>-->
- <!-- <div class="monitor2" v-if="pkVisible">-->
- <!-- <discharge-search></discharge-search>-->
- <!-- </div>-->
+ <!-- <div class="monitor2" v-if="hbVisible">-->
+ <!-- <env-protect-search></env-protect-search>-->
+ <!-- </div>-->
+ <!-- <div class="monitor2" v-if="pkVisible">-->
+ <!-- <discharge-search></discharge-search>-->
+ <!-- </div>-->
</template>
<script>
import WfsHelper from '@components/helpers/WfsHelper'
import AjaxUtils from '@utils/AjaxUtils'
+
export default {
name: 'DischargeSearch',
data () {
@@ -140,16 +142,36 @@
isWaybillHover: true,
isRouteHover: false,
levelOfRisk: [
- { name: '閲嶅ぇ椋庨櫓', value: '1', color: 'red' },
- { name: '涓�绾ч闄�', value: '2', color: 'sandybrown' },
- { name: '浜岀骇椋庨櫓', value: '3', color: 'yellow' },
- { name: '涓夌骇椋庨櫓', value: '4', color: 'green' }
+ {
+ name: '閲嶅ぇ椋庨櫓',
+ value: '1',
+ color: 'red'
+ },
+ {
+ name: '涓�绾ч闄�',
+ value: '2',
+ color: 'sandybrown'
+ },
+ {
+ name: '浜岀骇椋庨櫓',
+ value: '3',
+ color: 'yellow'
+ },
+ {
+ name: '涓夌骇椋庨櫓',
+ value: '4',
+ color: 'green'
+ }
],
areaTypeOptions: []
}
},
props: ['title'],
methods: {
+ flyto () {
+ const pos = [39.90751504898071, 116.38927817344666]
+ window.map.flyTo(pos, 15)
+ },
// 鍖哄煙绛涢��
areaType (val) {
this.pipelineTypeOptions.forEach((itm) => {
diff --git a/src/components/panel/topicSearch/SewersSearch.vue b/src/components/panel/topicSearch/SewersSearch.vue
index 2431ff5..b2f1dde 100644
--- a/src/components/panel/topicSearch/SewersSearch.vue
+++ b/src/components/panel/topicSearch/SewersSearch.vue
@@ -162,6 +162,8 @@
}
},
handleLocation (val, index) {
+ console.log(val)
+ // console.log(val)
this.activeNum = index
// layer && layer.openPopup()
window.layerFactory.flyByFeature(val, this.form.dataType.code)
diff --git a/src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/EventQuery.vue b/src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/EventQuery.vue
index 08e502c..f020f79 100644
--- a/src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/EventQuery.vue
+++ b/src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/EventQuery.vue
@@ -38,45 +38,21 @@
</el-form>
</el-form>
<el-scrollbar style="height:286.22px">
- <div class="environmental-risk-list">
- <i class="state"></i>
+ <div class="environmental-risk-list" v-for="(item,index) in list" :key="index"
+ :class="activeNum===index?'hover':''">
+ <!-- <i class="state"></i>-->
+ <img class="state" :src="getImgSrc()" style="background: none"/>
<div>
- <h3>浜嬩欢鍚嶇О:XXX浜嬩欢</h3>
- <h5>浜嬩欢浜嬩欢:2021骞�3鏈�21鏃�
- <el-button class="rt btn00fff6" size="mini" style="margin-right: 0.04rem;"
- @click="btnAffiliatedFacilities()">鍒犻櫎
- </el-button>
+ <h3 @click="handleLocation(item,index)">浜嬩欢鍚嶇О:XXX浜嬩欢</h3>
+ <h5>
+ 浜嬩欢浜嬩欢:2021骞�3鏈�21鏃�
+ <el-button class="rt btn00fff6" size="mini" style="margin-right: 0.04rem;">鍒犻櫎</el-button>
</h5>
- <p>浜嬩欢鐘舵�侊細<span>瀹℃壒闃舵</span></p>
- <p>浜嬩欢绫诲瀷锛�<span>鐪熷疄浜嬩欢</span>
- <el-button class="rt btn00fff6" size="mini" style="margin-right: 0.04rem;"
- @click="btnAffiliatedFacilities()">浜嬩欢绠＄悊
- </el-button>
+ <p>
+ 浜嬩欢鐘舵�侊細<span>瀹℃壒闃舵</span>
</p>
- </div>
- </div>
- <div class="environmental-risk-list">
- <i class="state"></i>
- <div>
- <h3>浜嬩欢鍚嶇О:XXX浜嬩欢</h3>
- <h5>浜嬩欢浜嬩欢:2021骞�3鏈�21鏃�</h5>
- <p>浜嬩欢鐘舵�侊細<span>瀹℃壒闃舵</span></p>
- <p>浜嬩欢绫诲瀷锛�<span>鐪熷疄浜嬩欢</span>
- <el-button class="rt btn00fff6" size="mini" style="margin-right: 0.04rem;"
- @click="btnAffiliatedFacilities()">浜嬩欢绠＄悊
- </el-button>
- </p>
- </div>
- </div>
- <div class="environmental-risk-list">
- <i class="state"></i>
- <div>
- <h3>浜嬩欢鍚嶇О:XXX浜嬩欢</h3>
- <h5>浜嬩欢浜嬩欢:2021骞�3鏈�21鏃�</h5>
- <p>浜嬩欢鐘舵�侊細<span>瀹℃壒闃舵</span></p>
- <p>浜嬩欢绫诲瀷锛�<span>鐪熷疄浜嬩欢</span>
- <el-button class="rt btn00fff6" size="mini" style="margin-right: 0.04rem;"
- @click="btnAffiliatedFacilities()">浜嬩欢绠＄悊
+ <p>浜嬩欢绫诲瀷锛�<span>{{ item.properties.pipecode }}</span>
+ <el-button class="rt btn00fff6" size="mini" style="margin-right: 0.04rem;">浜嬩欢绠＄悊
</el-button>
</p>
</div>
@@ -86,20 +62,25 @@
</template>
<script>
-// import { LayerEntEmer } from '../../../../../conf/layers/LayerEntEmer'
+import { LayerEntEmer } from '../../../../../conf/layers/LayerEntEmer'
+import { LayerEvent } from '../../../../../conf/layers/LayerEvent'
+import { LayerResources } from '../../../../../conf/layers/LayerResources'
import ReportPopup from './ReportPopup'
+
+import WfsHelper from '@components/helpers/WfsHelper'
+import AjaxUtils from '@utils/AjaxUtils'
export default {
name: 'EventQuery',
data () {
return {
list: [],
- items: [
- { name: '閲戦櫟鐭冲寲' },
- { name: '鍗椾含鍖栧' }
- ],
- subItems: ['浜嬪墠闃舵', '瀹℃壒闃舵', '浜嬩欢瀹岀粨'],
+ activeNum: -1,
+ LayerEvent: {},
+ LayerResources: {},
+ items: [LayerEvent, LayerResources],
+ subItems: LayerEntEmer.layers,
form: {
pipelineType: '',
dataType: '',
@@ -115,18 +96,51 @@
value: 2
}
]
- }
+ },
+ WfsHelper: null
}
},
+ mounted () {
+ this.wfsHelper = new WfsHelper()
+ },
methods: {
+ getImgSrc () {
+ const icon = this.form.dataType.icon
+ return icon ? 'assets/images/map/' + icon : ''
+ },
handleDataType () {
- console.log('ite')
+ this.list = []
},
- handlePipelineType () {
- console.log('鏁版嵁鏌ヨ')
+ handlePipelineType (val) {
+ this.list = []
+ for (let i = 0; i < this.items.length; i++) {
+ const item = this.items[i]
+ if (val === item.name) {
+ this.subItems = item.layers
+ return
+ }
+ }
},
- handleSearch () {
- console.log('item')
+ async handleSearch () {
+ this.list = []
+ this.wfsHelper.clearFilter()
+ // todo 鐜板湪浼佷笟搴旀�ヨ繕娌″尯鍒嗗紑绫诲瀷锛屽悗闈㈡敼
+ // this.wfsHelper.setTypeName([this.form.dataType.typeName])
+ this.wfsHelper.setTypeName(['sewer:emergency'])
+ if (this.form.keyword) {
+ this.wfsHelper.addLike('name', this.form.keyword)
+ }
+ const res = await AjaxUtils.GetDataAsynByUrl(this.wfsHelper.getUrl(), {})
+ if (res instanceof Object && Object.prototype.hasOwnProperty.call(res, 'features')) {
+ this.list = res.features
+ }
+ },
+ handleLocation (val, index) {
+ console.log(val)
+ this.activeNum = index
+ // layer && layer.openPopup()
+ // window.layerFactory.flyByFeature(val, this.form.dataType.code)
+ window.map.flyTo([val.properties.y, val.properties.x], 15)
},
btnAffiliatedFacilities () {
console.log('item')
@@ -145,6 +159,6 @@
}
</script>
-<style scoped>
+<style lang="less" scoped>
</style>
diff --git a/src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/ResourcesQuery.vue b/src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/ResourcesQuery.vue
index 687a39e..fd06274 100644
--- a/src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/ResourcesQuery.vue
+++ b/src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/ResourcesQuery.vue
@@ -40,47 +40,26 @@
</div>
</el-form>
<el-scrollbar style="height:286.22px">
- <div class="environmental-risk-list" @click="showthePopup">
- <!-- v-for="(item,index) in searchDataDisplay" :key="index" @click="setBounced(item)"-->
- <i class="state"></i>
- <div>
- <h3>浜嬩欢鍚嶇О:XXX浜嬩欢</h3>
- <h5>浜嬩欢浜嬩欢:2021骞�3鏈�21鏃�</h5>
- <p>浜嬩欢鐘舵�侊細<span>瀹℃壒闃舵</span></p>
- <p>浜嬩欢绫诲瀷锛�<span>鐪熷疄浜嬩欢</span></p>
- </div>
- </div>
- <div class="environmental-risk-list">
- <i class="state"></i>
- <div>
- <h3>浜嬩欢鍚嶇О:XXX浜嬩欢</h3>
- <h5>浜嬩欢浜嬩欢:2021骞�3鏈�21鏃�</h5>
- <p>浜嬩欢鐘舵�侊細<span>瀹℃壒闃舵</span></p>
- <p>浜嬩欢绫诲瀷锛�<span>鐪熷疄浜嬩欢</span></p>
- </div>
- </div>
- <div class="environmental-risk-list">
- <i class="state"></i>
- <div>
- <h3>浜嬩欢鍚嶇О:XXX浜嬩欢</h3>
- <h5>浜嬩欢浜嬩欢:2021骞�3鏈�21鏃�</h5>
- <p>浜嬩欢鐘舵�侊細<span>瀹℃壒闃舵</span></p>
- <p>浜嬩欢绫诲瀷锛�<span>鐪熷疄浜嬩欢</span></p>
- </div>
+ <div class="environmental-risk-list" v-for="(item,index) in list" :key="index"
+ :class="activeNum===index?'hover':''" @click="handleLocation(item,index)">
+ <!-- <i class="state"></i>-->
+ <img class="state" :src="getImgSrc()" style="background: none"/>
+ <h3>浜嬩欢鍚嶇О:XXX浜嬩欢</h3>
+ <h5>浜嬩欢浜嬩欢:2021骞�3鏈�21鏃�</h5>
+ <p>浜嬩欢鐘舵�侊細<span>瀹℃壒闃舵</span></p>
+ <p>浜嬩欢绫诲瀷锛�<span>鐪熷疄浜嬩欢</span></p>
</div>
</el-scrollbar>
</div>
</template>
<script>
-import { LayerEntEmer } from '../../../../../conf/layers/LayerEntEmer'
-// import ReportPopup from './ReportPopup'
+// import { LayerEntEmer } from '../../../../../conf/layers/LayerEntEmer'
+import WfsHelper from '@components/helpers/WfsHelper'
+import AjaxUtils from '@utils/AjaxUtils'
export default {
name: 'ResourcesQuery',
- // components: {
- // ReportPopup
- // },
data () {
return {
form: {
@@ -93,14 +72,22 @@
{ name: '鍗椾含鍖栧' }
]
},
- items: [LayerEntEmer],
- subItems: LayerEntEmer.layers,
- searchDataDisplay: []
+ activeNum: -1,
+ list: [],
+ // items: [LayerEntEmer],
+ items: [],
+ // subItems: LayerEntEmer.layers,
+ subItems: [],
+ WfsHelper: null
}
},
+ mounted () {
+ this.wfsHelper = new WfsHelper()
+ },
methods: {
- showthePopup () {
- console.log('item')
+ getImgSrc () {
+ const icon = this.form.dataType.icon
+ return icon ? 'assets/images/map/' + icon : ''
},
handlePipelineType () {
console.log('item')
@@ -108,11 +95,26 @@
handleDataType () {
console.log('item')
},
- handleSearch () {
- console.log('鏁版嵁鏌ヨ')
+ async handleSearch () {
+ this.list = []
+ this.wfsHelper.clearFilter()
+ // todo 鐜板湪浼佷笟搴旀�ヨ繕娌″尯鍒嗗紑绫诲瀷锛屽悗闈㈡敼
+ // this.wfsHelper.setTypeName([this.form.dataType.typeName])
+ this.wfsHelper.setTypeName(['sewer:emergency'])
+ if (this.form.keyword) {
+ this.wfsHelper.addLike('name', this.form.keyword)
+ }
+ const res = await AjaxUtils.GetDataAsynByUrl(this.wfsHelper.getUrl(), {})
+ if (res instanceof Object && Object.prototype.hasOwnProperty.call(res, 'features')) {
+ this.list = res.features
+ }
},
- setBounced (item) {
- console.log(item)
+ handleLocation (val, index) {
+ console.log(val)
+ this.activeNum = index
+ // layer && layer.openPopup()
+ // window.layerFactory.flyByFeature(val, this.form.dataType.code)
+ window.map.flyTo([val.properties.y, val.properties.x], 15)
}
}
}
diff --git a/src/conf/Constants.js b/src/conf/Constants.js
index 1eb2734..c22d41e 100644
--- a/src/conf/Constants.js
+++ b/src/conf/Constants.js
@@ -20,6 +20,7 @@
sewersAreaGs: 'Company.js',
pipesegment: 'PipeLineAnimal.js',
pollutionSources: 'SourcesPollution.js'
+ // EnterpriseEmergency: 'EnterpriseEmergency.js'
}
export const STYLES = {
diff --git a/src/conf/layers/LayerEntEmer.js b/src/conf/layers/LayerEntEmer.js
index d63a663..18fa844 100644
--- a/src/conf/layers/LayerEntEmer.js
+++ b/src/conf/layers/LayerEntEmer.js
@@ -1,75 +1,91 @@
/**
* 浼佷笟搴旀��
*/
-import { LayerHbss } from './LayerHbss'
-import { LayerFsss } from './LayerFsss'
+// import { LayerHbss } from './LayerHbss'
+// import { LayerFsss } from './LayerFsss'
-import { PIPELINE_WFS } from '../Constants'
+import { LayerEvent } from './LayerEvent'
+import { LayerResources } from './LayerResources'
-const WFS_URL = PIPELINE_WFS
+import { SERVICE_TYPE } from '../Constants'
export const LayerEntEmer = {
- code: 'reportEntemeage',
+ code: 'EnterpriseEmergency',
name: '浼佷笟搴旀��',
checked: false,
type: 0,
- childLayer: [LayerFsss, LayerHbss],
+ childLayer: [LayerEvent, LayerResources],
layers: [
{
code: 'rainline',
name: '鍩虹鍥惧眰',
- sname: '绠＄綉',
+ sname: '鍩虹鍥惧眰',
checked: false,
- type: 0,
- wmsLayers: 'sewer:pipeline_rain',
- // wfs: WFS_URL + '?TYPENAME=绠＄綉&FILTER=<Filter xmlns="http://www.opengis.net/ogc"><PropertyIsEqualTo><PropertyName>mediumtype</PropertyName><Literal>闆ㄦ按绠＄嚎</Literal></PropertyIsEqualTo></Filter>',
+ type: SERVICE_TYPE.WMS,
+ layerGroup: 'sewer:pipeline_group',
+ typeName: 'sewer:pipeline',
icon: 'sewers/闆ㄦ按绾�.png',
color: '#0070ff',
minZoom: 13,
styles: {
COLOR: '#0070ff',
FILL_COLOR: '#0070ff'
- }
+ },
+ filter: 'mediumtype = \'鍩虹鍥惧眰\'',
+ index: 1
},
{
code: 'accidentline',
name: '鍦ㄧ嚎鐩戞祴',
- sname: '浜嬫晠姘�',
+ sname: '鍦ㄧ嚎鐩戞祴',
checked: false,
- // wmsLayers: 'sewer:pipeline_accident',
- type: 0,
+ type: SERVICE_TYPE.WMS,
+ layerGroup: 'sewer:pipeline_group',
+ typeName: 'sewer:pipeline',
minZoom: 13,
- wfs: WFS_URL + '?TYPENAME=浜嬫晠姘�'
+ filter: 'mediumtype = \'鍦ㄧ嚎鐩戞祴\'',
+ index: 1
},
{
code: 'oilline',
name: '搴旀�ヨ祫婧�',
- sname: '鍚补姹℃按',
+ sname: '搴旀�ヨ祫婧�',
checked: false,
- type: 0,
+ type: SERVICE_TYPE.WMS,
+ layerGroup: 'sewer:pipeline_group',
+ typeName: 'sewer:pipeline',
minZoom: 13,
color: '#ffaa00',
- wmsLayers: 'sewer:pipeline_sewer',
- // wfs: 'http://xearth.cn:6240/geoserver/sewer/wfs?typeName=sewer:pipeline&maxFeatures=500&outputFormat=application%2Fjson&cql_filter=mediumtype=\'鍚补姹℃按\'',
+ filter: 'mediumtype = \'搴旀�ヨ祫婧怽'',
styles: {
COLOR: '#ffaa00',
FILL_COLOR: '#ffaa00'
- }
+ },
+ index: 1
},
{
- code: 'oil',
+ code: 'saltline',
name: '鍛ㄨ竟鐜',
- sname: '鍚补姹℃按',
+ sname: '鍛ㄨ竟鐜',
checked: false,
- type: 0,
+ type: SERVICE_TYPE.WMS,
+ layerGroup: 'sewer:pipeline_group',
+ typeName: 'sewer:pipeline',
minZoom: 13,
- color: '#ffaa00',
- wmsLayers: 'sewer:pipeline_sewer',
- // wfs: 'http://xearth.cn:6240/geoserver/sewer/wfs?typeName=sewer:pipeline&maxFeatures=500&outputFormat=application%2Fjson&cql_filter=mediumtype=\'鍚补姹℃按\'',
- styles: {
- COLOR: '#ffaa00',
- FILL_COLOR: '#ffaa00'
- }
+ filter: 'mediumtype = \'鍛ㄨ竟鐜\'',
+ index: 1
+ },
+ {
+ code: 'alkaliline',
+ name: '姹℃按绠＄嚎',
+ sname: '姹℃按绠＄嚎',
+ checked: false,
+ type: SERVICE_TYPE.WMS,
+ layerGroup: 'sewer:pipeline_group',
+ typeName: 'sewer:pipeline',
+ filter: 'mediumtype = \'姹℃按绠＄嚎\'',
+ minZoom: 10,
+ index: 1
}
]
}
diff --git a/src/conf/layers/LayerEvent.js b/src/conf/layers/LayerEvent.js
new file mode 100644
index 0000000..11352ed
--- /dev/null
+++ b/src/conf/layers/LayerEvent.js
@@ -0,0 +1,41 @@
+/**
+ * 浼佷笟搴旀�� event
+ */
+import { SERVICE_TYPE } from '../Constants'
+export const LayerEvent = {
+ code: 'njhx',
+ name: '鍗椾含鍖栧',
+ checked: false, // 榛樿閫変腑鐘舵��
+ layers: [
+ {
+ code: 'sqjd',
+ name: '鍗椾含鍖栧浜嬪墠闃舵',
+ sname: '浜嬪墠闃舵',
+ checked: false,
+ minZoom: 16,
+ type: SERVICE_TYPE.WMS,
+ wmsLayers: 'sewer:Aemergency',
+ icon: 'sewers/绐ㄤ簳.png'
+ },
+ {
+ code: 'spjd',
+ name: '鍗椾含鍖栧瀹℃壒闃舵',
+ sname: '瀹℃壒闃舵',
+ checked: false,
+ minZoom: 16,
+ type: '鍖婚櫌',
+ typeName: 'sewer:emergency',
+ // wfs: WFS_URL + '?TYPENAME=闆ㄧ瀛�',
+ icon: 'sewers/闆ㄧ瀛�.png'
+ },
+ {
+ code: 'sjwj',
+ name: '鍗椾含鍖栧浜嬩欢瀹岀粨',
+ sname: '浜嬩欢瀹岀粨',
+ minZoom: 16,
+ type: SERVICE_TYPE.WMS,
+ typeName: 'sewer:firedike',
+ checked: false
+ }
+ ]
+}
diff --git a/src/conf/layers/LayerResources.js b/src/conf/layers/LayerResources.js
new file mode 100644
index 0000000..927ea23
--- /dev/null
+++ b/src/conf/layers/LayerResources.js
@@ -0,0 +1,41 @@
+/**
+ * 浼佷笟搴旀�� event
+ */
+import { SERVICE_TYPE } from '../Constants'
+export const LayerResources = {
+ code: 'jlsh',
+ name: '閲戦櫟鐭冲寲',
+ checked: false, // 榛樿閫変腑鐘舵��
+ layers: [
+ {
+ code: 'yj',
+ name: '浜嬪墠闃舵',
+ sname: '浜嬪墠闃舵',
+ checked: false,
+ minZoom: 16,
+ type: SERVICE_TYPE.WMS,
+ wmsLayers: 'sewer:Aemergency',
+ icon: 'sewers/绐ㄤ簳.png'
+ },
+ {
+ code: 'ybz',
+ name: '瀹℃壒闃舵',
+ sname: '瀹℃壒闃舵',
+ checked: false,
+ minZoom: 16,
+ type: SERVICE_TYPE.WMS,
+ typeName: 'sewer:Aemergency',
+ // wfs: WFS_URL + '?TYPENAME=闆ㄧ瀛�',
+ icon: 'sewers/闆ㄧ瀛�.png'
+ },
+ {
+ code: 'fht',
+ name: '浜嬩欢瀹岀粨',
+ sname: '浜嬩欢瀹岀粨',
+ minZoom: 16,
+ type: SERVICE_TYPE.WMS,
+ typeName: 'sewer:firedike',
+ checked: false
+ }
+ ]
+}
--
Gitblit v1.8.0