04/12 11:06

课外训练(教学)BUG修复

dist/static/css/chunk-8f671e76.a5a60169.css → dist/static/css/chunk-711286d1.5976d865.css

@@ -1 +1 @@
-.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}.schoolCell[data-v-3be728ac]{width:400px;color:#333;background-color:#f5f7fa;border-color:#e4e7ed;height:40px;line-height:40px;outline:0;padding:0 15px;border-radius:4px;border:1px solid #dcdfe6;display:inline-block;-webkit-box-sizing:border-box;box-sizing:border-box;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}[data-v-3be728ac] .el-textarea.is-disabled .el-textarea__inner{color:#333}.schoolCell[data-v-b8cd1e84]{width:400px;color:#333;background-color:#f5f7fa;border-color:#e4e7ed;height:40px;line-height:40px;outline:0;padding:0 15px;border-radius:4px;border:1px solid #dcdfe6;display:inline-block;-webkit-box-sizing:border-box;box-sizing:border-box;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}[data-v-b8cd1e84] .el-textarea.is-disabled .el-textarea__inner{color:#333}
+.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}.schoolCell[data-v-3be728ac]{width:400px;color:#333;background-color:#f5f7fa;border-color:#e4e7ed;height:40px;line-height:40px;outline:0;padding:0 15px;border-radius:4px;border:1px solid #dcdfe6;display:inline-block;-webkit-box-sizing:border-box;box-sizing:border-box;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}[data-v-3be728ac] .el-textarea.is-disabled .el-textarea__inner{color:#333}.schoolCell[data-v-4ee4df51]{width:400px;color:#333;background-color:#f5f7fa;border-color:#e4e7ed;height:40px;line-height:40px;outline:0;padding:0 15px;border-radius:4px;border:1px solid #dcdfe6;display:inline-block;-webkit-box-sizing:border-box;box-sizing:border-box;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}[data-v-4ee4df51] .el-textarea.is-disabled .el-textarea__inner{color:#333}

dist/static/css/chunk-f974e3de.8e2fe878.css → dist/static/css/chunk-cca32892.002f29da.css

@@ -1 +1 @@
-.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}.schoolCell[data-v-b8cd1e84]{width:400px;color:#333;background-color:#f5f7fa;border-color:#e4e7ed;height:40px;line-height:40px;outline:0;padding:0 15px;border-radius:4px;border:1px solid #dcdfe6;display:inline-block;-webkit-box-sizing:border-box;box-sizing:border-box;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}[data-v-b8cd1e84] .el-textarea.is-disabled .el-textarea__inner{color:#333}
+.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}.schoolCell[data-v-4ee4df51]{width:400px;color:#333;background-color:#f5f7fa;border-color:#e4e7ed;height:40px;line-height:40px;outline:0;padding:0 15px;border-radius:4px;border:1px solid #dcdfe6;display:inline-block;-webkit-box-sizing:border-box;box-sizing:border-box;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}[data-v-4ee4df51] .el-textarea.is-disabled .el-textarea__inner{color:#333}

src/views/afterSchoolManager/afterSchoolTeach.vue

@@ -162,6 +162,7 @@ export default {
       searchForm: {
         timer: [],
         search: null,
+        organIdList:null,
         actualExercisesNumIsAchieve: null, // 训练次数
         exercisesMessageNumIsAchieve: null, //评价
         exercisesMessageTimelyNumIsAchieve: null, //及时评价
@@ -185,8 +186,10 @@ export default {
   //生命周期 - 挂载完成（可以访问DOM元素）
   mounted() {
     this.searchForm.timer = [];
-    this.searchForm.timer.push(this.getNowDateAndMonday(nowTime));
+        this.searchForm.timer.push(this.getNowDateAndMonday(nowTime));
     this.searchForm.timer.push(this.getNowDateAndSunday(nowTime));
+  
+
     getEmployeeOrgan().then(res => {
       if (res.code == 200) {
         this.organList = res.data;
@@ -212,7 +215,9 @@ export default {
         exercisesMessageTimelyNumIsAchieve:
           this.searchForm.exercisesMessageTimelyNumIsAchieve || null, //及时评价
         exercisesReplyNumIsAchieve:
-          this.searchForm.exercisesReplyNumIsAchieve || null // 提交次数
+          this.searchForm.exercisesReplyNumIsAchieve || null, // 提交次数
+          organIdList:this.searchForm.organIdList || null,
+          page: this.rules.page
       };
       if (this.searchForm.timer && this.searchForm.timer.length > 0) {
         obj.monday = this.searchForm.timer[0];
@@ -300,6 +305,9 @@ export default {
     getNowDateAndMonday(time) {
       let timestamp = new Date(time.replace(/-/g, "/")).getTime();
       let serverDate = new Date(time);
+      if(serverDate.getDay() == 0){
+       timestamp -=7* 24 * 60 * 60 * 1000
+      }
       let mondayTime =
         timestamp - (serverDate.getDay() - 1) * 24 * 60 * 60 * 1000;
 
@@ -365,7 +373,10 @@ export default {
           rules,
           searchForm,
           title: row.studentName,
-          extracurricularExercisesId: "yes"
+          extracurricularExercisesId: "yes",
+          startTime:this.searchForm.timer[0],
+          endTime:this.searchForm.timer[1]
+
         }
       });
     }

src/views/afterSchoolManager/afterWorkList.vue

@@ -286,6 +286,9 @@ export default {
         this.show = false
       }
       this.searchForm.search = this.$route.query.studentId
+      if(this.$route.query.startTime&&this.$route.query.endTime){
+        this.searchForm.timer = [this.$route.query.startTime,this.$route.query.endTime]
+      }
       // console.log(this.$route.query)
       this.getList();
     },