From 672f791281b80a61dbda7d2c2d426dd90b31b982 Mon Sep 17 00:00:00 2001
From: ChenZeping02609 <chenzeping02609@163.com>
Date: 星期四, 13 五月 2021 16:42:23 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/panel/RightSearchPanel.vue | 3 +--
src/components/BaseNav/pipeline/AffiliatedFacilities.vue | 25 +++++++++++--------------
src/components/LayerController/service/LayerFactory.js | 6 ++++--
src/components/LayerController/modules/LcServiceLayer.vue | 6 +++++-
src/conf/LayerEmergency.js | 2 +-
5 files changed, 22 insertions(+), 20 deletions(-)
diff --git a/src/components/BaseNav/pipeline/AffiliatedFacilities.vue b/src/components/BaseNav/pipeline/AffiliatedFacilities.vue
index c2e2514..1c72337 100644
--- a/src/components/BaseNav/pipeline/AffiliatedFacilities.vue
+++ b/src/components/BaseNav/pipeline/AffiliatedFacilities.vue
@@ -15,8 +15,8 @@
<div class="el-select el-select--mini">8888</div>
</el-form-item> -->
<el-form-item label="璁炬柦绫诲瀷锛�" size="mini" class="search-panel-item">
- <el-select style="width: 100%" v-model="dataType" @change="handleDataType" :popper-class="'select-down'">
- <el-option v-for="(item,index) in classification" :key="index" :label="item.name" :value="item.name"></el-option>
+ <el-select style="width: 100%" v-model="dataType" value-key="code" @change="handleDataType" :popper-class="'select-down'">
+ <el-option v-for="(item,index) in classification" :key="index" :label="item.name" :value="item"></el-option>
</el-select>
</el-form-item>
<div class="rightButtonSearch">
@@ -26,7 +26,7 @@
</el-form>
</div>
<el-scrollbar style="height:300px;">
- <div class="environmental-risk-list" v-for="(item,index) in list" :key="index" :class="activeNum==index?'hover':''">
+ <div class="environmental-risk-list" v-for="(item,index) in list" :key="index" :class="activeNum===index?'hover':''">
<img class="state" :src="getImgSrc()" style="background: none"/>
<div>
<h3 @click="handleLocation(item,index)">{{ item.properties.pipename }}</h3>
@@ -80,7 +80,7 @@
},
methods: {
getImgSrc () {
- const icon = this.form.dataType.icon
+ const icon = this.dataType.icon
return icon ? 'assets/images/map/' + icon : ''
},
handleClose (done) {
@@ -95,32 +95,29 @@
window.layerFactory.flyByFeature(val1, val.code)
},
handleDataType () {
- console.log(this.dataType)
+ this.list = []
},
async handleSearch () {
var wfsHelper = new WfsHelper()
// todo 鐜板湪绠＄綉杩樻病鍖哄垎寮�绫诲瀷锛屽悗闈㈡敼
- wfsHelper.addTypeName(this.dataType)
- wfsHelper.addLike('name', this.form.keyword)
+ wfsHelper.addTypeName(this.dataType.typeName)
+ if (this.form.keyword) {
+ wfsHelper.addLike('name', this.form.keyword)
+ }
// const _this = this
const res = await AjaxUtils.GetDataAsynByUrl(wfsHelper.getUrl(), {})
// console.log(res)
if (res instanceof Object && Object.prototype.hasOwnProperty.call(res, 'features')) {
- const datas = res.features
- const arrs = []
- for (let i = 0; i < 7; i++) {
- arrs.push(datas[i])
- }
- this.list = arrs
+ this.list = res.features
// this.$forceUpdate()
}
},
handleLocation (val, index) {
this.activeNum = index
- window.layerFactory.flyByFeature(val, this.form.dataType.code)
+ window.layerFactory.flyByFeature(val, this.dataType.code)
}
}
}
diff --git a/src/components/LayerController/modules/LcServiceLayer.vue b/src/components/LayerController/modules/LcServiceLayer.vue
index 7ec8aa9..4bd7e82 100644
--- a/src/components/LayerController/modules/LcServiceLayer.vue
+++ b/src/components/LayerController/modules/LcServiceLayer.vue
@@ -90,10 +90,14 @@
} else {
item1.type = 1 // 鍗婇��
}
+ if (item1.name === '浼佷笟搴旀��') {
+ console.log(item1)
+ bus.$emit('changeSearchBar', item1)
+ }
// console.log(item1.layers.length, item1.istrue, item1.isfalse, item1.type)
}
})
- console.log(this.serviceLayers)
+ // console.log(this.serviceLayers)
},
swLayers (layers, checked) {
if (layers) {
diff --git a/src/components/LayerController/service/LayerFactory.js b/src/components/LayerController/service/LayerFactory.js
index 0a661d6..7bba481 100644
--- a/src/components/LayerController/service/LayerFactory.js
+++ b/src/components/LayerController/service/LayerFactory.js
@@ -193,8 +193,10 @@
point = lineString[parseInt(lineString.length / 2)][0]
break
}
- console.log(point)
- window.map.flyTo(point.reverse(), 17)
+ if (point.length > 2) {
+ point.splice(2, 1)
+ }
+ window.map.setView(point.reverse(), 17)
code && this.openPopup(code, feature.id)
}
diff --git a/src/components/panel/RightSearchPanel.vue b/src/components/panel/RightSearchPanel.vue
index dfc0e27..a1cd903 100644
--- a/src/components/panel/RightSearchPanel.vue
+++ b/src/components/panel/RightSearchPanel.vue
@@ -217,11 +217,9 @@
mounted () {
const that = this
bus.$on('changeSearchBar', function (obj) {
- // console.log(obj.checked, obj.name)
that.gcComp = ''
that.topicList.forEach((item) => {
if (item.name === obj.name) {
- // console.log(obj)
if (obj.type > 0) {
item.isShow = true
} else {
@@ -236,6 +234,7 @@
}
})
})
+ // console.log(that.topicList)
}
}
</script>
diff --git a/src/conf/LayerEmergency.js b/src/conf/LayerEmergency.js
index e272e9d..6dff372 100644
--- a/src/conf/LayerEmergency.js
+++ b/src/conf/LayerEmergency.js
@@ -6,7 +6,7 @@
export const LayerEmergency = {
code: 'sewersEmergency',
- name: '搴旀�ュ浘灞�',
+ name: '浼佷笟搴旀��',
checked: false,
isShow: true,
type: 0,
--
Gitblit v1.8.0