From 3072da92f3c3f08b2ee0ca03ee4e74b12f545b0e Mon Sep 17 00:00:00 2001
From: yangdelong <828900aaa>
Date: 星期三, 26 五月 2021 21:31:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/panel/topicSearch/SewersSearch.vue | 62 +++++++++++++++---------------
1 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/src/components/panel/topicSearch/SewersSearch.vue b/src/components/panel/topicSearch/SewersSearch.vue
index fb291db..7eedeb7 100644
--- a/src/components/panel/topicSearch/SewersSearch.vue
+++ b/src/components/panel/topicSearch/SewersSearch.vue
@@ -6,7 +6,7 @@
<div class="search-panel ">
<el-form ref="form" :model="form" label-width="90px" class="search-form">
<el-form-item label="璁炬柦绫诲瀷锛�" size="mini" class="search-panel-item">
- <el-select style="width: 100%" v-model="form.pipelineType" @change="handlePipelineType"
+ <el-select style="width: 100%" v-model="form.pipelineType"
:popper-class="'select-down'">
<el-option
v-for="item in items"
@@ -27,6 +27,12 @@
</el-option>
</el-select>
</el-form-item>
+ <div class="page_total">
+ <p>鍏辫
+ <span>{{total}}</span>
+ 鏉¤褰�
+ </p>
+ </div>
<div class="rightButtonSearch">
<el-input v-model="form.keyword" size="mini" placeholder="鍦ㄦ杈撳叆鍏抽敭瀛楁悳绱�"></el-input>
<el-button class="el-icon-search" @click="handleSearch"></el-button>
@@ -78,11 +84,11 @@
<script>
// 寮曞叆缁勪欢鍐呭 =銆� 闄勫睘璁炬柦
-import AffiliatedFacilities from '@components/BaseNav/pipeline/AffiliatedFacilities'
+import AffiliatedFacilities from '@components/base-page/pipeline/AffiliatedFacilities'
// 绠＄嚎鍒嗘瀽鍔熻兘
-import SewersAnalysis from '@components/panel/topicSearch/SewersSelect/SewersAnalysis'
+import SewersAnalysis from '@components/panel/topicSearch/sewers-select/SewersAnalysis'
// 绠＄嚎鏌ヨ鍘嗗彶鍔熻兘
-import SewersHistory from '@components/panel/topicSearch/SewersSelect/SewersHistory'
+import SewersHistory from '@components/panel/topicSearch/sewers-select/SewersHistory'
// form绫诲瀷鍙�夋嫨鏁版嵁 鍥惧眰鎺у埗
import { LayerPipeLines } from '@src/conf/layers/LayerPipeLines'
import { LayerFsss } from '@src/conf/layers/LayerFsss'
@@ -127,29 +133,34 @@
wfsHelper: null
}
},
+ computed: {
+ subItems () {
+ const val = this.form.pipelineType
+ for (let i = 0; i < this.items.length; i++) {
+ const item = this.items[i]
+ if (val === item.name) {
+ return item.layers.filter(function (value, index, array) {
+ return value.name !== '娴佸悜'
+ })
+ }
+ }
+ return []
+ }
+ },
mounted () {
this.wfsHelper = new WfsHelper()
},
methods: {
- subItems () {
- const layers = LayerPipeLines.layers
- console.log(layers)
- const filtered = layers.filter(function (value, index, array) {
- console.log(value)
- return value.name !== '娴佸悜'
- })
- return filtered
- },
// tab鍒囨崲
handleClick (tab, event) {
console.log(tab, event)
- // if (tab.label === '鍒嗘瀽') {
- // // 鍏抽棴寮圭獥
- // window.mapManager.clickDialogSwitch = false
- // } else {
- // // 鎵撳紑寮圭獥
- // window.mapManager.clickDialogSwitch = true
- // }
+ if (tab.label === '鍒嗘瀽') {
+ // 鍏抽棴寮圭獥
+ window.mapManager.clickDialogSwitch = false
+ } else {
+ // 鎵撳紑寮圭獥
+ window.mapManager.clickDialogSwitch = true
+ }
},
// 鏍规嵁杩斿洖鏁版嵁 纭灞曠ず鍥剧墖
getImgSrc () {
@@ -160,17 +171,6 @@
handlePage (page) {
this.wfsHelper.setPage(page)
this.handleSearch()
- },
- // 璁炬柦绫诲瀷绛涢��
- handlePipelineType (val) {
- this.list = []
- for (let i = 0; i < this.items.length; i++) {
- const item = this.items[i]
- if (val === item.name) {
- this.subItems = item.layers
- return
- }
- }
},
// 浜岀骇form琛ㄥ崟鍒囨崲閫夋嫨娓呯┖宸查�夋嫨鏁版嵁
handleDataType () {
--
Gitblit v1.8.0