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/BaseNav/PublicBounced/GasComponents/PublicTable.vue | 26 +++++-------
src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue | 2
src/components/BaseNav/PublicBounced/PublicBounced.vue | 5 +-
src/components/panel/topicSearch/SolidWasteSearch.vue | 41 +-------------------
src/components/LayerController/logic/SolidWaste.js | 2
5 files changed, 19 insertions(+), 57 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue
index a35207d..56cd627 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue
@@ -9,7 +9,7 @@
<div class="main-video">
<el-table
tooltip-effect="dark"
- :data="displayContentTable2"
+ :data="displayContentTableData"
>
<el-table-column prop="StoragePlaceId" label="搴忓彿"></el-table-column>
<el-table-column prop="StoragePlaceTypeName" label="绫诲埆"></el-table-column>
@@ -30,20 +30,16 @@
props: ['displayContentTable'],
data () {
return {
- displayContentTable2: [
- {
- CompanyName: '涓煩鐭冲寲',
- StoragePlaceId: 3,
- StoragePlaceName: '鐏版福鍦�',
- StoragePlaceTypeName: '涓�鑸浐搴熷～鍩嬪満',
- StorageType: '绮夌叅鐏般�佺伆娓�',
- StorageZCL: '38',
- StorageZCNL: '40.7',
- StorageZDMJ: '10.60798'
- }
- ],
- displayContentTable3: []
+ displayContentTableData: []
}
+ },
+ mounted () {
+ this.$nextTick(() => {
+ this.displayContentTable.forEach(item => {
+ this.displayContentTableData = item
+ // console.log(item[0])
+ })
+ })
}
}
</script>
@@ -60,7 +56,7 @@
.main-video {
width: 100%;
- min-height: 164px;
+ min-height: 195px;
video {
width: 100%;
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue
index b8ea76b..29723b3 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue
@@ -62,7 +62,7 @@
this.$nextTick(() => {
this.displayContentTab.forEach(item => {
this.displayContentTab2 = item
- console.log(item)
+ // console.log(item)
})
})
}
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 7ef971b..9a379d9 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -6,9 +6,10 @@
</div>
<div class="public-bounced-content">
<div class="public-bounced-content-left">
- <PublicTabs :displayContentTab="displayContentTab" :value="value" :setWasteGasdata="setWasteGasdata"></PublicTabs>
+ <PublicTabs :displayContentTab="displayContentTab" :value="value"
+ :setWasteGasdata="setWasteGasdata"></PublicTabs>
<div class="public-bounced-content-left-bottom">
- <PublicTable v-if="value === 'gufei'"></PublicTable>
+ <PublicTable v-if="value === 'gufei'" :displayContentTable="displayContentTable"></PublicTable>
<PublicChart v-else></PublicChart>
</div>
</div>
diff --git a/src/components/LayerController/logic/SolidWaste.js b/src/components/LayerController/logic/SolidWaste.js
index bb980a5..04f0efc 100644
--- a/src/components/LayerController/logic/SolidWaste.js
+++ b/src/components/LayerController/logic/SolidWaste.js
@@ -89,7 +89,7 @@
const instance = new PublicBounced()
instance.$mount()
document.body.appendChild(instance.$el)
- instance.setData(resultBasic.Result.DataInfo, resultDetailed, 'gufei')
+ instance.setData(resultBasic.Result.DataInfo, resultDetailed.Result.DataInfo, 'gufei')
/* flyTo()寮瑰嚭妗嗗钩绉讳簨浠� */
this.setPanTo(e.latlng, 200)
}
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