From d54311dbd787d54876632026eec36497556ed57c Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期四, 01 四月 2021 15:33:02 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue | 34 +++++++++++++---------------------
1 files changed, 13 insertions(+), 21 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue
index f2c0f64..a35207d 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue
@@ -7,19 +7,18 @@
<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
+ 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>
</div>
</div>
</div>
@@ -45,13 +44,6 @@
],
displayContentTable3: []
}
- },
- mounted () {
- this.$nextTick(() => {
- this.displayContentTable.forEach(item => {
- this.displayContentTable3 = item
- })
- })
}
}
</script>
@@ -68,7 +60,7 @@
.main-video {
width: 100%;
- min-height: 195px;
+ min-height: 164px;
video {
width: 100%;
--
Gitblit v1.8.0