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 | 46 +++++++++++++++++-----------------------------
1 files changed, 17 insertions(+), 29 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue
index 2a6d685..3781da2 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue
@@ -6,21 +6,21 @@
<div class="border_corner border_corner_left_bottom"></div>
<div class="border_corner border_corner_right_bottom"></div>
<div class="main">
- <el-col class="main-video">
+ <div class="main-video">
<el-table
border
tooltip-effect="dark"
- :data="data"
+ :data="displayContentTableData"
>
- <el-table-column prop="name" label="搴忓彿"></el-table-column>
- <el-table-column prop="name" label="绫诲埆"></el-table-column>
- <el-table-column prop="date" label="鍥哄簾鍚嶇О"></el-table-column>
- <el-table-column prop="address" label="浠ｇ爜"></el-table-column>
- <el-table-column prop="address" label="浜х敓閲�"></el-table-column>
- <el-table-column prop="name" label="鍌ㄥ瓨閲�"></el-table-column>
- <el-table-column prop="date" label="浜х敓瑁呯疆"></el-table-column>
+ <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>
- </el-col>
+ </div>
</div>
</div>
</template>
@@ -28,30 +28,19 @@
<script>
export default {
name: 'PublicTable',
- props: ['requestSolidWasteData'],
+ props: ['displayContentTable'],
data () {
return {
- data: [{
- date: '2016-05-03',
- name: '鐜嬪皬铏�',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�'
- }, {
- date: '2016-05-02',
- name: '鐜嬪皬铏�',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�'
- }]
+ displayContentTableData: []
}
},
mounted () {
this.$nextTick(() => {
- this.getSolidWasteData()
+ this.displayContentTable.forEach(item => {
+ this.displayContentTableData = item
+ // console.log(item[0])
+ })
})
- },
- methods: {
- getSolidWasteData () {
- // const data = requestSolidWasteData
- // console.log(data)
- }
}
}
</script>
@@ -67,9 +56,8 @@
height: 100%;
.main-video {
- //border: 1px solid #396d83;
width: 100%;
- height: 100%;
+ min-height: 195px;
video {
width: 100%;
--
Gitblit v1.8.0