From 4f35a8b56c12315c82fd5bd136f32da2dcadc5e2 Mon Sep 17 00:00:00 2001 From: chenyabin <Chenab123!> Date: 星期二, 27 四月 2021 09:27:22 +0800 Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop --- src/components/panel/topicSearch/SewersSearch.vue | 31 +++++++++++++++---------------- 1 files changed, 15 insertions(+), 16 deletions(-) diff --git a/src/components/panel/topicSearch/SewersSearch.vue b/src/components/panel/topicSearch/SewersSearch.vue index 706f5e2..2213bef 100644 --- a/src/components/panel/topicSearch/SewersSearch.vue +++ b/src/components/panel/topicSearch/SewersSearch.vue @@ -39,7 +39,7 @@ <h3 @click="handleLocation(item,index)">{{ item.properties.pipename }}</h3> <p>鎵�灞炰紒涓氾細<span>{{ item.properties.orgcode }}</span> <p>璁炬柦绫诲瀷锛�<span>{{ item.properties.teetype }}</span> - <!-- <el-button v-if="fuShuSheShiShow" class="rt" size="mini" style="margin-right: 0.04rem" @click="btnAffiliatedFacilities(item)" >闄勫睘璁炬柦</el-button> --> + <el-button v-if="fuShuSheShiShow" class="rt btn00fff6" size="mini" style="margin-right: 0.04rem;" @click="btnAffiliatedFacilities(item,index)" >闄勫睘璁炬柦</el-button> </p> </div> </div> @@ -65,7 +65,7 @@ </el-tab-pane> </el-tabs> <!-- 闄勫睘璁炬柦闈㈡澘 --> - <affiliated-facilities :facilitiesParameter="facilitiesParameter" :fuShuSheShiSubItems="fuShuSheShiSubItems" ></affiliated-facilities> + <affiliated-facilities :facilitiesParameter="facilitiesParameter" v-if="fuShuSheShiShow" ></affiliated-facilities> </div> </template> @@ -101,7 +101,7 @@ subItems: LayerPipeLines.layers, total: 0, form: { - pipelineType: '绠$綉', + pipelineType: '绠$嚎', dataType: '', keyword: '' }, @@ -110,8 +110,8 @@ isWaybillHover: true, isRouteHover: false, facilitiesParameter: null, - // fuShuSheShiShow: false, - + fuShuSheShiShow: true, + fuShuSheShiPanelShow: true, activeNum: -1 } }, @@ -155,19 +155,18 @@ }, handleLocation (val, index) { this.activeNum = index - - this.facilitiesParameter = val // layer && layer.openPopup() + window.layerFactory.flyByFeature(val, this.form.dataType.code) + }, + btnAffiliatedFacilities (val, index) { + this.activeNum = index + this.facilitiesParameter = val // 鍒ゆ柇閫夋嫨鏄惁鏄绾匡紝濡傛灉鏄垯鏄剧ず銆婇檮灞炶鏂姐�嬪脊妗� - /* if (this.form.pipelineType === '绠$嚎') { - for (let i = 0; i < this.items.length; i++) { - const item = this.items[i] - if (item.name === '闄勫睘璁炬柦') { - this.fuShuSheShiSubItems = item.layers - // console.log(this.fuShuSheShiSubItems) - } - } - } */ + if (this.form.pipelineType === '绠$嚎') { + this.fuShuSheShiShow = true + } else { + this.fuShuSheShiShow = false + } window.layerFactory.flyByFeature(val, this.form.dataType.code) } } -- Gitblit v1.8.0