From 1660f87faf4d0cf6b8e56e09a5ed63e39c2abf7c Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Fri, 30 Apr 2021 14:59:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/breadcrumb/index.vue        |  6 +++---
 src/layouts/navbar/index.vue               |  7 +++++--
 src/mixins/examDo/index.js                 |  6 ++----
 src/pages/achievement/assessment/index.vue |  4 ++--
 src/pages/achievement/practice/index.vue   |  4 ++--
 src/pages/index/list/index.vue             |  5 +++--
 src/pages/practice/do/index.vue            |  4 ++--
 src/pages/practice/list/myPractice.vue     |  1 +
 src/pages/wrongBook/do/index.vue           |  2 +-
 src/styles/common.scss                     | 11 +++++++++--
 10 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/src/components/breadcrumb/index.vue b/src/components/breadcrumb/index.vue
index 6313b01..cf1c54c 100644
--- a/src/components/breadcrumb/index.vue
+++ b/src/components/breadcrumb/index.vue
@@ -3,7 +3,7 @@
         <span class="cur">当前位置：</span>
         <el-breadcrumb separator="/">
             <el-breadcrumb-item :to="{ path: '/' }">超竞学生端</el-breadcrumb-item>
-            <el-breadcrumb-item v-for="(item,index) in pages" :key="index" :to="{ path: index == pages.length - 1 ? curRoute : route }">{{item}}</el-breadcrumb-item>
+            <el-breadcrumb-item v-for="(item,index) in pages" :key="index" :to="{ path: index == pages.length - 1 ? curRoute : path }">{{item}}</el-breadcrumb-item>
         </el-breadcrumb>
     </div>
 </template>
@@ -14,12 +14,12 @@ export default {
     data() {
         return {
             pages: this.data.split('/'),
-            curRoute: this.$route.path
+            curRoute: this.$route.path,
+            path: this.route ? this.route : 'list'
         };
     },
     methods: {
         update(data){
-            console.log(2222,data)
             this.pages = data.split('/')
         }
     }
diff --git a/src/layouts/navbar/index.vue b/src/layouts/navbar/index.vue
index d3434e0..c65c6e2 100644
--- a/src/layouts/navbar/index.vue
+++ b/src/layouts/navbar/index.vue
@@ -94,7 +94,10 @@ export default {
             ],
             menus: [],
             actives: {
-                index: ['index-add'],
+                practice: ['practice-do','practice-randomDo'],
+                exam: ['exam-do'],
+                achievement: ['achievement-practice','achievement-assessment'],
+                wrongBook: ['wrongBook-do'],
             }
         };
     },
@@ -102,7 +105,7 @@ export default {
         onRoutes() {
             let actives = this.actives
             for(let i in this.actives){
-                if(actives[i].includes(this.$route.name)) return `/${i}`
+                if(actives[i].includes(this.$route.name)) return `/${i}/list`
             }
             return this.$route.path
         },
diff --git a/src/mixins/examDo/index.js b/src/mixins/examDo/index.js
index 3dd3178..fc4f7d1 100644
--- a/src/mixins/examDo/index.js
+++ b/src/mixins/examDo/index.js
@@ -64,14 +64,12 @@ export default {
             })
         },
         handleExceed(files, fileList) {
-            this.$message.warning(
-                `当前限制选择 1 个文件，如需更换，请删除上一个文件再重新选择！` 
-            )
+            util.warningMsg(`当前限制选择 1 个文件，如需更换，请删除上一个文件再重新选择！` )
         },
         beforeUpload(file,item){
             let ext = util.getFileExt(file.name)
             if(util.isDoc(ext) && (file.size / 1024 / 1024) > this.maxSize){
-                this.$message.error(`请上传${this.maxSize}M以内的文件`)
+                util.errorMsg(`请上传${this.maxSize}M以内的文件`)
                 return false
             }
             item.uploading = true
diff --git a/src/pages/achievement/assessment/index.vue b/src/pages/achievement/assessment/index.vue
index 9e3e6ae..38961f3 100644
--- a/src/pages/achievement/assessment/index.vue
+++ b/src/pages/achievement/assessment/index.vue
@@ -31,7 +31,7 @@
 
                 <div class="wrap">
                     <div class="item" v-for="(item,index) in curType" :key="index">
-                        <div class="type" :class="{wrong: item.question_score == 0,yet: item.question_score == null}">
+                        <div class="type" :class="{wrong: item.question_score <= 0,yet: item.question_score == null}">
                             <span>序号：{{index+1}}</span>
                             <span v-if="item.question_score != null">得分：{{item.question_score}}</span>
                         </div>
@@ -40,7 +40,7 @@
                                 <p class="key">题干：</p>
                                 <p class="val" v-html="item.question_stem"></p>
                             </div>
-                            <div class="meta">
+                            <div class="meta" v-if="item.typeName != '简答题' && item.typeName != '填空题'">
                                 <p class="key">选项：</p>
                                 <div class="val">
                                     <p v-for="(option,i) in item.options" :key="i">{{i}}.{{item.options[i]}}</p>
diff --git a/src/pages/achievement/practice/index.vue b/src/pages/achievement/practice/index.vue
index 5908e64..3bca8e6 100644
--- a/src/pages/achievement/practice/index.vue
+++ b/src/pages/achievement/practice/index.vue
@@ -27,7 +27,7 @@
 
                 <div class="wrap">
                     <div class="item" v-for="(item,index) in curType" :key="index">
-                        <div class="type" :class="{wrong: item.questionScore == 0,yet: !item.isCorrecting}">
+                        <div class="type" :class="{wrong: item.questionScore <= 0,yet: !item.isCorrecting}">
                             <span>序号：{{index+1}}</span>
                             <span v-if="item.isCorrecting">得分：{{item.questionScore}}</span>
                         </div>
@@ -36,7 +36,7 @@
                                 <p class="key">题干：</p>
                                 <p class="val" v-html="item.questionStem"></p>
                             </div>
-                            <div class="meta">
+                            <div class="meta" v-if="item.typeName != '简答题' && item.typeName != '填空题'">
                                 <p class="key">选项：</p>
                                 <div class="val">
                                     <p v-for="(option,i) in item.options" :key="i">{{i}}.{{item.options[i]}}</p>
diff --git a/src/pages/index/list/index.vue b/src/pages/index/list/index.vue
index 4e0bec7..35a4713 100644
--- a/src/pages/index/list/index.vue
+++ b/src/pages/index/list/index.vue
@@ -27,7 +27,8 @@
                         <el-table-column prop="endTime" label="考试结束时间" align="center"></el-table-column>
                         <el-table-column label="操作" width="200">
                             <template slot-scope="scope">
-                                <el-button type="text" @click="toExam(scope.row)" v-if="scope.row.assessmentState == 2" :disabled="scope.row.studentState == 2">进入考试</el-button>
+                                <el-button type="text" @click="toExam(scope.row)" v-if="scope.row.assessmentState == 2 && scope.row.studentState != 2">进入考试</el-button>
+                                <el-button type="text" @click="toExam(scope.row)" disabled v-if="scope.row.studentState == 2">已经交卷</el-button>
                             </template>
                         </el-table-column>
                     </el-table>
@@ -91,7 +92,7 @@
             </div>
             <div class="page" style="width: calc(50% - 12px)">
                 <div class="tabs">
-                    <a class="item active">我的成绩</a>
+                    <a class="item active">考试成绩</a>
                 </div>
                 <div class="page-content">
                     <template v-if="assesmentNameList.length">
diff --git a/src/pages/practice/do/index.vue b/src/pages/practice/do/index.vue
index 67ce167..c557042 100644
--- a/src/pages/practice/do/index.vue
+++ b/src/pages/practice/do/index.vue
@@ -277,7 +277,7 @@ export default {
                     if(n.uploading) uploading = true
                 })
             })
-            if(uploading) return this.$message.warning('视频正在上传，请稍候再试')
+            if(uploading) return util.warningMsg('视频正在上传，请稍候再试')
             if(this.submiting) return false
             this.submiting = true
             let data1 = []
@@ -317,7 +317,7 @@ export default {
                     .then(res => {
                         this.submiting = false
                         this.isSubmit = true
-                        this.$message.success(this.isDone ? '练习已结束，已经自动为您提交练习！' : '提交成功')
+                        util.successMsg(this.isDone ? '练习已结束，已经自动为您提交练习！' : '提交成功')
                         this.$router.push('list')
                     }).catch(err => {
                         this.submiting = false
diff --git a/src/pages/practice/list/myPractice.vue b/src/pages/practice/list/myPractice.vue
index 3c35fdc..ef6c756 100644
--- a/src/pages/practice/list/myPractice.vue
+++ b/src/pages/practice/list/myPractice.vue
@@ -114,6 +114,7 @@ export default {
         practice(row){
             if(row.isHava){
                 this.$confirm('是否要继续上次未完成的练习？',{
+                    type: 'warning',
                     title: '提示',
                     confirmButtonText: '是',
                     cancelButtonText: '否',
diff --git a/src/pages/wrongBook/do/index.vue b/src/pages/wrongBook/do/index.vue
index 782f549..5a0d446 100644
--- a/src/pages/wrongBook/do/index.vue
+++ b/src/pages/wrongBook/do/index.vue
@@ -1,6 +1,6 @@
 <template>
     <div>
-        <breadcrumb :data="'我的练习/练习'"></breadcrumb> 
+        <breadcrumb :data="'错题练习/错题练习'"></breadcrumb> 
         <div class="box">
             <div class="page left">
                 <div>
diff --git a/src/styles/common.scss b/src/styles/common.scss
index ae907fe..e8dcf0c 100644
--- a/src/styles/common.scss
+++ b/src/styles/common.scss
@@ -284,8 +284,15 @@
             color: #ffa900;
         }
     }
-    .el-button--primary,.el-button--primary:hover, .el-button--primary:focus{
-        background: #CC221C;
+    .el-button--primary{
+        color: #606266;
+        background: #fff;
+        border-color: #DCDFE6;
+        &:hover{
+            color: $--color-primary;
+            border-color: #efbdbb;
+            background-color: #fae9e8;
+        }
     }
 }