Merge remote-tracking branch 'origin/master'

src/pages/achievement/ass/index.vue

@@ -104,18 +104,26 @@ export default {
             token: util.local.get(Setting.tokenKey),
         };
     },
-    mounted() {
+    created() {
+        this.getData();
         this.classInfo = JSON.parse(this.$route.query.classInfo)
         for(var i=0;i<this.classInfo.length;i++){
             let id = this.classInfo[i].id
             this.classInfo[i].id = id.toString()
         }
-        this.activeName= this.classInfo[0].id
+        const activeName2 = sessionStorage.getItem('activeName2')
+        if(activeName2 && this.classInfo.some(item => item.id === activeName2)) {
+            this.classId = activeName2
+            this.activeName = activeName2
+        }else {
+            this.classId = this.classInfo[0].id;
+            this.activeName = this.classInfo[0].id;
+        }
         this.id = this.$route.query.id
-        this.getData();
     },
     methods: {
         handleClick(tab, event) {
+            sessionStorage.setItem('activeName2', tab.name)
             this.getData()
         },
         getData() {
@@ -144,6 +152,8 @@ export default {
             }
         },
         show(row) {
+            // console.log(row)
+            
             if (this.systemId == 2) {
                 this.$router.push(`showexperimentOption?id=${row.reportId}&stuId=${row.userId}&studentName=${row.studentName}&class=${row.class}`);
             } else if (this.systemId == 3) {

src/pages/achievement/teach/index.vue

@@ -115,7 +115,7 @@ export default {
     created() {
         this.classList = JSON.parse(this.$route.query.classList);
         const activeName = sessionStorage.getItem('activeName')
-        if(activeName) {
+        if(activeName && this.classList.some(item => item.id === activeName)) {
             this.classId = activeName
             this.activeName = activeName
         }else {

src/pages/assessment/list/index.vue

@@ -236,8 +236,9 @@ export default {
         beginTimer() {
             this.ticker = setInterval(() => {
                 if(this.sss == 0){
-                    this.ticker = null;
+                    
                     clearInterval(this.ticker);
+                    this.ticker = null;
                 }else{
                     for (let i = 0; i < this.listData.length; i++) {
                         const item = this.listData[i];

src/pages/match/manage/index.vue

@@ -50,8 +50,8 @@ export default {
         });
     },
     beforeDestroy() {
-        // 关闭所以EventBus事件
-        EventBus.$off()
+        // 关闭所有EventBus事件
+       EventBus.$off()
     },
     methods: {
         goBack() {

src/router/index.js

@@ -268,7 +268,7 @@ router.beforeEach(function(to, from, next) {
     }
     // 根据路由元信息设置文档标题
     // window.document.title = to.meta.title ? to.meta.title : "";
-    window.document.title = "职站教师端"
+    window.document.title = "教师管理端"
     next();
 
 });