From c7a549da66df42d4ec5c78ddf2cc138772616941 Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期一, 19 四月 2021 14:05:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/BaseNav/WasteSolid/PublicTable.vue | 35 ++++++++++++++---------------------
1 files changed, 14 insertions(+), 21 deletions(-)
diff --git a/src/components/BaseNav/WasteSolid/PublicTable.vue b/src/components/BaseNav/WasteSolid/PublicTable.vue
index 3bc0315..51b8427 100644
--- a/src/components/BaseNav/WasteSolid/PublicTable.vue
+++ b/src/components/BaseNav/WasteSolid/PublicTable.vue
@@ -5,7 +5,7 @@
<span></span>
<span></span>
<div class="main-table">
- <el-table :data="listData" style="width: 100%" height="325px" :row-class-name="tableRowClassName">
+ <el-table :data="listData" style="width: 100%" height="200px" :row-class-name="tableRowClassName">
<el-table-column v-for="(item, index) in listLabel" :key="index" :prop="item.prop"
:label="item.label" :show-overflow-tooltip="true"></el-table-column>
</el-table>
@@ -56,7 +56,7 @@
},
mounted () {
this.$nextTick(() => {
- this.listData.push({}, {}, {}, {}, {}, {})
+ // this.listData.push(this.listData2, {}, {}, {}, {}, {})
})
},
methods: {
@@ -66,7 +66,6 @@
}
const result = await mapApi.getSolidWasteDetail(StoragePlaceId)
this.listData = result.Result.DataInfo[0]
- console.log(this.listData)
},
// 闅旇棰滆壊璁剧疆
tableRowClassName ({
@@ -85,9 +84,6 @@
</script>
<style lang="less" scoped>
-.main-table {
- border: 1px #02a6b5 solid;
-}
/deep/ .el-table td {
border-bottom: none !important;
@@ -98,8 +94,8 @@
}
/deep/ .el-table td {
- height: 45px !important;
- line-height: 45px !important;
+ height: 30px !important;
+ line-height: 30px !important;
}
/deep/ .el-table tbody tr:hover > td {
@@ -109,16 +105,22 @@
.slotChildTable {
position: relative;
background: rgba(33, 41, 69, 0.9);
- //border: 1px solid red;
+
+ .main-table {
+ border: 1px #396d83 solid;
+ }
+}
+
+.slotChildTable span {
+ padding: 6px;
+ border-style: solid;
+ border-color: #02a6b5;
}
.slotChildTable span:nth-child(1) {
position: absolute;
left: -1px;
top: -1px;
- padding: 10px;
- border-style: solid;
- border-color: #02a6b5;
border-width: 1px 0 0 1px;
}
@@ -126,9 +128,6 @@
position: absolute;
right: -1px;
top: -1px;
- padding: 10px;
- border-style: solid;
- border-color: #02a6b5;
border-width: 1px 1px 0 0;
}
@@ -136,9 +135,6 @@
position: absolute;
right: -1px;
bottom: -1px;
- padding: 10px;
- border-style: solid;
- border-color: #02a6b5;
border-width: 0 1px 1px 0;
}
@@ -146,9 +142,6 @@
position: absolute;
left: -1px;
bottom: -1px;
- padding: 10px;
- border-style: solid;
- border-color: #02a6b5;
border-width: 0 0 1px 1px;
}
--
Gitblit v1.8.0