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/GasWasteSearch.vue | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/src/components/panel/topicSearch/GasWasteSearch.vue b/src/components/panel/topicSearch/GasWasteSearch.vue
index 42df935..57b7faa 100644
--- a/src/components/panel/topicSearch/GasWasteSearch.vue
+++ b/src/components/panel/topicSearch/GasWasteSearch.vue
@@ -48,6 +48,12 @@
<el-radio v-for="(item,index) in levelOfRisk" :label="item.value" :key="index"><span class="levelOfRisk-type">{{item.name}}</span></el-radio>
</el-radio-group>
<!-- <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-button slot="append" icon="el-icon-search" size="mini"></el-button>-->
@@ -98,7 +104,7 @@
<script>
import mapApi from '@/api/mapApi'
-import WasteWaterIndex from '../../BaseNav/WasteWater/WasteWaterIndex'
+import WasteWaterIndex from '../../base-page/WasteWater/WasteWaterIndex'
import { pulseEffect, setPanTo } from '../../../utils/utils'
export default {
@@ -109,6 +115,8 @@
gdVisible: true,
list: [],
total: 0,
+ // 鍒嗛〉
+ pageSize: 10,
inareaTypeOptions: [],
enterpriseTypeOptions: [],
enterpriseSubunitsTypeOptions: [],
@@ -130,6 +138,11 @@
}
},
methods: {
+ // 椤甸潰鍒囨崲 鍒嗛〉鍔熻兘
+ handlePage (page) {
+ // this.wfsHelper.setPage(page)
+ this.handleSearch()
+ },
// 鍖哄煙绛涢��
areaType (val) {
this.pipelineTypeOptions.forEach((itm) => {
@@ -169,7 +182,7 @@
window.map.setView(pos, 15)
window.$layer.open({
content: {
- content: WasteWaterIndex, // 缁勪欢
+ comp: WasteWaterIndex, // 缁勪欢
parent: this, // 鐖剁粍浠�
data: { // 浼犻�掔殑鍙傛暟
storagePlaceId: val
--
Gitblit v1.8.0