From 8c4ee30db078163fafe00f8200618303a131f86c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?kaizheng=28=E9=83=91=E5=87=AF=29?= <kaizheng@upchina.com>
Date: Sun, 16 Feb 2025 14:53:53 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BA=A4=E6=98=93=E5=9C=88=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E7=BB=9F=E8=AE=A1=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../circle/data/components/contentModule.vue  | 13 +++++-----
 .../circle/data/components/memberModule.vue   | 25 +++++++++----------
 src/views/circle/data/index.vue               | 23 ++++++++++++++---
 3 files changed, 38 insertions(+), 23 deletions(-)

diff --git a/src/views/circle/data/components/contentModule.vue b/src/views/circle/data/components/contentModule.vue
index dc4086a..ff9b1b5 100644
--- a/src/views/circle/data/components/contentModule.vue
+++ b/src/views/circle/data/components/contentModule.vue
@@ -100,6 +100,12 @@ import { getCircleStatistics } from "@/api/circle";
 import dayjs from "dayjs";
 export default {
   components: { LineChart },
+  props: {
+    currentData: {
+      type: Object,
+      default: () => {}
+    }
+  },
   data() {
     return {
       formInline: {
@@ -109,7 +115,6 @@ export default {
       },
       timeType: 1,
       time: "",
-      currentData: {},
       dataList: [],
       echartOption: {
         tooltip: {
@@ -193,12 +198,6 @@ export default {
       const ret = await getCircleStatistics(this.formInline);
       if (ret && ret.data) {
         this.dataList = ret.data;
-        if (
-          !this.formInline.endDate ||
-          this.formInline.endDate === dayjs().format("YYYY-MM-DD")
-        ) {
-          this.currentData = ret.data[ret.data.length - 1];
-        }
         const xAxisData = [];
         const seriesData = {
           advisorGroupContent: {
diff --git a/src/views/circle/data/components/memberModule.vue b/src/views/circle/data/components/memberModule.vue
index 2fd52cc..154284b 100644
--- a/src/views/circle/data/components/memberModule.vue
+++ b/src/views/circle/data/components/memberModule.vue
@@ -96,6 +96,12 @@ import { getCircleStatistics } from "@/api/circle";
 import dayjs from "dayjs";
 export default {
   components: { LineChart },
+  props: {
+    currentData: {
+      type: Object,
+      default: () => {}
+    }
+  },
   data() {
     return {
       formInline: {
@@ -105,7 +111,6 @@ export default {
       },
       timeType: 1,
       time: "",
-      currentData: {},
       dataList: [],
       echartOption: {
         tooltip: {
@@ -155,28 +160,28 @@ export default {
       }
       if (this.formInline.startDate !== null) {
         this.formInline.startDate = dayjs(this.formInline.startDate).format(
-          "YYYY-MM-DD HH:mm:ss"
+          "YYYY-MM-DD"
         );
       }
       if (this.timeType == 2) {
         this.formInline.endDate = dayjs(value)
           .add(1, "year")
-          .format("YYYY-MM-DD HH:mm:ss");
+          .format("YYYY-MM-DD");
       } else if (this.timeType == 3) {
         this.formInline.endDate = dayjs(value)
           .add(1, "month")
-          .format("YYYY-MM-DD HH:mm:ss");
+          .format("YYYY-MM-DD");
       } else if (this.timeType == 4) {
         this.formInline.startDate = dayjs(value)
           .subtract(1, "day")
-          .format("YYYY-MM-DD HH:mm:ss");
+          .format("YYYY-MM-DD");
         this.formInline.endDate = dayjs(value)
           .add(6, "day")
-          .format("YYYY-MM-DD HH:mm:ss");
+          .format("YYYY-MM-DD");
       } else if (this.timeType == 5) {
         this.formInline.endDate = dayjs(value)
           .add(1, "day")
-          .format("YYYY-MM-DD HH:mm:ss");
+          .format("YYYY-MM-DD");
       }
     }
   },
@@ -188,12 +193,6 @@ export default {
       const ret = await getCircleStatistics(this.formInline);
       if (ret && ret.data) {
         this.dataList = ret.data;
-        if (
-          !this.formInline.endDate ||
-          this.formInline.endDate === dayjs().format("YYYY-MM-DD")
-        ) {
-          this.currentData = ret.data[ret.data.length - 1];
-        }
         const xAxisData = [];
         const seriesData = {
           totalMembers: {
diff --git a/src/views/circle/data/index.vue b/src/views/circle/data/index.vue
index 013523a..2070998 100644
--- a/src/views/circle/data/index.vue
+++ b/src/views/circle/data/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
-    <memberModule />
-    <contentModule />
+    <memberModule :currentData="currentData" />
+    <contentModule :currentData="currentData" />
     <studentList />
   </div>
 </template>
@@ -9,7 +9,24 @@
 import memberModule from "./components/memberModule.vue";
 import contentModule from "./components/contentModule.vue";
 import studentList from "./components/studentList";
+import { getCurrentDayCircleData } from "@/api/circle";
 export default {
-  components: { memberModule, contentModule, studentList }
+  components: { memberModule, contentModule, studentList },
+  data() {
+    return {
+      currentData: {}
+    };
+  },
+  created() {
+    this.getData();
+  },
+  methods: {
+    async getData() {
+      const ret = await getCurrentDayCircleData({ id: this.$route.query.id });
+      if (ret && ret.data) {
+        this.currentData = ret.data;
+      }
+    }
+  }
 };
 </script>