Browse Source

首页优化

wyh 1 year ago
parent
commit
45b1e5673b
1 changed files with 24 additions and 14 deletions
  1. 24 14
      src/views/dashboard/Analysis.vue

+ 24 - 14
src/views/dashboard/Analysis.vue

@@ -228,6 +228,8 @@ export default {
             upkeep: "/cmmsUpkeep/cmmsUpkeep/getMyChargeNumDay",
             upkeepAll: "/cmmsUpkeep/cmmsUpkeep/getMyChargeNum",
             inspect: "/cmmsInspect/cmmsInspect/indexinspectnum",
+            todayelectricity: "/dataElectricity/dataElectricity/todayelectricity",
+            envirinfo: "/hsms/statistics/envirinfo",
         },
     }
   },
@@ -371,16 +373,24 @@ export default {
         this.operaStatistics.inspectCompleted = res.result.totalnum;
         this.operaStatistics.inspectIncomplete = res.result.todaynum;
       })
+      getAction(this.url.todayelectricity, null).then((res) => {
+        console.log('todayelectricity',res.result)
+        this.TodayElectricity = res.result;
+        this.initEcharts();
+      })
+      getAction(this.url.envirinfo, null).then((res) => {
+        console.log('envirinfo',res)
+        this.temperatureData = res.result;
+        this.initTempAndHumiEcharts();
+      })
+
 
-      this.TodayElectricity = emsdata.homedata.TodayElectricity;
-      this.EnvironmentTemp = emsdata.homedata.EnvironmentTemp;
       this.alarmList = emsdata.homedata.alarmData;
       this.noticeList = emsdata.homedata.noticeData;
+      // this.EnvironmentTemp = emsdata.homedata.EnvironmentTemp;
 
-      this.temperatureData = emsdata.homedata.envirData;
-
-      this.initEcharts();
-      this.initTempAndHumiEcharts();
+      // this.initEcharts();
+      // this.initTempAndHumiEcharts();
     },
     /** 查询报警数据列表 */
     getAlarmList() {
@@ -524,14 +534,14 @@ export default {
               type: 'shadow'
             },
             axisLabel: {
-              rotate: 45, // 设置刻度标签旋转角度为45度
-              formatter: function(value) {
-                if (value.length > 8) { // 当文本长度大于5时,截断并显示省略号
-                  return value.substring(0, 8) + '...';
-                } else {
-                  return value;
-                }
-              },
+              rotate: 25, // 设置刻度标签旋转角度为45度
+              // formatter: function(value) {
+              //   if (value.length > 8) { // 当文本长度大于5时,截断并显示省略号
+              //     return value.substring(0, 8) + '...';
+              //   } else {
+              //     return value;
+              //   }
+              // },
             },
           }
         ],