lex 1 year ago
parent
commit
d9801c152a

+ 16 - 12
src/views/main/coursewareDate/exerciseDuration.vue

@@ -189,20 +189,23 @@ let nowTime = dayjs()
 //   }
 //   return {};
 // };
+export const getCurrentMonth = () => {
+  return [
+    dayjs()
+      .startOf("month")
+      .format("YYYY-MM-DD"),
+    dayjs()
+      .endOf("month")
+      .format("YYYY-MM-DD")
+  ];
+};
 export default {
   components: { saveform, "ve-histogram": histogram },
   name: "helpCategory",
   data() {
     return {
       searchForm: {
-        dates: [
-          dayjs()
-            .subtract(1, "day")
-            .format("YYYY-MM-DD"),
-          dayjs()
-            .subtract(1, "day")
-            .format("YYYY-MM-DD")
-        ],
+        dates: getCurrentMonth(),
         sort: null,
         asc: null
       },
@@ -244,10 +247,11 @@ export default {
           fileName: "云课堂观看统计.xls",
           method: "post",
           params: {
-            exportEnum: "VIDEO_PLAY_STAT",
-            queryInfo: {
-              ...getTimeFormat(dates, ["startTime", "endTime"])
-            }
+            ...getTimeFormat(dates, ["startTime", "endTime"])
+            // exportEnum: "VIDEO_PLAY_STAT",
+            // queryInfo: {
+            //   ...getTimeFormat(dates, ["startTime", "endTime"])
+            // }
           }
         },
         "您确定导出云课堂观看统计?"

+ 17 - 23
src/views/main/coursewareDate/exerciseDurationDetail.vue

@@ -208,6 +208,17 @@ nowTime =
 //   }
 //   return {};
 // };
+
+export const getCurrentMonth = () => {
+  return [
+    dayjs()
+      .startOf("month")
+      .format("YYYY-MM-DD"),
+    dayjs()
+      .endOf("month")
+      .format("YYYY-MM-DD")
+  ];
+};
 export default {
   components: { saveform, "ve-histogram": histogram, pagination },
   name: "helpCategory",
@@ -215,14 +226,7 @@ export default {
     return {
       nowIndex: dayjs(dayjs().format("YYYY-MM-DD")).valueOf(),
       searchForm: {
-        dates: [
-          dayjs()
-            .subtract(1, "day")
-            .format("YYYY-MM-DD"),
-          dayjs()
-            .subtract(1, "day")
-            .format("YYYY-MM-DD")
-        ],
+        dates: getCurrentMonth(),
         organId: "",
         sort: null,
         asc: null
@@ -244,14 +248,7 @@ export default {
     this.searchForm.organId = query.organId ? Number(query.organId) : "";
     this.searchForm.dates = query.dates
       ? JSON.parse(query.dates)
-      : [
-          dayjs()
-            .subtract(1, "day")
-            .format("YYYY-MM-DD"),
-          dayjs()
-            .subtract(1, "day")
-            .format("YYYY-MM-DD")
-        ];
+      : getCurrentMonth();
     await this.$store.dispatch("setBranchs");
     // const arr = [36, 39, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 52, 54, 56];
     // this.specialList = this.selects.branchs.filter(item => {
@@ -293,13 +290,10 @@ export default {
           fileName: "云练习练习时长.xls",
           method: "post",
           params: {
-            exportEnum: "VIDEO_PLAY_DETAIL_STAT",
-            queryInfo: {
-              ...getTimeFormat(dates, ["startTime", "endTime"]),
-              organizationId: organId,
-              asc,
-              sort
-            }
+            ...getTimeFormat(dates, ["startTime", "endTime"]),
+            organizationId: organId,
+            asc,
+            sort
           }
         },
         "您确定导出云练习练习时长?"