bug

src/views/journalQun/CASCI.vue

@@ -36,18 +36,20 @@
             </el-date-picker>
           </el-form-item>
           <el-form-item v-if="form.date == 'week'">
-            <el-date-picker
-              v-model="form.week_value"
-              type="week"
-              format="yyyy 第 WW 周"
-              placeholder="选择周"
-            >
-            </el-date-picker>
+            <el-select style="width:220px" v-model="form.week_value" placeholder="选择周">
+                <el-option
+                  v-for="item in weeks"
+                  :key="item"
+                  :label="item"
+                  :value="item">
+                </el-option>
+              </el-select>
           </el-form-item>
           <el-form-item v-if="form.date == 'month'">
-            <el-date-picker
+            <el-date-picker style="width:220px"
               v-model="form.month_value"
               type="month"
+              value-format="yyyy-MM"
               placeholder="选择月"
             >
             </el-date-picker>
@@ -258,9 +260,9 @@ export default {
         page: 1,
         page_size: 20,
         date: "day",
-        day_value: new Date(new Date() - 1000 * 60 * 60 * 24),
-        week_value: new Date(new Date() - 1000 * 60 * 60 * 24),
-        month_value: new Date(new Date() - 1000 * 60 * 60 * 24),
+        day_value: '',
+        week_value: '',
+        month_value: '',
       },
       total: 1,
       list: [{ name: "2333" }],
@@ -278,6 +280,7 @@ export default {
       },
       order_by: "casci",
       order: "descending",
+      weeks:[]
     };
   },
   methods: {
@@ -393,6 +396,7 @@ export default {
       var parm = { ...this.form };
       parm.order_by = this.order_by;
       parm.order = this.order;
+      parm.week_value=parm.week_value.replace('至',',')
       this.loading = true;
       this.$api.getCASCIList(parm).then((res) => {
         this.list = res.data.data.list;
@@ -413,10 +417,48 @@ export default {
         });
       });
     },
+    getTimer() {
+      let time = new Date() // 获取当前时间
+      let nowTime = time.getTime()
+      let day = time.getDay()
+      let oneDayTime = 24 * 60 * 60 * 1000; // 一周的时间
+      let MondayTime = nowTime - (day - 1) * oneDayTime; //显示当前周一
+      let SundayTime = nowTime + (7 - day) * oneDayTime; //显示当前周日
+      let setlist = [] // 初始化一个空数组 准备装食物--你好骚啊
+      for (let i = 0; i < 365*3; i++) {
+        // 这块我不知道怎么回事一直会有重复的push进去，后面做了去重，可以放心食用，当然也可以优化一下
+        setlist.push(this.setTime(MondayTime) + ' 至 ' + this.setTime(SundayTime)) // this.setTime()在下面 放心食用
+        // 重点 push完，赶紧让它获取上一周的时间 oneDayTime上面有写
+        time = new Date(time - oneDayTime)
+        nowTime = time.getTime()
+        day = time.getDay()
+        MondayTime = nowTime - (day - 1) * oneDayTime; //显示当前周一
+        SundayTime = nowTime + (7 - day) * oneDayTime; //显示当前周日
+      }
+      let list = [...new Set(setlist)] // 简单去重一下
+      list.shift()
+      this.weeks=list
+      this.form.week_value=list[0]
+    },
+    setTime(time) {
+      // 将time时间戳 先格式化一下
+      let date = new Date(time)
+      let yy = date.getFullYear()
+      let m = date.getMonth() + 1
+      let day = date.getDate()
+      let str = yy + '-' + (m < 10 ? '0' + m : m) + '-' + (day < 10 ? '0' + day : day)
+      return str
+    }
   },
   created() {
+    var y = new Date().getFullYear() ,m=(new Date().getMonth() + 1) ,d=new Date().getDate();
+    m = m > 9 ? m : '0' + m;
+    d = d > 9 ? d : '0' + d;
+    this.form.day_value=y+'-'+m+'-'+d;
+    this.form.month_value=y+'-'+m;
     this.getData();
-    console.log(this.$date.getCurrWeek(new Date()));
+    this.getTimer()
+    // console.log(this.$date.getCurrWeek(new Date()));
   },
   beforeRouteEnter(to, from, next) {
     next((vm) => {