From 32b68b557eeb9286c9383c302b5867ad6b315073 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Wed, 19 May 2021 15:03:15 +0800
Subject: [PATCH] =?UTF-8?q?=E8=80=83=E6=A0=B8=E5=AE=9A=E6=97=B6=E5=99=A8?=
 =?UTF-8?q?=EF=BC=8C=E7=BB=83=E4=B9=A0=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/page/Assessment.vue | 49 ++++++++++++++++--------------
 src/components/page/Dashboard.vue  |  5 ++-
 src/utils/api.js                   |  2 +-
 3 files changed, 32 insertions(+), 24 deletions(-)

diff --git a/src/components/page/Assessment.vue b/src/components/page/Assessment.vue
index d0709c7..2f14009 100644
--- a/src/components/page/Assessment.vue
+++ b/src/components/page/Assessment.vue
@@ -163,7 +163,7 @@ export default {
                 stopTime: this.form.endTime,
                 searchContent: this.core.encodeString(this.keyword),
                 status: this.form.status,
-                pageNum: this.pageNo,
+                pageNum: 1,
                 pageSize: 10000,
             }
             this.$post(this.api.stuAssessmentByScreen,data).then(res => {
@@ -187,27 +187,32 @@ export default {
                         result.push(n)
                     }
                 })
-                this.$post(this.api.fictitiousRecord, { 
-                    classId: '',
-                    userId: this.userId,
-                    page: 1,
-                    size: 1000,
-                    searchContent: '',
-                    source: 2,
-                    systemId: 3
-                }).then(res => {
-                    let recordList = res.data.list
-                    result.map(n => {
-                        let same = recordList.find(e => e.className == n.className)
-                        if(same){
-                            n.reportId = same.reportId
-                        }
-                    })
-                    this.listDataAll = result
-                    this.totals = result.length
-                    this.handlePage()
-                }).catch(err => {})
-            }).catch(res => {});
+                this.listDataAll = result
+                this.totals = result.length
+                this.getRecord()
+            }).catch(res => {})
+        },
+        getRecord(){
+            this.$post(this.api.fictitiousRecord, { 
+                classId: '',
+                userId: this.userId,
+                page: 1,
+                size: 1000,
+                searchContent: '',
+                source: 2,
+                systemId: 3
+            }).then(res => {
+                let list = this.listDataAll
+                let recordList = res.data.list
+                list.map(n => {
+                    let same = recordList.find(e => e.className == n.className)
+                    if(same){
+                        n.reportId = same.reportId
+                    }
+                })
+                this.listDataAll = list
+                this.handlePage()
+            }).catch(err => {})
         },
         handlePage(){
             let list = this.listDataAll
diff --git a/src/components/page/Dashboard.vue b/src/components/page/Dashboard.vue
index be406a2..4dd7a80 100644
--- a/src/components/page/Dashboard.vue
+++ b/src/components/page/Dashboard.vue
@@ -22,7 +22,7 @@
                 </el-tab-pane>
             </el-tabs>
             <Index v-if="activeName=='index'"></Index>
-            <TeachingVideo v-if="!showProject && activeName!='fourth' && activeName!='fifth' && activeName!='index'"></TeachingVideo>
+            <TeachingVideo v-if="!showProject && activeName!='fourth' && activeName!='fifth' && activeName!='index' && activeName!='second'"></TeachingVideo>
             <Project v-if="showProject"></Project>
             <Assessment v-if="activeName=='fourth'"></Assessment>
             <Record v-if="activeName=='fifth'"></Record>
@@ -205,12 +205,15 @@ export default {
 
                 if(index == 3 && !isIndex){
                     this.toEvaluation(1,3)
+                }else if(index == 2){
+                    location.hash = `${this.routeName}#0`
                 }
             }
         },
         saveActive(activeName,oldActiveName){
             this.lastClick = oldActiveName
             if(activeName == 'second'){
+                this.activeName = oldActiveName
                 return false
             }
         },
diff --git a/src/utils/api.js b/src/utils/api.js
index c723873..44db5c1 100644
--- a/src/utils/api.js
+++ b/src/utils/api.js
@@ -1,5 +1,5 @@
 // let host = 'http://192.168.31.125:9090'//林
-// let host = 'http://192.168.31.152:9090'//榕
+// let host = 'http://192.168.31.151:9090'//榕
 // let host = 'http://192.168.31.137:9090'//陈
 // let host = 'http://122.9.154.146'