Merge remote-tracking branch 'origin/master'

src/pages/achievement/list/index.vue

@@ -290,6 +290,9 @@ export default {
                         this.getData();
                     }).catch(res => {
                     });
+                    if(this.multipleSelection.length === this.listData.length && this.pageNum>1) {
+                        this.handleCurrentChange(this.pageNum - 1)
+                    }
                 }).catch(() => {
                 });
             } else {

src/pages/assessment/list/index.vue

@@ -392,6 +392,7 @@ export default {
                 this.$confirm("确定要删除吗？", "提示", {
                     type: "warning"
                 }).then(() => {
+                    
                     this.$post(this.api.deleteAssessment, ids).then(res => {
                         this.multipleSelection = [];
                         this.$refs.table.clearSelection();
@@ -400,6 +401,10 @@ export default {
                         this.getData();
                     }).catch(res => {
                     });
+                    if(this.multipleSelection.length === this.listData.length && this.pageNum>1) {
+                        console.log(this.pageNum - 1)
+                        this.handleCurrentChange(this.pageNum - 1)
+                    }
                 }).catch(() => {
                 });
             } else {

src/pages/course/list/courseManagement/index.vue

@@ -184,6 +184,9 @@ export default {
                             this.initData();
                         }).catch(res => {
                         });
+                        if(this.multipleSelection.length === this.courseData.length && this.current>1) {
+                            this.handleCurrentChange(this.current - 1)
+                        }
                     }).catch(() => {
                 });
             } else {

src/pages/evaluation/list/index.vue

@@ -429,6 +429,9 @@ export default {
                     }).catch(err => {
                         console.log(err);
                     });
+                    if(this.multipleSelection.length === this.listData.length && this.page>1) {
+                        this.handleCurrentChange(this.page - 1)
+                    }
                 }).catch(() => {
                 });
             } else {

src/pages/information/contentManage/contentList.vue

@@ -154,6 +154,9 @@ export default {
                             this.getData();
                         }).catch(res => {
                         });
+                        if(this.multipleSelection.length === this.listData.length && this.pageNo>1) {
+                            this.handleCurrentChange(this.pageNo - 1)
+                        }
                     })
                     .catch(() => {
                     });

src/pages/student/list/index.vue

@@ -659,6 +659,9 @@ export default {
                         }
                     }).catch(res => {
                     });
+                    if(this.multipleSelection.length === this.listData.length && this.page>1) {
+                        this.handleCurrentChange(this.page - 1)
+                    }
                 }).catch(() => {
                 });
             } else {

src/pages/system/list/role.vue

@@ -146,6 +146,9 @@ export default {
                         util.successMsg("删除成功");
                         this.getData();
                     }).catch(res => {});
+                    if(this.multipleSelection.length === this.listData.length && this.page>1) {
+                        this.handleCurrentChange(this.page - 1)
+                    }
                 }).catch(() => {});
             } else {
                 util.errorMsg("请先选择数据！");