瀏覽代碼

1106 9:48

mo 5 年之前
父節點
當前提交
339d077b53
共有 5 個文件被更改,包括 23 次插入10 次删除
  1. 0 0
      dist/index.html
  2. 0 0
      dist/static/js/chunk-a9ded3bc.ac01c820.js
  3. 3 3
      src/permission.js
  4. 18 5
      src/views/teamDetail/components/resetClass.vue
  5. 2 2
      vue.config.js

文件差異過大導致無法顯示
+ 0 - 0
dist/index.html


文件差異過大導致無法顯示
+ 0 - 0
dist/static/js/chunk-a9ded3bc.ac01c820.js


+ 3 - 3
src/permission.js

@@ -22,7 +22,7 @@ router.beforeEach(async (to, from, next) => {
   if (hasToken) {
   if (hasToken) {
     if (to.path === '/login') {
     if (to.path === '/login') {
       // 如果有tonken直接跳转到首页
       // 如果有tonken直接跳转到首页
-      next({ path: '/' })
+      next({ path: '/main/main' })
       NProgress.done()
       NProgress.done()
     } else {
     } else {
       const hasGetUserInfo = store.getters.name
       const hasGetUserInfo = store.getters.name
@@ -44,7 +44,7 @@ router.beforeEach(async (to, from, next) => {
           // remove token and go to login page to re-login
           // remove token and go to login page to re-login
           await store.dispatch('user/resetToken')
           await store.dispatch('user/resetToken')
           Message.error(error || 'Has Error')
           Message.error(error || 'Has Error')
-          next(`/login?redirect=${to.path}`)
+          next(`/login?redirect=/main/main`)
           NProgress.done()
           NProgress.done()
         }
         }
       }
       }
@@ -57,7 +57,7 @@ router.beforeEach(async (to, from, next) => {
       next()
       next()
     } else {
     } else {
       // other pages that do not have permission to access are redirected to the login page.
       // other pages that do not have permission to access are redirected to the login page.
-      next(`/login?redirect=${to.path}`)
+      next(`/login?redirect=/main/main`)
       NProgress.done()
       NProgress.done()
     }
     }
   }
   }

+ 18 - 5
src/views/teamDetail/components/resetClass.vue

@@ -579,15 +579,22 @@ export default {
       // removeStudents({ classGroupId:}).then(res => {
       // removeStudents({ classGroupId:}).then(res => {
       removeStudents({ classGroupId: this.activeClass, userId: item.userId }).then(res => {
       removeStudents({ classGroupId: this.activeClass, userId: item.userId }).then(res => {
         if (res.code == 200) {
         if (res.code == 200) {
-
-
-          getClassAllStudent({ classGroupId: row.id }).then(res => {
+          item.isVisible = false;
+          // 这里刷新 this.studentList this.activeListStudent 
+          this.getList(this.activeMixClass);
+          getClassAllStudent({ classGroupId: this.activeClass }).then(res => {
             if (res.code == 200) {
             if (res.code == 200) {
-              this.activeListStudent = res.data.map(item => {
+              this.activeListStudent = res.data;
+            }
+          })
+          getNoClassStudentAll({ musicGroupId: this.teamid }).then(res => {
+            if (res.code == 200) {
+              this.$message.success('删除成功');
+              this.studentList = res.data.map(item => {
                 item.isVisible = false;
                 item.isVisible = false;
                 return item;
                 return item;
               });
               });
-              this.$message.success('删除成功')
+
             }
             }
           })
           })
         }
         }
@@ -691,6 +698,7 @@ export default {
           let musicGroupId = this.teamid;
           let musicGroupId = this.teamid;
           let startDate = this.teacherForm.courseTime;
           let startDate = this.teacherForm.courseTime;
           let courseType = this.teacherForm.courseType;
           let courseType = this.teacherForm.courseType;
+          let courseTimes = this.teacherForm.courseNum
           let students = this.activeListStudent.map(item => {
           let students = this.activeListStudent.map(item => {
             return item.userId;
             return item.userId;
           })
           })
@@ -719,6 +727,7 @@ export default {
             courseType,
             courseType,
             students,
             students,
             holiday,
             holiday,
+            courseTimes,
             courseTimeDtoList: courseList
             courseTimeDtoList: courseList
           }
           }
           if (type == 1) {
           if (type == 1) {
@@ -727,6 +736,8 @@ export default {
                 // 提示修改成功
                 // 提示修改成功
                 this.$message.success('修改成功')
                 this.$message.success('修改成功')
                 this.infoVisible = false;
                 this.infoVisible = false;
+                this.studentVisible = false;
+                this.getList(this.activeMixClass);
               }
               }
             })
             })
           } else if (type == 2) {
           } else if (type == 2) {
@@ -735,6 +746,8 @@ export default {
                 // 修改成功
                 // 修改成功
                 this.$message.success('修改成功');
                 this.$message.success('修改成功');
                 this.infoVisible = false;
                 this.infoVisible = false;
+                this.studentVisible = false;
+                this.getList(this.activeMixClass);
               }
               }
             })
             })
           }
           }

+ 2 - 2
vue.config.js

@@ -19,8 +19,8 @@ const name = defaultSettings.title || 'vue Admin Template' // page title
 // let target = 'http://192.168.3.27:8000' // 箭河
 // let target = 'http://192.168.3.27:8000' // 箭河
 // let target = 'http://192.168.3.28:8000' //邹璇` `
 // let target = 'http://192.168.3.28:8000' //邹璇` `
 // let target = 'http://192.168.3.8:8000' //勇哥
 // let target = 'http://192.168.3.8:8000' //勇哥
-let target = 'http://47.99.212.176:8000' // 测试服
-// let target = 'http://192.168.3.48:8000' // 乔
+// let target = 'http://47.99.212.176:8000' // 测试服
+let target = 'http://192.168.3.48:8000' // 乔
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {
 module.exports = {
   /**
   /**

部分文件因文件數量過多而無法顯示