From a4a4db4d04174541e4b44b83583be515f77b10b4 Mon Sep 17 00:00:00 2001
From: 陈泽平 <chenzeping>
Date: 星期二, 18 五月 2021 16:30:10 +0800
Subject: [PATCH] 应急问题修改
---
src/components/panel/topicSearch/EnterpriseEmergency/EventQuery.vue | 38 ++-----------------
/dev/null | 0
src/components/panel/topicSearch/EnterpriseEmergency/ResourcesQuery.vue | 18 +++++----
src/conf/layers/LayerHbss.js | 2
src/conf/layers/LayerArea.js | 2
src/components/panel/topicSearch/SewersSearch.vue | 2
6 files changed, 17 insertions(+), 45 deletions(-)
diff --git "a/public/assets/images/map/sewers/\345\205\254\345\217\270.png" "b/public/assets/images/map/sewers/\345\205\254\345\217\270.png"
deleted file mode 100644
index 0d202f5..0000000
--- "a/public/assets/images/map/sewers/\345\205\254\345\217\270.png"
+++ /dev/null
Binary files differ
diff --git "a/public/assets/images/map/sewers/\346\272\242\346\265\201\345\240\260.png" "b/public/assets/images/map/sewers/\346\272\242\346\265\201\345\240\260.png"
deleted file mode 100644
index 81a8b47..0000000
--- "a/public/assets/images/map/sewers/\346\272\242\346\265\201\345\240\260.png"
+++ /dev/null
Binary files differ
diff --git a/src/components/panel/topicSearch/EnterpriseEmergency/EventQuery.vue b/src/components/panel/topicSearch/EnterpriseEmergency/EventQuery.vue
index a3215b4..ff8798d 100644
--- a/src/components/panel/topicSearch/EnterpriseEmergency/EventQuery.vue
+++ b/src/components/panel/topicSearch/EnterpriseEmergency/EventQuery.vue
@@ -81,14 +81,9 @@
</template>
<script>
-// 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'
+// import AjaxUtils from '@utils/AjaxUtils'
export default {
name: 'EventQuery',
@@ -128,16 +123,6 @@
// 鐐瑰嚮浜嬩欢绠＄悊
accordPopup () {
console.log('item')
- window.$layer.open({
- content: {
- comp: ReportPopup, // 缁勪欢
- parent: this, // 鐖剁粍浠�
- data: { // 浼犻�掔殑鍙傛暟
- // storagePlaceId: e.layer.options.totransferData.StoragePlaceId
- }
- }
- // title: 'title' // 鏍囬
- })
},
// radio鏁版嵁閫夋嫨
redioChange (item) {
@@ -165,26 +150,11 @@
},
// 鏁版嵁鎼滅储浜嬩欢
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)
+ handleLocation () {
+ console.log('val')
}
}
}
diff --git a/src/components/panel/topicSearch/EnterpriseEmergency/ResourcesQuery.vue b/src/components/panel/topicSearch/EnterpriseEmergency/ResourcesQuery.vue
index 0d18d91..5df7689 100644
--- a/src/components/panel/topicSearch/EnterpriseEmergency/ResourcesQuery.vue
+++ b/src/components/panel/topicSearch/EnterpriseEmergency/ResourcesQuery.vue
@@ -57,9 +57,10 @@
import AjaxUtils from '@utils/AjaxUtils'
import { LayerEmergencySource } from '../../../../conf/layers/LayerEmergencySource'
import { LayerSurroundings } from '../../../../conf/layers/LayerSurroundings'
-import { pulseEffect } from '../../../../utils/utils'
-import { openPopup } from '../../../helpers/LocateHelper'
-// import { fitBounds, highlight } from '../../../helpers/LocateHelper'
+// import { pulseEffect } from '../../../../utils/utils'
+// import { locate, openPropsPopup } from '../../../helpers/LocateHelper'
+import { locate } from '../../../helpers/LocateHelper'
+// import { fitBounds, highlight, locate } from '../../../helpers/LocateHelper'
export default {
name: 'ResourcesQuery',
@@ -136,12 +137,13 @@
},
// 鏌ヨ瀹氫綅鍔熻兘
handleLocation (val, index) {
- // console.log(val)
+ console.log(val)
this.activeNum = index
- const positionArea = [val.properties.y, val.properties.x]
- window.map.setView(positionArea, 17)
- pulseEffect(positionArea)
- openPopup(positionArea, val.id)
+ const config = this.form.dataType
+ locate(val, config)
+ // const positionArea = [val.properties.y, val.properties.x]
+ // window.map.setView(positionArea, 17)
+ // pulseEffect(positionArea)
// fitBounds(val, this.form.dataType.code)
// highlight(val, this.form.dataType)
}
diff --git a/src/components/panel/topicSearch/SewersSearch.vue b/src/components/panel/topicSearch/SewersSearch.vue
index db65213..bc9772d 100644
--- a/src/components/panel/topicSearch/SewersSearch.vue
+++ b/src/components/panel/topicSearch/SewersSearch.vue
@@ -38,7 +38,7 @@
<div>
<h3 @click="handleLocation(item,index)">{{ item.properties.pipename }}</h3>
<p>鎵�灞炰紒涓氾細<span>{{ item.properties.orgname }}</span>
- <p>璁炬柦绫诲瀷锛�<span>{{ item.properties.linenumtype }}</span>
+ <p>璁炬柦绫诲瀷锛�<span>{{ item.properties.linenumtype }}{{ item.properties.fourtype }}{{ item.properties.teetype }}</span>
<el-button v-if="fuShuSheShiShow" class="rt btn00fff6" size="mini" style="margin-right: 0.04rem;"
@click="btnAffiliatedFacilities(item,index)" >
闄勫睘璁炬柦
diff --git a/src/conf/layers/LayerArea.js b/src/conf/layers/LayerArea.js
index 6315538..6bda76a 100644
--- a/src/conf/layers/LayerArea.js
+++ b/src/conf/layers/LayerArea.js
@@ -13,7 +13,7 @@
sname: '鍏徃', // 琛ㄥ悕
checked: true, // 榛樿閫変腑鐘舵��
type: 0,
- icon: 'sewers/鍏徃.png',
+ icon: 'sewers/.png',
legendImage: '../.././assets/images/map/company_refining.png'
},
{
diff --git a/src/conf/layers/LayerHbss.js b/src/conf/layers/LayerHbss.js
index 657d994..4fca6f8 100644
--- a/src/conf/layers/LayerHbss.js
+++ b/src/conf/layers/LayerHbss.js
@@ -64,7 +64,7 @@
minZoom: 16,
type: SERVICE_TYPE.WMS,
typeName: 'ewer:overflowweir',
- icon: 'sewers/婧㈡祦鍫�.png',
+ icon: 'sewers/.png',
checked: false
},
{
--
Gitblit v1.8.0