From 7f6529bd1266c01d15e2481284f304fb097b4499 Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期三, 07 四月 2021 15:31:38 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/panel/LegendPanel.vue | 12 ++++++------
src/components/panel/topicSearch/SewersSearch.vue | 4 ++--
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/components/panel/LegendPanel.vue b/src/components/panel/LegendPanel.vue
index fe6d347..d14a1b3 100644
--- a/src/components/panel/LegendPanel.vue
+++ b/src/components/panel/LegendPanel.vue
@@ -1,13 +1,13 @@
<template>
<div class="legend-panel">
<transition name="fade">
- <div :class="'legend-content map-background'" v-show="legendControl">
+ <div :class="'legend-content map-background'" v-show="isShow">
<div class="legend-content-box" v-for="(item,index) in serviceLayers" :key="index">
<p><span>{{ item.name }}</span></p>
<div class="map-under-line"></div>
<ul>
- <li v-for="(ite,inde) in item.layers" :key="inde">
- <img :src='ite.legendImage' alt=''>
+ <li v-for="(ite,idx) in item.layers" :key="idx">
+ <img :src="ite.legendImage===undefined?'../.././assets/images/map-pages/setting.png':ite.legendImage" alt=''>
<span>{{ ite.name }}</span>
</li>
</ul>
@@ -15,7 +15,7 @@
</div>
</transition>
<el-tooltip :popper-class="'map-tooltip'" effect="dark" content="鍥句緥" placement="left">
- <div :class="this.legendControl?'legend-btn map-btn-active':'legend-btn map-btn-unactive'"
+ <div :class="this.isShow?'legend-btn map-btn-active':'legend-btn map-btn-unactive'"
@click="legendChange()">
<i class="el-icon-more-outline"></i>
</div>
@@ -38,14 +38,14 @@
data () {
return {
// 鎺у埗鍥句緥 鍐呭鐨� 鏄剧ず/闅愯棌
- legendControl: false,
+ isShow: false,
serviceLayers: [LayerSoilGroundWater, LayerEnvRisk, LayerAirQuality, LayerWasteSolid, LayerWasteGas, LayerWasteWater, LayerArea, LayerPk, LayerPipeLines]
}
},
methods: {
// 鍥炬爣 鎺у埗鍐呭鐨勫睍绀轰笌闅愯棌
legendChange () {
- this.legendControl = !this.legendControl
+ this.isShow = !this.isShow
}
}
}
diff --git a/src/components/panel/topicSearch/SewersSearch.vue b/src/components/panel/topicSearch/SewersSearch.vue
index 46e94a3..79f5f03 100644
--- a/src/components/panel/topicSearch/SewersSearch.vue
+++ b/src/components/panel/topicSearch/SewersSearch.vue
@@ -164,8 +164,8 @@
wfsHelper.addLike(this.form.query.key, this.form.keyword)
// const _this = this
const res = await AjaxUtils.GetDataAsynByUrl(wfsHelper.getUrl(), {})
- if (res.data instanceof Object && Object.prototype.hasOwnProperty.call(res.data, 'features')) {
- this.list = res.data.features
+ if (res instanceof Object && Object.prototype.hasOwnProperty.call(res, 'features')) {
+ this.list = res.features
}
},
handleLocation (val) {
--
Gitblit v1.8.0