From 99e870b82c4a2ecf4a8f94b2a677de92c3c54ed1 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Thu, 4 Feb 2021 16:08:39 +0800
Subject: [PATCH] .

---
 src/api/index.js                              |  3 +-
 src/components/testPaperDetail/index.vue      | 11 +++-
 src/pages/account/login/index.vue             |  2 +-
 src/pages/achievement/list/examResults.vue    | 21 ++++++--
 .../achievement/list/practiceResults.vue      |  6 ++-
 src/pages/achievement/list/wrongBook.vue      | 16 ++----
 src/pages/achievement/statistics/index.vue    | 16 +++++-
 src/pages/assessment/detail/index.vue         |  9 ++--
 src/pages/assessment/doReview/index.vue       |  5 +-
 src/pages/assessment/list/index.vue           | 53 ++++++++++++++++---
 src/pages/assessment/list/studentSide.vue     | 23 ++++++--
 src/pages/assessment/list/studentTree.vue     | 20 ++++++-
 src/pages/assessment/review/index.vue         |  5 +-
 src/pages/assessment/scoreQuery/index.vue     | 12 ++++-
 src/pages/messageBoard/list/index.vue         | 12 ++++-
 src/pages/practice/detail/index.vue           |  4 +-
 src/pages/practice/list/index.vue             |  2 +-
 src/pages/practice/list/studentSide.vue       |  4 +-
 src/pages/quesBank/list/myQuesBank.vue        | 27 ++++++----
 src/pages/quesBank/list/quesBankType.vue      |  4 +-
 src/pages/testPaper/list/allTestPaper.vue     |  5 +-
 src/pages/testPaper/list/myTestPaper.vue      |  4 +-
 src/setting.js                                |  2 +-
 src/store/modules/assessment.js               |  2 +
 24 files changed, 196 insertions(+), 72 deletions(-)

diff --git a/src/api/index.js b/src/api/index.js
index ac2f19d..a27a6a3 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -73,7 +73,7 @@ export default {
   updateStaff: `management/staff/updateStaff`,
   getWorkNumber: `management/staff/getWorkNumber`,
   exportFailureStaff: `${Setting.apiBaseURL}/management/staff/exportFailure`,
-  uploadFileStaff: `${Setting.apiBaseURL}/management/staff/uploadFile`,
+  uploadFileStaff: `${Setting.apiBaseURL}/management/staff/managementUpload`,
   downloadStaffTemp: `http://liuwanr.oss-cn-shenzhen.aliyuncs.com/xlsx/20201102/1604658763812.xlsx`,
 
   // 角色管理
@@ -114,6 +114,7 @@ export default {
   modifyState:`management/testPaper/modifyState`,
   schoolTestPaperByRelease:`management/testPaper/schoolTestPaperByRelease`,
   previewPaper:`/management/testPaper/previewPaper`,
+  getPaperCurriculum:`/management/testPaper/getPaperCurriculum`,
 
   // 试题信息相关
   addQuestions:`management/questions/addQuestions`,
diff --git a/src/components/testPaperDetail/index.vue b/src/components/testPaperDetail/index.vue
index 96624ce..a745730 100644
--- a/src/components/testPaperDetail/index.vue
+++ b/src/components/testPaperDetail/index.vue
@@ -118,9 +118,18 @@ export default {
         initData(data){
             let index = 0
             for(let i in data){
-                data[i].map(n => {
+                data[i].map((n,j) => {
                     index++
                     n.mediaEleId = `player${index}`
+                    if(i == 'list3'){
+                        let answer = []
+                        for(let j in n){
+                            if(j.includes('option') && n[j]){
+                                answer.push(n[j])
+                            }
+                        }
+                        n.answer = answer.join('|')
+                    }
                 })
             }
             this.allData = data
diff --git a/src/pages/account/login/index.vue b/src/pages/account/login/index.vue
index 65be1d2..64864f2 100644
--- a/src/pages/account/login/index.vue
+++ b/src/pages/account/login/index.vue
@@ -58,7 +58,7 @@ export default {
     data: function() {
         return {
             loginForm: {
-                username: 'manager',
+                username: 'manage',
                 password: '111aaa',
             },
             loginRules: {
diff --git a/src/pages/achievement/list/examResults.vue b/src/pages/achievement/list/examResults.vue
index fbfa49d..ec3bae3 100644
--- a/src/pages/achievement/list/examResults.vue
+++ b/src/pages/achievement/list/examResults.vue
@@ -69,9 +69,21 @@
                 </el-table-column>
                 <el-table-column prop="stuName" label="真实姓名" align="center"></el-table-column>
                 <el-table-column prop="stuNo" label="学号" align="center"></el-table-column>
-                <el-table-column prop="thisScore" label="得分" align="center"></el-table-column>
-                <el-table-column prop="timeSpent" label="用时（分钟）" align="center"></el-table-column>
-                <el-table-column prop="openingTime" label="考试时间" align="center"></el-table-column>
+                <el-table-column prop="thisScore" label="得分" align="center">
+                    <template slot-scope="scope">
+                        <p>{{scope.row.thisScore | defaultShow}}</p>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="timeSpent" label="用时（分钟）" align="center">
+                    <template slot-scope="scope">
+                        {{scope.row.timeSpent != null && scope.row.timeSpent != '--' ? (scope.row.timeSpent / 60).toFixed(2) : scope.row.timeSpent}}
+                    </template>
+                </el-table-column>
+                <el-table-column prop="openingTime" label="考试时间" align="center">
+                    <template slot-scope="scope">
+                        <p>{{scope.row.openingTime | defaultShow}}</p>
+                    </template>
+                </el-table-column>
                 <el-table-column label="操作" align="center">
                     <template slot-scope="scope">
                         <el-button type="text" @click="show(scope.row)" v-auth="'/achievement/list:考试成绩:查看详情'">查看详情</el-button>
@@ -183,7 +195,8 @@ export default {
                 id: row.paperId,
                 assessmentId: row.assessmentId,
                 stuId: row.stuId,
-                thisScore: row.thisScore
+                thisScore: row.thisScore,
+                timeSpent: row.timeSpent
             })
             this.$router.push('/assessment/detail')
         },
diff --git a/src/pages/achievement/list/practiceResults.vue b/src/pages/achievement/list/practiceResults.vue
index 59b6f61..05d75f4 100644
--- a/src/pages/achievement/list/practiceResults.vue
+++ b/src/pages/achievement/list/practiceResults.vue
@@ -121,7 +121,11 @@
                     >{{scope.$index + (page - 1) * pageSize + 1}}</template>
                 </el-table-column>
                 <el-table-column prop="paperName" label="练习试卷名称" align="center"></el-table-column>
-                <el-table-column prop="examTime" label="开始时间" align="center"></el-table-column>
+                <el-table-column prop="examTime" label="开始时间" align="center">
+                    <template slot-scope="scope">
+                        <p>{{scope.row.examTime | defaultShow}}</p>
+                    </template>
+                </el-table-column>
                 <el-table-column prop="score" label="得分" align="center">
                     <template slot-scope="scope">
                         <p>{{scope.row.score | defaultShow}}</p>
diff --git a/src/pages/achievement/list/wrongBook.vue b/src/pages/achievement/list/wrongBook.vue
index c3121b0..7b5b595 100644
--- a/src/pages/achievement/list/wrongBook.vue
+++ b/src/pages/achievement/list/wrongBook.vue
@@ -43,12 +43,6 @@
                 header-align="center"
                 @selection-change="handleSelectionChange"
             >
-                <el-table-column
-                    type="selection"
-                    width="55"
-                    align="center"
-                    :reserve-selection="true"
-                ></el-table-column>
                 <el-table-column type="index" width="100" label="序号" align="center">
                     <template
                         slot-scope="scope"
@@ -59,16 +53,12 @@
                         {{type == 1 ? '考核试卷' : '练习试卷'}}
                     </template>
                 </el-table-column>
-                <el-table-column label="试卷名称" align="center">
-                    <template slot-scope="scope">
-                        {{paperName}}
-                    </template>
-                </el-table-column>
+                <el-table-column prop="paperName" label="试卷名称" align="center"></el-table-column>
                 <el-table-column prop="knowledgePoints" label="所需知识点" align="center"></el-table-column>
                 <el-table-column prop="questionStem" label="题干" align="center" :show-overflow-tooltip="true"></el-table-column>
-                <el-table-column label="错题人数" align="center">
+                <el-table-column label="错题次数" align="center">
                     <template slot-scope="scope">
-                        <el-button type="text" @click="showNum(scope.row)">{{scope.row.wrongNum}}</el-button>
+                        <el-button type="primary" size="mini" @click="showNum(scope.row)">{{scope.row.wrongNum}}次</el-button>
                     </template>
                 </el-table-column>
                 <el-table-column label="操作" align="center">
diff --git a/src/pages/achievement/statistics/index.vue b/src/pages/achievement/statistics/index.vue
index 9633de3..adcc822 100644
--- a/src/pages/achievement/statistics/index.vue
+++ b/src/pages/achievement/statistics/index.vue
@@ -173,7 +173,21 @@ export default {
         getList() {
             this.$get(`${this.api.getRanking}?pageNum=${this.page}&pageSize=${this.pageSize}&assessmentId=${this.assessmentId}`)
             .then(res => {
-                this.listData = res.data.list.list
+                let list = res.data.list.list
+                let len = list.length - 1
+                for(let i = 0; i < len; i++){
+                    for(let j = 0; j < len; j++){
+                        if(list[j].rank && list[j].rank > list[j + 1].rank){
+                            let temp = list[j]
+                            list[j] = list[j + 1]
+                            list[j + 1] = temp
+                        }
+                    }
+                }
+                let hasRank = list.filter(n => n.rank)
+                let notRank = list.filter(n => !n.rank)
+                list = [...hasRank,...notRank]
+                this.listData = list
                 this.total = res.data.list.totalCount
             })
             .catch(err => {})
diff --git a/src/pages/assessment/detail/index.vue b/src/pages/assessment/detail/index.vue
index 38a0674..cda0f40 100644
--- a/src/pages/assessment/detail/index.vue
+++ b/src/pages/assessment/detail/index.vue
@@ -12,7 +12,7 @@
             </div>
             <div class="m-r-20">
                 <span class="name">考试时长：</span>
-                <span class="val">{{time}}分钟</span>
+                <span class="val">{{timeSpent != null && timeSpent != '--' ? (timeSpent / 60).toFixed(2) + '分钟' : timeSpent}}</span>
             </div>
             <div>
                 <span class="name">排名：</span>
@@ -42,14 +42,14 @@
                     <p class="key">题干：</p>
                     <p class="val" v-html="item.question_stem"></p>
                 </div>
-                <div class="meta">
+                <div class="meta" v-if="active != 4 && active != 5">
                     <p class="key">选项：</p>
                     <div class="val">
                         <p v-for="(option,i) in item.options" :key="i">{{i}}.{{item.options[i]}}</p>
                     </div>
                 </div>
                 <div class="meta ans">
-                    <div class="info">
+                    <div class="info" v-if="active != 4">
                         <p class="key">正确答案：</p>
                         <p class="val">{{item.answer}}</p>
                     </div>
@@ -136,7 +136,7 @@ export default {
             'userId'
         ]),
         ...mapState('achievement', [
-            'id','assessmentId','stuId','thisScore'
+            'id','assessmentId','stuId','thisScore','timeSpent'
         ])
     },
     mounted() {
@@ -147,7 +147,6 @@ export default {
             this.$post(`${this.api.answerDetail}?userId=${this.stuId}&assessmentId=${this.assessmentId}&paperId=${this.id}`)
             .then(res => {
                 this.paperName = res.paperName
-                this.time = res.time
                 this.ranking = res.ranking
 
                 res.data.list4.map(n => {
diff --git a/src/pages/assessment/doReview/index.vue b/src/pages/assessment/doReview/index.vue
index 67748a9..e0f3c28 100644
--- a/src/pages/assessment/doReview/index.vue
+++ b/src/pages/assessment/doReview/index.vue
@@ -16,7 +16,7 @@
             </div>
             <div>
                 <span class="name">考试时长：</span>
-                <span class="val">{{duration}}</span>
+                <span class="val">{{timeSpent != null && timeSpent != '--' ? (timeSpent / 60).toFixed(2) + '分钟' : timeSpent}}</span>
             </div>
         </div>
         
@@ -114,7 +114,7 @@ export default {
             'userId','clientId'
         ]),
         ...mapState('assessment', [
-            'reviewId','paperId','isReview','reviewStatus','stuId'
+            'reviewId','paperId','isReview','reviewStatus','stuId','timeSpent'
         ]),
         ...mapGetters('assessment', [
             'getCorrectingName'
@@ -152,7 +152,6 @@ export default {
                 this.paperName = list[0].name
                 this.userName = list[0].userName
                 this.this_score = list[0].this_score
-                this.duration = list[0].duration
             })
             .catch(err => {})
         },
diff --git a/src/pages/assessment/list/index.vue b/src/pages/assessment/list/index.vue
index 77041df..6d61644 100644
--- a/src/pages/assessment/list/index.vue
+++ b/src/pages/assessment/list/index.vue
@@ -139,7 +139,7 @@
                     </el-tag>
                 </el-form-item>
                 <el-form-item label="发布班级">
-                    <studentSide ref="getSelectData" :classId="form.classId" :studentId="form.studentId" :key="stuCompKey" @fircheck="fircheck" @twocheck="twocheck" @threecheck="threecheck"></studentSide>
+                    <studentSide ref="getSelectData" :classId="form.classId" :studentId="form.studentId" :key="stuCompKey" @fircheck="fircheck" @twocheck="twocheck" @threecheck="threecheck" @fourcheck="fourcheck"></studentSide>
                 </el-form-item>
             </el-form>
 
@@ -297,7 +297,7 @@ export default {
     },
     mounted() {
         this.getData()
-        // this.addInterval()
+        this.addInterval()
     },
     watch: {
         keyword: function(val) {
@@ -377,10 +377,18 @@ export default {
                     r.children.forEach( n => {
                         if(n.ischeck){
                             classIds.push(n.classId)
-                            studentId = studentId.concat(n.userIds)
                         }else{
                             util.removeByValue(classIds, n.classId);
                         }
+
+                        n.children.forEach( j => {
+                            if(j.ischeck){
+                                studentId.push(j.userId)
+                                classIds.indexOf(n.classId) == -1 && classIds.push(n.classId)
+                            }else{
+                                util.removeByValue(studentId, j.userId);
+                            }
+                        })
                     })
                 })
             })
@@ -392,6 +400,7 @@ export default {
             if(val.children){
                 val.children.map( e => e.ischeck = val.ischeck)
                 val.children.map( e => e.children.map(n => n.ischeck = e.ischeck))
+                val.children.map( e => e.children.map(n => n.children.map(j => j.ischeck = e.ischeck)))
                 this.handleCheck(val2)
             }else{
                 this.form.classId = val.classId
@@ -401,10 +410,11 @@ export default {
         twocheck(val,val2){
             val.ischeck = !val.ischeck
             val.children.map( e => e.ischeck = val.ischeck)
+            val.children.map( e => e.children.map(n => n.ischeck = e.ischeck))
             val2.forEach( e => {
                 e.children.forEach( r => {
                     if(r.gradeId == val.gradeId){
-                        if(e.children.every(i => i.ischeck)){
+                        if(e.children.length && e.children.every(i => i.ischeck)){
                             e.ischeck = true
                         }else{
                             e.ischeck = false
@@ -416,6 +426,7 @@ export default {
         },
         threecheck(val,val2){
             val.ischeck = !val.ischeck
+            val.children.map( e => e.ischeck = val.ischeck)
             val2.forEach( e => {
                 e.children.forEach( r => {
                     r.children.forEach( n => {
@@ -427,7 +438,7 @@ export default {
                             }
                         }
                     })
-                    if(e.children.every(i => i.ischeck)){
+                    if(e.children.length && e.children.every(i => i.ischeck)){
                         e.ischeck = true
                     }else{
                         e.ischeck = false
@@ -436,6 +447,35 @@ export default {
             })
             this.handleCheck(val2)
         },
+        fourcheck(val,val2){
+            val.ischeck = !val.ischeck
+            val2.forEach( e => {
+                e.children.forEach( r => {
+                    r.children.forEach( n => {
+                        n.children.forEach( j => {
+                            if(j.studentId == val.studentId){
+                                if(n.children.every(i => i.ischeck)){
+                                    n.ischeck = true
+                                }else{
+                                    n.ischeck = false
+                                }
+                            }
+                        })
+                    })
+                    if(r.children.length && r.children.every(i => i.ischeck)){
+                        r.ischeck = true
+                    }else{
+                        r.ischeck = false
+                    }
+                })
+                if(e.children.length && e.children.every(i => i.ischeck)){
+                    e.ischeck = true
+                }else{
+                    e.ischeck = false
+                }
+            })
+            this.handleCheck(val2)
+        },
         handleCurrentChange(val) {
             this.page = val;
             this.getData();
@@ -516,7 +556,6 @@ export default {
             this.time = [now,second]
             this.form.startTime = now
             this.form.endTime = second
-            console.log(11,this.form)
             this.addVisible = true
         },
         save(){
@@ -529,7 +568,7 @@ export default {
             if((new Date(this.form.endTime).getTime() - new Date(this.form.startTime).getTime()) / 1000 <= 60) return this.$message.warning('考核开始时间和结束时间间隔不得小于1分钟')
             if(form.testPaperId === '') return this.$message.warning('请选择试卷')
             if(form.classId === '') return this.$message.warning('请选择发布班级')
-            // if(!form.studentId.length) return this.$message.warning('请选择学生')
+            if(!form.studentId.length) return this.$message.warning('请选择学生')
             if(new Date(this.form.startTime).getTime() < new Date().getTime()) form.state = 2
             
             let data = {
diff --git a/src/pages/assessment/list/studentSide.vue b/src/pages/assessment/list/studentSide.vue
index 59d3412..32e5f55 100644
--- a/src/pages/assessment/list/studentSide.vue
+++ b/src/pages/assessment/list/studentSide.vue
@@ -1,7 +1,7 @@
 <template>
     <div>
         <div>
-            <lctree :data="majorList" :allClassList.sync="allClassList" @fircheckitem="fircheckitem" @twocheckitem="twocheckitem" @threecheckitem="threecheckitem"></lctree>
+            <lctree :data="majorList" :allClassList.sync="allClassList" @fircheckitem="fircheckitem" @twocheckitem="twocheckitem" @threecheckitem="threecheckitem" @fourcheckitem="fourcheckitem"></lctree>
         </div>
     </div>
 </template>
@@ -54,7 +54,6 @@ export default {
             let classId = this.classId ? this.classId.split(',') : []
             let studentId = this.studentId
             let classList = []
-            console.log(22,this.classId)
             this.$get(this.api.queryStudentProfessionalArchitecture,data).then(res => {
                 let StaffProfessionalArchitectureList = res.data.StaffProfessionalArchitectureList
                 StaffProfessionalArchitectureList.map(n => {
@@ -80,7 +79,17 @@ export default {
                                         schoolId: this.clientId
                                     }
                                     this.$get(`${this.api.queryStudent}/1/200`,data).then(res => {
-                                        e.userIds = res.data.studentList.map(n => n.userId)
+                                        res.data.studentList.map(s => {
+                                            (s.ifVisible = false), (s.ischeck = false), (s.label = s.studentName)
+                                            if(studentId.includes(s.userId)){
+                                                s.ischeck = true
+                                                e.ifVisible = true
+                                                j.ifVisible = true
+                                                n.ifVisible = true
+                                            }
+                                        })
+                                        e.children = res.data.studentList
+                                        // e.userIds = res.data.studentList.map(n => n.userId)
                                     }).catch(res => {})
 
                                     if(classId.includes(String(e.classId))){
@@ -91,10 +100,10 @@ export default {
                                 })
                                 j.children = res.data.Class
                                 classList = classList.concat(res.data.Class)
-                                if(j.children.every(i => i.ischeck)){
+                                if(j.children.length && j.children.every(i => i.ischeck)){
                                     j.ischeck = true
                                 }
-                                if(n.children.every(i => i.ischeck)){
+                                if(n.children.length && n.children.every(i => i.ischeck)){
                                     n.ischeck = true
                                 }
                             }).catch(res => {});
@@ -123,6 +132,10 @@ export default {
         threecheckitem(three){
             this.$emit("threecheck",three,this.majorList)
         },
+        // 选择学生
+        fourcheckitem(four){
+            this.$emit("fourcheck",four,this.majorList)
+        },
     }
 };
 </script>
diff --git a/src/pages/assessment/list/studentTree.vue b/src/pages/assessment/list/studentTree.vue
index cf9b717..435c2bd 100644
--- a/src/pages/assessment/list/studentTree.vue
+++ b/src/pages/assessment/list/studentTree.vue
@@ -42,10 +42,25 @@
                     <div v-show="item1.ifVisible" v-if="item1.children&&item1.children.length!=0">
                         <div v-for="(item2,index2) in item1.children" :key="index2">
                             <div class="item2" @click.stop="open(item2)">
-                                <i class="empty"></i>
+                                <img
+                                    v-if="item2.children&&item2.children.length!=0"
+                                    :class="{ 'arrowTransform': !item2.ifVisible, 'arrowTransformReturn': item2.ifVisible}"
+                                    src="../../../assets/img/icon-xiangyou.png"
+                                    alt
+                                />
+                                <i v-else class="empty"></i>
                                 <i :class="item2.ischeck ? 'icon-yigouxuan' : 'icon-weigouxuan'" @click.stop="threecheckitem(item2)"></i>
                                 <span>{{item2.label}}班</span>
                             </div>
+
+                            <div v-show="item2.ifVisible" v-if="item2.children&&item2.children.length!=0">
+                                <div v-for="(item3,index3) in item2.children" :key="index3">
+                                    <div class="item3" @click.stop="open(item3)">
+                                        <i :class="item3.ischeck ? 'icon-yigouxuan' : 'icon-weigouxuan'" @click.stop="fourcheckitem(item3)"></i>
+                                        <span>{{item3.label}}</span>
+                                    </div>
+                                </div>
+                            </div>
                         </div>
                     </div>
                 </div>
@@ -124,6 +139,9 @@ export default {
         threecheckitem(item){
             this.$emit('threecheckitem',item);
         },
+        fourcheckitem(item){
+            this.$emit('fourcheckitem',item);
+        },
         //判断数组中是否包含某个对象
         isHasObj(arr, val) {
             var flag = 0; //1为有 0为没有
diff --git a/src/pages/assessment/review/index.vue b/src/pages/assessment/review/index.vue
index de6c114..4b5646a 100644
--- a/src/pages/assessment/review/index.vue
+++ b/src/pages/assessment/review/index.vue
@@ -49,7 +49,7 @@
                 </el-table-column>
                 <el-table-column prop="name" label="考试状态" align="center">
                     <template slot-scope="scope">
-                        {{getExamStatusName(scope.row.examinationStatus)}}
+                        {{scope.row.examinationStatus == 1 ? '已考' : getExamStatusName(scope.row.examinationStatus)}}
                     </template>
                 </el-table-column>
                 <el-table-column prop="name" label="批阅状态" align="center">
@@ -152,7 +152,8 @@ export default {
                 id: row.assessmentId,
                 paperId: row.paperId,
                 stuId: row.stuId,
-                reviewStatus: row.reviewStatus
+                reviewStatus: row.reviewStatus,
+                timeSpent: row.timeSpent
             })
             this.$router.push('doReview') 
         },
diff --git a/src/pages/assessment/scoreQuery/index.vue b/src/pages/assessment/scoreQuery/index.vue
index 5242d98..ba73fb3 100644
--- a/src/pages/assessment/scoreQuery/index.vue
+++ b/src/pages/assessment/scoreQuery/index.vue
@@ -74,8 +74,16 @@
                         <p>{{scope.row.thisScore | defaultShow}}</p>
                     </template>
                 </el-table-column>
-                <el-table-column prop="timeSpent" label="用时（分钟）" align="center"></el-table-column>
-                <el-table-column prop="openingTime" label="考试时间" align="center"></el-table-column>
+                <el-table-column prop="timeSpent" label="用时（分钟）" align="center">
+                    <template slot-scope="scope">
+                        {{scope.row.timeSpent != null && scope.row.timeSpent != '--' ? (scope.row.timeSpent / 60).toFixed(2) : scope.row.timeSpent}}
+                    </template>
+                </el-table-column>
+                <el-table-column prop="openingTime" label="考试时间" align="center">
+                    <template slot-scope="scope">
+                        <p>{{scope.row.openingTime | defaultShow}}</p>
+                    </template>
+                </el-table-column>
                 <el-table-column label="操作" align="center">
                     <template slot-scope="scope">
                         <el-button type="text" @click="show(scope.row)">查看详情</el-button>
diff --git a/src/pages/messageBoard/list/index.vue b/src/pages/messageBoard/list/index.vue
index 5e483c4..33381dd 100644
--- a/src/pages/messageBoard/list/index.vue
+++ b/src/pages/messageBoard/list/index.vue
@@ -152,9 +152,12 @@ export default {
             }).catch(res => {})
         },
         submitComment(row){
+            let content = row.replyContent
+            if(!content) return this.$message.error('请填写内容')
+            content = content.replace(/\uD83C[\uDF00-\uDFFF]|\uD83D[\uDC00-\uDE4F]/g, "")
             let data = {
                 bid: row.bid,
-                content: row.replyContent,
+                content,
                 commentUserId: this.userId,
                 schoolId: this.clientId,
             }
@@ -178,10 +181,13 @@ export default {
             }
         },
         submitReply(row){
+            let content = row.replyContent
+            if(!content) return this.$message.error('请填写内容')
+            content = content.replace(/\uD83C[\uDF00-\uDFFF]|\uD83D[\uDC00-\uDE4F]/g, "")
             let data = {
                 bid: row.bid,
                 commentId: row.commentId,
-                replyComment: row.replyContent,
+                replyComment: content,
                 replyUserId: row.commentUserId ? row.commentUserId : row.userIdByReply,
                 userId: this.userId,
             }
@@ -192,6 +198,8 @@ export default {
             }).catch(res => {})
         },
         submitMsg(){
+            if(!this.content) return this.$message.error('请填写内容')
+            this.content = this.content.replace(/\uD83C[\uDF00-\uDFFF]|\uD83D[\uDC00-\uDE4F]/g, "")
             let data = {
                 content: this.content,
                 schoolId: this.clientId,
diff --git a/src/pages/practice/detail/index.vue b/src/pages/practice/detail/index.vue
index a19f376..a94c3ec 100644
--- a/src/pages/practice/detail/index.vue
+++ b/src/pages/practice/detail/index.vue
@@ -38,14 +38,14 @@
                     <p class="key">题干：</p>
                     <p class="val" v-html="item.questionStem"></p>
                 </div>
-                <div class="meta">
+                <div class="meta" v-if="active != 4 && active != 5">
                     <p class="key">选项：</p>
                     <div class="val">
                         <p v-for="(option,i) in item.options" :key="i">{{i}}.{{item.options[i]}}</p>
                     </div>
                 </div>
                 <div class="meta ans">
-                    <div class="info">
+                    <div class="info" v-if="active != 4">
                         <p class="key">正确答案：</p>
                         <p class="val">{{item.answer}}</p>
                     </div>
diff --git a/src/pages/practice/list/index.vue b/src/pages/practice/list/index.vue
index 18ce34f..ce3fdc5 100644
--- a/src/pages/practice/list/index.vue
+++ b/src/pages/practice/list/index.vue
@@ -307,7 +307,7 @@ export default {
             val2.forEach( e => {
                 e.children.forEach( r => {
                     if(r.gradeId == val.gradeId){
-                        if(e.children.every(i => i.ischeck)){
+                        if(e.children.length && e.children.every(i => i.ischeck)){
                             e.ischeck = true
                         }else{
                             e.ischeck = false
diff --git a/src/pages/practice/list/studentSide.vue b/src/pages/practice/list/studentSide.vue
index 40e7590..3d51f28 100644
--- a/src/pages/practice/list/studentSide.vue
+++ b/src/pages/practice/list/studentSide.vue
@@ -85,10 +85,10 @@ export default {
                                 })
                                 j.children = res.data.Class
                                 classList = classList.concat(res.data.Class)
-                                if(j.children.every(i => i.ischeck)){
+                                if(j.children.length && j.children.every(i => i.ischeck)){
                                     j.ischeck = true
                                 }
-                                if(n.children.every(i => i.ischeck)){
+                                if(n.children.length && n.children.every(i => i.ischeck)){
                                     n.ischeck = true
                                 }
                             }).catch(res => {});
diff --git a/src/pages/quesBank/list/myQuesBank.vue b/src/pages/quesBank/list/myQuesBank.vue
index e11da49..37b99b1 100644
--- a/src/pages/quesBank/list/myQuesBank.vue
+++ b/src/pages/quesBank/list/myQuesBank.vue
@@ -90,17 +90,20 @@
             <div style="text-align: center">
                 <div style="margin-bottom: 10px;"><el-button type="primary" @click="downLoad">模板下载<i class="el-icon-download el-icon--right"></i></el-button></div>
                 <el-upload
+                    ref="upload"
                     accept=".xls,.xlsx"
                     :on-remove="handleRemove"
                     :on-error="uploadError"
                     :on-success="uploadSuccess"
                     :before-remove="beforeRemove"
+                    :on-progress="handleProgress"
                     :limit="1"
                     :on-exceed="handleExceed"
                     :action="this.api.impExcel"
                     :file-list="uploadList"
                     :data="{userId: this.userId,schoolId: this.clientId}"
                     name="file"
+                    :auto-upload="false"
                 > 
                     <el-button type="primary" class="ml20">上传文件<i class="el-icon-upload2 el-icon--right"></i></el-button>
                 </el-upload>
@@ -352,12 +355,16 @@ export default {
         uploadSuccess(res, file, fileList) {
             this.uploadFaild = false
             if(res.success){
-                if(res.data.data.token){
-                    this.token = res.data.data.token
-                    this.uploadFaild = true
-                }else{
+                // if(res.data.data.token){
+                //     this.token = res.data.data.token
+                //     this.uploadFaild = true
+                // }else{
                     this.$message.success('上传成功')
-                }
+                    this.importVisible = false
+                    this.page = 1
+                    this.keyword = ''
+                    this.getData()
+                // }
             }else{
                 // res.message ? this.$message.error(res.message) : this.$message.error('上传失败，请检查数据')
                 res.message && this.$message.error(res.message)
@@ -374,7 +381,10 @@ export default {
             });
         },
         beforeRemove(file, fileList) {
-            return this.$confirm(`确定移除 ${file.name}？`);
+            return this.$confirm(`确定移除 ${file.name}？`)
+        },
+        handleProgress(event, file, fileList){
+            
         },
         handleRemove(file, fileList) {
             this.uploadList = fileList
@@ -386,10 +396,7 @@ export default {
             this.uploadList = []
         },
         uploadSure(){
-            this.importVisible = false
-            this.page = 1
-            this.keyword = ''
-            this.getData()
+            this.$refs.upload.submit()
         },
     }
 };
diff --git a/src/pages/quesBank/list/quesBankType.vue b/src/pages/quesBank/list/quesBankType.vue
index d6e3f81..6beed9c 100644
--- a/src/pages/quesBank/list/quesBankType.vue
+++ b/src/pages/quesBank/list/quesBankType.vue
@@ -29,8 +29,8 @@
                 <el-table-column label="操作" width="200">
                     <template slot-scope="scope">
                         <el-button type="text" v-if="scope.row.parentId == 0 && scope.row.source == 2" @click="addSecond(scope.row)" v-auth="'/quesBank/list:题库分类:添加'">添加</el-button>
-                        <el-button type="text" @click="editType(scope.row)" v-auth="'/quesBank/list:题库分类:编辑'">编辑</el-button>
-                        <el-button type="text" @click="handleDelete(scope.row)" v-auth="'/quesBank/list:题库分类:删除'">删除</el-button>
+                        <el-button type="text" v-if="scope.row.source == 2" @click="editType(scope.row)" v-auth="'/quesBank/list:题库分类:编辑'">编辑</el-button>
+                        <el-button type="text" v-if="scope.row.source == 2" @click="handleDelete(scope.row)" v-auth="'/quesBank/list:题库分类:删除'">删除</el-button>
                     </template>
                 </el-table-column>
             </el-table>
diff --git a/src/pages/testPaper/list/allTestPaper.vue b/src/pages/testPaper/list/allTestPaper.vue
index 130cda2..0501b2f 100644
--- a/src/pages/testPaper/list/allTestPaper.vue
+++ b/src/pages/testPaper/list/allTestPaper.vue
@@ -44,7 +44,6 @@
         <el-card shadow="hover">
             <div class="p-title m-b-20">所有试卷</div>
             <el-table :data="listData" class="table" stripe header-align="center" row-key="id" @selection-change="handleSelecteChange">
-                <el-table-column type="selection" width="55" align="center" :reserve-selection="true"></el-table-column>
                 <el-table-column type="index" width="100" label="序号" align="center"></el-table-column>
                 <el-table-column prop="name" label="试卷名称" align="center"></el-table-column>
                 <el-table-column prop="courses" label="所属课程" align="center"></el-table-column>
@@ -169,9 +168,9 @@ export default {
             this.multipleSelection = val;
         },
         getCourses() {
-            this.$post(`${this.api.getSelectInfo}?type=2`)
+            this.$get(`${this.api.getPaperCurriculum}?schoolId=${this.clientId}`)
             .then(res => {
-                this.courseList = res.data.pointList
+                this.courseList = res.data.list
             })
             .catch(err => {})
         },
diff --git a/src/pages/testPaper/list/myTestPaper.vue b/src/pages/testPaper/list/myTestPaper.vue
index f52150e..f3f7957 100644
--- a/src/pages/testPaper/list/myTestPaper.vue
+++ b/src/pages/testPaper/list/myTestPaper.vue
@@ -288,9 +288,9 @@ export default {
             this.multipleSelection = val
         },
         getCourses() {
-            this.$post(`${this.api.getSelectInfo}?type=2`)
+            this.$get(`${this.api.getPaperCurriculum}?schoolId=${this.clientId}`)
             .then(res => {
-                this.courseList = res.data.pointList
+                this.courseList = res.data.list
             })
             .catch(err => {})
         },
diff --git a/src/setting.js b/src/setting.js
index 29f9384..14c6beb 100644
--- a/src/setting.js
+++ b/src/setting.js
@@ -16,7 +16,7 @@ const Setting = {
     showProgressBar: true,
     // 接口请求地址
     // apiBaseURL: env === 'development' ? 'http://192.168.31.152:8001' : 'http://39.108.250.202:8000/',
-    apiBaseURL: env === 'development' ? 'http://192.168.31.152:8001' : 'http://39.108.250.202:9000',
+    apiBaseURL: env === 'development' ? 'http://39.108.250.202:9000' : 'http://39.108.250.202:9000',
     // 接口请求返回错误时，弹窗的持续时间，单位：秒
     modalDuration: 3,
     // 接口请求返回错误时，弹窗的类型，可选值为 Message 或 Notice
diff --git a/src/store/modules/assessment.js b/src/store/modules/assessment.js
index 061199a..4d1eb94 100644
--- a/src/store/modules/assessment.js
+++ b/src/store/modules/assessment.js
@@ -11,6 +11,7 @@ export default {
         stuId: '',
         isReview: false,
         reviewStatus: '',
+        timeSpent: 0,
         typeList: [
             {
                 id: 1,
@@ -115,6 +116,7 @@ export default {
             state.stuId = info.stuId
             state.isReview = info.isReview
             state.reviewStatus = info.reviewStatus
+            state.timeSpent = info.timeSpent
         },
     },
     actions: {