From 3054bbce49457c82df9ad32523f3a0186e268d6f Mon Sep 17 00:00:00 2001
From: yangdelong <828900aaa>
Date: 星期五, 28 五月 2021 21:17:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/panel/topicSearch/SewersSearch.vue | 27 +++++++++++++++++----------
1 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/src/components/panel/topicSearch/SewersSearch.vue b/src/components/panel/topicSearch/SewersSearch.vue
index f2e157a..dfa3a7c 100644
--- a/src/components/panel/topicSearch/SewersSearch.vue
+++ b/src/components/panel/topicSearch/SewersSearch.vue
@@ -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'
@@ -148,13 +154,13 @@
// 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 () {
@@ -187,6 +193,7 @@
// }
// const _this = this
const res = await AjaxUtils.GetDataAsynByUrl(this.wfsHelper.getUrl(), {})
+ console.log(res)
if (res instanceof Object && Object.prototype.hasOwnProperty.call(res, 'features')) {
this.total = res.totalFeatures
this.list = res.features
--
Gitblit v1.8.0