src/api/circle.js

@@ -153,13 +153,3 @@ export function getCircleStatistics(data) {
     data
   });
 }
-
-// 后台查询交易圈当日统计
-export function getCurrentDayCircleData(data) {
-  debugger;
-  return request({
-    url: "/admin/group/collect/queryToday",
-    method: "post",
-    data
-  });
-}

src/settings.js

@@ -38,7 +38,7 @@ module.exports = {
   /**
    * 底部文字，支持html语法
    */
-  footerTxt: "后管系统",
+  footerTxt: "底部文字，支持html语法",
   /**
    * 备案号
    */

src/views/circle/data/components/contentModule.vue

@@ -100,12 +100,6 @@ import { getCircleStatistics } from "@/api/circle";
 import dayjs from "dayjs";
 export default {
   components: { LineChart },
-  props: {
-    currentData: {
-      type: Object,
-      default: () => {}
-    }
-  },
   data() {
     return {
       formInline: {
@@ -115,6 +109,7 @@ export default {
       },
       timeType: 1,
       time: "",
+      currentData: {},
       dataList: [],
       echartOption: {
         tooltip: {
@@ -198,6 +193,12 @@ 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: {

src/views/circle/data/components/memberModule.vue

@@ -96,12 +96,6 @@ import { getCircleStatistics } from "@/api/circle";
 import dayjs from "dayjs";
 export default {
   components: { LineChart },
-  props: {
-    currentData: {
-      type: Object,
-      default: () => {}
-    }
-  },
   data() {
     return {
       formInline: {
@@ -111,6 +105,7 @@ export default {
       },
       timeType: 1,
       time: "",
+      currentData: {},
       dataList: [],
       echartOption: {
         tooltip: {
@@ -160,28 +155,28 @@ export default {
       }
       if (this.formInline.startDate !== null) {
         this.formInline.startDate = dayjs(this.formInline.startDate).format(
-          "YYYY-MM-DD"
+          "YYYY-MM-DD HH:mm:ss"
         );
       }
       if (this.timeType == 2) {
         this.formInline.endDate = dayjs(value)
           .add(1, "year")
-          .format("YYYY-MM-DD");
+          .format("YYYY-MM-DD HH:mm:ss");
       } else if (this.timeType == 3) {
         this.formInline.endDate = dayjs(value)
           .add(1, "month")
-          .format("YYYY-MM-DD");
+          .format("YYYY-MM-DD HH:mm:ss");
       } else if (this.timeType == 4) {
         this.formInline.startDate = dayjs(value)
           .subtract(1, "day")
-          .format("YYYY-MM-DD");
+          .format("YYYY-MM-DD HH:mm:ss");
         this.formInline.endDate = dayjs(value)
           .add(6, "day")
-          .format("YYYY-MM-DD");
+          .format("YYYY-MM-DD HH:mm:ss");
       } else if (this.timeType == 5) {
         this.formInline.endDate = dayjs(value)
           .add(1, "day")
-          .format("YYYY-MM-DD");
+          .format("YYYY-MM-DD HH:mm:ss");
       }
     }
   },
@@ -193,6 +188,12 @@ 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: {

src/views/circle/data/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
-    <memberModule :currentData="currentData" />
+    <memberModule />
-    <contentModule :currentData="currentData" />
+    <contentModule />
     <studentList />
   </div>
 </template>
@@ -9,24 +9,7 @@
 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>