修复本月 本年

1

src/views/main/baseinfo/hr.vue

@@ -162,7 +162,6 @@ export default {
         console.log(error);
       }
       this.loading = false;
-      console.log(data);
       // this.dataInfo = data;
       this.$emit("resetDate", data);
     },

src/views/main/baseinfo/management.vue

@@ -233,7 +233,7 @@ export default {
   },
   methods: {
     init() {
-      this.$refs.searchHeader.initStatue("month");
+      // this.$refs.searchHeader.initStatue("month");
       this.mdate = this.getInitDate();
       this.endDate = this.$helpers.dayjs(new Date()).format("YYYY-MM-DD");
       // this.$refs.searchHeader.initStatue()

src/views/main/baseinfo/modals/manageOrganAll.vue

@@ -224,7 +224,6 @@ export default {
           obj[str] = this.data[str];
         }
       });
-      console.log('items2',obj)
       return obj;
     },
     chartExtend() {

src/views/main/baseinfo/modals/searchDayHeader.vue

@@ -76,16 +76,38 @@ export default {
       let endDate;
       if (val == "month") {
         // 获取本月的第一天 获取本月的今天
-        startDate = this.$helpers
-          .dayjs(new Date())
-          .set("date", 1)
-          .format("YYYY-MM-DD");
-        this.endDate
-          ? (endDate = this.endDate)
-          : (endDate = this.$helpers
-              .dayjs(new Date())
-              .subtract(1, "day")
-              .format("YYYY-MM-DD"));
+        let nowDate = this.$helpers.dayjs(new Date()).get("date");
+
+        if (nowDate == 1) {
+          startDate = this.$helpers
+            .dayjs()
+            .add(-1, "month")
+            .startOf("month")
+            .format("YYYY-MM-DD");
+          endDate = this.$helpers
+            .dayjs(new Date())
+            .subtract(1, "day")
+            .format("YYYY-MM-DD");
+        } else {
+          startDate = this.$helpers
+            .dayjs(new Date())
+            .set("date", 1)
+            .format("YYYY-MM-DD");
+          endDate = this.$helpers
+            .dayjs(new Date())
+            .subtract(1, "day")
+            .format("YYYY-MM-DD");
+        }
+        // startDate = this.$helpers
+        //   .dayjs(new Date())
+        //   .set("date", 1)
+        //   .format("YYYY-MM-DD");
+        // this.endDate
+        //   ? (endDate = this.endDate)
+        //   : (endDate = this.$helpers
+        //       .dayjs(new Date())
+        //       .subtract(1, "day")
+        //       .format("YYYY-MM-DD"));
         this.date = [startDate, endDate];
         this.submitDate(this.date);
       } else if (val == "day") {
@@ -100,19 +122,35 @@ export default {
 
               .format("YYYY-MM-DD"));
         this.date = [startDate, endDate];
-         this.submitDate(this.date);
+        this.submitDate(this.date);
       } else if (val == "year") {
-        startDate = this.$helpers
-          .dayjs(new Date())
-          .set("month", 0)
-          .set("date", 1)
-          .format("YYYY-MM-DD");
-        this.endDate
-          ? (endDate = this.endDate)
-          : (endDate = this.$helpers
-              .dayjs(new Date())
-              .subtract(1, "day")
-              .format("YYYY-MM-DD"));
+        let nowDate = this.$helpers.dayjs(new Date()).get("date");
+        let nowMonth = this.$helpers.dayjs(new Date()).get("month") + 1;
+        if (nowDate == 1 && nowMonth == 1) {
+          startDate = this.$helpers
+            .dayjs(new Date())
+            .add(-1, "year")
+            .set("month", 0)
+            .set("date", 1)
+            .format("YYYY-MM-DD");
+          endDate = this.$helpers
+            .dayjs(new Date())
+            .subtract(1, "day")
+            .format("YYYY-MM-DD");
+        } else {
+          startDate = this.$helpers
+            .dayjs(new Date())
+            .set("month", 0)
+            .set("date", 1)
+            .format("YYYY-MM-DD");
+          this.endDate
+            ? (endDate = this.endDate)
+            : (endDate = this.$helpers
+                .dayjs(new Date())
+                .subtract(1, "day")
+                .format("YYYY-MM-DD"));
+        }
+
         this.date = [startDate, endDate];
         this.submitDate(this.date);
       } else if (val == "lastYear") {

src/views/main/baseinfo/modals/searchHeader.vue

@@ -5,12 +5,7 @@
       <span>{{ title }}</span>
     </div>
     <div class="right">
-      <el-radio-group
-        v-model="timer"
-        
-        @change="changeQuick"
-        v-if="isShowQuert"
-      >
+      <el-radio-group v-model="timer" @change="changeQuick" v-if="isShowQuert">
         <el-radio-button label="month">本月</el-radio-button>
         <el-radio-button label="year">本年度</el-radio-button>
         <el-radio-button label="lastYear">去年</el-radio-button>
@@ -25,7 +20,6 @@
         end-placeholder="结束日期"
         value-format="yyyy-MM-dd"
         format="yyyy-MM-dd"
-        
         @change="changeValue"
         :picker-options="bigin()"
       >
@@ -40,7 +34,6 @@
         end-placeholder="结束日期"
         value-format="yyyy-MM-dd"
         format="yyyy-MM-dd"
-        
         @change="changeWeek"
         :picker-options="bigin()"
       >
@@ -59,14 +52,12 @@ export default {
       date: this.dates,
     };
   },
-  mounted() {
-  },
+  mounted() {},
 
   watch: {
     dates(val) {
       this.date = val;
     },
-
   },
 
   methods: {
@@ -84,30 +75,57 @@ export default {
       let endDate;
       if (val == "month") {
         // 获取本月的第一天 获取本月的今天
-        startDate = this.$helpers
-          .dayjs(new Date())
-          .set("date", 1)
-          .format("YYYY-MM-DD");
-        this.endDate
-          ? (endDate = this.endDate)
-          : (endDate = this.$helpers
-              .dayjs(new Date())
-              .subtract(1, "day")
-              .format("YYYY-MM-DD"));
+        let nowDate = this.$helpers.dayjs(new Date()).get("date");
+
+        if (nowDate == 1) {
+          startDate = this.$helpers
+            .dayjs()
+            .add(-1, "month")
+            .startOf("month")
+            .format("YYYY-MM-DD");
+          endDate = this.$helpers
+            .dayjs(new Date())
+            .subtract(1, "day")
+            .format("YYYY-MM-DD");
+        } else {
+          startDate = this.$helpers
+            .dayjs(new Date())
+            .set("date", 1)
+            .format("YYYY-MM-DD");
+          endDate = this.$helpers
+            .dayjs(new Date())
+            .subtract(1, "day")
+            .format("YYYY-MM-DD");
+        }
         this.date = [startDate, endDate];
         this.submitDate(this.date);
       } else if (val == "year") {
-        startDate = this.$helpers
-          .dayjs(new Date())
-          .set("month", 0)
-          .set("date", 1)
-          .format("YYYY-MM-DD");
-        this.endDate
-          ? (endDate = this.endDate)
-          : (endDate = this.$helpers
-              .dayjs(new Date())
-              .subtract(1, "day")
-              .format("YYYY-MM-DD"));
+        let nowDate = this.$helpers.dayjs(new Date()).get("date");
+        let nowMonth = this.$helpers.dayjs(new Date()).get("month") + 1;
+        if (nowDate == 1 && nowMonth == 1) {
+          startDate = this.$helpers
+            .dayjs(new Date())
+            .add(-1, "year")
+            .set("month", 0)
+            .set("date", 1)
+            .format("YYYY-MM-DD");
+          endDate = this.$helpers
+            .dayjs(new Date())
+            .subtract(1, "day")
+            .format("YYYY-MM-DD");
+        } else {
+          startDate = this.$helpers
+            .dayjs(new Date())
+            .set("month", 0)
+            .set("date", 1)
+            .format("YYYY-MM-DD");
+          this.endDate
+            ? (endDate = this.endDate)
+            : (endDate = this.$helpers
+                .dayjs(new Date())
+                .subtract(1, "day")
+                .format("YYYY-MM-DD"));
+        }
         this.date = [startDate, endDate];
         this.submitDate(this.date);
       } else if (val == "lastYear") {
@@ -144,12 +162,11 @@ export default {
       };
     },
     initStatue(val) {
-      if(val){
+      if (val) {
         this.timer = val;
-      }else{
-         this.timer = "";
+      } else {
+        this.timer = "";
       }
-
     },
   },
 };

src/views/main/baseinfo/operate.vue

@@ -178,7 +178,7 @@ export default {
         console.log(error);
       }
       this.loading = false;
-      console.log(data);
+
       // this.dataInfo = data;
       this.$emit("resetDate", data);
     },

src/views/main/baseinfo/studentBaseinfo.vue

@@ -165,7 +165,6 @@ export default {
         console.log(error);
       }
       this.loading = false;
-      console.log(data);
       // this.dataInfo = data;
       this.$emit("resetDate", data);
     },

src/views/main/cloudDate/activeUserNum.vue

@@ -1,9 +1,13 @@
 <template>
   <div>
     <el-card>
-      <headers title="活跃用户统计" @changeOrgan="changeOrgan"  :special="true"/>
+      <headers
+        title="活跃用户统计"
+        @changeOrgan="changeOrgan"
+        :special="true"
+      />
       <div class="chioseBox">
-        <el-radio-group v-model="timers"  @change="changeQuick">
+        <el-radio-group v-model="timers" @change="changeQuick">
           <el-radio-button label="month">本月</el-radio-button>
           <el-radio-button label="year">本年度</el-radio-button>
           <el-radio-button label="lastYear">去年</el-radio-button>
@@ -18,14 +22,13 @@
           end-placeholder="结束日期"
           value-format="yyyy-MM-dd"
           format="yyyy-MM-dd"
-          
           @change="changeValue"
           :picker-options="bigin()"
         >
         </el-date-picker>
         <p>单位:</p>
 
-        <el-radio-group v-model="timer" >
+        <el-radio-group v-model="timer">
           <el-radio-button label="day">按天</el-radio-button>
           <el-radio-button label="month">按月</el-radio-button>
         </el-radio-group>
@@ -180,7 +183,10 @@ export default {
             };
             months[key][item.title] = row.percent;
           } else {
-            if (months[key][item.title]&&item.dataType=='CLOUD_STUDY_NEW_STUDENT_NUM') {
+            if (
+              months[key][item.title] &&
+              item.dataType == "CLOUD_STUDY_NEW_STUDENT_NUM"
+            ) {
               months[key][item.title] += parseFloat(row.percent);
             } else {
               months[key][item.title] = row.percent;
@@ -298,32 +304,49 @@ export default {
       let endDate;
       if (val == "month") {
         // 获取本月的第一天 获取本月的今天
-        startDate = this.$helpers
-          .dayjs(new Date())
-          .set("date", 1)
-          .format("YYYY-MM-DD");
-        this.endDate
-          ? (endDate = this.endDate)
-          : (endDate = this.$helpers
-              .dayjs(new Date())
-              .subtract(1, "day")
-              .format("YYYY-MM-DD"));
+        let nowDate =  this.$helpers.dayjs(new Date()).get("date");
+
+        if (nowDate == 1) {
+          startDate =  this.$helpers.dayjs()
+            .add(-1, "month")
+            .startOf("month")
+            .format("YYYY-MM-DD");
+          endDate =  this.$helpers.dayjs(new Date()).subtract(1, "day").format("YYYY-MM-DD");
+        } else {
+          startDate =  this.$helpers.dayjs(new Date()).set("date", 1).format("YYYY-MM-DD");
+          endDate =  this.$helpers.dayjs(new Date()).subtract(1, "day").format("YYYY-MM-DD");
+        }
         this.mdate = [startDate, endDate];
         this.isDayOrMoth(this.mdate);
         this.FetchDetail();
         // this.submitDate(this.date);
       } else if (val == "year") {
-        startDate = this.$helpers
-          .dayjs(new Date())
-          .set("month", 0)
-          .set("date", 1)
-          .format("YYYY-MM-DD");
-        this.endDate
-          ? (endDate = this.endDate)
-          : (endDate = this.$helpers
-              .dayjs(new Date())
-              .subtract(1, "day")
-              .format("YYYY-MM-DD"));
+        let nowDate = this.$helpers.dayjs(new Date()).get("date");
+        let nowMonth = this.$helpers.dayjs(new Date()).get("month") + 1;
+        if (nowDate == 1 && nowMonth == 1) {
+          startDate = this.$helpers
+            .dayjs(new Date())
+            .add(-1, "year")
+            .set("month", 0)
+            .set("date", 1)
+            .format("YYYY-MM-DD");
+          endDate = this.$helpers
+            .dayjs(new Date())
+            .subtract(1, "day")
+            .format("YYYY-MM-DD");
+        } else {
+          startDate = this.$helpers
+            .dayjs(new Date())
+            .set("month", 0)
+            .set("date", 1)
+            .format("YYYY-MM-DD");
+          this.endDate
+            ? (endDate = this.endDate)
+            : (endDate = this.$helpers
+                .dayjs(new Date())
+                .subtract(1, "day")
+                .format("YYYY-MM-DD"));
+        }
         this.mdate = [startDate, endDate];
         this.isDayOrMoth(this.mdate);
         this.FetchDetail();

src/views/smallStudentManager/components/searchHeader.vue

@@ -25,7 +25,6 @@
         end-placeholder="结束日期"
         value-format="yyyy-MM-dd"
         format="yyyy-MM-dd"
-
         @change="changeValue"
         :picker-options="bigin()"
       >
@@ -40,7 +39,6 @@
         end-placeholder="结束日期"
         value-format="yyyy-MM-dd"
         format="yyyy-MM-dd"
-
         @change="changeWeek"
         :picker-options="bigin()"
       >
@@ -59,14 +57,12 @@ export default {
       date: this.dates,
     };
   },
-  mounted() {
-  },
+  mounted() {},
 
   watch: {
     dates(val) {
       this.date = val;
     },
-
   },
 
   methods: {
@@ -84,30 +80,47 @@ export default {
       let endDate;
       if (val == "month") {
         // 获取本月的第一天 获取本月的今天
-        startDate = this.$helpers
-          .dayjs(new Date())
-          .set("date", 1)
-          .format("YYYY-MM-DD");
-        this.endDate
-          ? (endDate = this.endDate)
-          : (endDate = this.$helpers
-              .dayjs(new Date())
-              .subtract(1, "day")
-              .format("YYYY-MM-DD"));
+        let nowDate =  this.$helpers.dayjs(new Date()).get("date");
+
+        if (nowDate == 1) {
+          startDate = this.$helpers.dayjs()
+            .add(-1, "month")
+            .startOf("month")
+            .format("YYYY-MM-DD");
+          endDate = this.$helpers.dayjs(new Date()).subtract(1, "day").format("YYYY-MM-DD");
+        } else {
+          startDate = this.$helpers.dayjs(new Date()).set("date", 1).format("YYYY-MM-DD");
+          endDate = this.$helpers.dayjs(new Date()).subtract(1, "day").format("YYYY-MM-DD");
+        }
         this.date = [startDate, endDate];
         this.submitDate(this.date);
       } else if (val == "year") {
-        startDate = this.$helpers
-          .dayjs(new Date())
-          .set("month", 0)
-          .set("date", 1)
-          .format("YYYY-MM-DD");
-        this.endDate
-          ? (endDate = this.endDate)
-          : (endDate = this.$helpers
-              .dayjs(new Date())
-              .subtract(1, "day")
-              .format("YYYY-MM-DD"));
+        let nowDate = this.$helpers.dayjs(new Date()).get("date");
+        let nowMonth = this.$helpers.dayjs(new Date()).get("month") + 1;
+        if (nowDate == 1 && nowMonth == 1) {
+          startDate = this.$helpers
+            .dayjs(new Date())
+            .add(-1, "year")
+            .set("month", 0)
+            .set("date", 1)
+            .format("YYYY-MM-DD");
+          endDate = this.$helpers
+            .dayjs(new Date())
+            .subtract(1, "day")
+            .format("YYYY-MM-DD");
+        } else {
+          startDate = this.$helpers
+            .dayjs(new Date())
+            .set("month", 0)
+            .set("date", 1)
+            .format("YYYY-MM-DD");
+          this.endDate
+            ? (endDate = this.endDate)
+            : (endDate = this.$helpers
+                .dayjs(new Date())
+                .subtract(1, "day")
+                .format("YYYY-MM-DD"));
+        }
         this.date = [startDate, endDate];
         this.submitDate(this.date);
       } else if (val == "lastYear") {
@@ -144,12 +157,11 @@ export default {
       };
     },
     initStatue(val) {
-      if(val){
+      if (val) {
         this.timer = val;
-      }else{
-         this.timer = "";
+      } else {
+        this.timer = "";
       }
-
     },
   },
 };

src/views/smallStudentManager/components/studentChange.vue

@@ -46,22 +46,28 @@ export default {
   inject: ["organId", "isSearch"],
   components: {
     "count-to": countTo,
-    searchHeader
+    searchHeader,
   },
   data() {
-    let startTime = dayjs(new Date())
-      .set("date", 1)
-      .format("YYYY-MM-DD");
-    let endTime = dayjs(new Date())
-      .subtract(1, "day")
-      .format("YYYY-MM-DD");
+    //判断一下
+    console.log();
+    let startTime,endTime;
+    let nowDate =  dayjs(new Date()).get("date");
+    if (nowDate == 1) {
+      startTime = dayjs().add(-1, 'month').startOf('month').format('YYYY-MM-DD');
+      endTime =  dayjs(new Date()).subtract(1, "day").format("YYYY-MM-DD");
+    } else {
+       startTime =  dayjs(new Date()).set("date", 1).format("YYYY-MM-DD");
+       endTime =  dayjs(new Date()).subtract(1, "day").format("YYYY-MM-DD");
+    }
+
     return {
       active: "",
       loading: false,
       mdate: [startTime, endTime],
       endDate: "",
       data: {},
-      flag: null
+      flag: null,
     };
   },
   computed: {
@@ -73,25 +79,25 @@ export default {
         {
           text: "回访流失人数",
           value: 0,
-          id: "lostNum"
+          id: "lostNum",
         },
         {
           text: "新增人数",
           value: 0,
-          id: "addNum"
+          id: "addNum",
         },
         {
           text: "续费人数",
           value: 0,
-          id: "renewNum"
+          id: "renewNum",
         },
         {
           text: "回访人数",
           value: 0,
-          id: "visitNum"
-        }
+          id: "visitNum",
+        },
       ];
-      tempArr.forEach(item => {
+      tempArr.forEach((item) => {
         if (this.data[item.id]) {
           item.value = this.data[item.id];
         }
@@ -111,8 +117,8 @@ export default {
         this.flag = flag;
 
         return flag;
-      }
-    }
+      },
+    },
   },
   mounted() {
     this.init();
@@ -141,20 +147,20 @@ export default {
         console.log({
           groupType: this.groupType,
           ...getTimes(this.mdate, ["startDate", "endDate"]),
-          organId: this.organIds
+          organId: this.organIds,
         });
         const res = await studentSmallClassStatisticsSumForDate({
           groupType: this.groupType,
           ...getTimes(this.mdate, ["startDate", "endDate"]),
-          organId: this.organIds
+          organId: this.organIds,
         });
         this.data = res.data || {};
       } catch (error) {
         console.log(error);
       }
       this.loading = false;
-    }
-  }
+    },
+  },
 };
 </script>