From c6dd775e9437ba929a2633c1a9f4d71379e5d19b Mon Sep 17 00:00:00 2001 From: 阳洁 <2077506045@qq.com> Date: 星期三, 10 五月 2023 15:14:58 +0800 Subject: [PATCH] Merge branch 'v13-20230413' --- src/views/exam/paper/career_interests.vue | 61 ++++++++++++++++++++++++++++-- 1 files changed, 56 insertions(+), 5 deletions(-) diff --git a/src/views/exam/paper/career_interests.vue b/src/views/exam/paper/career_interests.vue index 662ae2a..f86476b 100644 --- a/src/views/exam/paper/career_interests.vue +++ b/src/views/exam/paper/career_interests.vue @@ -5,7 +5,7 @@ <h1></h1> </el-header> <el-main style="padding-top: 3%;"> - <div v-html="guideDescirption" v-if="guide" :style="ismobile?'padding-top: 2%;':'padding-top: 2%;margin: 0 auto;width:66%'"></div> + <div v-html="guideDescirption" v-if="guide" :style="ismobile?'padding-top: 2%;margin-top: 5%;':'padding-top: 2%;margin: 0 auto;width:66%'"></div> <el-row class="do-align-center" v-if="guide"> <el-button @click="startDo" type="primary" :disable="startDoDisable">{{$t('start')}}</el-button> </el-row > @@ -17,7 +17,7 @@ <hr style="border : 1px dashed #b3d8ff;" /> <el-form-item :key="itemOrder" label-width="1px"> <QuestionEdit @callNextSubject="nextSubject" :qType="questionItem.questionType" :question="questionItem" - :answer="answer.answerItems[questionItem.itemOrder-1]" :qLabel="itemOrder+'/'+itemSize"/> + :answer="answer.answerItems[questionItem.itemOrder-1]" :qLabel="questionItem.serialNumber+'/'+questionItem.serialNumberCount"/> </el-form-item> <hr style="border : 0.5px dashed #b3d8ff;" /> <div style="color: red;font-size: smaller">{{$t('pleaseAnswerCarefully')}}</div> @@ -61,7 +61,7 @@ import examPaperAnswerApi from '@/api/examPaperAnswer' import demographyApi from '@/api/demography' export default { - name: 'personality', + name: 'career_interests', components: { QuestionEdit }, data () { return { @@ -117,9 +117,16 @@ _this.itemOrder = _this.form.titleItems[0].questionItems[0].itemOrder _this.timeReduce() _this.initAnswer() + _this.initPartSize() _this.formLoading = false _this.memberName = _this.form.memberName _this.itemSize = _this.form.titleItems[0].questionItems.length + + // 灞曠ず鎸囧璇� + if (_this.form.parts[0].signals.length !== 0) { + console.log('棣栭鎻愮ず璇�') + _this.showNextGuide(_this.form.parts[0].signals[0], false) + } } else { _this.formLoading = true // 闃叉鍒锋柊鎴愪簡涓嶅悓鐨勮瑷� @@ -140,6 +147,7 @@ _this.questionItem = _this.form.titleItems[0].questionItems[_this.order] _this.partOrder = _this.questionItem.partOrder _this.initAnswer() + _this.initPartSize() _this.formLoading = false _this.memberName = _this.form.memberName @@ -247,6 +255,36 @@ } } }, + initPartSize: function () { + // 鍒濆鍖栭鐩簭鍙� 姣忎釜鍒嗙墖浠�0寮�濮� + let _this = this + let serialNumber = 1 + let partOrder = 1 + for (let i = 0; i < _this.form.titleItems[0].questionItems.length; i++) { + if (_this.form.titleItems[0].questionItems[i].partOrder === partOrder) { + _this.form.titleItems[0].questionItems[i].serialNumber = serialNumber + _this.form.titleItems[0].questionItems[i].serialNumberCount = _this.getPartCount(partOrder) + serialNumber++ + } else { + partOrder = _this.form.titleItems[0].questionItems[i].partOrder + serialNumber = 1 + _this.form.titleItems[0].questionItems[i].serialNumber = serialNumber + _this.form.titleItems[0].questionItems[i].serialNumberCount = _this.getPartCount(partOrder) + serialNumber++ + } + } + }, + getPartCount: function (partOrder) { + // 鏁版嵁缁熻 + let _this = this + let sum = 0 + _this.form.titleItems[0].questionItems.forEach(function (elem, index) { + if (elem.partOrder === partOrder) { + sum += 1 + } + }) + return sum + }, isContentNotEmpty: function (num) { let _this = this return _this.answer.answerItems[num].content !== '' && _this.answer.answerItems[num].content !== null && _this.answer.answerItems[num].content.trim() !== '' @@ -265,7 +303,13 @@ if (_this.partOrder !== nowPartOrder) { _this.isShowGuide(true) } - _this.preDisable = true + + // 濡傛灉涓婁竴棰樹笉鏄湰娈碉紝鍒欎笉鑳借繑鍥炰笂涓�娈� + if (this.isDiffPartOrder()) { + _this.preDisable = false + } else { + _this.preDisable = true + } _this.nextDisable = false _this.answer.answerItems[_this.order].startTime = _this.formatDate(new Date(), 'yyyy-MM-dd hh:mm:ss') @@ -395,6 +439,13 @@ let _this = this _this.isShowGuide(false) if (_this.order > 0) { + // 娓呯┖鏈鐨勯�夋嫨 + _this.answer.answerItems[_this.order].content = null + _this.answer.answerItems[_this.order].completed = false + _this.answer.answerItems[_this.order].questionReport = null + _this.answer.answerItems[_this.order].readOnly = false + + // 璁剧疆鍥炲埌涓婁竴棰� let num = --_this.order _this.itemOrder = _this.form.titleItems[0].questionItems[num].itemOrder _this.questionItem = _this.form.titleItems[0].questionItems[num] @@ -458,7 +509,7 @@ examPaperAnswerApi.answerSubmit(answerSubmit, _this.memberToken).then(re => { loading.close() if (re.code === 1) { - _this.$router.push({ path: '/exam/finish', query: { name: _this.form.name, content: mess, tokenId: _this.memberToken } }) + _this.$router.push({ path: '/exam/finish', query: { name: _this.form.name, content: mess, tokenId: _this.memberToken, type: 'CIAQ' } }) } else { _this.$message.error(re.message + '/exam/finish') } -- Gitblit v1.9.1