From 4e9b321312df7e751d8ef54ddbe4883f039324a2 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Fri, 25 Dec 2020 11:51:32 +0800
Subject: [PATCH] .

---
 src/api/index.js                              |   3 +
 src/components/messageBoard/index.vue         |  72 -----
 src/components/testPaperDetail/index.vue      |   7 +-
 src/layouts/header/index.vue                  |   7 +-
 src/libs/auth/generateBtnPermission.js        |   4 +-
 src/libs/bus.js                               |   6 +-
 src/libs/random_str.js                        |  10 +-
 src/libs/route/addRoutes.js                   |   8 +-
 src/libs/route/generateRoutes.js              |   6 +-
 src/libs/route/resetRouter.js                 |   2 +-
 src/libs/util.cookies.js                      |   6 +-
 src/libs/util.js                              |   8 +-
 src/pages/account/login/index.vue             |   8 +-
 src/pages/achievement/detail/index.vue        |   6 +-
 src/pages/achievement/list/wrongBook.vue      | 280 ++++++++++++++----
 src/pages/assessment/detail/index.vue         |   6 +-
 src/pages/messageBoard/list/index.vue         |  19 +-
 src/pages/practice/detail/index.vue           |   8 +-
 src/plugins/auth/index.js                     |  10 +-
 src/store/modules/auth.js                     |  26 ++
 src/store/modules/practice.js                 |   2 +-
 src/store/modules/user.js                     |   4 +-
 .../lib/{background.scss => _background.scss} |   0
 src/styles/lib/{border.scss => _border.scss}  |   0
 src/styles/lib/{box.scss => _box.scss}        |   0
 src/styles/lib/{cursor.scss => _cursor.scss}  |   0
 .../lib/{display.scss => _display.scss}       |   0
 src/styles/lib/{flex.scss => _flex.scss}      |   0
 src/styles/lib/{float.scss => _float.scss}    |   0
 .../lib/{font-size.scss => _font-size.scss}   |   0
 .../{font-weight.scss => _font-weight.scss}   |   0
 .../{line-height.scss => _line-height.scss}   |   0
 src/styles/lib/{link.scss => _link.scss}      |   0
 .../lib/{overflow.scss => _overflow.scss}     |   0
 .../lib/{position.scss => _position.scss}     |   0
 src/styles/lib/{size.scss => _size.scss}      |   0
 .../lib/{text-align.scss => _text-align.scss} |   0
 .../lib/{text-color.scss => _text-color.scss} |   0
 ...rtical-align.scss => _vertical-align.scss} |   0
 .../lib/{visibility.scss => _visibility.scss} |   0
 .../{white-space.scss => _white-space.scss}   |   0
 src/styles/lib/index.scss                     |   3 +-
 src/styles/lib/mixin.scss                     |   9 -
 src/styles/var.scss                           |  24 ++
 vue.config.js                                 |   3 +
 45 files changed, 337 insertions(+), 210 deletions(-)
 delete mode 100644 src/components/messageBoard/index.vue
 create mode 100644 src/store/modules/auth.js
 rename src/styles/lib/{background.scss => _background.scss} (100%)
 rename src/styles/lib/{border.scss => _border.scss} (100%)
 rename src/styles/lib/{box.scss => _box.scss} (100%)
 rename src/styles/lib/{cursor.scss => _cursor.scss} (100%)
 rename src/styles/lib/{display.scss => _display.scss} (100%)
 rename src/styles/lib/{flex.scss => _flex.scss} (100%)
 rename src/styles/lib/{float.scss => _float.scss} (100%)
 rename src/styles/lib/{font-size.scss => _font-size.scss} (100%)
 rename src/styles/lib/{font-weight.scss => _font-weight.scss} (100%)
 rename src/styles/lib/{line-height.scss => _line-height.scss} (100%)
 rename src/styles/lib/{link.scss => _link.scss} (100%)
 rename src/styles/lib/{overflow.scss => _overflow.scss} (100%)
 rename src/styles/lib/{position.scss => _position.scss} (100%)
 rename src/styles/lib/{size.scss => _size.scss} (100%)
 rename src/styles/lib/{text-align.scss => _text-align.scss} (100%)
 rename src/styles/lib/{text-color.scss => _text-color.scss} (100%)
 rename src/styles/lib/{vertical-align.scss => _vertical-align.scss} (100%)
 rename src/styles/lib/{visibility.scss => _visibility.scss} (100%)
 rename src/styles/lib/{white-space.scss => _white-space.scss} (100%)
 delete mode 100644 src/styles/lib/mixin.scss
 create mode 100644 src/styles/var.scss

diff --git a/src/api/index.js b/src/api/index.js
index 9e2c2d6..48d1884 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -188,4 +188,7 @@ export default {
   getMineClass:`/management/practise/review/getMineClass`,
   AchievementListByClassId:`/management/practise/review/AchievementListByClassId`,
   byClassIdGetPractise:`/management/practise/review/byClassIdGetPractise`,
+
+  // 错题管理
+  pageByNameWrong:`/management/wrongTopic/pageByName`,
 }
\ No newline at end of file
diff --git a/src/components/messageBoard/index.vue b/src/components/messageBoard/index.vue
deleted file mode 100644
index 82c4d41..0000000
--- a/src/components/messageBoard/index.vue
+++ /dev/null
@@ -1,72 +0,0 @@
-<template>
-    <div>
-        <div class="message" @click="showMessage">
-            <img src="../../assets/img/message.png">
-            留言板
-        </div>
-
-        <el-dialog title="留言内容" :visible.sync="messageVisible" width="30%" @close="closeMessage" :close-on-click-modal="false" :modal-append-to-body="false" :modal="true">
-            <div class="message-wrap">
-                <div class="people">张三提问于2020-12-11</div>
-                <el-input type="textarea" rows="3"></el-input>
-                <div class="btn-wrap">
-                    <el-button type="primary" size="small">回复</el-button>
-                    <el-button type="error" size="small">删除</el-button>
-                </div>
-                <!-- <quill :border="true" :height="100"></quill> -->
-                <el-input type="textarea" rows="3"></el-input>
-            </div>
-            <span slot="footer" class="dialog-footer">
-                <el-button @click="messageVisible = false" size="small">取消</el-button>
-                <el-button type="primary" size="small">确定</el-button>
-            </span>
-        </el-dialog>
-    </div>
-</template>
-<script>
-import Setting from '@/setting';
-import quill from '@/components/quill';
-export default {
-    data() {
-        return {
-            messageVisible: false
-        };
-    },
-    components: {quill},
-    methods: {
-        closeMessage(){
-
-        },
-        showMessage(){
-            this.messageVisible = true
-        }
-    },
-};
-</script>
-<style lang="scss" scoped>
-    .message{
-        display: inline-flex;
-        align-items: center;
-        margin-right: 20px;
-        color: #666;
-        font-size: 12px;
-        cursor: pointer;
-        &:hover{
-            opacity: .8;
-        }
-        img{
-            margin-right: 5px;
-        }
-    }
-    .message-wrap{
-        .people{
-            margin-bottom: 10px;
-            font-size: 12px;
-            color: #333;
-        }
-        .btn-wrap{
-            margin: 10px 0;
-            text-align: right;
-        }
-    }
-</style>
diff --git a/src/components/testPaperDetail/index.vue b/src/components/testPaperDetail/index.vue
index abf7ca5..42de91c 100644
--- a/src/components/testPaperDetail/index.vue
+++ b/src/components/testPaperDetail/index.vue
@@ -176,7 +176,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-    $mainColor: #e80909;
     .box{
         width: 90%;
         margin: 0 auto;
@@ -223,7 +222,7 @@ export default {
                 left: 0;
                 width: 100%;
                 height: 4px;
-                background-color: $mainColor;
+                background-color: $main-color;
             }
         }
     }
@@ -293,8 +292,8 @@ export default {
             cursor: pointer;
             &.submit{
                 color: #fff;
-                background-color: $mainColor;
-                border-color: $mainColor;
+                background-color: $main-color;
+                border-color: $main-color;
             }
             &:hover{
                 opacity: .8;
diff --git a/src/layouts/header/index.vue b/src/layouts/header/index.vue
index 4505aac..3f9c0b6 100644
--- a/src/layouts/header/index.vue
+++ b/src/layouts/header/index.vue
@@ -39,13 +39,14 @@ export default {
         
     },
     methods: {
+        ...mapActions('user', [
+            'logout'
+        ]),
         toPerson(){
             this.$router.push('/setting/person')
         },
         loginout() {
-            sessionStorage.removeItem(Setting.usernameKey);
-            sessionStorage.removeItem(Setting.storeKey);
-            location.reload()
+            this.logout()
         },
         back(){
             this.$router.back()
diff --git a/src/libs/auth/generateBtnPermission.js b/src/libs/auth/generateBtnPermission.js
index fff1faa..8ff2f6b 100644
--- a/src/libs/auth/generateBtnPermission.js
+++ b/src/libs/auth/generateBtnPermission.js
@@ -2,7 +2,7 @@
  * @description 生成按钮级别权限组
  * */
 
-import store from '@/store';
+import store from '@/store'
 export default function(data){
     let result = []
     data.map(e => {
@@ -21,6 +21,6 @@ export default function(data){
             })
         }
     })
-    store.commit('addBtnPerData',{btnPermissions: result})
+    store.auth.commit('addBtnAuth',{btns: result})
     // console.log('geneBtn:',result)
 }
diff --git a/src/libs/bus.js b/src/libs/bus.js
index b433c90..e1402d8 100644
--- a/src/libs/bus.js
+++ b/src/libs/bus.js
@@ -1,6 +1,6 @@
-import Vue from 'vue';
+import Vue from 'vue'
 
 // 使用 Event Bus
-const bus = new Vue();
+const bus = new Vue()
 
-export default bus;
\ No newline at end of file
+export default bus
\ No newline at end of file
diff --git a/src/libs/random_str.js b/src/libs/random_str.js
index d9b5838..64971da 100644
--- a/src/libs/random_str.js
+++ b/src/libs/random_str.js
@@ -1,10 +1,10 @@
 // 生成随机字符串
 export default function (len = 32) {
-    const $chars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890';
-    const maxPos = $chars.length;
-    let str = '';
+    const $chars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890'
+    const maxPos = $chars.length
+    let str = ''
     for (let i = 0; i < len; i++) {
-        str += $chars.charAt(Math.floor(Math.random() * maxPos));
+        str += $chars.charAt(Math.floor(Math.random() * maxPos))
     }
-    return str;
+    return str
 }
diff --git a/src/libs/route/addRoutes.js b/src/libs/route/addRoutes.js
index 331056f..25359ba 100644
--- a/src/libs/route/addRoutes.js
+++ b/src/libs/route/addRoutes.js
@@ -1,6 +1,6 @@
-import store from '@/store';
-import router from '@/router';
-import generateBtnPermission from '../auth/generateBtnPermission';
+import store from '@/store'
+import router from '@/router'
+import generateBtnPermission from '../auth/generateBtnPermission'
 
 const newRoutes = []
 
@@ -29,6 +29,6 @@ export default function(data,path){
     createRoute(data)
     let routes = router.options.routes
     routes[1].children = [...routes[1].children,...newRoutes]
-    store.commit("addRoutesData", { routes })
+    store.auth.commit("addRoutes", { routes })
     router.addRoutes(routes)
 }
\ No newline at end of file
diff --git a/src/libs/route/generateRoutes.js b/src/libs/route/generateRoutes.js
index 02362a4..2762f9a 100644
--- a/src/libs/route/generateRoutes.js
+++ b/src/libs/route/generateRoutes.js
@@ -1,9 +1,9 @@
-import store from '@/store';
-import router from '@/router';
+import store from '@/store'
+import router from '@/router'
 
 export default function(){
     setTimeout(() => {
-        let routes = store.state.routes
+        let routes = store.state.auth.routes
         routes.forEach(e => {
             if(e.path == '/'){
                 e.component = () => import('@/layouts/home/index.vue')
diff --git a/src/libs/route/resetRouter.js b/src/libs/route/resetRouter.js
index 096e4f5..478cfd5 100644
--- a/src/libs/route/resetRouter.js
+++ b/src/libs/route/resetRouter.js
@@ -1,4 +1,4 @@
-import router from '@/router';
+import router from '@/router'
 
 export default function(){
     const newRouter = createRouter()
diff --git a/src/libs/util.cookies.js b/src/libs/util.cookies.js
index 63c9a8b..5085a59 100644
--- a/src/libs/util.cookies.js
+++ b/src/libs/util.cookies.js
@@ -1,7 +1,7 @@
-import Cookies from 'js-cookie';
-import Setting from '@/setting';
+import Cookies from 'js-cookie'
+import Setting from '@/setting'
 
-const cookies = {};
+const cookies = {}
 
 /**
  * @description 存储 cookie 值
diff --git a/src/libs/util.js b/src/libs/util.js
index f342b94..1c8fb9a 100644
--- a/src/libs/util.js
+++ b/src/libs/util.js
@@ -1,5 +1,5 @@
-import cookies from './util.cookies';
-import {_local,_session} from './util.db';
+import cookies from './util.cookies'
+import {_local,_session} from './util.db'
 
 const util = {
   cookies,
@@ -73,6 +73,6 @@ const util = {
     if('jpg,jpeg,png,gif,svg,psd'.includes(ext)) return true
     return false
   }
-};
+}
 
-export default util;
\ No newline at end of file
+export default util
\ No newline at end of file
diff --git a/src/pages/account/login/index.vue b/src/pages/account/login/index.vue
index 40e70b4..205cbfe 100644
--- a/src/pages/account/login/index.vue
+++ b/src/pages/account/login/index.vue
@@ -53,7 +53,7 @@
 </template>
 
 <script>
-import { mapActions } from 'vuex';
+import { mapActions } from 'vuex'
 export default {
     data: function() {
         return {
@@ -94,11 +94,9 @@ export default {
                     this.login(data).then(() => {
                         this.$router.replace('/index')
                     })
-                    .catch(() => {
-                        
-                    })
+                    .catch(() => {})
                 }
-            });
+            })
         }
     },
 };
diff --git a/src/pages/achievement/detail/index.vue b/src/pages/achievement/detail/index.vue
index c12fca6..1a132e3 100644
--- a/src/pages/achievement/detail/index.vue
+++ b/src/pages/achievement/detail/index.vue
@@ -185,7 +185,7 @@ export default {
                 left: 0;
                 width: 100%;
                 height: 4px;
-                background-color: #e80909;
+                background-color: $main-color;
             }
         }
     }
@@ -251,8 +251,8 @@ export default {
             cursor: pointer;
             &.submit{
                 color: #fff;
-                background-color: #e80909;
-                border-color: #e80909;
+                background-color: $main-color;
+                border-color: $main-color;
             }
             &:hover{
                 opacity: .8;
diff --git a/src/pages/achievement/list/wrongBook.vue b/src/pages/achievement/list/wrongBook.vue
index dd9acf8..48e0301 100644
--- a/src/pages/achievement/list/wrongBook.vue
+++ b/src/pages/achievement/list/wrongBook.vue
@@ -10,13 +10,18 @@
                     <div class="flex j-between">
                         <el-form label-width="80px" inline>
                             <el-form-item class="no-mb" label="错题来源">
-                                <el-select v-model="publishStatus" clearable placeholder="请选择错题来源" @change="getData">
-                                    <el-option v-for="(item,index) in statusList" :key="index" :label="item.name" :value="item.value"></el-option>
+                                <el-select v-model="type" clearable placeholder="请选择错题来源" @change="getName">
+                                    <el-option v-for="(item,index) in typeList" :key="index" :label="item.name" :value="item.id"></el-option>
                                 </el-select>
                             </el-form-item>
-                            <el-form-item class="no-mb" label="试卷名称">
-                                <el-select v-model="publishStatus" clearable placeholder="请选择试卷名称" @change="getData">
-                                    <el-option v-for="(item,index) in statusList" :key="index" :label="item.name" :value="item.value"></el-option>
+                            <el-form-item class="no-mb" label="练习名称" v-if="type == 2">
+                                <el-select v-model="name" clearable placeholder="请选择练习名称" @change="getData">
+                                    <el-option v-for="(item,index) in nameList" :key="index" :label="item.practiseName" :value="item.practiseId"></el-option>
+                                </el-select>
+                            </el-form-item>
+                            <el-form-item class="no-mb" label="考核名称" v-else>
+                                <el-select v-model="name" clearable placeholder="请选择考核名称" @change="getData">
+                                    <el-option v-for="(item,index) in nameList" :key="index" :label="item.assessmentName" :value="item.id"></el-option>
                                 </el-select>
                             </el-form-item>
                         </el-form>
@@ -61,18 +66,30 @@
                                 slot-scope="scope"
                             >{{scope.$index + (page - 1) * pageSize + 1}}</template>
                         </el-table-column>
-                        <el-table-column prop="name" label="错题来源" align="center"></el-table-column>
-                        <el-table-column prop="name" label="试卷名称" align="center"></el-table-column>
-                        <el-table-column prop="name" label="所需知识点" align="center"></el-table-column>
-                        <el-table-column prop="name" label="教学班级" align="center"></el-table-column>
-                        <el-table-column prop="name" label="真实姓名" align="center"></el-table-column>
-                        <el-table-column prop="name" label="学号" align="center"></el-table-column>
-                        <el-table-column prop="name" label="错题数" align="center"></el-table-column>
-                        <el-table-column prop="name" label="重做正确率" align="center"></el-table-column>
-                        <el-table-column prop="name" label="知识点掌握程度" align="center"></el-table-column>
+                        <el-table-column label="错题来源" align="center">
+                            <template>
+                                {{type == 1 ? '考核试卷' : '练习试卷'}}
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="试卷名称" align="center">
+                            <template slot-scope="scope">
+                                
+                            </template>
+                        </el-table-column>
+                        <el-table-column prop="knowledgePoints" label="所需知识点" align="center"></el-table-column>
+                        <el-table-column label="题干名称" align="center">
+                            <template slot-scope="scope">
+                                <div v-html="scope.row.questionStem"></div>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="错题人数" align="center">
+                            <template slot-scope="scope">
+                                <el-button type="text" @click="showNum(scope.row)">{{scope.row.wrongNum}}</el-button>
+                            </template>
+                        </el-table-column>
                         <el-table-column label="操作" align="center">
                             <template slot-scope="scope">
-                                <el-button type="text" @click="show(scope.row)">查看详情</el-button>
+                                <el-button type="text" @click="show(scope.row)">查看</el-button>
                             </template>
                         </el-table-column>
                     </el-table>
@@ -89,22 +106,109 @@
                 </el-card>
             </el-col>
         </el-row>
+
+        <el-dialog title="错题人数" :visible.sync="numVisible" width="50%">
+            <el-table
+                :data="numList"
+                ref="table"
+                row-key="id"
+                class="table"
+                stripe
+                header-align="center"
+            >
+                <el-table-column type="index" width="100" label="序号" align="center">
+                    <template
+                        slot-scope="scope"
+                    >{{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="score" label="所属班级" align="center"></el-table-column>
+                <el-table-column prop="score" label="重做正确率" align="center"></el-table-column>
+                <el-table-column prop="score" label="知识点掌握程度" align="center"></el-table-column>
+                <el-table-column label="操作" align="center">
+                    <template slot-scope="scope">
+                        <el-button type="text" @click="show(scope.row)">查看</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <div class="pagination">
+                <el-pagination
+                    background
+                    @current-change="handleNumCurrentChange"
+                    :current-page="pageNum"
+                    :page-size="pageSizeNum"
+                    layout="total,prev, pager, next"
+                    :total="totalNum"
+                ></el-pagination>
+            </div>
+        </el-dialog>
+
+        <el-dialog title="错题详情" :visible.sync="detailVisible" width="40%">
+            <!-- <div class="ques">
+                <div class="meta">
+                    <p class="key">题干：</p>
+                    <p class="val" v-html="item.questionStem"></p>
+                    <div class="media" :id="item.mediaEleId"></div>
+                </div>
+                <div class="meta">
+                    <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">
+                        <p class="key">正确答案：</p>
+                        <p class="val">{{item.answer}}</p>
+                    </div>
+                </div>
+                <div class="meta">
+                    <p class="key">答案解析：</p>
+                    <p class="val" v-html="item.answerAnalysis"></p>
+                </div>
+            </div> -->
+        </el-dialog>
     </div>
 </template>
 <script>
+import { mapState,mapActions } from 'vuex'
 export default {
     data() {
         return {
-            listData: [],
             keyword: '',
+            type: 1,
+            typeList: [
+                {
+                    id: 1,
+                    name: '考核试卷'
+                },{
+                    id: 2,
+                    name: '练习试卷'
+                }
+            ],
+            name: '',
+            nameList: [],
+            listData: [],
             page: 1,
             pageSize: 10,
             total: 0,
             searchTimer: null,
+            numVisible: false,
+            numList: [],
+            pageNum: 0,
+            pageSizeNum: 10,
+            totalNum: 0,
+            detailVisible: false
         };
     },
+    computed: {
+        ...mapState('user', [
+            'userId','clientId'
+        ]),
+    },
     mounted() {
-        this.getData()
+        this.getName()
     },
     watch: {
         keyword: function(val) {
@@ -116,33 +220,71 @@ export default {
     },
     methods: {
         getData() {
-            // this.$get(this.api.list, {
-            //     page: this.page,
-            //     size: this.pageSize,
-            //     questionStem: this.keyword,
-            //     questionType: this.subject
-            // })
-            // .then(res => {
-            //     this.total = res.page.totalCount; //总条数
-            //     this.page = res.page.currPage; //当前页数
-            //     this.listData = res.page.list;
-            //     this.$refs.table.clearSelection()
-            // })
-            // .catch(err => {})
+            this.$post(`${this.api.pageByNameWrong}?type=${this.type}&pageNum=${this.page}&pageSize=${this.pageSize}&practiseName=${this.keyword}&userId=${this.userId}&id=${this.name}`)
+            .then(res => {
+                this.listData = res.data.list.list
+                this.total = res.data.list.totalCount
+            })
+            .catch(err => {})
+        },
+        getName() {
+            if(this.type == 1){
+                this.$get(this.api.queryAssessment, {
+                    page: 1,
+                    size: 1000,
+                    type: '',
+                    state: '',
+                    assessmentName: '',
+                    userId: this.userId
+                })
+                .then(res => {
+                    this.nameList = res.data.Assessment
+                    this.name = this.nameList[0].id
+                    this.getData()
+                }).catch(err => {})
+            }else{
+                this.$post(`${this.api.pageByName}?pageNum=1&pageSize=1000&practiseName=&userId=${this.userId}`)
+                .then(res => {
+                    this.nameList = res.data.list.list
+                    this.name = this.nameList[0].practiseId
+                    this.getData()
+                }).catch(err => {})
+            }
         },
         handleCurrentChange(val) {
             this.page = val
             this.getData()
         },
-        closeTopics() {
-            this.isShowTopics = false
-            this.resetForm()
+        getNum() {
+            this.$post(`${this.api.pageByNameWrong}?type=${this.type}&pageNum=${this.page}&pageSize=${this.pageSize}&practiseName=${this.keyword}&userId=${this.userId}&id=${this.name}`)
+            .then(res => {
+                this.numData = res.data.list.list
+                this.totalNum = res.data.list.totalCount
+            })
+            .catch(err => {})
         },
         handleSelectionChange(val) {
-            this.multipleSelection = val;
+            this.multipleSelection = val
+        },
+        handleNumCurrentChange(val) {
+            this.pageNum = val
+            this.getData()
+        },
+        showNum(row){
+            this.numVisible = true
+            this.getNum()
+        },
+        getDetail() {
+            this.$post(`${this.api.pageByNameWrong}?type=${this.type}&pageNum=${this.page}&pageSize=${this.pageSize}&practiseName=${this.keyword}&userId=${this.userId}&id=${this.name}`)
+            .then(res => {
+                this.numData = res.data.list.list
+                this.totalNum = res.data.list.totalCount
+            })
+            .catch(err => {})
         },
         show(row){
-            this.$router.push('/testPaper/show')
+            this.detailVisible = true
+            this.getDetail()
         },
     }
 };
@@ -152,31 +294,47 @@ export default {
     /deep/.no-mb.el-form-item{
         margin-bottom: 0;
     }
-    /deep/.el-radio{
-        margin-right: 15px;
-    }
-    ::v-deep .el-checkbox-group{
-        font-size: 2px;
-    }
-    .Upload {
-        text-align: center;
-    }
-    .bt {
-        margin-bottom: 15px;
-    }
-    .flex_around {
-        display: flex;
-        justify-content: space-around;
-        align-items: center;
-    }
-    .card_m {
-        margin: 10px 0 20px 0;
-    }
-    .input ::v-deep .el-input {
-        width: 50%;
-    }
-    .radio {
-        margin: 0 15px 0 30px;
-        font-weight: 600;
+    .ques{
+        .key{
+            font-weight: bold;
+            color: #333;
+            font-size: 14px;
+        }
+        .val{
+            color: #757575;
+            font-size: 14px;
+        }
+        .answer{
+            display: flex;
+            align-items: center;
+            padding: 15px;
+            margin: 15px 0;
+            font-size: 12px;
+            border: 1px solid #e8e8e8;
+            background-color: #f3f2f2;
+            .info{
+                display: inline-flex;
+                align-items: center;
+                margin-right: 30px;
+            }
+        }
+        .meta{
+            padding-left: 10px;
+            margin: 20px 0;
+            font-size: 12px;
+            &.ans{
+                display: flex;
+                align-items: center;
+                .info{
+                    margin-right: 20px;
+                }
+            }
+            .key{
+                margin-bottom: 5px;
+            }
+            .media{
+                margin-top: 10px;
+            }
+        }
     }
 </style>
\ No newline at end of file
diff --git a/src/pages/assessment/detail/index.vue b/src/pages/assessment/detail/index.vue
index c12fca6..1a132e3 100644
--- a/src/pages/assessment/detail/index.vue
+++ b/src/pages/assessment/detail/index.vue
@@ -185,7 +185,7 @@ export default {
                 left: 0;
                 width: 100%;
                 height: 4px;
-                background-color: #e80909;
+                background-color: $main-color;
             }
         }
     }
@@ -251,8 +251,8 @@ export default {
             cursor: pointer;
             &.submit{
                 color: #fff;
-                background-color: #e80909;
-                border-color: #e80909;
+                background-color: $main-color;
+                border-color: $main-color;
             }
             &:hover{
                 opacity: .8;
diff --git a/src/pages/messageBoard/list/index.vue b/src/pages/messageBoard/list/index.vue
index cb72e66..fd5d70f 100644
--- a/src/pages/messageBoard/list/index.vue
+++ b/src/pages/messageBoard/list/index.vue
@@ -44,7 +44,7 @@
                                 </div>
                                 <div class="action">
                                     <button v-if="reply.commentUserId != userId" class="btn" @click="showReply(reply)">回复</button>
-                                    <button v-else class="btn" @click="delReply(reply)">删除</button>
+                                    <button v-else class="btn" @click="delReply(reply,i,index)">删除</button>
                                 </div>
                                 <div class="reply" v-if="reply.showReply">
                                     <quill :border="true" v-model="reply.replyContent" :height="150" />
@@ -107,8 +107,7 @@ export default {
             .then(res => {
                 this.listData = this.handleList(res.data.list.list)
                 this.total = res.data.list.totalCount
-            })
-            .catch(err => {})
+            }).catch(err => {})
         },
         handleList(list){
             list.map(n => {
@@ -138,7 +137,6 @@ export default {
                     replyList = replyList.concat(n.replyList)
                 })
                 children = children.concat(replyList)
-                console.log(11,replyList,children)
                 row.children = this.handleList(children)
                 row.showChildren = true
             }).catch(res => {})
@@ -165,16 +163,16 @@ export default {
                 this.getData()
             }).catch(res => {})
         },
-        delReply(row){
+        delReply(row,i,index){
             if(row.identification == 1){
                 this.$post(`${this.api.delComment}?commentId=${row.commentId}`).then(res => {
                     this.$message.success('删除成功')
-                    this.getData()
+                    this.listData[index].children.splice(i,1)
                 }).catch(res => {})
             }else{
                 this.$post(`${this.api.delReply}?replyId=${row.replyId}`).then(res => {
                     this.$message.success('删除成功')
-                    this.getData()
+                    this.listData[index].children.splice(i,1)
                 }).catch(res => {})
             }
         },
@@ -209,7 +207,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-    $mainColor: #cc201c;
     .list{
         li{
             padding-bottom: 10px;
@@ -234,7 +231,7 @@ export default {
                         margin-bottom: 5px;
                         font-size: 14px;
                         .username{
-                            color: $mainColor;
+                            color: $main-color;
                         }
                         .publish{
                             margin: 0 5px;
@@ -256,7 +253,7 @@ export default {
                 text-align: right;
                 .btn{
                     padding: 2px 4px;
-                    color: $mainColor;
+                    color: $main-color;
                     font-size: 12px;
                     background-color: #fff;
                     border: 1px solid;
@@ -286,7 +283,7 @@ export default {
     .toggle{
         margin: 10px 0;
         text-align: center;
-        color: $mainColor;
+        color: $main-color;
         font-size: 12px;
         span{
             cursor: pointer;
diff --git a/src/pages/practice/detail/index.vue b/src/pages/practice/detail/index.vue
index b2a09a4..06073cb 100644
--- a/src/pages/practice/detail/index.vue
+++ b/src/pages/practice/detail/index.vue
@@ -115,7 +115,7 @@ export default {
                             if(i.includes('option')) answer.push(n[i])
                         }
                         n.answer = answer.join('|')
-                        n.userAnswer = n.userAnswer.replace(/&lt;&gt;/g,'|')
+                        n.userAnswer = n.userAnswer ? n.userAnswer.replace(/&lt;&gt;/g,'|') : ''
                     }
                 })
                 this.list = data.list
@@ -202,7 +202,7 @@ export default {
                 left: 0;
                 width: 100%;
                 height: 4px;
-                background-color: #e80909;
+                background-color: $main-color;
             }
         }
     }
@@ -268,8 +268,8 @@ export default {
             cursor: pointer;
             &.submit{
                 color: #fff;
-                background-color: #e80909;
-                border-color: #e80909;
+                background-color: $main-color;
+                border-color: $main-color;
             }
             &:hover{
                 opacity: .8;
diff --git a/src/plugins/auth/index.js b/src/plugins/auth/index.js
index b76d1c9..6375be0 100644
--- a/src/plugins/auth/index.js
+++ b/src/plugins/auth/index.js
@@ -1,9 +1,9 @@
 /**
  * @description 鉴权指令
  * 当传入的权限当前用户没有时，会移除该组件
- * 用例：<Tag v-auth">text</Tag> 或者：<Tag v-auth="'user:编辑'">text</Tag>
+ * 用例：<Tag v-auth>text</Tag> 或者：<Tag v-auth="'user:编辑'">text</Tag>
  * */
-import store from '@/store';
+import store from '@/store'
 
 export default {
     inserted (el, binding, vnode) {
@@ -13,13 +13,13 @@ export default {
         }else{
             btnText = `${vnode.context.$route.name}:${el.innerText}`
         }
-        const btnPermissions = store.state.btnPermissions;
+        const btnPermissions = store.state.auth.btns
         // console.log(22,btnText,btnPermissions)
 
         if (btnText && btnPermissions && btnPermissions.length) {
-            const isPermission = btnPermissions.includes(btnText);
+            const isPermission = btnPermissions.includes(btnText)
             if (!isPermission) {
-                el.parentNode && el.parentNode.removeChild(el);
+                el.parentNode && el.parentNode.removeChild(el)
             }
         }
     }
diff --git a/src/store/modules/auth.js b/src/store/modules/auth.js
new file mode 100644
index 0000000..4ffed5e
--- /dev/null
+++ b/src/store/modules/auth.js
@@ -0,0 +1,26 @@
+/**
+ * 权限管理
+ * */
+export default {
+    namespaced: true,
+    state: {
+        btns: [],
+        routes: []
+    },
+    mutations: {
+        SET_BTN_AUTH: (state, btns) => {
+            state.btns = btns
+        },
+        SET_ROUTE: (state, routes) => {
+            state.routes = routes
+        },
+    },
+    actions: {
+        addBtnAuth({ state,commit },btns) {
+            commit('SET_BTN_AUTH',btns)
+        },
+        addRoutes({ state,commit },routes) {
+            commit('SET_ROUTE',routes)
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/store/modules/practice.js b/src/store/modules/practice.js
index 066eb88..492feec 100644
--- a/src/store/modules/practice.js
+++ b/src/store/modules/practice.js
@@ -1,5 +1,5 @@
 /**
- * 考核管理
+ * 练习管理
  * */
 export default {
     namespaced: true,
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 986f676..4482c25 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -50,7 +50,7 @@ export default {
         },
         SET_CLIENTNAME: (state, clientName) => {
             state.clientName = clientName
-        }
+        },
     },
     actions: {
         login({ state,commit }, userInfo) {
@@ -74,7 +74,7 @@ export default {
                             Setting.dynamicRoute && addRoutes(routes)
                             util.session.set(Setting.usernameKey, user.userName)
                             util.session.set(Setting.storeKey, JSON.stringify(state))
-                            Message.success('登录成功');
+                            Message.success('登录成功')
                             resolve()
                         }else{
                             Message.error('该用户没有权限')
diff --git a/src/styles/lib/background.scss b/src/styles/lib/_background.scss
similarity index 100%
rename from src/styles/lib/background.scss
rename to src/styles/lib/_background.scss
diff --git a/src/styles/lib/border.scss b/src/styles/lib/_border.scss
similarity index 100%
rename from src/styles/lib/border.scss
rename to src/styles/lib/_border.scss
diff --git a/src/styles/lib/box.scss b/src/styles/lib/_box.scss
similarity index 100%
rename from src/styles/lib/box.scss
rename to src/styles/lib/_box.scss
diff --git a/src/styles/lib/cursor.scss b/src/styles/lib/_cursor.scss
similarity index 100%
rename from src/styles/lib/cursor.scss
rename to src/styles/lib/_cursor.scss
diff --git a/src/styles/lib/display.scss b/src/styles/lib/_display.scss
similarity index 100%
rename from src/styles/lib/display.scss
rename to src/styles/lib/_display.scss
diff --git a/src/styles/lib/flex.scss b/src/styles/lib/_flex.scss
similarity index 100%
rename from src/styles/lib/flex.scss
rename to src/styles/lib/_flex.scss
diff --git a/src/styles/lib/float.scss b/src/styles/lib/_float.scss
similarity index 100%
rename from src/styles/lib/float.scss
rename to src/styles/lib/_float.scss
diff --git a/src/styles/lib/font-size.scss b/src/styles/lib/_font-size.scss
similarity index 100%
rename from src/styles/lib/font-size.scss
rename to src/styles/lib/_font-size.scss
diff --git a/src/styles/lib/font-weight.scss b/src/styles/lib/_font-weight.scss
similarity index 100%
rename from src/styles/lib/font-weight.scss
rename to src/styles/lib/_font-weight.scss
diff --git a/src/styles/lib/line-height.scss b/src/styles/lib/_line-height.scss
similarity index 100%
rename from src/styles/lib/line-height.scss
rename to src/styles/lib/_line-height.scss
diff --git a/src/styles/lib/link.scss b/src/styles/lib/_link.scss
similarity index 100%
rename from src/styles/lib/link.scss
rename to src/styles/lib/_link.scss
diff --git a/src/styles/lib/overflow.scss b/src/styles/lib/_overflow.scss
similarity index 100%
rename from src/styles/lib/overflow.scss
rename to src/styles/lib/_overflow.scss
diff --git a/src/styles/lib/position.scss b/src/styles/lib/_position.scss
similarity index 100%
rename from src/styles/lib/position.scss
rename to src/styles/lib/_position.scss
diff --git a/src/styles/lib/size.scss b/src/styles/lib/_size.scss
similarity index 100%
rename from src/styles/lib/size.scss
rename to src/styles/lib/_size.scss
diff --git a/src/styles/lib/text-align.scss b/src/styles/lib/_text-align.scss
similarity index 100%
rename from src/styles/lib/text-align.scss
rename to src/styles/lib/_text-align.scss
diff --git a/src/styles/lib/text-color.scss b/src/styles/lib/_text-color.scss
similarity index 100%
rename from src/styles/lib/text-color.scss
rename to src/styles/lib/_text-color.scss
diff --git a/src/styles/lib/vertical-align.scss b/src/styles/lib/_vertical-align.scss
similarity index 100%
rename from src/styles/lib/vertical-align.scss
rename to src/styles/lib/_vertical-align.scss
diff --git a/src/styles/lib/visibility.scss b/src/styles/lib/_visibility.scss
similarity index 100%
rename from src/styles/lib/visibility.scss
rename to src/styles/lib/_visibility.scss
diff --git a/src/styles/lib/white-space.scss b/src/styles/lib/_white-space.scss
similarity index 100%
rename from src/styles/lib/white-space.scss
rename to src/styles/lib/_white-space.scss
diff --git a/src/styles/lib/index.scss b/src/styles/lib/index.scss
index acf06a0..6003530 100644
--- a/src/styles/lib/index.scss
+++ b/src/styles/lib/index.scss
@@ -25,5 +25,4 @@
 @import "visibility";
 @import "white-space";
 
-@import "style";
-@import "mixin";
\ No newline at end of file
+@import "style";
\ No newline at end of file
diff --git a/src/styles/lib/mixin.scss b/src/styles/lib/mixin.scss
deleted file mode 100644
index ad48275..0000000
--- a/src/styles/lib/mixin.scss
+++ /dev/null
@@ -1,9 +0,0 @@
-@mixin ellipsis {
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-}
-
-.ellipsis{
-    @include ellipsis();
-}
\ No newline at end of file
diff --git a/src/styles/var.scss b/src/styles/var.scss
new file mode 100644
index 0000000..db7369c
--- /dev/null
+++ b/src/styles/var.scss
@@ -0,0 +1,24 @@
+$main-color: #e80909;
+
+@mixin ellipsis {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
+@mixin mul-ellipsis($num) {
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: $num;
+    text-overflow: ellipsis;
+    overflow: hidden;
+}
+
+.ellipsis{
+    @include ellipsis();
+}
+.mul-ellipsis2{
+    @include mul-ellipsis(2);
+}
+.mul-ellipsis3{
+    @include mul-ellipsis(3);
+}
\ No newline at end of file
diff --git a/vue.config.js b/vue.config.js
index cd4f100..ac91734 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -13,6 +13,9 @@ module.exports = {
   lintOnSave: true,
   css: {
     loaderOptions: {
+      sass: {
+        prependData: `@import "@/styles/var.scss";`
+      },
       postcss: {
         plugins: [
           postcss