From 472ae45bb0ae81f9de8fd0dd86c8fb5c198fc7b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com>
Date: Tue, 18 Apr 2023 10:12:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/StatisticsParent.js          |  9 +++++
 src/views/system/StatisticsParent/index.vue | 42 +++++++++++++++++----
 2 files changed, 44 insertions(+), 7 deletions(-)

diff --git a/src/api/system/StatisticsParent.js b/src/api/system/StatisticsParent.js
index afa8982..87d10c2 100644
--- a/src/api/system/StatisticsParent.js
+++ b/src/api/system/StatisticsParent.js
@@ -6,4 +6,13 @@ export function clockStatistics(pageNum, pageSize, parentInfoId, classId, startD
         url: `/system/appLogManage/clockStatistics?pageNum=${pageNum}&pageSize=${pageSize}&parentInfoId=${parentInfoId}&classId=${classId}&startDate=${startDate}&endDate=${endDate}`,
         method: 'post',
     })
+}
+
+
+
+export function calendarStatistics(parentInfoId, startDate) {
+    return request({
+        url: `/system/appLogManage/calendarStatistics?parentInfoId=${parentInfoId}&startDate=${startDate}`,
+        method: 'post',
+    })
 }
\ No newline at end of file
diff --git a/src/views/system/StatisticsParent/index.vue b/src/views/system/StatisticsParent/index.vue
index ff8645a..597a556 100644
--- a/src/views/system/StatisticsParent/index.vue
+++ b/src/views/system/StatisticsParent/index.vue
@@ -198,7 +198,10 @@
   </div>
 </template>
 <script>
-import { clockStatistics } from "@/api/system/StatisticsParent";
+import {
+  clockStatistics,
+  calendarStatistics
+} from "@/api/system/StatisticsParent";
 import classe from "../../assembly/classe.vue";
 import parent from "../../assembly/parent.vue";
 import calendar from "../../calendar.js";
@@ -252,10 +255,11 @@ export default {
         startDate: "",
         endDate: ""
       },
-      selectedDates: ["2023-03-12", "2023-04-12", "2023-04-15", "2023-04-24"],
+      selectedDates: [],
       date: new Date(),
       yearmonths: [],
-      year: "2023"
+      year: "2023",
+      parentInfoId: ""
     };
   },
   created() {
@@ -279,6 +283,17 @@ export default {
         this.year + "-11",
         this.year + "-12"
       ];
+      this.selectedDates = [];
+      var startDate = this.year + "-01-01";
+      calendarStatistics(this.parentInfoId, startDate).then(res => {
+        if (res.data) {
+          if (res.data.dateTimeList.length > 0) {
+            res.data.dateTimeList.forEach(e => {
+              this.selectedDates.push(e.logDate);
+            });
+          }
+        }
+      });
     }
   },
   methods: {
@@ -365,7 +380,6 @@ export default {
         dates.year + "-11",
         dates.year + "-12"
       ];
-      console.log(this.year);
       // //拼接
       // if (dates.month < 10) {
       //   this.query.startDate = dates.year + "-0" + dates.month;
@@ -382,8 +396,20 @@ export default {
       //   this.query.endDate = this.endDate + "-" + dates.date;
       // }
     },
-    look() {
-      this.loginCountshow = true;
+    look(row) {
+      this.parentInfoId = row.parentInfoId;
+      this.selectedDates = [];
+      var startDate = "2023-01-01";
+      calendarStatistics(row.parentInfoId, startDate).then(res => {
+        if (res.data) {
+          if (res.data.dateTimeList.length > 0) {
+            res.data.dateTimeList.forEach(e => {
+              this.selectedDates.push(e.logDate);
+            });
+          }
+        }
+        this.loginCountshow = true;
+      });
     },
     //家长
     parentlist(e) {
@@ -397,6 +423,8 @@ export default {
     resetQuery() {
       this.newtime();
       this.valuetime = "";
+      this.query.classId = "";
+      this.query.parentInfoId = "";
       this.query.startDate = "";
       this.query.endDate = "";
       this.$refs.resets.reset();
@@ -493,6 +521,7 @@ export default {
 .el-calendar-table .el-calendar-day > div.selected {
   background-color: #fef2f2;
   border: 3px solid #fb0;
+  color: #fb0;
   border-radius: 10px;
   text-align: center;
 }
@@ -503,7 +532,6 @@ export default {
 }
 /**本月农历设置为灰色*/
 .el-calendar-table .current .lunar {
-  color: #606266;
   width: 100%;
 }
 /**本月农历节日设置为红色*/