huoran
/
FE_exam_server
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复客户所提缺陷

Browse Source
master
yujialong 4 years ago
parent dfa5632b29
commit cf99172f6a
24 changed files with 155 additions and 69 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      src/components/testPaperDetail/index.vue
  2. 10
      src/pages/achievement/list/wrongBook.vue
  3. 1
      src/pages/assessment/detail/index.vue
  4. 1
      src/pages/assessment/doReview/index.vue
  5. 2
      src/pages/assessment/list/index.vue
  6. 2
      src/pages/index/list/index.vue
  7. 1
      src/pages/practice/detail/index.vue
  8. 1
      src/pages/practice/doReview/index.vue
  9. 2
      src/pages/practice/list/index.vue
  10. 53
      src/pages/quesBank/list/globalQuesBank.vue
  11. 59
      src/pages/quesBank/list/myQuesBank.vue
  12. 16
      src/pages/quesBank/list/quesBankType.vue
  13. 8
      src/pages/quesBank/list/quesDialog.vue
  14. 5
      src/pages/system/list/organization.vue
  15. 6
      src/pages/system/list/role.vue
  16. 6
      src/pages/testPaper/add/index.vue
  17. 2
      src/pages/testPaper/list/allTestPaper.vue
  18. 17
      src/pages/testPaper/list/myTestPaper.vue
  19. 2
      src/setting.js
  20. 2
      src/store/modules/testpaper.js
  21. 2
      src/store/modules/user.js
  22. 22
      src/styles/common.scss
  23. 1
      src/styles/pages/messageBoard.scss
  24. 2
      src/styles/pages/testPaperDetail.scss

1
src/components/testPaperDetail/index.vue
Unescape View File

@ -133,6 +133,7 @@ export default {
} }
} }
n.answer = answer.join('，') n.answer = answer.join('，')
n.questionStem = n.questionStem.replace(/\(\)\(\)\(\)/g,`______`)
} }
}) })
} }

10
src/pages/achievement/list/wrongBook.vue
Unescape View File

@ -81,7 +81,7 @@
<p class="val" v-html="quesInfo.questionStem"></p> <p class="val" v-html="quesInfo.questionStem"></p>
<div class="media" :id="quesInfo.mediaEleId"></div> <div class="media" :id="quesInfo.mediaEleId"></div>
</div> </div>
<div class="meta"> <div class="meta" v-if="quesInfo.name == '单项选择' || quesInfo.name == '多项选择'">
<p class="key">选项：</p> <p class="key">选项：</p>
<div class="val"> <div class="val">
<p v-for="(option,i) in quesInfo.options" :key="i">{{i}}.{{quesInfo.options[i]}}</p> <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] 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 info.options = options
this.quesInfo = info this.quesInfo = info
}).catch(err => {}) }).catch(err => {})

1
src/pages/assessment/detail/index.vue
Unescape View File

@ -193,6 +193,7 @@ export default {
if(n.typeName == '填空题'){ if(n.typeName == '填空题'){
n.answer = answer.join('，') n.answer = answer.join('，')
n.user_answer = n.user_answer ? n.user_answer.split('&lt;&gt;').filter(n => n).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 n.options = options
} }

1
src/pages/assessment/doReview/index.vue
Unescape View File

@ -187,6 +187,7 @@ export default {
if(n.typeName == '填空题'){ if(n.typeName == '填空题'){
n.answer = answer.join('，') n.answer = answer.join('，')
n.user_answer = n.user_answer ? n.user_answer.split('&lt;&gt;').filter(n => n).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 n.options = options
} }

2
src/pages/assessment/list/index.vue
Unescape View File

@ -48,7 +48,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="className" label="考试班级" align="center"></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"> <template slot-scope="scope">
<el-popover <el-popover
placement="bottom" placement="bottom"

2
src/pages/index/list/index.vue
Unescape View File

@ -318,6 +318,8 @@ export default {
}).catch(res => {}) }).catch(res => {})
}, },
submitComment(row){ submitComment(row){
let content = row.replyContent
if(!content) return util.errorMsg('请填写内容')
let data = { let data = {
bid: row.bid, bid: row.bid,
content: row.replyContent, content: row.replyContent,

1
src/pages/practice/detail/index.vue
Unescape View File

@ -156,6 +156,7 @@ export default {
} }
n.answer = answer.join('，') n.answer = answer.join('，')
n.userAnswer = n.userAnswer ? n.userAnswer.split('&lt;&gt;').filter(n => n).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.typeName == '简答题'){
if(n.fileUrl) n.fileUrl = JSON.parse(n.fileUrl) if(n.fileUrl) n.fileUrl = JSON.parse(n.fileUrl)

1
src/pages/practice/doReview/index.vue
Unescape View File

@ -179,6 +179,7 @@ export default {
} }
n.answer = answer.join('，') n.answer = answer.join('，')
n.userAnswer = n.userAnswer ? n.userAnswer.split('&lt;&gt;').filter(n => n).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) if(n.fileUrl) n.fileUrl = JSON.parse(n.fileUrl)

2
src/pages/practice/list/index.vue
Unescape View File

@ -31,7 +31,7 @@
<el-table-column prop="totalScore" label="练习总分" align="center"></el-table-column> <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="createTime" label="创建时间" align="center"></el-table-column>
<el-table-column prop="className" 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"> <template slot-scope="scope">
<el-button type="text" @click="edit(scope.row)" v-auth>修改</el-button> <el-button type="text" @click="edit(scope.row)" v-auth>修改</el-button>
<el-button type="text" @click="delData(scope.row)" v-auth>删除</el-button> <el-button type="text" @click="delData(scope.row)" v-auth>删除</el-button>

53
src/pages/quesBank/list/globalQuesBank.vue
Unescape View File

@ -26,13 +26,13 @@
</div> </div>
</div> </div>
<el-table :data="listData" class="table" stripe header-align="center" row-key="id" @selection-change="handleSelectionChange"> <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"></el-table-column> <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 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="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="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="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="useNum" label="使用次数" width="100" align="center"></el-table-column>
<el-table-column prop="createTime" label="共享时间" width="140" 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"> <el-table-column label="操作" align="center" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" @click="show(scope.row)" v-auth="'/quesBank/list:校企公共题库:查看'">查看</el-button> <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> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -73,6 +73,16 @@
<div v-html="topicForm.questionStem"></div> <div v-html="topicForm.questionStem"></div>
</div> </div>
</li> </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> <li>
<span class="name">答案解析：</span> <span class="name">答案解析：</span>
<span class="val">{{topicForm.answerAnalysis}}</span> <span class="val">{{topicForm.answerAnalysis}}</span>
@ -160,6 +170,10 @@ export default {
handleSelectionChange(val) { handleSelectionChange(val) {
this.multipleSelection = val; this.multipleSelection = val;
}, },
disabledSelection(row,index){
if(row.createUser == '超竞教育') return false
return true
},
delData(row) { delData(row) {
this.$confirm('确定要取消共享该选中的题目吗？', '提示', { this.$confirm('确定要取消共享该选中的题目吗？', '提示', {
type: 'warning' type: 'warning'
@ -184,9 +198,9 @@ export default {
}) })
.then(() => { .then(() => {
this.$post(`${this.api.deleteByMeSubjectBySharing}?identification=2&ids=${delList.join()}`).then(res => { this.$post(`${this.api.deleteByMeSubjectBySharing}?identification=2&ids=${delList.join()}`).then(res => {
this.multipleSelection = [];
util.successMsg('取消共享成功') util.successMsg('取消共享成功')
this.getData() this.getData()
this.$refs.table.clearSelection()
}).catch(res => {}) }).catch(res => {})
}) })
.catch(() => {}); .catch(() => {});
@ -223,6 +237,29 @@ export default {
getDetail(id) { getDetail(id) {
this.$post(`${this.api.findById}?id=${id}`).then(res => { this.$post(`${this.api.findById}?id=${id}`).then(res => {
let list = res.data.list 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 = { this.topicForm = {
id: list.id, id: list.id,
userId: list.userId, userId: list.userId,
@ -232,7 +269,7 @@ export default {
courses: list.courses, courses: list.courses,
knowledgePoints: list.knowledgePoints, knowledgePoints: list.knowledgePoints,
answer: list.answer, answer: list.answer,
questionType: '', questionType: typeName,
questionStem: list.questionStem, questionStem: list.questionStem,
optionA: list.optionA, optionA: list.optionA,
optionB: list.optionB, optionB: list.optionB,
@ -240,6 +277,7 @@ export default {
optionD: list.optionD, optionD: list.optionD,
optionE: list.optionE, optionE: list.optionE,
optionF: list.optionF, optionF: list.optionF,
options,
aisTrue: false, aisTrue: false,
bisTrue: false, bisTrue: false,
cisTrue: false, cisTrue: false,
@ -251,7 +289,6 @@ export default {
answerAnalysis: list.answerAnalysis, answerAnalysis: list.answerAnalysis,
videoAudio: list.videoAudio videoAudio: list.videoAudio
} }
console.log(this.topicForm,this.quesBankList)
}).catch(err => {}) }).catch(err => {})
}, },
edit(row) { edit(row) {

59
src/pages/quesBank/list/myQuesBank.vue
Unescape View File

@ -27,10 +27,10 @@
<el-table-column type="index" width="60" label="序号" align="center"> <el-table-column type="index" width="60" label="序号" align="center">
<template slot-scope="scope">{{scope.$index + (page - 1) * pageSize + 1}}</template> <template slot-scope="scope">{{scope.$index + (page - 1) * pageSize + 1}}</template>
</el-table-column> </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="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="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="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="useNum" label="使用次数" width="100" align="center"></el-table-column>
<el-table-column prop="createTime" label="上传时间" width="140" 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 ? '已共享' : '未共享'}} {{scope.row.myShare ? '已共享' : '未共享'}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" width="230"> <el-table-column label="操作" width="230" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" @click="show(scope.row)" v-auth="'/quesBank/list:我上传的题库:查看'">查看</el-button> <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> <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 v-html="topicForm.questionStem"></div>
</div> </div>
</li> </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> <li>
<span class="name">答案解析：</span> <span class="name">答案解析：</span>
<span class="val">{{topicForm.answerAnalysis}}</span> <span class="val">{{topicForm.answerAnalysis}}</span>
@ -85,7 +95,7 @@
</ul> </ul>
</el-dialog> </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}"> <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-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"> <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) { getDetail(id) {
this.$post(`${this.api.findById}?id=${id}`).then(res => { this.$post(`${this.api.findById}?id=${id}`).then(res => {
let list = res.data.list 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 = { this.topicForm = {
id: list.id, id: list.id,
userId: list.userId, userId: list.userId,
@ -221,7 +254,7 @@ export default {
courses: list.courses, courses: list.courses,
knowledgePoints: list.knowledgePoints, knowledgePoints: list.knowledgePoints,
answer: list.answer, answer: list.answer,
questionType: '', questionType: typeName,
questionStem: list.questionStem, questionStem: list.questionStem,
optionA: list.optionA, optionA: list.optionA,
optionB: list.optionB, optionB: list.optionB,
@ -229,6 +262,7 @@ export default {
optionD: list.optionD, optionD: list.optionD,
optionE: list.optionE, optionE: list.optionE,
optionF: list.optionF, optionF: list.optionF,
options,
aisTrue: false, aisTrue: false,
bisTrue: false, bisTrue: false,
cisTrue: false, cisTrue: false,
@ -240,7 +274,6 @@ export default {
answerAnalysis: list.answerAnalysis, answerAnalysis: list.answerAnalysis,
videoAudio: list.videoAudio videoAudio: list.videoAudio
} }
console.log(this.topicForm,this.quesBankList)
}).catch(err => {}) }).catch(err => {})
}, },
show(row) { show(row) {
@ -268,7 +301,8 @@ export default {
}, },
share(row) { share(row) {
this.$confirm('该题将共享至公共题库，是否确认共享？', '提示', { this.$confirm('该题将共享至公共题库，是否确认共享？', '提示', {
type: 'info' type: 'info',
customClass: 'normal'
}) })
.then(() => { .then(() => {
let data = { let data = {
@ -293,7 +327,6 @@ export default {
}).catch(() => {}) }).catch(() => {})
}, },
disabledSelection(row,index){ disabledSelection(row,index){
let list = this.listData
if(row.myShare) return false if(row.myShare) return false
return true return true
}, },
@ -308,16 +341,15 @@ export default {
}) })
this.$confirm(`是否确认共享${util.ellipsisStr(newArr[0].questionStem)}等${newArr.length}个选中的题目？`, '提示', { this.$confirm(`是否确认共享${util.ellipsisStr(newArr[0].questionStem)}等${newArr.length}个选中的题目？`, '提示', {
type: 'info' type: 'info',
}) customClass: 'normal'
.then(() => { }).then(() => {
let data = { let data = {
userId: this.userId, userId: this.userId,
ids: shareList, ids: shareList,
source: 2 source: 2
} }
this.$post(this.api.batchSave,data).then(res => { this.$post(this.api.batchSave,data).then(res => {
this.multipleSelection = [];
util.successMsg('此题已成功共享至校企公共题库') util.successMsg('此题已成功共享至校企公共题库')
this.getData() this.getData()
this.$refs.table.clearSelection() this.$refs.table.clearSelection()
@ -325,7 +357,7 @@ export default {
this.getData() this.getData()
}) })
}) })
.catch(() => {}); .catch(() => {})
}else{ }else{
util.errorMsg('请先选择数据') util.errorMsg('请先选择数据')
} }
@ -342,7 +374,6 @@ export default {
}) })
.then(() => { .then(() => {
this.$post(`${this.api.deleteByMeSubject}?ids=${delList.join()}`).then(res => { this.$post(`${this.api.deleteByMeSubject}?ids=${delList.join()}`).then(res => {
this.multipleSelection = [];
util.successMsg('删除成功'); util.successMsg('删除成功');
this.getData() this.getData()
this.$refs.table.clearSelection() this.$refs.table.clearSelection()

16
src/pages/quesBank/list/quesBankType.vue
Unescape View File

@ -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> <span style="display: inline-block;width: 23px;" v-if="!scope.row.secondColumn.length"></span><span v-html="scope.row.typeName"></span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" width="200"> <el-table-column label="操作" width="200" align="center">
<template slot-scope="scope"> <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.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> <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-item>
</el-form> </el-form>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button @click="firstVisible = false">取消</el-button> <el-button size="small" @click="firstVisible = false">取消</el-button>
<el-button type="primary" @click="firstSubmit">确定</el-button> <el-button size="small" type="primary" @click="firstSubmit">确定</el-button>
</span> </span>
</el-dialog> </el-dialog>
@ -50,8 +50,8 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button @click="secondVisible = false">取消</el-button> <el-button size="small" @click="secondVisible = false">取消</el-button>
<el-button type="primary" @click="secondSubmit">确定</el-button> <el-button size="small" type="primary" @click="secondSubmit">确定</el-button>
</span> </span>
</el-dialog> </el-dialog>
</div> </div>
@ -106,8 +106,7 @@ export default {
schoolId: this.clientId, schoolId: this.clientId,
source: 2 source: 2
} }
this.$post(this.api.listByPage,data) this.$post(this.api.listByPage,data).then(res => {
.then(res => {
let list = res.data.list.list let list = res.data.list.list
let result = [] let result = []
list.map(n => { list.map(n => {
@ -125,8 +124,7 @@ export default {
schoolId: this.clientId, schoolId: this.clientId,
source: 2 source: 2
} }
this.$post(this.api.listByPage,data1) this.$post(this.api.listByPage,data1).then(res => {
.then(res => {
let original = this.listData let original = this.listData
let list = res.data.list.list let list = res.data.list.list
original.map(n => { original.map(n => {

8
src/pages/quesBank/list/quesDialog.vue
Unescape View File

@ -102,18 +102,18 @@
v-model="fillList[index]" v-model="fillList[index]"
></el-input> ></el-input>
<template v-if="!isDetail"> <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"> <template v-if="fillList.length > 1">
<i class="el-icon-close" @click="delFill(index)"></i> <i class="el-icon-close" @click="delFill(index)"></i>
</template> </template>
<template v-if="index == fillList.length - 1">
<i class="el-icon-circle-plus-outline" @click="addFill"></i>
</template>
</template> </template>
</div> </div>
</div> </div>
</el-form-item> </el-form-item>
<el-form-item label="答案解析" prop="answerAnalysis"> <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-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer" v-show="!isDetail"> <div slot="footer" class="dialog-footer" v-show="!isDetail">

5
src/pages/system/list/organization.vue
Unescape View File

@ -7,7 +7,7 @@
</div> </div>
</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="架构名称"> <el-table-column prop="label" label="架构名称">
<template slot-scope="scope"> <template slot-scope="scope">
<span class="text">{{scope.row.label}}</span> <span class="text">{{scope.row.label}}</span>
@ -87,10 +87,12 @@ export default {
this.$get(this.api.queryStaffPro,data).then(res => { this.$get(this.api.queryStaffPro,data).then(res => {
let firList = res.data.StaffProfessionalArchitectureList let firList = res.data.StaffProfessionalArchitectureList
if(firList){ if(firList){
let index = 0
firList.map(e => { firList.map(e => {
e.isParent = true e.isParent = true
e.id = e.staffProfessionalArchitectureId e.id = e.staffProfessionalArchitectureId
e.label = e.staffProfessionalArchitectureName e.label = e.staffProfessionalArchitectureName
e.index = ++index
let data = { let data = {
staffProfessionalArchitectureId: e.staffProfessionalArchitectureId staffProfessionalArchitectureId: e.staffProfessionalArchitectureId
} }
@ -98,6 +100,7 @@ export default {
res1.data.staffGradeList.map(e => { res1.data.staffGradeList.map(e => {
e.id = e.staffGradeId e.id = e.staffGradeId
e.label = e.staffGradeName e.label = e.staffGradeName
e.index = ++index
}) })
e.children = res1.data.staffGradeList e.children = res1.data.staffGradeList
}).catch(res => {}) }).catch(res => {})

6
src/pages/system/list/role.vue
Unescape View File

@ -24,13 +24,13 @@
<el-input disabled placeholder="该角色用于管理全部功能权限" v-model="scope.row.remark "></el-input> <el-input disabled placeholder="该角色用于管理全部功能权限" v-model="scope.row.remark "></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" width="180"> <el-table-column label="操作" width="180" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" @click="showRole(scope.row)" v-auth="'/system/list:角色权限:查看'">查看</el-button> <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="editRole(scope.row)" v-auth="'/system/list:角色权限:编辑'">编辑</el-button>
<el-button type="text" @click="handleDelete(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> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>

6
src/pages/testPaper/add/index.vue
Unescape View File

@ -59,9 +59,9 @@
<el-table-column type="selection" width="80" align="center" :reserve-selection="true"></el-table-column> <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 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="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="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="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="useNum" label="使用次数" width="100" align="center"></el-table-column>
<el-table-column prop="createTime" label="上传时间" width="150" 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> >{{scope.$index + (page - 1) * pageSize + 1}}</template>
</el-table-column> </el-table-column>
<el-table-column prop="questionSource" label="题库来源" align="center"></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="name" label="试题类型" align="center"></el-table-column>
<el-table-column prop="courses" 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> <el-table-column prop="knowledgePoints" label="知识点" align="center"></el-table-column>

2
src/pages/testPaper/list/allTestPaper.vue
Unescape View File

@ -61,7 +61,7 @@
{{getStatusName(scope.row.state)}} {{getStatusName(scope.row.state)}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" width="120"> <el-table-column label="操作" width="120" align="center">
<template slot-scope="scope"> <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" 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> <el-button type="text" @click="preview(scope.row)" v-auth="'/testPaper/list:本校卷库:预览'">预览</el-button>

17
src/pages/testPaper/list/myTestPaper.vue
Unescape View File

@ -8,7 +8,7 @@
<h6 class="type">一、单选题</h6> <h6 class="type">一、单选题</h6>
<ul class="ques"> <ul class="ques">
<li v-for="(item,index) in paperList.list1" :key="index"> <li v-for="(item,index) in paperList.list1" :key="index">
<div class="l-title"> <div class="stem">
<span class="index">{{index+1}}.</span> <span class="index">{{index+1}}.</span>
<div v-html="item.questionStem"></div> <div v-html="item.questionStem"></div>
</div> </div>
@ -22,7 +22,7 @@
<h6 class="type">二、多选题</h6> <h6 class="type">二、多选题</h6>
<ul class="ques"> <ul class="ques">
<li v-for="(item,index) in paperList.list2" :key="index"> <li v-for="(item,index) in paperList.list2" :key="index">
<div class="l-title"> <div class="stem">
<span class="index">{{index+1}}.</span> <span class="index">{{index+1}}.</span>
<div v-html="item.questionStem"></div> <div v-html="item.questionStem"></div>
</div> </div>
@ -36,7 +36,7 @@
<h6 class="type">三、填空题</h6> <h6 class="type">三、填空题</h6>
<ul class="ques"> <ul class="ques">
<li v-for="(item,index) in paperList.list3" :key="index"> <li v-for="(item,index) in paperList.list3" :key="index">
<div class="l-title"> <div class="stem">
<span class="index">{{index+1}}.</span> <span class="index">{{index+1}}.</span>
<div v-html="item.questionStem"></div> <div v-html="item.questionStem"></div>
</div> </div>
@ -50,7 +50,7 @@
<h6 class="type">四、判断题</h6> <h6 class="type">四、判断题</h6>
<ul class="ques"> <ul class="ques">
<li v-for="(item,index) in paperList.list4" :key="index"> <li v-for="(item,index) in paperList.list4" :key="index">
<div class="l-title"> <div class="stem">
<span class="index">{{index+1}}.</span> <span class="index">{{index+1}}.</span>
<div v-html="item.questionStem"></div> <div v-html="item.questionStem"></div>
</div> </div>
@ -64,7 +64,7 @@
<h6 class="type">五、简答题</h6> <h6 class="type">五、简答题</h6>
<ul class="ques"> <ul class="ques">
<li v-for="(item,index) in paperList.list5" :key="index"> <li v-for="(item,index) in paperList.list5" :key="index">
<div class="l-title"> <div class="stem">
<span class="index">{{index+1}}.</span> <span class="index">{{index+1}}.</span>
<div v-html="item.questionStem"></div> <div v-html="item.questionStem"></div>
</div> </div>
@ -144,7 +144,7 @@
{{getStatusName(scope.row.state)}} {{getStatusName(scope.row.state)}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" width="250"> <el-table-column label="操作" width="250" align="center">
<template slot-scope="scope"> <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" 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> <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> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
/deep/.no-mb.el-form-item{
margin-bottom: 0;
}
.testpaper{ .testpaper{
width: 90%; width: 90%;
padding: 50px 100px; padding: 50px 100px;
@ -487,7 +484,7 @@ export default {
.ques{ .ques{
&>li{ &>li{
margin-bottom: 20px; margin-bottom: 20px;
.l-title{ .stem{
display: flex; display: flex;
margin-bottom: 10px; margin-bottom: 10px;
font-size: 14px; font-size: 14px;

2
src/setting.js
Unescape View File

@ -16,7 +16,7 @@ const Setting = {
showProgressBar: true, 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: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, modalDuration: 3,
// 接口请求返回错误时，弹窗的类型，可选值为 Message 或 Notice // 接口请求返回错误时，弹窗的类型，可选值为 Message 或 Notice

2
src/store/modules/testpaper.js
Unescape View File

@ -19,7 +19,7 @@ export default {
label: '考试' label: '考试'
},{ },{
id: 1, id: 1,
label: '学习' label: '练习'
} }
], ],
degreeList: [ degreeList: [

2
src/store/modules/user.js
Unescape View File

@ -73,7 +73,6 @@ export default {
}) })
Setting.dynamicRoute && addRoutes(routes) Setting.dynamicRoute && addRoutes(routes)
util.session.set(Setting.usernameKey, user.userName) util.session.set(Setting.usernameKey, user.userName)
util.session.set(Setting.storeKey, JSON.stringify(state))
util.successMsg('登录成功') util.successMsg('登录成功')
resolve() resolve()
}else{ }else{
@ -91,7 +90,6 @@ export default {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
util.session.remove(Setting.usernameKey); util.session.remove(Setting.usernameKey);
util.session.remove(Setting.storeKey); util.session.remove(Setting.storeKey);
// router.push('/login')
location.reload() location.reload()
resolve() resolve()
}) })

22
src/styles/common.scss
Unescape View File

@ -356,14 +356,16 @@
color: #ffa900; color: #ffa900;
} }
} }
.el-button--primary{ &:not(.normal){
color: #606266; .el-button--primary{
background: #fff; color: #606266;
border-color: #DCDFE6; background: #fff;
&:hover{ border-color: #DCDFE6;
color: $--color-primary; &:hover{
border-color: #efbdbb; color: $--color-primary;
background-color: #fae9e8; border-color: #efbdbb;
background-color: #fae9e8;
}
} }
} }
} }
@ -428,6 +430,10 @@
} }
} }
.el-tooltip__popper{
width: 300px;
}
@media(max-width: 1600px){ @media(max-width: 1600px){
.el-table{ .el-table{
.el-switch__label--right.is-active{ .el-switch__label--right.is-active{

1
src/styles/pages/messageBoard.scss
Unescape View File

@ -1,5 +1,6 @@
.list{ .list{
li{ li{
margin-bottom: 10px;
border-top: 1px solid #f1f1f1; border-top: 1px solid #f1f1f1;
&:first-child{ &:first-child{
border-top: 0; border-top: 0;

2
src/styles/pages/testPaperDetail.scss
Unescape View File

@ -44,7 +44,7 @@
} }
} }
.wrap{ .wrap{
height: calc(100vh - 367px); height: calc(100vh - 413px);
margin-top: 24px; margin-top: 24px;
overflow: auto; overflow: auto;
.item{ .item{

Write Preview
Loading…
Cancel
Save