From 4c401c805a04f1407dddc54b035e5ce40fc24091 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Wed, 13 Mar 2024 11:19:35 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=97=A0=E7=BB=84=E7=BB=87=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/style/dark.scss | 4 + src/utils/enum.js | 5 + .../bigScreen/enpComponents/pollutant.vue | 94 ++++++++++++------- .../bigScreen/enpComponents/pollutant2.vue | 10 +- .../bigScreen/enpComponents/smarg_trans.vue | 33 ++++--- .../bigScreen/enpComponents/smartg_prod.vue | 33 ++++--- 6 files changed, 118 insertions(+), 61 deletions(-) diff --git a/src/style/dark.scss b/src/style/dark.scss index 1cda8824..91ec2deb 100644 --- a/src/style/dark.scss +++ b/src/style/dark.scss @@ -9,7 +9,11 @@ html.dark { --el-color-primary-light-7: var(--el-color-primary-dark-6) !important; --el-color-primary-light-5: var(--el-color-primary-dark-4) !important; --el-color-primary-light-3: var(--el-color-primary-dark-3) !important; + --el-menu-active-color: #ffffff !important; + .el-tag { + background-color: #f8f5f5 !important; + } //背景 #app { background: var(--el-bg-color); diff --git a/src/utils/enum.js b/src/utils/enum.js index e5910710..c5e8e91c 100644 --- a/src/utils/enum.js +++ b/src/utils/enum.js @@ -52,6 +52,11 @@ export const runningStateEnum = new EnumFactory({ 50: { text: '未知', type: 'info' }, }, parseInt) +export const onlingEnum = new EnumFactory({ + 1: { text: '在线', type: 'success' }, + 0: { text: '离线', type: 'info' }, +}, parseInt) + export const drainTypeEnum = new EnumFactory({ 'product': '生产工艺', 'mtrans': '物料输送', diff --git a/src/views/bigScreen/enpComponents/pollutant.vue b/src/views/bigScreen/enpComponents/pollutant.vue index 8dd186c5..b9719de2 100644 --- a/src/views/bigScreen/enpComponents/pollutant.vue +++ b/src/views/bigScreen/enpComponents/pollutant.vue @@ -4,6 +4,9 @@
污染源清单
+
+ 返回地图 +
@@ -166,10 +169,11 @@
污染源及关联设备动态信息
-
-
-
-
+
+
+ +
+
@@ -201,7 +205,7 @@ export default { biquery: { end_time: '2024-02-01', start_time: '2024-01-29', - time_bucket: "1 minute", + time_bucket: "5 minute", equipment_id: "3491356310052896768", }, basicOption: { @@ -247,19 +251,29 @@ export default { series: [{ type: 'line' }] }, } + }, + mounted() { + }, methods: { + initDom() { + var chart1 = echarts.init(document.getElementById('dataChart'), 'dark'); + var chart2 = echarts.init(document.getElementById('dataChart2'), 'dark'); + var chart3 = echarts.init(document.getElementById('dataChart3'), 'dark'); + echarts.connect([chart1, chart2, chart3]); + }, + backtoMap() { + this.$emit('close') + }, updateCount(res, tableData) { this.count = res.count }, initTimeNow() { var now = new Date(); - let year = now.getFullYear(); // 年份 - let month = now.getMonth() + 1; // 月份 - let day = now.getDate(); // 日期 - this.detailForm.year = year; - this.detailForm.month = month; - this.detailForm.day = day; + var start = new Date(); + start.setTime(start.getTime() - 3600 * 1000 * 24 * 3); + this.biquery['start_time'] = this.$TOOL.dateFormat(start, 'yyyy-MM-dd hh:mm:00') + this.biquery['end_time'] = this.$TOOL.dateFormat(now, 'yyyy-MM-dd hh:mm:00') }, handleQuery() { this.$refs.table.queryData(this.query); @@ -269,21 +283,22 @@ export default { this.detailItem = row; this.$nextTick(() => { this.getEquipments(row.equipments); - this.getDetailData(); + this.initTimeNow(); + this.initDom(); }) }, getEquipments(ids) { let that = this; - console.log(ids); + let reqs = []; ids.forEach(id => { that.$API.em.equipment.item.req(id).then(res => { - if (res.type == 10) { + if (res.type == 10) { //生产设备 that.eqs = res; that.getDetailData(1, id); - } else if (res.type == 20) { + } else if (res.type == 40) { //监测设备 that.eqc = res; that.getDetailData(2, id); - } else if (res.type == 30) { + } else if (res.type == 30) { //治理设备 that.eqz = res; that.getDetailData(3, id); } @@ -292,44 +307,55 @@ export default { }, getDetailData(type, id) { var that = this; + var bicode = 'enp_edata2' if (type == 1) { - var chartDom = document.getElementById('dataChart'); - var myChart = echarts.init(chartDom); + var myChart = echarts.getInstanceByDom(document.getElementById('dataChart')); + bicode = 'eq_status' + myChart.showLoading(); } else if (type == 2) { - var chartDom2 = document.getElementById('dataChart2'); - var myChart2 = echarts.init(chartDom2); + var myChart2 = echarts.getInstanceByDom(document.getElementById('dataChart2')); + myChart2.showLoading(); } else if (type == 3) { - var chartDom3 = document.getElementById('dataChart3'); - var myChart3 = echarts.init(chartDom3); - } else { - var chartDom4 = document.getElementById('dataChart4'); - var myChart4 = echarts.init(chartDom4); + var myChart3 = echarts.getInstanceByDom(document.getElementById('dataChart3')); + bicode = 'eq_status' + myChart3.showLoading(); } + // else { + // var chartDom4 = document.getElementById('dataChart4'); + // var myChart4 = echarts.init(chartDom4); + // } let obj = that.biquery; obj.equipment_id = id; let params = { query: obj }; - that.$API.bi.dataset.exec.req('eq_status', params).then(res => { + that.$API.bi.dataset.exec.req(bicode, params).then(res => { let newOption = Object.assign({}, this.basicOption); newOption.dataset.source = res.data.ds0; newOption.dataZoom.startValue = that.biquery.start_time; if (type == 1) { newOption.title.text = that.eqs.name; + myChart.hideLoading() myChart.setOption(newOption); } else if (type == 2) { + newOption.series = [ + { type: 'line', encode: { y: 'tsp', seriesName: ["tsp"] } }, + { type: 'line', encode: { y: '温度', seriesName: ["温度"] } }, + { type: 'line', encode: { y: '压力', seriesName: ["压力"] } }] newOption.title.text = that.eqc.name; + newOption.yAxis.minInterval = 1; myChart2.setOption(newOption); - echarts.connect([myChart, myChart2]) + myChart2.hideLoading() } else if (type == 3) { newOption.title.text = that.eqz.name; + newOption.yAxis.minInterval = 1; myChart3.setOption(newOption); - echarts.connect([myChart2, myChart3]) - } else { - newOption.title.text = that.eqc.name; - myChart4.setOption(newOption); - echarts.connect([myChart3, myChart4]) + myChart3.hideLoading() } - }).then(() => { myChart.hideLoading() }) - myChart.hideLoading() + // else { + // newOption.title.text = that.eqc.name; + // myChart4.setOption(newOption); + // echarts.connect([myChart3, myChart4]) + // } + }) }, handleClick() { this.pollutantDetail = false; diff --git a/src/views/bigScreen/enpComponents/pollutant2.vue b/src/views/bigScreen/enpComponents/pollutant2.vue index 5d152f5e..d04c6b08 100644 --- a/src/views/bigScreen/enpComponents/pollutant2.vue +++ b/src/views/bigScreen/enpComponents/pollutant2.vue @@ -4,6 +4,9 @@
污染源监测清单
+
+ 返回地图 +
@@ -27,7 +30,7 @@ @@ -127,6 +130,9 @@ export default { this.initTimeRange() }, methods: { + backtoMap() { + this.$emit('close') + }, initTimeRange() { var now = new Date(); var start = new Date(); diff --git a/src/views/bigScreen/enpComponents/smarg_trans.vue b/src/views/bigScreen/enpComponents/smarg_trans.vue index 6af98d52..348cf6b7 100644 --- a/src/views/bigScreen/enpComponents/smarg_trans.vue +++ b/src/views/bigScreen/enpComponents/smarg_trans.vue @@ -8,13 +8,16 @@
+ + {{ item.text }} + -
+
@@ -42,10 +45,13 @@ @@ -54,10 +60,11 @@ @@ -65,11 +72,9 @@ @@ -79,9 +84,11 @@