From 8f327155ec6a3d5ad1f1ff4e170ed85747439373 Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期四, 15 四月 2021 17:49:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/BaseNav/WasteSolid/PublicTabs.vue | 61 +++++++++++++-----------------
1 files changed, 27 insertions(+), 34 deletions(-)
diff --git a/src/components/BaseNav/WasteSolid/PublicTabs.vue b/src/components/BaseNav/WasteSolid/PublicTabs.vue
index ba844dd..a0df48a 100644
--- a/src/components/BaseNav/WasteSolid/PublicTabs.vue
+++ b/src/components/BaseNav/WasteSolid/PublicTabs.vue
@@ -1,41 +1,20 @@
<template>
- <!-- 妗� -->
<div class="win">
- <!-- 鍥涗釜瑙掔殑杈规鏁堟灉 -->
<div class="border_corner border_corner_left_top"></div>
<div class="border_corner border_corner_right_top"></div>
<div class="border_corner border_corner_left_bottom"></div>
<div class="border_corner border_corner_right_bottom"></div>
<div class="main">
<div class="main-matter">
- <div v-if="value === 'feiqi'">
+ <div>
<ul>
- <li>鐩戞祴鐐瑰悕绉�:{{ setWasteGasdata.Name }}</li>
- <li>鐢熶骇鍗曚綅:{{ setWasteGasdata.porltName }}</li>
- <li>鎺掓斁绫诲瀷鍚嶇О:{{ setWasteGasdata.MonTypeName }}</li>
- <li>鎺掓斁鍘诲悜:{{ setWasteGasdata.EmissDirecti }}</li>
- <li>鎺у埗绾у埆鍚嶇О:{{ setWasteGasdata.ContrLevelShowName }}</li>
- <li>鍐�/澶栨帓鍙�:{{ setWasteGasdata.OrOutPortName }}</li>
- </ul>
- </div>
- <div v-if="value === 'gufei'">
- <ul>
- <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'">
- <ul>
- <li>鐩戞祴鐐瑰悕绉�:{{ setWasteWaterdata.Name }}</li>
- <li>鐢熶骇鍗曚綅:{{ setWasteWaterdata.porltName }}</li>
- <li>鎺掓斁绫诲瀷鍚嶇О:{{ setWasteWaterdata.MonTypeName }}</li>
- <li>鎺掓斁鍘诲悜:{{ setWasteWaterdata.EmissDirecti }}</li>
- <li>鎺у埗绾у埆鍚嶇О:{{ setWasteWaterdata.ContrLevelShowName }}</li>
- <li>鍐�/澶栨帓鍙�:{{ setWasteWaterdata.OrOutPortName }}</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>-->
+ <li v-for="(item,index) in tabList" :key="index"></li>
</ul>
</div>
</div>
@@ -46,7 +25,22 @@
<script>
export default {
name: 'GasTable',
- props: ['setSolidWaste', 'value', 'setWasteGasdata', 'setWasteWaterdata']
+ props: ['setSolidWaste', 'value', 'setWasteGasdata', 'setWasteWaterdata'],
+ data () {
+ return {
+ tabList: []
+ }
+ },
+ methods: {
+ // async getTabsData () {
+ // // 鍩烘湰淇℃伅 鍜� 璇︾粏淇℃伅 灞曠ず鏁版嵁鎵�闇�鍙傛暟
+ // const dataValue = {
+ // StoragePlaceId: e.layer.options.totransferData.StoragePlaceId
+ // }
+ // // 鍩烘湰淇℃伅 tabs
+ // const resultBasic = await mapApi.getSolidWasteBaseInfo(dataValue)
+ // }
+ }
}
</script>
@@ -56,19 +50,16 @@
position: relative;
margin-bottom: 0.04rem;
background-color: @background-color;
- //width: 6rem;
- //height: 0.5rem;
}
.main {
- //width: 100%;
- //height: 100%;
.main-matter {
font-size: 0.06rem;
font-weight: normal;
padding: 0.04rem 0;
border: 1px solid #396d83;
+
ul {
//width: 100%;
//height: 100%;
@@ -77,6 +68,7 @@
justify-content: space-around;
flex-wrap: wrap;
margin-bottom: -0.04rem;
+
li {
margin-bottom: 0.04rem;
text-align: center;
@@ -88,6 +80,7 @@
line-height: 0.09rem;
padding: 0.03rem .5%;
}
+
.lastli {
visibility: hidden
}
--
Gitblit v1.8.0