From a312e0dd96d8f7e96fb3341f1a55561b12394405 Mon Sep 17 00:00:00 2001 From: 徐旺旺 <11530253@qq.com> Date: 星期日, 30 五月 2021 12:29:48 +0800 Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop --- src/components/table/components/WasteGas.vue | 54 +++++------------------------------------------------- 1 files changed, 5 insertions(+), 49 deletions(-) diff --git a/src/components/table/components/WasteGas.vue b/src/components/table/components/WasteGas.vue index 1bbe3b1..86a5779 100644 --- a/src/components/table/components/WasteGas.vue +++ b/src/components/table/components/WasteGas.vue @@ -63,6 +63,7 @@ import ChemicalWastewater from '@components/table/components/componented/ChemicalWastewater' import Refinery from '@components/table/components/componented/refinery' import MissingAlarm from '@components/table/components/componented/MissingAlarm' +import mapApi from '@/api/mapApi' export default { name: 'WasteGas', components: { @@ -74,55 +75,7 @@ return { isActive: '', isShowIcon: false, - tableData: [{ - UserName: '闆嗗洟鍚嶇О', - WasteWaters: '', - AddOutPut: '', - MonthOutPut: '', - NH4NPut: '', - NH4NMonth: '', - normal: '', - overProof: '', - Abnormal: '', - StopProduction: '', - deficiency: '' - }, { - UserName: '澶╂触鐭冲寲', - WasteWaters: '116.6', - AddOutPut: '58.3', - MonthOutPut: '13.1', - NH4NPut: '58.3', - NH4NMonth: '13.1', - normal: '21', - overProof: '2', - Abnormal: '2', - StopProduction: '2', - deficiency: '2' - }, { - UserName: 'xxxx鐐煎寲3', - WasteWaters: '116.6', - MonthOutPut: '13.1', - NH4NPut: '58.3', - NH4NMonth: '13.1', - normal: '21', - overProof: '2', - Abnormal: '2', - StopProduction: '2', - deficiency: '2' - }, { - UserName: 'xxxx4', - WasteWaters: '116.6', - AddOutPut: '58.3', - MonthOutPut: '13.1', - NH4NPut: '58.3', - NH4NMonth: '13.1', - normal: '21', - overProof: '2', - Abnormal: '2', - StopProduction: '2', - deficiency: '2' - - }], + tableData: null, tableHeader1: [ { name: '鎺掓斁鐐�', width: '140', propS: 'value1' }, { name: '鍗曚綅閮ㄩ棬', width: '80', propS: 'value2' }, @@ -137,6 +90,9 @@ ] } }, + async mounted () { + this.tableData = await mapApi.getWasteGasStatistics() + }, methods: { tableHeaderColor ({ columnIndex }) { // return 'background-color: rgba(26, 73, 81, 0.901960784313726);color:#fff;font-wight:500;font-size:12px;text-align:center;height:0px' -- Gitblit v1.8.0