lex-xin 5 年之前
父節點
當前提交
dc80d921c8

File diff suppressed because it is too large
+ 0 - 0
dist/index.html


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/chunk-2ec48d42.8671fb2d.css


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.e9341c5c.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-1c9ae0ee.c383b3b7.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-1c9ae0ee.dce03d4c.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-2ec48d42.331c4edb.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-487aacc2.2bfdc415.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-b1e176fc.01a1fd60.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-b1e176fc.e24264ac.js


+ 20 - 14
src/views/teamDetail/components/studentList.vue

@@ -214,31 +214,30 @@
           <el-select placeholder="起始年级"
                      clearable
                      v-model="maskForm.startClass">
-            <el-option value="1"
+            <el-option value="一年级"
                        label="一年级"></el-option>
-            <el-option value="2"
+            <el-option value="二年级"
                        label="二年级"></el-option>
-            <el-option value="3"
+            <el-option value="三年级"
                        label="三年级"></el-option>
-            <el-option value="4"
+            <el-option value="四年级"
                        label="四年级"></el-option>
-            <el-option value="5"
+            <el-option value="五年级"
                        label="五年级"></el-option>
-            <el-option value="6"
+            <el-option value="六年级"
                        label="六年级"></el-option>
-            <el-option value="7"
+            <el-option value="初一"
                        label="初一"></el-option>
-            <el-option value="8"
+            <el-option value="初二"
                        label="初二"></el-option>
-            <el-option value="9"
+            <el-option value="初三"
                        label="初三"></el-option>
-            <el-option value="10"
+            <el-option value="高一"
                        label="高一"></el-option>
-            <el-option value="11"
+            <el-option value="高二"
                        label="高二"></el-option>
-            <el-option value="12"
+            <el-option value="高三"
                        label="高三"></el-option>
-
           </el-select>
         </el-form-item>
         <el-form-item label="班级"
@@ -497,7 +496,14 @@ export default {
       })
     },
     gotoSignin () {
-      this.$router.push({ path: '/business/studentSignin', query: { id: this.teamid } })
+      this.$router.push({ 
+        path: '/business/studentSignin', 
+        query: { 
+          id: this.teamid,
+          status: this.$route.query.status,
+          name: this.$route.query.name
+        } 
+      })
     },
     chioseType (row) {
       row.userId;

+ 11 - 1
src/views/teamDetail/components/studentSignin.vue

@@ -70,7 +70,17 @@ export default {
   },
   methods: {
     onCancel() {
-      history.go(-1)
+      // history.go(-1)
+      let params = this.$route.query
+      this.$router.push({
+        path: '/business/teamDetails',
+        query: {
+          id: params.id,
+          status: params.status,
+          name: params.name,
+          checkIndex: "3"
+        }
+      })
     },
     getList () {
       // console.log(111);

+ 8 - 1
src/views/teamDetail/components/teacherList.vue

@@ -165,7 +165,14 @@ export default {
       })
     },
     gotoRecord () {
-      this.$router.push({ path: `/business/teamTeacherRecord`, query: { id: this.teamid } })
+      this.$router.push({ 
+        path: `/business/teamTeacherRecord`, 
+        query: { 
+          id: this.teamid,
+          status: this.$route.query.status,
+          name: this.$route.query.name
+        } 
+      })
     }
   }
 }

+ 11 - 1
src/views/teamDetail/components/teamTeacherRecord.vue

@@ -122,7 +122,17 @@ export default {
   },
   methods: {
     onCancel() {
-      window.history.back()
+      // window.history.back()
+      let params = this.$route.query
+      this.$router.push({
+        path: '/business/teamDetails',
+        query: {
+          id: params.id,
+          status: params.status,
+          name: params.name,
+          checkIndex: "2"
+        }
+      })
     },
     search () {
       this.rules.page = 1;

+ 1 - 1
src/views/teamDetail/index.vue

@@ -69,7 +69,7 @@ import { getMusicGroup } from '@/api/buildTeam'
 export default {
   data () {
     return {
-      activeIndex: '1',
+      activeIndex: this.$route.query.checkIndex ? this.$route.query.checkIndex : '1',
       teamid: '',
       name: '',
       stepImgs: {

Some files were not shown because too many files changed in this diff