解决缺陷 监控调阅统计页面

src/components/date-picker/src/panel/week-range.vue

@@ -334,7 +334,7 @@
         visible: '',
         disabledDate: '',
         cellClassName: '',
-        firstDayOfWeek: 7,
+        firstDayOfWeek: 1,
         minTimePickerVisible: false,
         maxTimePickerVisible: false,
         format: '',

src/views/core/reportForms/monitorAccessReport.vue

@@ -99,6 +99,7 @@ import {deptTreeSelect,businessTreeSelect} from "@/api/system/public";
 // import orgTree from "@/components/orgTree";
 import OrgTree from "@/components/orgTree/orgQuerySelector.vue";
 import {Message} from "element-ui";
+import dayjs from "dayjs";
 export default {
   dicts: ['sys_normal_disable','sys_org_type','repot_cycle'],
   name: "Check",
@@ -220,24 +221,43 @@ setWeekNum() {
   this.queryParams.endDate = this.endDate;
 },
     //时间是周日就往前推一天
-    getStartAndEndOfWeek(newDate){
-      let date = new Date(newDate);
-      let newTime = date.getTime();
-      let day = date.getDay();
-      if (day === 0){
-        date.setDate(date.getDate() - 1);
-        newTime = date.getTime();
-        day = date.getDay();
-      }
-      const oneDayTime = 24 * 60 * 60 * 1000;
-      const fromTime = newTime - day * oneDayTime;
-      const endTime = newTime + (7 - day) * oneDayTime;
-      const fromDate = new Date(fromTime);
-      const toDate = new Date(endTime);
-      let startDate = fromDate.getFullYear() + '-' + this.p((fromDate.getMonth() + 1)) + '-' + this.p(fromDate.getDate() + 1);
-      let endDate = toDate.getFullYear() + '-' + this.p((toDate.getMonth() + 1)) + '-' + this.p(toDate.getDate());
+    // getStartAndEndOfWeek(newDate){
+    //   let date = new Date(newDate);
+    //   let newTime = date.getTime();
+    //   let day = date.getDay();
+    //   if (day === 0){
+    //     date.setDate(date.getDate() - 1);
+    //     newTime = date.getTime();
+    //     day = date.getDay();
+    //   }
+    //   const oneDayTime = 24 * 60 * 60 * 1000;
+    //   const fromTime = newTime - day * oneDayTime;
+    //   const endTime = newTime + (7 - day) * oneDayTime;
+    //   const fromDate = new Date(fromTime);
+    //   const toDate = new Date(endTime);
+    //   let tempDay = new Date(fromTime);
+    //   // tempDay.setDate(tempDay.getDate() - 1);
+    //   let startDate = fromDate.getFullYear() + '-' + this.p((fromDate.getMonth() + 1)) + '-' + this.p(tempDay.getDate());
+    //   let endDate = toDate.getFullYear() + '-' + this.p((toDate.getMonth() + 1)) + '-' + this.p(toDate.getDate());
 
-      return [startDate,endDate];
+    //   return [startDate,endDate];
+    // },
+    getStartAndEndOfWeek(newDate) {
+      const nowDay = dayjs(newDate).day()
+      // 这周的第一天
+      let str=null;
+      console.log("getStartAndEndOfWeek",nowDay);
+      if (nowDay){
+        // 非周天，即当周
+        str = dayjs(newDate).startOf('week')
+      }else {
+        // 周天，先减去一天，当作是上周的，然后算出来是上周的周天是第一天，最后再加上一天就是周一
+        console.log("getStartAndEndOfWeek",dayjs(newDate).subtract(1, 'day').format('YYYY-MM-DD'));  
+        str = dayjs(newDate).subtract(1, 'day').startOf('week')
+      }
+      const startOfWeek = dayjs(str).add(0,'day').format('YYYY-MM-DD');
+      const endOfWeek =dayjs(str).add(6,'day').format('YYYY-MM-DD');
+      return [startOfWeek,endOfWeek];
     },
 
 /** 查询机构树数据 */