From cf99172f6a07ccfdb3cbd8e00ad4f627092c2f45 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Tue, 11 May 2021 14:57:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AE=A2=E6=88=B7=E6=89=80?=
 =?UTF-8?q?=E6=8F=90=E7=BC=BA=E9=99=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/testPaperDetail/index.vue   |  1 +
 src/pages/achievement/list/wrongBook.vue   | 10 +++-
 src/pages/assessment/detail/index.vue      |  1 +
 src/pages/assessment/doReview/index.vue    |  1 +
 src/pages/assessment/list/index.vue        |  2 +-
 src/pages/index/list/index.vue             |  2 +
 src/pages/practice/detail/index.vue        |  1 +
 src/pages/practice/doReview/index.vue      |  1 +
 src/pages/practice/list/index.vue          |  2 +-
 src/pages/quesBank/list/globalQuesBank.vue | 53 ++++++++++++++++---
 src/pages/quesBank/list/myQuesBank.vue     | 59 +++++++++++++++++-----
 src/pages/quesBank/list/quesBankType.vue   | 16 +++---
 src/pages/quesBank/list/quesDialog.vue     |  8 +--
 src/pages/system/list/organization.vue     |  5 +-
 src/pages/system/list/role.vue             |  6 +--
 src/pages/testPaper/add/index.vue          |  6 +--
 src/pages/testPaper/list/allTestPaper.vue  |  2 +-
 src/pages/testPaper/list/myTestPaper.vue   | 17 +++----
 src/setting.js                             |  2 +-
 src/store/modules/testpaper.js             |  2 +-
 src/store/modules/user.js                  |  2 -
 src/styles/common.scss                     | 22 +++++---
 src/styles/pages/messageBoard.scss         |  1 +
 src/styles/pages/testPaperDetail.scss      |  2 +-
 24 files changed, 155 insertions(+), 69 deletions(-)

diff --git a/src/components/testPaperDetail/index.vue b/src/components/testPaperDetail/index.vue
index 836ddef..9fca11f 100644
--- a/src/components/testPaperDetail/index.vue
+++ b/src/components/testPaperDetail/index.vue
@@ -133,6 +133,7 @@ export default {
                             }
                         }
                         n.answer = answer.join('，')
+                        n.questionStem = n.questionStem.replace(/\(\)\(\)\(\)/g,`______`)
                     }
                 })
             }
diff --git a/src/pages/achievement/list/wrongBook.vue b/src/pages/achievement/list/wrongBook.vue
index bb10697..181ee3a 100644
--- a/src/pages/achievement/list/wrongBook.vue
+++ b/src/pages/achievement/list/wrongBook.vue
@@ -81,7 +81,7 @@
                     <p class="val" v-html="quesInfo.questionStem"></p>
                     <div class="media" :id="quesInfo.mediaEleId"></div>
                 </div>
-                <div class="meta">
+                <div class="meta" v-if="quesInfo.name == '单项选择' || quesInfo.name == '多项选择'">
                     <p class="key">选项：</p>
                     <div class="val">
                         <p v-for="(option,i) in quesInfo.options" :key="i">{{i}}.{{quesInfo.options[i]}}</p>
@@ -234,6 +234,14 @@ export default {
                         options[i.replace('option','')] = info[i]
                     }
                 }
+                if(info.name == '填空题'){
+                    let answer = []
+                    for(let i in info){
+                        if(i.includes('option') && info[i]) answer.push(info[i])
+                    }
+                    info.answer = answer.join('，')
+                    info.questionStem = info.questionStem.replace(/\(\)\(\)\(\)/g,`______`)
+                }
                 info.options = options
                 this.quesInfo = info
             }).catch(err => {})
diff --git a/src/pages/assessment/detail/index.vue b/src/pages/assessment/detail/index.vue
index bfe6d36..b9124ad 100644
--- a/src/pages/assessment/detail/index.vue
+++ b/src/pages/assessment/detail/index.vue
@@ -193,6 +193,7 @@ export default {
                     if(n.typeName == '填空题'){
                         n.answer = answer.join('，')
                         n.user_answer = n.user_answer ? n.user_answer.split('&lt;&gt;').filter(n => n).join('，') : ''
+                        n.question_stem = n.question_stem.replace(/\(\)\(\)\(\)/g,`______`)
                     }
                     n.options = options
                 }
diff --git a/src/pages/assessment/doReview/index.vue b/src/pages/assessment/doReview/index.vue
index af0e762..d58e96e 100644
--- a/src/pages/assessment/doReview/index.vue
+++ b/src/pages/assessment/doReview/index.vue
@@ -187,6 +187,7 @@ export default {
                     if(n.typeName == '填空题'){
                         n.answer = answer.join('，')
                         n.user_answer = n.user_answer ? n.user_answer.split('&lt;&gt;').filter(n => n).join('，') : ''
+                        n.question_stem = n.question_stem.replace(/\(\)\(\)\(\)/g,`______`)
                     }
                     n.options = options
                 }
diff --git a/src/pages/assessment/list/index.vue b/src/pages/assessment/list/index.vue
index 66864ed..9792a1d 100644
--- a/src/pages/assessment/list/index.vue
+++ b/src/pages/assessment/list/index.vue
@@ -48,7 +48,7 @@
                         </template>
                     </el-table-column>
                     <el-table-column prop="className" label="考试班级" align="center"></el-table-column>
-                    <el-table-column label="操作" width="180">
+                    <el-table-column label="操作" width="180" align="center">
                         <template slot-scope="scope">
                             <el-popover
                                 placement="bottom"
diff --git a/src/pages/index/list/index.vue b/src/pages/index/list/index.vue
index ca50556..39834d6 100644
--- a/src/pages/index/list/index.vue
+++ b/src/pages/index/list/index.vue
@@ -318,6 +318,8 @@ export default {
             }).catch(res => {})
         },
         submitComment(row){
+            let content = row.replyContent
+            if(!content) return util.errorMsg('请填写内容')
             let data = {
                 bid: row.bid,
                 content: row.replyContent,
diff --git a/src/pages/practice/detail/index.vue b/src/pages/practice/detail/index.vue
index 529322c..8a7d78d 100644
--- a/src/pages/practice/detail/index.vue
+++ b/src/pages/practice/detail/index.vue
@@ -156,6 +156,7 @@ export default {
                         }
                         n.answer = answer.join('，')
                         n.userAnswer = n.userAnswer ? n.userAnswer.split('&lt;&gt;').filter(n => n).join('，') : ''
+                        n.questionStem = n.questionStem.replace(/\(\)\(\)\(\)/g,`______`)
                     }
                     if(n.typeName == '简答题'){
                         if(n.fileUrl) n.fileUrl = JSON.parse(n.fileUrl)
diff --git a/src/pages/practice/doReview/index.vue b/src/pages/practice/doReview/index.vue
index 67cdb7f..4879990 100644
--- a/src/pages/practice/doReview/index.vue
+++ b/src/pages/practice/doReview/index.vue
@@ -179,6 +179,7 @@ export default {
                     }
                     n.answer = answer.join('，')
                     n.userAnswer = n.userAnswer ? n.userAnswer.split('&lt;&gt;').filter(n => n).join('，') : ''
+                    n.questionStem = n.questionStem.replace(/\(\)\(\)\(\)/g,`______`)
                 }
                 
                 if(n.fileUrl) n.fileUrl = JSON.parse(n.fileUrl)
diff --git a/src/pages/practice/list/index.vue b/src/pages/practice/list/index.vue
index 2650e31..f83dece 100644
--- a/src/pages/practice/list/index.vue
+++ b/src/pages/practice/list/index.vue
@@ -31,7 +31,7 @@
                     <el-table-column prop="totalScore" label="练习总分" align="center"></el-table-column>
                     <el-table-column prop="createTime" label="创建时间" align="center"></el-table-column>
                     <el-table-column prop="className" label="练习班级" align="center"></el-table-column>
-                    <el-table-column label="操作" width="220">
+                    <el-table-column label="操作" width="220" align="center">
                         <template slot-scope="scope">
                             <el-button type="text" @click="edit(scope.row)" v-auth>修改</el-button>
                             <el-button type="text" @click="delData(scope.row)" v-auth>删除</el-button>
diff --git a/src/pages/quesBank/list/globalQuesBank.vue b/src/pages/quesBank/list/globalQuesBank.vue
index bf636b0..ad90f81 100644
--- a/src/pages/quesBank/list/globalQuesBank.vue
+++ b/src/pages/quesBank/list/globalQuesBank.vue
@@ -26,13 +26,13 @@
             </div>
         </div>
 
-        <el-table :data="listData" class="table" stripe header-align="center" row-key="id" @selection-change="handleSelectionChange">
-            <el-table-column type="selection" width="80" align="center" :reserve-selection="true"></el-table-column>
+        <el-table :data="listData" class="table" ref="table" stripe header-align="center" row-key="id" @selection-change="handleSelectionChange">
+            <el-table-column type="selection" width="80" align="center" :reserve-selection="true" :selectable="disabledSelection"></el-table-column>
             <el-table-column type="index" width="60" label="序号" align="center"></el-table-column>
-            <el-table-column prop="questionStem" :show-overflow-tooltip="true" label="题干" align="center"></el-table-column>
+            <el-table-column prop="questionStem" :show-overflow-tooltip="true" width="300" label="题干" align="center"></el-table-column>
             <el-table-column prop="name" label="试题类型" width="100" align="center"></el-table-column>
             <el-table-column prop="courses" label="对应课程" width="140" align="center"></el-table-column>
-            <el-table-column prop="typeName" label="所属题库" width="140" align="center"></el-table-column>
+            <el-table-column prop="typeName" label="所属题库" min-width="140" align="center"></el-table-column>
             <el-table-column prop="knowledgePoints" label="知识点" width="140" align="center"></el-table-column>
             <el-table-column prop="useNum" label="使用次数" width="100" align="center"></el-table-column>
             <el-table-column prop="createTime" label="共享时间" width="140" align="center"></el-table-column>
@@ -40,7 +40,7 @@
             <el-table-column label="操作" align="center" width="120">
                 <template slot-scope="scope">
                     <el-button type="text" @click="show(scope.row)" v-auth="'/quesBank/list:校企公共题库:查看'">查看</el-button>
-                    <el-button v-if="scope.row.createUser != '系统内置'" type="text" @click="delData(scope.row)" v-auth="'/quesBank/list:校企公共题库:取消共享'">取消共享</el-button>
+                    <el-button v-if="scope.row.createUser != '超竞教育'" type="text" @click="delData(scope.row)" v-auth="'/quesBank/list:校企公共题库:取消共享'">取消共享</el-button>
                 </template>
             </el-table-column>
         </el-table>
@@ -73,6 +73,16 @@
                         <div v-html="topicForm.questionStem"></div>
                     </div>
                 </li>
+                <li v-if="topicForm.typeId == 1 || topicForm.typeId == 2">
+                    <span class="name">选项：</span>
+                    <div class="val">
+                        <p class="m-b-5" v-for="(option,i) in topicForm.options" :key="i">{{i}}.{{topicForm.options[i]}}</p>
+                    </div>
+                </li>
+                <li v-if="topicForm.typeId != 4" :class="{'a-center': topicForm.typeId == 1 || topicForm.typeId == 2}">
+                    <span class="name">正确答案：</span>
+                    <span class="val">{{topicForm.answer}}</span>
+                </li>
                 <li>
                     <span class="name">答案解析：</span>
                     <span class="val">{{topicForm.answerAnalysis}}</span>
@@ -160,6 +170,10 @@ export default {
         handleSelectionChange(val) {
             this.multipleSelection = val;
         },
+        disabledSelection(row,index){
+            if(row.createUser == '超竞教育') return false
+            return true
+        },
         delData(row) {
             this.$confirm('确定要取消共享该选中的题目吗？', '提示', {
                 type: 'warning'
@@ -184,9 +198,9 @@ export default {
                 })
                 .then(() => {
                     this.$post(`${this.api.deleteByMeSubjectBySharing}?identification=2&ids=${delList.join()}`).then(res => {
-                        this.multipleSelection = [];
                         util.successMsg('取消共享成功')
                         this.getData()
+                        this.$refs.table.clearSelection()
                     }).catch(res => {})
                 })
                 .catch(() => {});
@@ -223,6 +237,29 @@ export default {
         getDetail(id) {
             this.$post(`${this.api.findById}?id=${id}`).then(res => {
                 let list = res.data.list
+                let typeName = res.data.typeName
+                let options = {}
+                
+                if(typeName == '填空题'){
+                    let answer = []
+                    for(let i in list){
+                        if(i.includes('option') && list[i]) answer.push(list[i])
+                    }
+                    list.answer = answer.join('，')
+                    list.questionStem = list.questionStem.replace(/\(\)\(\)\(\)/g,`______`)
+                }else if(typeName == '判断题'){
+                    if(list.answer == 'A'){
+                        list.answer = '正确'
+                    }else{
+                        list.answer = '错误'
+                    }
+                }else if(typeName != '简答题'){
+                    for(let i in list){
+                        if(i.includes('option') && list[i]){
+                            options[i.replace('option','')] = list[i]
+                        }
+                    }
+                }
                 this.topicForm = {
                     id: list.id,
                     userId: list.userId,
@@ -232,7 +269,7 @@ export default {
                     courses: list.courses,
                     knowledgePoints: list.knowledgePoints,
                     answer: list.answer,
-                    questionType: '',
+                    questionType: typeName,
                     questionStem: list.questionStem,
                     optionA: list.optionA,
                     optionB: list.optionB,
@@ -240,6 +277,7 @@ export default {
                     optionD: list.optionD,
                     optionE: list.optionE,
                     optionF: list.optionF,
+                    options,
                     aisTrue: false,
                     bisTrue: false,
                     cisTrue: false,
@@ -251,7 +289,6 @@ export default {
                     answerAnalysis: list.answerAnalysis,
                     videoAudio: list.videoAudio
                 }
-                console.log(this.topicForm,this.quesBankList)
             }).catch(err => {})
         },
         edit(row) {
diff --git a/src/pages/quesBank/list/myQuesBank.vue b/src/pages/quesBank/list/myQuesBank.vue
index 8c1fbeb..19b7644 100644
--- a/src/pages/quesBank/list/myQuesBank.vue
+++ b/src/pages/quesBank/list/myQuesBank.vue
@@ -27,10 +27,10 @@
             <el-table-column type="index" width="60" label="序号" align="center">
                 <template slot-scope="scope">{{scope.$index + (page - 1) * pageSize + 1}}</template>
             </el-table-column>
-            <el-table-column prop="questionStem" :show-overflow-tooltip="true" label="题干" min-width="200" align="center"></el-table-column>
+            <el-table-column prop="questionStem" :show-overflow-tooltip="true" label="题干" width="300" align="center"></el-table-column>
             <el-table-column prop="name" label="试题类型" width="100" align="center"></el-table-column>
             <el-table-column prop="courses" label="对应课程" width="140" align="center"></el-table-column>
-            <el-table-column prop="typeName" label="所属题库" width="140" align="center"></el-table-column>
+            <el-table-column prop="typeName" label="所属题库" min-width="140" align="center"></el-table-column>
             <el-table-column prop="knowledgePoints" label="知识点" width="140" align="center"></el-table-column>
             <el-table-column prop="useNum" label="使用次数" width="100" align="center"></el-table-column>
             <el-table-column prop="createTime" label="上传时间" width="140" align="center"></el-table-column>
@@ -39,7 +39,7 @@
                     {{scope.row.myShare ? '已共享' : '未共享'}}
                 </template>
             </el-table-column>
-            <el-table-column label="操作" width="230">
+            <el-table-column label="操作" width="230" align="center">
                 <template slot-scope="scope">
                     <el-button type="text" @click="show(scope.row)" v-auth="'/quesBank/list:我上传的题库:查看'">查看</el-button>
                     <el-button type="text" @click="edit(scope.row)" v-auth="'/quesBank/list:我上传的题库:修改'">修改</el-button>
@@ -78,6 +78,16 @@
                         <div v-html="topicForm.questionStem"></div>
                     </div>
                 </li>
+                <li v-if="topicForm.typeId == 1 || topicForm.typeId == 2">
+                    <span class="name">选项：</span>
+                    <div class="val">
+                        <p class="m-b-5" v-for="(option,i) in topicForm.options" :key="i">{{i}}.{{topicForm.options[i]}}</p>
+                    </div>
+                </li>
+                <li v-if="topicForm.typeId != 4" :class="{'a-center': topicForm.typeId == 1 || topicForm.typeId == 2}">
+                    <span class="name">正确答案：</span>
+                    <span class="val">{{topicForm.answer}}</span>
+                </li>
                 <li>
                     <span class="name">答案解析：</span>
                     <span class="val">{{topicForm.answerAnalysis}}</span>
@@ -85,7 +95,7 @@
             </ul>
         </el-dialog>
 
-        <el-dialog title="批量导入" :visible.sync="importVisible" width="400px" :close-on-click-modal="false">
+        <el-dialog title="批量导入" :visible.sync="importVisible" width="400px" @close="closeImport" :close-on-click-modal="false">
             <div class="upload-wrap" :class="{lg: uploadFaild}">
                 <el-button class="download" size="small" @click="downLoad"><img src="../../../assets/img/download.png" alt=""> 模板下载</el-button>
                 <el-upload ref="upload" accept=".xls,.xlsx" :on-remove="handleRemove" :on-error="uploadError" :on-success="uploadSuccess" :before-remove="beforeRemove" :limit="1" :on-exceed="handleExceed" :action="this.api.impExcel" :file-list="uploadList" :data="{userId: this.userId,schoolId: this.clientId}" name="file" :auto-upload="false"> 
@@ -212,6 +222,29 @@ export default {
         getDetail(id) {
             this.$post(`${this.api.findById}?id=${id}`).then(res => {
                 let list = res.data.list
+                let typeName = res.data.typeName
+                let options = {}
+                
+                if(typeName == '填空题'){
+                    let answer = []
+                    for(let i in list){
+                        if(i.includes('option') && list[i]) answer.push(list[i])
+                    }
+                    list.answer = answer.join('，')
+                    list.questionStem = list.questionStem.replace(/\(\)\(\)\(\)/g,`______`)
+                }else if(typeName == '判断题'){
+                    if(list.answer == 'A'){
+                        list.answer = '正确'
+                    }else{
+                        list.answer = '错误'
+                    }
+                }else if(typeName != '简答题'){
+                    for(let i in list){
+                        if(i.includes('option') && list[i]){
+                            options[i.replace('option','')] = list[i]
+                        }
+                    }
+                }
                 this.topicForm = {
                     id: list.id,
                     userId: list.userId,
@@ -221,7 +254,7 @@ export default {
                     courses: list.courses,
                     knowledgePoints: list.knowledgePoints,
                     answer: list.answer,
-                    questionType: '',
+                    questionType: typeName,
                     questionStem: list.questionStem,
                     optionA: list.optionA,
                     optionB: list.optionB,
@@ -229,6 +262,7 @@ export default {
                     optionD: list.optionD,
                     optionE: list.optionE,
                     optionF: list.optionF,
+                    options,
                     aisTrue: false,
                     bisTrue: false,
                     cisTrue: false,
@@ -240,7 +274,6 @@ export default {
                     answerAnalysis: list.answerAnalysis,
                     videoAudio: list.videoAudio
                 }
-                console.log(this.topicForm,this.quesBankList)
             }).catch(err => {})
         },
         show(row) {
@@ -268,7 +301,8 @@ export default {
         },
         share(row) {
             this.$confirm('该题将共享至公共题库，是否确认共享？', '提示', {
-                type: 'info'
+                type: 'info',
+                customClass: 'normal'
             })
             .then(() => {
                 let data = {
@@ -293,7 +327,6 @@ export default {
             }).catch(() => {})
         },
         disabledSelection(row,index){
-            let list = this.listData
             if(row.myShare) return false
             return true
         },
@@ -308,16 +341,15 @@ export default {
                 })
 
                 this.$confirm(`是否确认共享${util.ellipsisStr(newArr[0].questionStem)}等${newArr.length}个选中的题目？`, '提示', {
-                    type: 'info'
-                })
-                .then(() => {
+                    type: 'info',
+                    customClass: 'normal'
+                }).then(() => {
                     let data = {
                         userId: this.userId,
                         ids: shareList,
                         source: 2
                     }
                     this.$post(this.api.batchSave,data).then(res => {
-                        this.multipleSelection = [];
                         util.successMsg('此题已成功共享至校企公共题库')
                         this.getData()
                         this.$refs.table.clearSelection()
@@ -325,7 +357,7 @@ export default {
                         this.getData()
                     })
                 })
-                .catch(() => {});
+                .catch(() => {})
             }else{
                 util.errorMsg('请先选择数据')
             }
@@ -342,7 +374,6 @@ export default {
                 })
                 .then(() => {
                     this.$post(`${this.api.deleteByMeSubject}?ids=${delList.join()}`).then(res => {
-                        this.multipleSelection = [];
                         util.successMsg('删除成功');
                         this.getData()
                         this.$refs.table.clearSelection()
diff --git a/src/pages/quesBank/list/quesBankType.vue b/src/pages/quesBank/list/quesBankType.vue
index b5b9cff..652de96 100644
--- a/src/pages/quesBank/list/quesBankType.vue
+++ b/src/pages/quesBank/list/quesBankType.vue
@@ -18,7 +18,7 @@
                     <span style="display: inline-block;width: 23px;" v-if="!scope.row.secondColumn.length"></span><span v-html="scope.row.typeName"></span>
                 </template>
             </el-table-column>
-            <el-table-column label="操作" width="200">
+            <el-table-column label="操作" width="200" align="center">
                 <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" v-if="scope.row.source == 2" @click="editType(scope.row)" v-auth="'/quesBank/list:题库分类:编辑'">编辑</el-button>
@@ -38,8 +38,8 @@
                 </el-form-item>
             </el-form>
             <span slot="footer" class="dialog-footer">
-                <el-button @click="firstVisible = false">取消</el-button>
-                <el-button type="primary" @click="firstSubmit">确定</el-button>
+                <el-button size="small" @click="firstVisible = false">取消</el-button>
+                <el-button size="small" type="primary" @click="firstSubmit">确定</el-button>
             </span>
         </el-dialog>
 
@@ -50,8 +50,8 @@
                 </el-form-item>
             </el-form>
             <span slot="footer" class="dialog-footer">
-                <el-button @click="secondVisible = false">取消</el-button>
-                <el-button type="primary" @click="secondSubmit">确定</el-button>
+                <el-button size="small" @click="secondVisible = false">取消</el-button>
+                <el-button size="small" type="primary" @click="secondSubmit">确定</el-button>
             </span>
         </el-dialog>
     </div>
@@ -106,8 +106,7 @@ export default {
                 schoolId: this.clientId,
                 source: 2
             }
-            this.$post(this.api.listByPage,data)
-            .then(res => {
+            this.$post(this.api.listByPage,data).then(res => {
                 let list = res.data.list.list
                 let result = []
                 list.map(n => {
@@ -125,8 +124,7 @@ export default {
                     schoolId: this.clientId,
                     source: 2
                 }
-                this.$post(this.api.listByPage,data1)
-                .then(res => {
+                this.$post(this.api.listByPage,data1).then(res => {
                     let original = this.listData
                     let list = res.data.list.list
                     original.map(n => {
diff --git a/src/pages/quesBank/list/quesDialog.vue b/src/pages/quesBank/list/quesDialog.vue
index 02b8d1c..4d38ecd 100644
--- a/src/pages/quesBank/list/quesDialog.vue
+++ b/src/pages/quesBank/list/quesDialog.vue
@@ -102,18 +102,18 @@
                                 v-model="fillList[index]"
                             ></el-input>
                             <template v-if="!isDetail">
-                                <template v-if="index == 0">
-                                    <i class="el-icon-circle-plus-outline" @click="addFill"></i>
-                                </template>
                                 <template v-if="fillList.length > 1">
                                     <i class="el-icon-close" @click="delFill(index)"></i>
                                 </template>
+                                <template v-if="index == fillList.length - 1">
+                                    <i class="el-icon-circle-plus-outline" @click="addFill"></i>
+                                </template>
                             </template>
                         </div>
                     </div>
                 </el-form-item>
                 <el-form-item label="答案解析" prop="answerAnalysis">
-                    <el-input type="textarea" v-model="topicForm.answerAnalysis"></el-input>
+                    <el-input type="textarea" v-model="topicForm.answerAnalysis" resize="none"></el-input>
                 </el-form-item>
             </el-form>
             <div slot="footer" class="dialog-footer" v-show="!isDetail">
diff --git a/src/pages/system/list/organization.vue b/src/pages/system/list/organization.vue
index c2c18c9..51bff2b 100644
--- a/src/pages/system/list/organization.vue
+++ b/src/pages/system/list/organization.vue
@@ -7,7 +7,7 @@
             </div>
         </div>
  
-        <el-table :data="listData" stripe header-align="center" row-key="id" :tree-props="treeProps" :indent="9">
+        <el-table :data="listData" stripe header-align="center" row-key="index" :tree-props="treeProps" :indent="9">
             <el-table-column prop="label" label="架构名称">
                 <template slot-scope="scope">
                     <span class="text">{{scope.row.label}}</span>
@@ -87,10 +87,12 @@ export default {
             this.$get(this.api.queryStaffPro,data).then(res => {
                 let firList = res.data.StaffProfessionalArchitectureList
                 if(firList){
+                    let index = 0
                     firList.map(e => {
                         e.isParent = true
                         e.id = e.staffProfessionalArchitectureId
                         e.label = e.staffProfessionalArchitectureName
+                        e.index = ++index
                         let data = {
                             staffProfessionalArchitectureId: e.staffProfessionalArchitectureId
                         }
@@ -98,6 +100,7 @@ export default {
                             res1.data.staffGradeList.map(e => {
                                 e.id = e.staffGradeId
                                 e.label = e.staffGradeName
+                                e.index = ++index
                             })
                             e.children = res1.data.staffGradeList
                         }).catch(res => {})
diff --git a/src/pages/system/list/role.vue b/src/pages/system/list/role.vue
index 379c9df..2839f78 100644
--- a/src/pages/system/list/role.vue
+++ b/src/pages/system/list/role.vue
@@ -24,13 +24,13 @@
                     <el-input disabled placeholder="该角色用于管理全部功能权限" v-model="scope.row.remark "></el-input>
                 </template>
             </el-table-column>
-            <el-table-column label="操作" width="180">
+            <el-table-column label="操作" width="180" align="center">
                 <template slot-scope="scope">
                     <el-button type="text" @click="showRole(scope.row)" v-auth="'/system/list:角色权限:查看'">查看</el-button>
-                    <!-- <template v-if="scope.row.id != 1"> -->
+                    <template v-if="scope.row.id != 1">
                         <el-button type="text" @click="editRole(scope.row)" v-auth="'/system/list:角色权限:编辑'">编辑</el-button>
                         <el-button type="text" @click="handleDelete(scope.row)" v-auth="'/system/list:角色权限:删除'">删除</el-button>
-                    <!-- </template> -->
+                    </template>
                 </template>
             </el-table-column>
         </el-table>
diff --git a/src/pages/testPaper/add/index.vue b/src/pages/testPaper/add/index.vue
index 898561c..fd3c04e 100644
--- a/src/pages/testPaper/add/index.vue
+++ b/src/pages/testPaper/add/index.vue
@@ -59,9 +59,9 @@
                         <el-table-column type="selection" width="80" align="center" :reserve-selection="true"></el-table-column>
                         <el-table-column type="index" width="60" label="序号" align="center"></el-table-column>
                         <el-table-column prop="questionSource" label="题库来源" width="120" align="center"></el-table-column>
-                        <el-table-column prop="questionStem" label="题干" align="center" :show-overflow-tooltip="true"></el-table-column>
+                        <el-table-column prop="questionStem" width="300" label="题干" align="center" :show-overflow-tooltip="true"></el-table-column>
                         <el-table-column prop="name" label="试题类型" width="100" align="center"></el-table-column>
-                        <el-table-column prop="courses" label="对应课程" width="120" align="center"></el-table-column>
+                        <el-table-column prop="courses" label="对应课程" min-width="120" align="center"></el-table-column>
                         <el-table-column prop="knowledgePoints" label="知识点" width="120" align="center"></el-table-column>
                         <el-table-column prop="useNum" label="使用次数" width="100" align="center"></el-table-column>
                         <el-table-column prop="createTime" label="上传时间" width="150" align="center"></el-table-column>
@@ -161,7 +161,7 @@
                     >{{scope.$index + (page - 1) * pageSize + 1}}</template>
                 </el-table-column>
                 <el-table-column prop="questionSource" label="题库来源" align="center"></el-table-column>
-                <el-table-column prop="questionStem" label="题干" align="center" :show-overflow-tooltip="true"></el-table-column>
+                <el-table-column prop="questionStem" width="300" label="题干" align="center" :show-overflow-tooltip="true"></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>
                 <el-table-column prop="knowledgePoints" label="知识点" align="center"></el-table-column>
diff --git a/src/pages/testPaper/list/allTestPaper.vue b/src/pages/testPaper/list/allTestPaper.vue
index 5122b75..0c58671 100644
--- a/src/pages/testPaper/list/allTestPaper.vue
+++ b/src/pages/testPaper/list/allTestPaper.vue
@@ -61,7 +61,7 @@
                     {{getStatusName(scope.row.state)}}
                 </template>
             </el-table-column>
-            <el-table-column label="操作" width="120">
+            <el-table-column label="操作" width="120" align="center">
                 <template slot-scope="scope">
                     <el-button type="text" v-if="scope.row.state == 0 && userId == scope.row.userId" @click="publish(scope.row)" v-auth="'/testPaper/list:本校卷库:发布'">发布</el-button>
                     <el-button type="text" @click="preview(scope.row)" v-auth="'/testPaper/list:本校卷库:预览'">预览</el-button>
diff --git a/src/pages/testPaper/list/myTestPaper.vue b/src/pages/testPaper/list/myTestPaper.vue
index e4ee8e3..9d93013 100644
--- a/src/pages/testPaper/list/myTestPaper.vue
+++ b/src/pages/testPaper/list/myTestPaper.vue
@@ -8,7 +8,7 @@
                         <h6 class="type">一、单选题</h6>
                         <ul class="ques">
                             <li v-for="(item,index) in paperList.list1" :key="index">
-                                <div class="l-title">
+                                <div class="stem">
                                     <span class="index">{{index+1}}.</span>
                                     <div v-html="item.questionStem"></div>
                                 </div>
@@ -22,7 +22,7 @@
                         <h6 class="type">二、多选题</h6>
                         <ul class="ques">
                             <li v-for="(item,index) in paperList.list2" :key="index">
-                                <div class="l-title">
+                                <div class="stem">
                                     <span class="index">{{index+1}}.</span>
                                     <div v-html="item.questionStem"></div>
                                 </div>
@@ -36,7 +36,7 @@
                         <h6 class="type">三、填空题</h6>
                         <ul class="ques">
                             <li v-for="(item,index) in paperList.list3" :key="index">
-                                <div class="l-title">
+                                <div class="stem">
                                     <span class="index">{{index+1}}.</span>
                                     <div v-html="item.questionStem"></div>
                                 </div>
@@ -50,7 +50,7 @@
                         <h6 class="type">四、判断题</h6>
                         <ul class="ques">
                             <li v-for="(item,index) in paperList.list4" :key="index">
-                                <div class="l-title">
+                                <div class="stem">
                                     <span class="index">{{index+1}}.</span>
                                     <div v-html="item.questionStem"></div>
                                 </div>
@@ -64,7 +64,7 @@
                         <h6 class="type">五、简答题</h6>
                         <ul class="ques">
                             <li v-for="(item,index) in paperList.list5" :key="index">
-                                <div class="l-title">
+                                <div class="stem">
                                     <span class="index">{{index+1}}.</span>
                                     <div v-html="item.questionStem"></div>
                                 </div>
@@ -144,7 +144,7 @@
                     {{getStatusName(scope.row.state)}}
                 </template>
             </el-table-column>
-            <el-table-column label="操作" width="250">
+            <el-table-column label="操作" width="250" align="center">
                 <template slot-scope="scope">
                     <el-button type="text" v-if="scope.row.state == 0" @click="publish(scope.row)" v-auth="'/testPaper/list:我的试卷:发布'">发布</el-button>
                     <el-button type="text" @click="preview(scope.row)" v-auth="'/testPaper/list:我的试卷:预览'" :disabled="!scope.row.qid">预览</el-button>
@@ -463,9 +463,6 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-    /deep/.no-mb.el-form-item{
-        margin-bottom: 0;
-    }
     .testpaper{
         width: 90%;
         padding: 50px 100px;
@@ -487,7 +484,7 @@ export default {
             .ques{
                 &>li{
                     margin-bottom: 20px;
-                    .l-title{
+                    .stem{
                         display: flex;
                         margin-bottom: 10px;
                         font-size: 14px;
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/testpaper.js b/src/store/modules/testpaper.js
index 7c4885f..357c305 100644
--- a/src/store/modules/testpaper.js
+++ b/src/store/modules/testpaper.js
@@ -19,7 +19,7 @@ export default {
                 label: '考试'
             },{
                 id: 1,
-                label: '学习'
+                label: '练习'
             }
         ],
         degreeList: [
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 542132d..713cd43 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -73,7 +73,6 @@ export default {
                             })
                             Setting.dynamicRoute && addRoutes(routes)
                             util.session.set(Setting.usernameKey, user.userName)
-                            util.session.set(Setting.storeKey, JSON.stringify(state))
                             util.successMsg('登录成功')
                             resolve()
                         }else{
@@ -91,7 +90,6 @@ export default {
             return new Promise((resolve, reject) => {
                 util.session.remove(Setting.usernameKey);
                 util.session.remove(Setting.storeKey);
-                // router.push('/login')
                 location.reload()
                 resolve()
             })
diff --git a/src/styles/common.scss b/src/styles/common.scss
index abe1847..f0c09c9 100644
--- a/src/styles/common.scss
+++ b/src/styles/common.scss
@@ -356,14 +356,16 @@
             color: #ffa900;
         }
     }
-    .el-button--primary{
-        color: #606266;
-        background: #fff;
-        border-color: #DCDFE6;
-        &:hover{
-            color: $--color-primary;
-            border-color: #efbdbb;
-            background-color: #fae9e8;
+    &:not(.normal){
+        .el-button--primary{
+            color: #606266;
+            background: #fff;
+            border-color: #DCDFE6;
+            &:hover{
+                color: $--color-primary;
+                border-color: #efbdbb;
+                background-color: #fae9e8;
+            }
         }
     }
 }
@@ -428,6 +430,10 @@
     }
 }
 
+.el-tooltip__popper{
+    width: 300px;
+}
+
 @media(max-width: 1600px){
     .el-table{
         .el-switch__label--right.is-active{
diff --git a/src/styles/pages/messageBoard.scss b/src/styles/pages/messageBoard.scss
index e50d52b..da87bcc 100644
--- a/src/styles/pages/messageBoard.scss
+++ b/src/styles/pages/messageBoard.scss
@@ -1,5 +1,6 @@
 .list{
     li{
+        margin-bottom: 10px;
         border-top: 1px solid #f1f1f1;
         &:first-child{
             border-top: 0;
diff --git a/src/styles/pages/testPaperDetail.scss b/src/styles/pages/testPaperDetail.scss
index 0671389..6d7f02e 100644
--- a/src/styles/pages/testPaperDetail.scss
+++ b/src/styles/pages/testPaperDetail.scss
@@ -44,7 +44,7 @@
     }
 }
 .wrap{
-    height: calc(100vh - 367px);
+    height: calc(100vh - 413px);
     margin-top: 24px;
     overflow: auto;
     .item{