yujialong 4 years ago
parent 59be73c83d
commit c76069a722
  1. 6
      src/pages/achievement/list/examResults.vue
  2. 6
      src/pages/achievement/list/practiceResults.vue
  3. 1
      src/pages/assessment/list/index.vue
  4. 1
      src/pages/practice/list/index.vue
  5. 2
      src/pages/quesBank/list/globalQuesBank.vue
  6. 12
      src/pages/quesBank/list/quesDialog.vue
  7. 2
      src/pages/testPaper/add/index.vue
  8. 2
      src/pages/testPaper/list/myTestPaper.vue

@ -56,12 +56,6 @@
header-align="center" header-align="center"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
> >
<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">
<template <template
slot-scope="scope" slot-scope="scope"

@ -49,12 +49,6 @@
header-align="center" header-align="center"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
> >
<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">
<template <template
slot-scope="scope" slot-scope="scope"

@ -35,7 +35,6 @@
</div> </div>
</div> </div>
<el-table :data="listData" class="table" stripe header-align="center" row-key="id"> <el-table :data="listData" class="table" stripe header-align="center" row-key="id">
<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> <el-table-column type="index" width="100" label="序号" align="center"></el-table-column>
<el-table-column prop="assessmentName" label="考核名称" align="center"></el-table-column> <el-table-column prop="assessmentName" label="考核名称" align="center"></el-table-column>
<el-table-column prop="name" label="考核类型" align="center"> <el-table-column prop="name" label="考核类型" align="center">

@ -20,7 +20,6 @@
</div> </div>
</div> </div>
<el-table :data="listData" class="table" stripe header-align="center" row-key="id"> <el-table :data="listData" class="table" stripe header-align="center" row-key="id">
<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> <el-table-column type="index" width="100" label="序号" align="center"></el-table-column>
<el-table-column prop="practiseName" label="练习名称" align="center"></el-table-column> <el-table-column prop="practiseName" 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>

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

@ -12,9 +12,9 @@
<el-form-item label="所属题库" prop="cid"> <el-form-item label="所属题库" prop="cid">
<el-select v-model="topicForm.cid" clearable placeholder="请选择所属题库"> <el-select v-model="topicForm.cid" clearable placeholder="请选择所属题库">
<template v-for="(item,index) in quesBankList"> <template v-for="(item,index) in quesBankList">
<el-option :key="index" :label="item.typeName" :value="item.cid"></el-option> <el-option :key="item.cid" :label="item.typeName" :value="item.cid"></el-option>
<template v-for="(item1,index1) in item.secondColumn"> <template v-for="(item1,index1) in item.secondColumn">
<el-option class="second" :key="index1" :label="item1.typeName" :value="item1.cid"></el-option> <el-option class="second" :key="item1.cid" :label="item1.typeName" :value="item1.cid"></el-option>
</template> </template>
</template> </template>
</el-select> </el-select>
@ -296,13 +296,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) {
@ -321,6 +314,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('请至少添加一个正确答案!')

@ -440,7 +440,9 @@ export default {
if(this.courses === '') return this.$message.warning('请填写所属课程') if(this.courses === '') return this.$message.warning('请填写所属课程')
if(this.degree === '') return this.$message.warning('请选择难易程度') if(this.degree === '') return this.$message.warning('请选择难易程度')
if(this.duration === '') return this.$message.warning('请填写建议时长') if(this.duration === '') return this.$message.warning('请填写建议时长')
}
if(qid === '') return this.$message.warning('请选择试题') if(qid === '') return this.$message.warning('请选择试题')
if(status == 1){
if(this.totalScore < 100) return this.$message.warning('总分值未满100分,请重新设置') if(this.totalScore < 100) return this.$message.warning('总分值未满100分,请重新设置')
if(this.totalScore > 100) return this.$message.warning('总分值超过100分,请重新设置') if(this.totalScore > 100) return this.$message.warning('总分值超过100分,请重新设置')
} }

@ -158,7 +158,7 @@
<el-table-column label="操作" width="250"> <el-table-column label="操作" width="250">
<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:我的试卷:预览'">预览</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="copy(scope.row)" v-auth="'/testPaper/list:我的试卷:复制'">复制</el-button> <el-button type="text" @click="copy(scope.row)" v-auth="'/testPaper/list:我的试卷:复制'">复制</el-button>
<el-button type="text" @click="edit(scope.row)" v-auth="'/testPaper/list:我的试卷:修改'">修改</el-button> <el-button type="text" @click="edit(scope.row)" v-auth="'/testPaper/list:我的试卷:修改'">修改</el-button>
<el-button type="text" @click="delData(scope.row)" v-auth="'/testPaper/list:我的试卷:删除'">删除</el-button> <el-button type="text" @click="delData(scope.row)" v-auth="'/testPaper/list:我的试卷:删除'">删除</el-button>

Loading…
Cancel
Save