From 06b8e7a0ae832fdf83dcefd069b9cf9b5580f013 Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期三, 14 四月 2021 17:59:57 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/PublicBounced/common/PublicTabs.vue | 51 ++++++++++++++++++---------------------------------
1 files changed, 18 insertions(+), 33 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/common/PublicTabs.vue b/src/components/BaseNav/PublicBounced/common/PublicTabs.vue
index 713354f..ba844dd 100644
--- a/src/components/BaseNav/PublicBounced/common/PublicTabs.vue
+++ b/src/components/BaseNav/PublicBounced/common/PublicTabs.vue
@@ -18,14 +18,14 @@
<li>鍐�/澶栨帓鍙�:{{ setWasteGasdata.OrOutPortName }}</li>
</ul>
</div>
- <div v-else-if="value === 'gufei'">
+ <div v-if="value === 'gufei'">
<ul>
- <li>鍦烘墍鍚嶇О:{{ tabData.StoragePlaceName }}</li>
- <li>璐瓨鑳藉姏:{{ tabData.StorageQty }}(鍚�)</li>
- <li>鍓╀綑璐瓨鑳藉姏:{{ tabData.SurplusFloorArea }}(鍚�)</li>
- <li>鍗犲湴闈㈢Н(銕�):{{ tabData.DesignFloorArea }}(銕�)</li>
- <li>鏈�杩戣串瀛樻棩鏈�:{{ tabData.StorageDate }}</li>
- <li></li>
+ <li>鍦烘墍鍚嶇О:{{ setSolidWaste.StoragePlaceName }}</li>
+ <li>璐瓨鑳藉姏:{{ setSolidWaste.StorageQty }}(鍚�)</li>
+ <li>鍓╀綑璐瓨鑳藉姏:{{ setSolidWaste.SurplusFloorArea }}(鍚�)</li>
+ <li>鍗犲湴闈㈢Н(銕�):{{ setSolidWaste.DesignFloorArea }}(銕�)</li>
+ <li>鏈�杩戣串瀛樻棩鏈�:{{ setSolidWaste.StorageDate }}</li>
+ <li class="lastli"></li>
</ul>
</div>
<div v-else-if="value === 'feishui'">
@@ -46,23 +46,7 @@
<script>
export default {
name: 'GasTable',
- props: ['displayContentTab', 'value', 'setWasteGasdata', 'setWasteWaterdata'],
- data () {
- return {
- tabData: []
- }
- },
- mounted () {
- this.processingData()
- },
- methods: {
- processingData () {
- for (var i = 0; i < this.displayContentTab.length; i++) {
- // console.log(this.displayContentTab[i])
- this.tabData = this.displayContentTab[i]
- }
- }
- }
+ props: ['setSolidWaste', 'value', 'setWasteGasdata', 'setWasteWaterdata']
}
</script>
@@ -70,7 +54,7 @@
.win {
position: relative;
- margin-bottom: 10px;
+ margin-bottom: 0.04rem;
background-color: @background-color;
//width: 6rem;
//height: 0.5rem;
@@ -81,9 +65,9 @@
//height: 100%;
.main-matter {
- font-size: 13px;
+ font-size: 0.06rem;
font-weight: normal;
- padding: 6px;
+ padding: 0.04rem 0;
border: 1px solid #396d83;
ul {
//width: 100%;
@@ -92,18 +76,19 @@
align-items: center;
justify-content: space-around;
flex-wrap: wrap;
- margin-bottom: -6px;
+ margin-bottom: -0.04rem;
li {
- margin-bottom: 6px;
+ margin-bottom: 0.04rem;
text-align: center;
- min-width: 32%;
+ min-width: 31%;
background-color: #243a55;
color: #00d0f9;
- border-radius: 3px;
+ border-radius: 0.02rem;
font-size: 0.08rem;
+ line-height: 0.09rem;
+ padding: 0.03rem .5%;
}
-
- li:last-child {
+ .lastli {
visibility: hidden
}
}
--
Gitblit v1.8.0