Merge remote-tracking branch 'origin/master'

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;
+              //   }
+              // },
             },
           }
         ],

src/views/module_ems/energyAnalyse/moniparamData/index.vue

@@ -15,7 +15,7 @@
                 placeholder="请选择能源参数"
                 :options="options">
               </a-select> -->
-              <a-select v-model="queryParam.energyitemid" placeholder="请选择能源参数">
+              <a-select v-model="queryParam.queryparamtype" placeholder="请选择能源参数">
                 <a-select-option
                   v-for="item in options"
                   :key="item"
@@ -96,7 +96,6 @@ export default {
     },
     getNycsList(){
       getAction(this.url.nycsList, null).then((res) => {
-        console.log(88888,res)
         // this.options = res.map((item,index )=> {
         //   return {
         //     key: item,
@@ -105,11 +104,10 @@ export default {
         //   }
         // })
         this.options = res
-        console.log(this.options)
       })
     },
     getList() {
-      getAction(this.url.list2, null).then((res) => {
+      getAction(this.url.list2, this.queryParam).then((res) => {
         console.log(9999,res)
       })
     },