From a0853997270e8feeccfaaa03722f783a072ffbc0 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Thu, 15 Aug 2024 14:07:53 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=B6=85=E4=BD=8E=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../enpComponents/envirqualmonitor.vue | 9 +- .../bigScreen/enpComponents/innerclean.vue | 2 +- .../bigScreen/enpComponents/pollutant.vue | 47 ++++--- .../bigScreen/enpComponents/transport.vue | 17 ++- .../bigScreen/enpComponents/transport_old.vue | 115 ++++++++++++++++++ 5 files changed, 165 insertions(+), 25 deletions(-) create mode 100644 src/views/bigScreen/enpComponents/transport_old.vue diff --git a/src/views/bigScreen/enpComponents/envirqualmonitor.vue b/src/views/bigScreen/enpComponents/envirqualmonitor.vue index 9d5000c9..d11f2d98 100644 --- a/src/views/bigScreen/enpComponents/envirqualmonitor.vue +++ b/src/views/bigScreen/enpComponents/envirqualmonitor.vue @@ -14,7 +14,7 @@
- @@ -28,7 +28,7 @@
- + @@ -83,6 +83,7 @@ export default { data() { return { + tableLoading: false, tableData: [], metricOptions: [ { label: 'PM2.5', value: 'pm25' }, @@ -131,13 +132,15 @@ export default { } else if (that.time_bucket == 'hour') { exec_search = 'enp_edata_hour_nodrain'; } + that.tableLoading = true; that.$API.bi.dataset.exec.req(exec_search, { query: that.query, raise_exception: true }).then(res => { console.log(res.data2.ds0); this.tableData = res.data2.ds0; - }) + that.tableLoading = false; + }).catch(e=>{that.tableLoading = false;}) }, }, diff --git a/src/views/bigScreen/enpComponents/innerclean.vue b/src/views/bigScreen/enpComponents/innerclean.vue index 4cf13841..6bd199c1 100644 --- a/src/views/bigScreen/enpComponents/innerclean.vue +++ b/src/views/bigScreen/enpComponents/innerclean.vue @@ -53,7 +53,7 @@ export default { query: {}, params: { type: 30, tags: 'carwash' }, cateOptions: [ - { id: 'inner_car', name: '场内运输车辆' }, + { id: 'inner_car', name: '厂内运输车辆' }, { id: 'inner_car2', name: '非路道移动机械' }, ], apiObj: this.$API.em.equipment.list, diff --git a/src/views/bigScreen/enpComponents/pollutant.vue b/src/views/bigScreen/enpComponents/pollutant.vue index 70dad411..4330aaac 100644 --- a/src/views/bigScreen/enpComponents/pollutant.vue +++ b/src/views/bigScreen/enpComponents/pollutant.vue @@ -28,56 +28,65 @@ row-key="id" :params="params" :query="query" @row-click="rowClick" @dataChange="updateCount"> - - - + + + + + - + + + + + + + - + - + - + + \ No newline at end of file