From 896634d49ec0991b3859e7e4813ff95d9dac352c Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期四, 01 四月 2021 14:45:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue | 32 ++++++++++++--------------------
1 files changed, 12 insertions(+), 20 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue
index f2c0f64..a99b76f 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>
--
Gitblit v1.8.0