From c3b1af220f56a85491badc2b11ed2c89fee14622 Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期五, 02 四月 2021 11:06:19 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/panel/topicSearch/SolidWasteSearch.vue | 41 +++--------------------------------------
1 files changed, 3 insertions(+), 38 deletions(-)
diff --git a/src/components/panel/topicSearch/SolidWasteSearch.vue b/src/components/panel/topicSearch/SolidWasteSearch.vue
index 87b3911..f05678e 100644
--- a/src/components/panel/topicSearch/SolidWasteSearch.vue
+++ b/src/components/panel/topicSearch/SolidWasteSearch.vue
@@ -28,24 +28,12 @@
</el-input>
</el-form>
<el-card class="box-card"
- v-for="(item,index) in searchDataDisplay.slice((currentPage-1)*PageSize,currentPage*PageSize)"
+ v-for="(item,index) in searchDataDisplay"
:key="index">
- <div v-if="totalCount > 0">
+ <div>
{{ item.CompanyName }}
</div>
</el-card>
- <div class="search-pagination">
- <el-pagination
- small
- @size-change="handleSizeChange"
- @current-change="handleCurrentChange"
- :current-page="currentPage"
- :page-sizes="[1, 2, 3]"
- :page-size="1"
- layout="total, sizes, prev, pager, next, jumper"
- :total='totalCount'>
- </el-pagination>
- </div>
</div>
<!-- <el-scrollbar style="height:100%">-->
<!-- </el-scrollbar>-->
@@ -133,27 +121,10 @@
// 鏁版嵁鐨勪紶閫�
transferData: ''
},
- searchDataDisplay: [],
- // 榛樿鏄剧ず绗嚑椤�
- currentPage: 1,
- // 鎬绘潯鏁帮紝鏍规嵁鎺ュ彛鑾峰彇鏁版嵁闀垮害(娉ㄦ剰锛氳繖閲屼笉鑳戒负绌�)
- totalCount: 1,
- // 涓暟閫夋嫨鍣紙鍙慨鏀癸級
- pageSizes: [1, 2, 3, 4],
- // 榛樿姣忛〉鏄剧ず鐨勬潯鏁帮紙鍙慨鏀癸級
- PageSize: 1
+ searchDataDisplay: []
}
},
methods: {
- // 姣忛〉鏄剧ず鐨勬潯鏁�
- handleSizeChange (val) {
- this.PageSize = val
- this.currentPage = 1
- },
- // 鏄剧ず绗嚑椤�
- handleCurrentChange (val) {
- this.currentPage = val
- },
handlePipelineType (val) {
// console.log(val)
this.solidWasteTypeOptions.forEach(item => {
@@ -172,7 +143,6 @@
const result = await mapApi.getSolidWasteSurveyDetail(data)
// console.log(result)
this.searchDataDisplay = result.Result.DataInfo
- this.totalCount = result.Result.DataInfo.length
}
}
}
@@ -223,11 +193,6 @@
}
.box-card {
- margin: 15px auto;
- }
-
- .search-pagination {
- padding: 0;
margin: 15px auto;
}
}
--
Gitblit v1.8.0