From 1602bcb0af9757e6d3af0b509060c4c0a40e1ba8 Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期四, 01 四月 2021 14:36:28 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue | 59 +++++++++++++++++++++++++----------------------------------
1 files changed, 25 insertions(+), 34 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue
index b60d7b7..a99b76f 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue
@@ -6,21 +6,20 @@
<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="displayContentTable2"
>
- <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,29 +27,22 @@
<script>
export default {
name: 'PublicTable',
- props: ['requestSolidWasteData'],
+ props: ['displayContentTable'],
data () {
return {
- data: [{
- date: '2016-05-03',
- name: '鐜嬪皬铏�',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌�518鍖洪噾娌欐睙璺�'
- }, {
- date: '2016-05-02',
- name: '鐜嬪皬铏�',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙鍖洪噾娌�'
- }]
- }
- },
- mounted () {
- this.$nextTick(() => {
- this.getSolidWasteData()
- })
- },
- methods: {
- getSolidWasteData () {
- // const data = requestSolidWasteData
- // console.log(data)
+ displayContentTable2: [
+ {
+ CompanyName: '涓煩鐭冲寲',
+ StoragePlaceId: 3,
+ StoragePlaceName: '鐏版福鍦�',
+ StoragePlaceTypeName: '涓�鑸浐搴熷～鍩嬪満',
+ StorageType: '绮夌叅鐏般�佺伆娓�',
+ StorageZCL: '38',
+ StorageZCNL: '40.7',
+ StorageZDMJ: '10.60798'
+ }
+ ],
+ displayContentTable3: []
}
}
}
@@ -67,9 +59,8 @@
height: 100%;
.main-video {
- //border: 1px solid #396d83;
width: 100%;
- height: 100%;
+ min-height: 195px;
video {
width: 100%;
--
Gitblit v1.8.0