|
|
@@ -99,36 +99,36 @@
|
|
|
<!-- <div style="font-size: 20px; text-align: center;color: rgb(68, 152, 248);font-weight: 700;">
|
|
|
提示</div> -->
|
|
|
<div class="popup-content">
|
|
|
- <div style="font-size: 20px; text-align: center;color: #333;font-weight: 700;">
|
|
|
+ <div style="font-size: 20px; text-align: center;color: #333;font-weight: 700;padding: 10px;">
|
|
|
提示</div>
|
|
|
<div style="text-align: left;padding: 2%; font-weight: 700;font-size: 15px;color: #333;">当前考试信息如下：
|
|
|
</div>
|
|
|
<div style="width: 90%;margin: auto;">
|
|
|
<van-row class="examRow">
|
|
|
- <van-col span="8" class="popupTitle">考试名称:</van-col>
|
|
|
+ <van-col span="7" class="popupTitle">考试名称：</van-col>
|
|
|
<van-col
|
|
|
- span="16"
|
|
|
+ span="17"
|
|
|
class="popupContent"
|
|
|
>{{ examPopup.examName===''?'/':examPopup.examName===null?'/':examPopup.examName }}</van-col>
|
|
|
</van-row>
|
|
|
<van-row class="examRow">
|
|
|
- <van-col span="8" class="popupTitle">考试题库:</van-col>
|
|
|
+ <van-col span="7" class="popupTitle">考试题库：</van-col>
|
|
|
<van-col
|
|
|
- span="16"
|
|
|
+ span="17"
|
|
|
class="popupContent"
|
|
|
>{{ examPopup.bankName===''?'/':examPopup.bankName===null?'/':examPopup.bankName }}</van-col>
|
|
|
</van-row>
|
|
|
<van-row class="examRow">
|
|
|
- <van-col span="8" class="popupTitle">题目数量:</van-col>
|
|
|
+ <van-col span="7" class="popupTitle">题目数量：</van-col>
|
|
|
<van-col
|
|
|
- span="16"
|
|
|
+ span="17"
|
|
|
class="popupContent"
|
|
|
>{{ examPopup.questionCount===''?'/':examPopup.questionCount===null?'/':examPopup.questionCount }}</van-col>
|
|
|
</van-row>
|
|
|
<van-row class="examRow">
|
|
|
- <van-col span="8" class="popupTitle">考试总分:</van-col>
|
|
|
+ <van-col span="7" class="popupTitle">考试总分：</van-col>
|
|
|
<van-col
|
|
|
- span="16"
|
|
|
+ span="17"
|
|
|
class="popupContent"
|
|
|
>{{ examPopup.totalScore===''?'/':examPopup.totalScore===null?'/':examPopup.totalScore }}</van-col>
|
|
|
</van-row>
|
|
|
@@ -140,37 +140,37 @@
|
|
|
>{{ examPopup.allExaminee===''?'/':examPopup.allExaminee===null?'/':(examPopup.allExaminee || '').split(',').length }}</van-col>
|
|
|
</van-row> -->
|
|
|
<van-row class="examRow">
|
|
|
- <van-col span="8" class="popupTitle">限考时间:</van-col>
|
|
|
+ <van-col span="7" class="popupTitle">限考时间：</van-col>
|
|
|
<van-col
|
|
|
- span="16"
|
|
|
+ span="17"
|
|
|
class="popupContent"
|
|
|
>{{ examPopup.limitDate===''?'/':examPopup.limitDate===null?'/':examPopup.limitDate }}</van-col>
|
|
|
</van-row>
|
|
|
<van-row class="examRow">
|
|
|
- <van-col span="8" class="popupTitle">限考次数:</van-col>
|
|
|
+ <van-col span="7" class="popupTitle">限考次数：</van-col>
|
|
|
<van-col
|
|
|
- span="16"
|
|
|
+ span="17"
|
|
|
class="popupContent"
|
|
|
>{{ examPopup.limitCount===''?'/':examPopup.limitCount===null?'/':countTotal?`${examPopup.limitCount}次 （您已参加${countTotal.count - 1}次 ，本次不消耗次数）`:'' }}</van-col>
|
|
|
</van-row>
|
|
|
<van-row class="examRow">
|
|
|
- <van-col span="8" class="popupTitle">考试时长:</van-col>
|
|
|
+ <van-col span="7" class="popupTitle">考试时长：</van-col>
|
|
|
<van-col
|
|
|
- span="16"
|
|
|
+ span="17"
|
|
|
class="popupContent"
|
|
|
>{{ examPopup.duration===''?'/':examPopup.duration===null?'/':examPopup.duration=='不限'?examPopup.duration:transformTime(examPopup.duration) }}</van-col>
|
|
|
</van-row>
|
|
|
<van-row class="examRow">
|
|
|
- <van-col span="8" class="popupTitle">达标分数占比:</van-col>
|
|
|
+ <van-col span="7" class="popupTitle">达标分数占比：</van-col>
|
|
|
<van-col
|
|
|
- span="16"
|
|
|
+ span="17"
|
|
|
class="popupContent"
|
|
|
>{{ examPopup.qualifiedRadio===''?'/':examPopup.qualifiedRadio===null?'/':examPopup.qualifiedRadio }}</van-col>
|
|
|
</van-row>
|
|
|
<van-row class="examRow">
|
|
|
- <van-col span="8" class="popupTitle">计分方式:</van-col>
|
|
|
+ <van-col span="7" class="popupTitle">计分方式：</van-col>
|
|
|
<van-col
|
|
|
- span="16"
|
|
|
+ span="17"
|
|
|
class="popupContent"
|
|
|
>{{ examPopup.scoringType===''?'/':examPopup.scoringType===null?'/':examPopup.scoringType }}</van-col>
|
|
|
</van-row>
|
|
|
@@ -350,6 +350,20 @@ export default {
|
|
|
next()
|
|
|
}
|
|
|
},
|
|
|
+ // watch: {
|
|
|
+ // moreParams: {
|
|
|
+ // handler(val) {
|
|
|
+ // console.log('val', val.length)
|
|
|
+ // if (val) {
|
|
|
+ // console.log('1111')
|
|
|
+ // } else {
|
|
|
+ // console.log('222')
|
|
|
+ // }
|
|
|
+ // // this.moreParams = val
|
|
|
+ // }
|
|
|
+ // // deep: true
|
|
|
+ // }
|
|
|
+ // },
|
|
|
|
|
|
methods: {
|
|
|
onClickTab(index) {
|
|
|
@@ -474,97 +488,6 @@ export default {
|
|
|
})
|
|
|
}
|
|
|
},
|
|
|
- // getQuestionData() {
|
|
|
- // const param = this.examId ? `and e.exam_id_ = '${this.examId}'` : 'and e.exam_id_ is null'
|
|
|
- // const sql = `select e.id_ as dataId, e.exam_id_ as examId, e.kao_shi_ren_ as examinee, e.bu_men_ as dept, e.zhuang_tai_ as status, e.bao_ming_shi_jian as applyTime, e.kai_shi_shi_jian_ as startTime, e.jie_shu_shi_jian_ as endTime, e.ti_ku_zong_fen_ as totalScore, e.de_fen_ as resultScore, ed.ti_mu_id_ as questionId, ed.ti_gan_ as stem, ed.ti_xing_ as questionType, ed.fen_zhi_ as questionScore, ed.fu_tu_ as img, ed.xuan_xiang_lei_xi as optionsType, ed.xuan_xiang_ as options, ed.can_kao_da_an_ as rightKey, ed.ping_fen_fang_shi as rateType, ed.ping_fen_ren_ as rater, ed.hui_da_ as answer, ed.ping_yue_shi_jian as rateTime, ed.de_fen_ as score, ed.jie_xi_ as analysis, q.ti_ku_ming_cheng_ as paperName, case when e.exam_id_ is not null then ex.da_biao_zhan_bi_ else q.da_biao_zhan_bi_ end as qualifiedRadio, case when e.exam_id_ is not null then ex.ji_fen_fang_shi_ else q.ji_fen_fang_shi_ end as scoringType, case when e.exam_id_ is not null then ex.kao_shi_ming_chen else '自主考核' end as examName, case when e.exam_id_ is not null then ex.xian_kao_shi_jian else '不限' end as limitDate from t_examination e left join t_examination_detail ed on e.id_ = ed.parent_id_ left join t_question_bank q on e.ti_ku_id_ = q.id_ left join t_exams ex on e.exam_id_ = ex.id_ where e.ti_ku_id_ = '${this.bankId}' ${param} and e.kao_shi_ren_ = '${this.examineeId}' and (e.zhuang_tai_ = '已完成' or e.zhuang_tai_ = '已交卷') order by field(ed.ti_xing_, '单选题', '多选题', '判断题', '填空题', '简答题')`
|
|
|
- // return new Promise((resolve, reject) => {
|
|
|
- // this.$common.request('sql', sql).then(res => {
|
|
|
- // const { data = [] } = res.variables || {}
|
|
|
- // if (!data.length) {
|
|
|
- // Notify({ type: 'primary', message: '未查询到已提交的考试记录，请先完成考试！' })
|
|
|
- // // this.$message.error('未查询到已提交的考试记录，请先完成考试！')
|
|
|
- // this.closeDialog()
|
|
|
- // return
|
|
|
- // }
|
|
|
- // const result = []
|
|
|
- // data.map(item => {
|
|
|
- // // 数据转换
|
|
|
- // if (['单选题', '多选题'].includes(item.questionType)) {
|
|
|
- // item.options = JSON.parse(item.options)
|
|
|
- // item.rightKey = item.questionType === '多选题' ? item.rightKey.split(',') : item.rightKey
|
|
|
- // item.answer = item.questionType === '多选题' ? JSON.parse(item.answer) : item.answer
|
|
|
- // } else if (item.questionType === '填空题') {
|
|
|
- // item.rightKey = item.rightKey ? JSON.parse(item.rightKey) : []
|
|
|
- // item.answer = item.answer ? JSON.parse(item.answer) : Array(item.rightKey.length).fill('')
|
|
|
- // } else if (item.questionType === '简答题') {
|
|
|
- // item.rightKey = [item.rightKey]
|
|
|
- // item.answer = [item.answer]
|
|
|
- // }
|
|
|
- // item.img = item.img ? JSON.parse(item.img) : ''
|
|
|
-
|
|
|
- // // 数据分组
|
|
|
- // const index = result.findIndex(i => i.dataId === item.dataId)
|
|
|
- // if (index === -1) {
|
|
|
- // const { dataId, examinee, dept, status, applyTime, startTime, endTime, qualifiedRadio, paperName, totalScore, resultScore, scoringType } = item || {}
|
|
|
- // result.push({
|
|
|
- // dataId,
|
|
|
- // examinee,
|
|
|
- // dept,
|
|
|
- // status,
|
|
|
- // applyTime,
|
|
|
- // startTime,
|
|
|
- // endTime,
|
|
|
- // qualifiedRadio,
|
|
|
- // isQualified: status === '已完成' ? parseFloat(resultScore) >= (parseFloat(qualifiedRadio) / 100 * parseFloat(totalScore)) : '',
|
|
|
- // paperName,
|
|
|
- // totalScore: parseFloat(totalScore),
|
|
|
- // resultScore: parseFloat(resultScore),
|
|
|
- // // totalCount: data.length,
|
|
|
- // scoringType,
|
|
|
- // list: [{
|
|
|
- // type: item.questionType,
|
|
|
- // questions: [item]
|
|
|
- // }]
|
|
|
- // })
|
|
|
- // } else {
|
|
|
- // const qIndex = result[index].list.findIndex(i => i.type === item.questionType)
|
|
|
- // if (qIndex === -1) {
|
|
|
- // result[index].list.push({
|
|
|
- // type: item.questionType,
|
|
|
- // questions: [item]
|
|
|
- // })
|
|
|
- // } else {
|
|
|
- // result[index].list[qIndex].questions.push(item)
|
|
|
- // }
|
|
|
- // }
|
|
|
- // })
|
|
|
- // result.forEach(item => {
|
|
|
- // let count = 0
|
|
|
- // item.list.forEach(i => {
|
|
|
- // count += i.questions.length
|
|
|
- // i.totalScore = i.questions.reduce((a, b) => a + parseFloat(b.questionScore), 0)
|
|
|
- // })
|
|
|
- // item.totalCount = count
|
|
|
- // })
|
|
|
- // // 获取最高分最低分
|
|
|
- // const { maxScore, minScore } = result.filter(i => i.status === '已完成').reduce((acc, curr) => {
|
|
|
- // if (curr.resultScore > acc.maxScore) {
|
|
|
- // acc.maxScore = curr.resultScore
|
|
|
- // }
|
|
|
- // if (curr.resultScore < acc.minScore) {
|
|
|
- // acc.minScore = curr.resultScore
|
|
|
- // }
|
|
|
- // return acc
|
|
|
- // }, { maxScore: -Infinity, minScore: Infinity })
|
|
|
- // this.maxScore = maxScore
|
|
|
- // this.minScore = minScore
|
|
|
- // resolve(result)
|
|
|
- // }).catch(error => {
|
|
|
- // console.log('111')
|
|
|
- // reject(error)
|
|
|
- // })
|
|
|
- // })
|
|
|
- // },
|
|
|
closeDetail(val) {
|
|
|
this.examDetail = val
|
|
|
this.onSearch()
|
|
|
@@ -786,6 +709,9 @@ export default {
|
|
|
canshu3 = `AND startDate<='${aa.startDateDG}'`
|
|
|
}
|
|
|
}
|
|
|
+ } else {
|
|
|
+ this.moreSubject = ''
|
|
|
+ this.subjectTitle = ''
|
|
|
}
|
|
|
const key = this.subject
|
|
|
const key1 = this.moreSubject
|
|
|
@@ -860,7 +786,7 @@ export default {
|
|
|
// align-items: center; /* 垂直居中对齐 */
|
|
|
|
|
|
.popupTitle {
|
|
|
- text-align: center;
|
|
|
+ text-align: left;
|
|
|
font-size: 14px;
|
|
|
color: #555;
|
|
|
}
|
lidie