From 272c1dc7490b70a50f245bd4965284f7baa15bdf Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期二, 06 四月 2021 09:03:13 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue | 43 ++++++++++++++++---------------------------
1 files changed, 16 insertions(+), 27 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue
index f2c0f64..3781da2 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue
@@ -7,19 +7,19 @@
<div class="border_corner border_corner_right_bottom"></div>
<div class="main">
<div class="main-video">
-<!-- <el-table-->
-<!-- tooltip-effect="dark"-->
-<!-- :data="displayContentTable2"-->
-<!-- >-->
-<!-- <el-table-column prop="StoragePlaceId" label="搴忓彿"></el-table-column>-->
-<!-- <el-table-column prop="StoragePlaceTypeName" label="绫诲埆"></el-table-column>-->
-<!-- <el-table-column prop="StoragePlaceName" label="鍥哄簾鍚嶇О"></el-table-column>-->
-<!-- <el-table-column prop="StorageZDMJ" label="浠ｇ爜"></el-table-column>-->
-<!-- <el-table-column prop="StorageZCNL" label="浜х敓閲�"></el-table-column>-->
-<!-- <el-table-column prop="StorageZCL" label="鍌ㄥ瓨閲�"></el-table-column>-->
-<!-- <el-table-column prop="StorageType" label="浜х敓瑁呯疆"></el-table-column>-->
-<!-- </el-table>-->
- <span>{{ displayContentTable3.StoragePlaceTypeName }}</span>
+ <el-table
+ border
+ tooltip-effect="dark"
+ :data="displayContentTableData"
+ >
+ <el-table-column prop="StoragePlaceId" label="搴忓彿"></el-table-column>
+ <el-table-column prop="StoragePlaceTypeName" label="绫诲埆"></el-table-column>
+ <el-table-column prop="StoragePlaceName" label="鍥哄簾鍚嶇О"></el-table-column>
+ <el-table-column prop="StorageZDMJ" label="浠ｇ爜"></el-table-column>
+ <el-table-column prop="StorageZCNL" label="浜х敓閲�"></el-table-column>
+ <el-table-column prop="StorageZCL" label="鍌ㄥ瓨閲�"></el-table-column>
+ <el-table-column prop="StorageType" label="浜х敓瑁呯疆"></el-table-column>
+ </el-table>
</div>
</div>
</div>
@@ -31,25 +31,14 @@
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.displayContentTable3 = item
+ this.displayContentTableData = item
+ // console.log(item[0])
})
})
}
--
Gitblit v1.8.0