diff --git a/src/utils/enum.js b/src/utils/enum.js index e3f3cc79..9a840e9b 100644 --- a/src/utils/enum.js +++ b/src/utils/enum.js @@ -49,7 +49,7 @@ export const runningStateEnum = new EnumFactory({ 20: { text: '待机', type: 'primary' }, 30: { text: '停机', type: 'warning' }, 40: { text: '故障', type: 'danger' }, - 50: { text: '未知', type: 'info' }, + 50: { text: '离线', type: 'info' }, }, parseInt) export const onlingEnum = new EnumFactory({ diff --git a/src/views/bigScreen/cesiumtest.vue b/src/views/bigScreen/cesiumtest.vue index 4803d8e6..8f14537f 100644 --- a/src/views/bigScreen/cesiumtest.vue +++ b/src/views/bigScreen/cesiumtest.vue @@ -570,8 +570,11 @@ export default { }, getChartTime() { let endDate = new Date(); + endDate.setTime(endDate.getTime() - 1000 * 60); + endDate.setSeconds(0); let startDate = new Date(); startDate.setTime(endDate.getTime() - 1000 * 3600 * 6); + startDate.setSeconds(0); console.log(tool.dateFormat1(startDate), tool.dateFormat1(endDate)); let params = { query: { @@ -681,7 +684,6 @@ export default { type: item.cate_code, cate_code: item.cate_code, state: item.running_state, - is_online: item.is_online, }; let config = { show: true, @@ -710,7 +712,6 @@ export default { id = "11111", type, height, - is_online, cate_code, state, } = attrs; @@ -731,7 +732,6 @@ export default { attrs: attrs, id: id, type: type, - is_online: is_online, cate_code: cate_code, state: state, position: Cesium.Cartesian3.fromDegrees( diff --git a/src/views/bigScreen/enpComponents/orgwryList.vue b/src/views/bigScreen/enpComponents/orgwryList.vue index 223a24ea..32a23c9f 100644 --- a/src/views/bigScreen/enpComponents/orgwryList.vue +++ b/src/views/bigScreen/enpComponents/orgwryList.vue @@ -431,7 +431,7 @@ export default { // echarts.connect([myChart, myChart2]) }).then(() => { params['equipment_id'] = this.eqs.id - that.$API.bi.dataset.exec.req('eq_status', params).then(res2 => { + that.$API.bi.dataset.exec.req('enp_eq_rs', params).then(res2 => { let newOption2 = Object.assign({}, this.basicOption); newOption2.yAxis.minInterval = 1; newOption2.dataset.source = res2.data.ds0; @@ -442,7 +442,7 @@ export default { }) }).then(() => { params['equipment_id'] = this.eqz.id - that.$API.bi.dataset.exec.req('eq_status', params).then(res3 => { + that.$API.bi.dataset.exec.req('enp_eq_rs', params).then(res3 => { let newOption3 = Object.assign({}, this.basicOption); newOption3.yAxis.minInterval = 1; newOption3.dataset.source = res3.data.ds0; diff --git a/src/views/bigScreen/enpComponents/pollutant.vue b/src/views/bigScreen/enpComponents/pollutant.vue index e3405a69..6fdb2f90 100644 --- a/src/views/bigScreen/enpComponents/pollutant.vue +++ b/src/views/bigScreen/enpComponents/pollutant.vue @@ -310,14 +310,14 @@ export default { var bicode = 'enp_edata2' if (type == 1) { var myChart = echarts.getInstanceByDom(document.getElementById('dataChart')); - bicode = 'eq_status' + bicode = 'enp_eq_rs' myChart.showLoading(); } else if (type == 2) { var myChart2 = echarts.getInstanceByDom(document.getElementById('dataChart2')); myChart2.showLoading(); } else if (type == 3) { var myChart3 = echarts.getInstanceByDom(document.getElementById('dataChart3')); - bicode = 'eq_status' + bicode = 'enp_eq_rs' myChart3.showLoading(); } // else { diff --git a/src/views/bigScreen/enpComponents/smartg_prod.vue b/src/views/bigScreen/enpComponents/smartg_prod.vue index 2ac8a770..f60dfd7d 100644 --- a/src/views/bigScreen/enpComponents/smartg_prod.vue +++ b/src/views/bigScreen/enpComponents/smartg_prod.vue @@ -49,7 +49,7 @@ {{ runningStateEnum[item.running_state]?.text }}| {{ item.name }} | - 运行时间 {{ item.total_duration_run + 运行时间 {{ item.duration_run }} h @@ -62,7 +62,7 @@
{{ runningStateEnum[item.running_state]?.text }}|{{ item.name }} | - 运行时间 {{ item.total_duration_run + 运行时间 {{ item.duration_run }} h
@@ -73,7 +73,7 @@