From de32f49313e2c7534009758193c41be61517f1d5 Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期五, 14 五月 2021 15:27:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/panel/topicSearch/EnterpriseEmergency/ResourcesQuery.vue | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/ResourcesQuery.vue b/src/components/panel/topicSearch/EnterpriseEmergency/ResourcesQuery.vue
similarity index 91%
rename from src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/ResourcesQuery.vue
rename to src/components/panel/topicSearch/EnterpriseEmergency/ResourcesQuery.vue
index 5a88c59..40bc1b5 100644
--- a/src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/ResourcesQuery.vue
+++ b/src/components/panel/topicSearch/EnterpriseEmergency/ResourcesQuery.vue
@@ -55,10 +55,10 @@
<script>
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'
+import { LayerEmergencySource } from '../../../../conf/layers/LayerEmergencySource'
+import { LayerSurroundings } from '../../../../conf/layers/LayerSurroundings'
+import { pulseEffect } from '../../../../utils/utils'
export default {
name: 'ResourcesQuery',
@@ -66,7 +66,7 @@
return {
form: {
eventName: '',
- pipelineType: '搴旀�ヨ祫婧�',
+ pipelineType: LayerEmergencySource.name,
dataType: '',
keyword: '',
eventNameList: [
@@ -107,7 +107,7 @@
}
},
handleDataType (val) {
- console.log(val)
+ // console.log(val)
this.list = []
},
async handleSearch () {
@@ -129,9 +129,11 @@
this.list = res.features
}
},
+ // 鏌ヨ瀹氫綅鍔熻兘
handleLocation (val, index) {
this.activeNum = index
- window.map.flyTo([val.properties.y, val.properties.x], 15)
+ window.map.setView([val.properties.y, val.properties.x], 16)
+ pulseEffect([val.properties.y, val.properties.x])
}
}
}
--
Gitblit v1.8.0