周报设置一周从周一开始周日结束

src/pages/SchoolReport/SchoolReport.vue

@@ -1893,7 +1893,7 @@ export default {
     },
     // 当天11：00 ~ 13：00属于高峰期
     isPeakPeriod() {
-      let first = this.timeIn("11:00:00", "11:01:00");
+      let first = this.timeIn("11:00:00", "13:00:00");
       return first;
     },
     nodataClick: function () {
@@ -2122,17 +2122,36 @@ export default {
       this.dataRangeIndex = e.target.value;
       this.getDataRangeArr(this.reportTypeIndex);
     },
+    // 获取一年中的所有周
+    getAllWeeksInYear(year) {
+      let currentDate = dayjs(new Date(year, 0, 1)); // 设置为年份的第一天
+      const weeks = [];
+    
+      while (currentDate.year() === year) {
+        const startOfWeek = currentDate.startOf('week');
+        const endOfWeek = currentDate.endOf('week');
+        weeks.push({
+          startDate: startOfWeek.format('YYYY-MM-DD'),
+          endDate: endOfWeek.format('YYYY-MM-DD')
+        });
+        currentDate = currentDate.add(1, 'week');
+      }
+    
+      return weeks;
+    },
     getDataRangeArr: async function (num) {
       if (num) {
         // 一年 52周   周报
         let tmpArr = [];
         for (let i = 1; i <= 52; i++) {
-          let startWeek = dayjs().subtract(i, "week").startOf("week");
+          // 设置 locale，将一周的开始日设置为周一 (1)
+          let startWeek = dayjs().subtract(i, "week").startOf("week").add(1, 'day');
           let endWeek =
             dayjs().$d.getTime() >
             dayjs().subtract(i, "week").endOf("week").$d.getTime()
               ? dayjs().subtract(i, "week").endOf("week")
               : dayjs();
+          endWeek = endWeek.add(1, 'day');
           tmpArr.push({
             week:
               startWeek.format("YYYY/MM/DD") +