yujialong 4 years ago
parent bd4157f0a3
commit 2105a2cbe3
  1. 1
      src/api/index.js
  2. 2
      src/pages/quesBank/list/globalQuesBank.vue
  3. 8
      src/pages/quesBank/list/quesDialog.vue
  4. 10
      src/pages/user/list/index.vue

@ -20,6 +20,7 @@ export default {
userinfoUpdate:`management/userInfo/update`, userinfoUpdate:`management/userInfo/update`,
userinfo:`management/userInfo/getUserInfo`, userinfo:`management/userInfo/getUserInfo`,
getAccount:`management/userInfo/getAccount`, getAccount:`management/userInfo/getAccount`,
getUserAccount:`management/userInfo/getUserAccount`,
// 组织架构 // 组织架构
addStaffPro: `management/staffProfessionalArchitecture/addStaffProfessionalArchitecture`, addStaffPro: `management/staffProfessionalArchitecture/addStaffProfessionalArchitecture`,

@ -52,7 +52,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 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>

@ -280,13 +280,6 @@ export default {
if(this.topicForm.typeId == 3){ if(this.topicForm.typeId == 3){
this.topicForm.optionA = '正确' this.topicForm.optionA = '正确'
this.topicForm.optionB = '错误' this.topicForm.optionB = '错误'
if(this.topicForm.aisTrue == 1){
this.topicForm.aisTrue = true
this.topicForm.answer = 'A'
}else{
this.topicForm.bisTrue = true
this.topicForm.answer = 'B'
}
} }
if(topicForm.typeId == 1 || topicForm.typeId == 2 || topicForm.typeId == 3){ if(topicForm.typeId == 1 || topicForm.typeId == 2 || topicForm.typeId == 3){
for(let n in topicForm) { for(let n in topicForm) {
@ -305,6 +298,7 @@ export default {
if(topicForm.questionType == '单选题' && answer.length > 1) return this.$message.warning('单选题只能设置一个正确选项!') if(topicForm.questionType == '单选题' && answer.length > 1) return this.$message.warning('单选题只能设置一个正确选项!')
if(topicForm.questionType == '多选题' && answer.length < 2) return this.$message.warning('多选题必须设置至少两个正确选项!') if(topicForm.questionType == '多选题' && answer.length < 2) return this.$message.warning('多选题必须设置至少两个正确选项!')
if(isInvalidAnswer) return this.$message.warning('正确答案选项为空,请重新设置!'); if(isInvalidAnswer) return this.$message.warning('正确答案选项为空,请重新设置!');
if(topicForm.typeId == 3) answer = topicForm.aisTrue == 1 ? 'a' : 'b'
this.topicForm.answer = answer.toUpperCase() this.topicForm.answer = answer.toUpperCase()
}else if(this.topicForm.typeId == 5){ }else if(this.topicForm.typeId == 5){
if(!this.fillList.length || this.fillList.every(n => n === '')) return this.$message.warning('请至少添加一个正确答案!') if(!this.fillList.length || this.fillList.every(n => n === '')) return this.$message.warning('请至少添加一个正确答案!')

@ -26,9 +26,9 @@
<el-table-column type="selection" width="55" align="center" :reserve-selection="true"></el-table-column> <el-table-column type="selection" width="55" align="center" :reserve-selection="true"></el-table-column>
<el-table-column type="index" width="100" label="序号" align="center"> <el-table-column type="index" width="100" label="序号" align="center">
</el-table-column> </el-table-column>
<el-table-column prop="clientName" label="客户名称" align="center"> <el-table-column prop="clientName" label="所属院校" align="center">
</el-table-column> </el-table-column>
<el-table-column prop="name" label="姓名" align="center"> <el-table-column prop="name" label="管理员姓名" align="center">
</el-table-column> </el-table-column>
<el-table-column prop="account" label="账号" align="center"> <el-table-column prop="account" label="账号" align="center">
</el-table-column> </el-table-column>
@ -73,8 +73,8 @@
<el-checkbox label="超级管理员"></el-checkbox> <el-checkbox label="超级管理员"></el-checkbox>
</el-checkbox-group> </el-checkbox-group>
</el-form-item> </el-form-item>
<el-form-item prop="clientId" label="客户名称"> <el-form-item prop="clientId" label="所属院校">
<el-select v-model="form.clientId" clearable placeholder="请选择客户名称" filterable> <el-select v-model="form.clientId" clearable placeholder="请选择院校名称" filterable>
<el-option v-for="(item,index) in clientList" :key="index" :label="item.clientName" :value="item.id"></el-option> <el-option v-for="(item,index) in clientList" :key="index" :label="item.clientName" :value="item.id"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -141,7 +141,7 @@ export default {
{ required: true, message: '请输入用户姓名', trigger: 'blur' } { required: true, message: '请输入用户姓名', trigger: 'blur' }
], ],
clientId: [ clientId: [
{ required: true, message: '请选择客户名称', trigger: 'change' }, { required: true, message: '请选择院校名称', trigger: 'change' },
] ]
}, },
userData:[], userData:[],

Loading…
Cancel
Save