Merge remote-tracking branch 'origin/master'

src/views/module_tpm/equipmentRunStatis/realtime.vue

@@ -69,6 +69,7 @@ import * as echarts from 'echarts'
 import { mixinDevice } from '@/utils/mixin'
 import { JeecgListMixin } from '@/mixins/JeecgListMixin'
 import { httpAction, getAction } from '@/api/manage'
+import { emsdata } from '@/views/module_ems/energyAnalyse/emsdata'
 export default {
   name: '',
   mixins: [JeecgListMixin, mixinDevice],
@@ -176,9 +177,17 @@ export default {
       var now = this.dateformat(new Date()).substring(0, 10)
       this.queryParams.day = now
       this.handleQuery()
+      setTimeout(() => {
+        this.getTest()
+      }, 1000)
     })
   },
   methods: {
+    // 后端好了需要删掉
+    getTest() {
+      this.moniparamData = emsdata.moniparamData
+      this.initEcharts()
+    },
     /** 重置按钮操作 */
     resetQuery() {
       this.handleQuery()