From e25ff993695e7a4b394a5d1aa102f113dbe5316b Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期日, 18 四月 2021 22:40:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/BaseNav/WasteSolid/PublicTable.vue | 53 +++++++++++++++++++++--------------------------------
1 files changed, 21 insertions(+), 32 deletions(-)
diff --git a/src/components/BaseNav/WasteSolid/PublicTable.vue b/src/components/BaseNav/WasteSolid/PublicTable.vue
index 1515187..3bc0315 100644
--- a/src/components/BaseNav/WasteSolid/PublicTable.vue
+++ b/src/components/BaseNav/WasteSolid/PublicTable.vue
@@ -1,13 +1,5 @@
<template>
- <!-- <div class="react">-->
- <!-- <div class="main-table">-->
- <!-- <el-table :data="listData" style="width: 100%" height="255px" :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>-->
- <!-- </div>-->
- <!-- </div>-->
- <div class="main">
+ <div class="slotChildTable">
<span></span>
<span></span>
<span></span>
@@ -22,6 +14,8 @@
</template>
<script>
+import mapApi from '@/api/mapApi'
+
export default {
name: 'PublicTable',
props: ['displayContentTable'],
@@ -62,10 +56,18 @@
},
mounted () {
this.$nextTick(() => {
- this.listData.push(this.displayContentTable[0], {}, {}, {}, {}, {}, {})
+ this.listData.push({}, {}, {}, {}, {}, {})
})
},
methods: {
+ async refsDataTable (data) {
+ const StoragePlaceId = {
+ StoragePlaceId: data
+ }
+ const result = await mapApi.getSolidWasteDetail(StoragePlaceId)
+ this.listData = result.Result.DataInfo[0]
+ console.log(this.listData)
+ },
// 闅旇棰滆壊璁剧疆
tableRowClassName ({
row,
@@ -83,23 +85,10 @@
</script>
<style lang="less" scoped>
-//.react {
-// position: relative;
-// background: rgba(33, 41, 69, 0.9);
-// background: linear-gradient(to left, #02a6b5, #02a6b5) left top no-repeat,
-// linear-gradient(to bottom, #02a6b5, #02a6b5) left top no-repeat,
-// linear-gradient(to left, #02a6b5, #02a6b5) right top no-repeat,
-// linear-gradient(to bottom, #02a6b5, #02a6b5) right top no-repeat,
-// linear-gradient(to left, #02a6b5, #02a6b5) left bottom no-repeat,
-// linear-gradient(to bottom, #02a6b5, #02a6b5) left bottom no-repeat,
-// linear-gradient(to left, #02a6b5, #02a6b5) right bottom no-repeat,
-// linear-gradient(to left, #02a6b5, #02a6b5) right bottom no-repeat;
-// background-size: 2px 20px, 20px 2px, 2px 20px, 20px 2px;
-//
-// .main-table {
-// //border: 1px red solid;
-// }
-//}
+.main-table {
+ border: 1px #02a6b5 solid;
+}
+
/deep/ .el-table td {
border-bottom: none !important;
}
@@ -117,13 +106,13 @@
background: none !important
}
-.main {
+.slotChildTable {
position: relative;
background: rgba(33, 41, 69, 0.9);
//border: 1px solid red;
}
-.main span:nth-child(1) {
+.slotChildTable span:nth-child(1) {
position: absolute;
left: -1px;
top: -1px;
@@ -133,7 +122,7 @@
border-width: 1px 0 0 1px;
}
-.main span:nth-child(2) {
+.slotChildTable span:nth-child(2) {
position: absolute;
right: -1px;
top: -1px;
@@ -143,7 +132,7 @@
border-width: 1px 1px 0 0;
}
-.main span:nth-child(3) {
+.slotChildTable span:nth-child(3) {
position: absolute;
right: -1px;
bottom: -1px;
@@ -153,7 +142,7 @@
border-width: 0 1px 1px 0;
}
-.main span:nth-child(4) {
+.slotChildTable span:nth-child(4) {
position: absolute;
left: -1px;
bottom: -1px;
--
Gitblit v1.8.0