From b765df07d1b732dad563712a49d0c0d810d940c9 Mon Sep 17 00:00:00 2001 From: chenyabin <Chenab123!> Date: 星期一, 19 四月 2021 18:02:57 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop --- src/components/BaseNav/WasteWater/PublicTabs.vue | 51 +++++++++++++++++++++++++++++---------------------- 1 files changed, 29 insertions(+), 22 deletions(-) diff --git a/src/components/BaseNav/WasteWater/PublicTabs.vue b/src/components/BaseNav/WasteWater/PublicTabs.vue index a0df48a..fbf6c13 100644 --- a/src/components/BaseNav/WasteWater/PublicTabs.vue +++ b/src/components/BaseNav/WasteWater/PublicTabs.vue @@ -7,14 +7,13 @@ <div class="main"> <div class="main-matter"> <div> - <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>--> - <li v-for="(item,index) in tabList" :key="index"></li> + <ul v-for="(item,index) in setWasteWater" :key="index"> + <li>鐩戞祴鐐瑰悕绉�:{{ item.Name }}</li> + <li>鐢熶骇鍗曚綅:{{ item.porltName }}</li> + <li>鎺掓斁绫诲瀷鍚嶇О:{{ item.MonTypeName }}</li> + <li>鎺掓斁鍘诲悜:{{ item.EmissDirecti }}</li> + <li>鎺у埗绾у埆鍚嶇О:{{ item.ContrLevelShowName }}</li> + <li>鍐�/澶栨帓鏀惧彛:{{ item.OrOutPortName }}</li> </ul> </div> </div> @@ -23,23 +22,34 @@ </template> <script> +import mapApi from '../../../api/mapApi' export default { - name: 'GasTable', - props: ['setSolidWaste', 'value', 'setWasteGasdata', 'setWasteWaterdata'], + name: 'WaterTabs', data () { return { - tabList: [] + setWasteWater: [] } }, + mounted () { + // this.$nextTick(() => { + // this.refsDataTabs() + // }) + }, methods: { - // async getTabsData () { - // // 鍩烘湰淇℃伅 鍜� 璇︾粏淇℃伅 灞曠ず鏁版嵁鎵�闇�鍙傛暟 - // const dataValue = { - // StoragePlaceId: e.layer.options.totransferData.StoragePlaceId - // } - // // 鍩烘湰淇℃伅 tabs - // const resultBasic = await mapApi.getSolidWasteBaseInfo(dataValue) - // } + async refsDataTabs (data) { + // 鍩烘湰淇℃伅 鍜� 璇︾粏淇℃伅 灞曠ず鏁版嵁鎵�闇�鍙傛暟 + // const EpsGisMonPointId = { + // EpsGisMonPointId: data + // } + // 鍩烘湰淇℃伅 tabs + const result = await mapApi.getWasteWater() + // for (var i = 0; i < result.length; i++) { + // if (result[i].Name === data.title) { + // } + // } + this.setWasteWater = result.Result.DataInfo + // return result + } } } </script> @@ -81,9 +91,6 @@ padding: 0.03rem .5%; } - .lastli { - visibility: hidden - } } } } -- Gitblit v1.8.0