* 更改能源管理大屏的使用的模型

ems-ui-cloud/src/utils/DateTool.js

@@ -88,9 +88,15 @@ export const DateTool = {
   lastDay: (format = DateTool.DateFormat.YYYY_MM_DD) => {
     return dayjs().subtract(1, 'day').format(format);
   },
+  lastXDay: (days, format = DateTool.DateFormat.YYYY_MM_DD) => {
+    return dayjs().subtract(days, 'day').format(format);
+  },
   lastMonth: (format = DateTool.DateFormat.YYYY_MM) => {
     return dayjs().subtract(1, 'month').format(format);
   },
+  lastXMonth: (before, format = DateTool.DateFormat.YYYY_MM) => {
+    return dayjs().subtract(before, 'month').format(format);
+  },
   thisMonthLastDay: (format = DateTool.DateFormat.YYYY_MM_DD) => {
     return dayjs().endOf('month').format(format);
   },

ems-ui-cloud/src/views/largeScreen/net/left.vue

@@ -309,17 +309,19 @@ export default {
     async getPgSupplyDayTotalPv() {
       const {data: pgPvSupplyThisMonthTotalPv} = await pgSupplyDayTotalPv({
         areaCode: this.areaType,
-        date: DateTool.now(DateTool.DateFormat.YYYY_MM)
+        startRecTime: DateTool.lastXDay(30),
+        endRecTime: DateTool.now(),
       })
       if (!pgPvSupplyThisMonthTotalPv) {
         return
       }
       const {data: pgPvSupplyLastMonthTotalPv} = await pgSupplyDayTotalPv({
         areaCode: this.areaType,
-        date: DateTool.lastMonth(DateTool.DateFormat.YYYY_MM)
+        startRecTime: DateTool.lastXDay(61),
+        endRecTime: DateTool.lastXDay(31),
       })
-      const days = DateTool.getDayOfRange(DateTool.now(`${DateTool.DateFormat.YYYY_MM}-01`), DateTool.now())
-      const lastMonthDays = DateTool.getDayOfRange(DateTool.lastMonth(`${DateTool.DateFormat.YYYY_MM}-01`), DateTool.now())
+      const days = DateTool.getDayOfRange(DateTool.lastXDay(30), DateTool.now())
+      const lastMonthDays = DateTool.getDayOfRange(DateTool.lastXDay(61), DateTool.lastXDay(31))
       const thisMonthData = array2Map(pgPvSupplyThisMonthTotalPv)
       const lastMonthData = array2Map(pgPvSupplyLastMonthTotalPv)
       this.lineData = days.map((item, index) => {

ems-ui-cloud/src/views/largeScreen/soc/left.vue

@@ -251,13 +251,14 @@ export default {
     async getPgSupplyDayTotalPv() {
       const {data: pgPvHisSupply} = await pgSupplyDayTotalPv({
         areaCode: this.areaType,
-        date: DateTool.now(DateTool.DateFormat.YYYY_MM)
+        startRecTime: DateTool.lastXDay(30),
+        endRecTime: DateTool.now(),
       })
       if (!pgPvHisSupply) {
         return
       }
 
-      const dateTips = DateTool.getDayOfRange(DateTool.now(`${DateTool.DateFormat.YYYY_MM}-01`), DateTool.now());
+      const dateTips = DateTool.getDayOfRange(DateTool.lastXDay(30), DateTool.now());
       const dateIndexMap = {}
       pgPvHisSupply.forEach(item => {
         dateIndexMap[item.date] = item

ems-ui-cloud/src/views/largeScreen/source/left.vue

@@ -287,13 +287,14 @@ export default {
     async getHisPgPvSupply() {
       const {data: pgPvHisSupply} = await pgSupplyDayTotalPv({
         areaCode: this.areaType,
-        date: DateTool.now(DateTool.DateFormat.YYYY_MM)
+        startRecTime: DateTool.lastXDay(30),
+        endRecTime: DateTool.now(),
       })
       if (!pgPvHisSupply) {
         return
       }
 
-      const dateTips = DateTool.getDayOfRange(DateTool.now(`${DateTool.DateFormat.YYYY_MM}-01`), DateTool.now());
+      const dateTips = DateTool.getDayOfRange(DateTool.lastXDay(30), DateTool.now());
       const dateIndexMap = {}
       pgPvHisSupply.forEach(item => {
         dateIndexMap[item.date] = item