From 166f256cda92ce8755ce0bf982ee2d355d7b6e42 Mon Sep 17 00:00:00 2001
From: zhijie <1003392067@qq.com>
Date: 星期日, 03 十二月 2023 22:53:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master_merge_V13'
---
dist.zip | 0
package-lock.json | 31 -------------------------------
src/views/exam/paper/values.vue | 20 ++++++++++----------
3 files changed, 10 insertions(+), 41 deletions(-)
diff --git a/dist.zip b/dist.zip
new file mode 100644
index 0000000..e79735c
--- /dev/null
+++ b/dist.zip
Binary files differ
diff --git a/package-lock.json b/package-lock.json
index 5043d83..f84c49e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4720,22 +4720,6 @@
},
"echarts": {
"version": "5.4.2",
- "resolved": "https://registry.npmjs.org/echarts/-/echarts-5.4.2.tgz",
- "integrity": "sha512-2W3vw3oI2tWJdyAz+b8DuWS0nfXtSDqlDmqgin/lfzbkB01cuMEN66KWBlmur3YMp5nEDEEt5s23pllnAzB4EA==",
- "requires": {
- "tslib": "2.3.0",
- "zrender": "5.4.3"
- },
- "dependencies": {
- "tslib": {
- "version": "2.3.0",
- "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz",
- "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="
- }
- }
- },
- "echarts": {
- "version": "5.4.2",
"resolved": "https://registry.npmmirror.com/echarts/-/echarts-5.4.2.tgz",
"integrity": "sha512-2W3vw3oI2tWJdyAz+b8DuWS0nfXtSDqlDmqgin/lfzbkB01cuMEN66KWBlmur3YMp5nEDEEt5s23pllnAzB4EA==",
"requires": {
@@ -14018,21 +14002,6 @@
"resolved": "http://registry.npm.taobao.org/yallist/download/yallist-2.1.2.tgz",
"integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
"dev": true
- }
- }
- },
- "zrender": {
- "version": "5.4.3",
- "resolved": "https://registry.npmjs.org/zrender/-/zrender-5.4.3.tgz",
- "integrity": "sha512-DRUM4ZLnoaT0PBVvGBDO9oWIDBKFdAVieNWxWwK0niYzJCMwGchRk21/hsE+RKkIveH3XHCyvXcJDkgLVvfizQ==",
- "requires": {
- "tslib": "2.3.0"
- },
- "dependencies": {
- "tslib": {
- "version": "2.3.0",
- "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz",
- "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="
}
}
},
diff --git a/src/views/exam/paper/values.vue b/src/views/exam/paper/values.vue
index 2ebeca9..11c2df3 100644
--- a/src/views/exam/paper/values.vue
+++ b/src/views/exam/paper/values.vue
@@ -23,7 +23,7 @@
<div>{{$t('values_title_description_3')}}<img class="tools-button" src="@/assets/exam-paper/question.png" style="width: 15px;position: absolute;margin-top: 2px"/><span style="margin-left: 20px;">{{$t('values_title_description_3_2')}}</span></div>
<div>{{$t('values_title_description_4')}}<img class="tools-button" src="@/assets/exam-paper/scale.png" style="width: 15px;height: 15px;position: absolute;margin-top: 2px"/><span style="margin-left: 20px;">{{$t('values_title_description_4_2')}}</span></div>
</div>
-
+
<div style="display: flex;justify-content: flex-start;padding: 10px 0;">
<el-button style="margin-top: 12px;" @click="step1_start" type="primary" round v-if="!step1Start">{{$t('start')}}</el-button>
<el-button style="margin-top: 12px;" type="primary" round @click="step1_next"
@@ -155,7 +155,7 @@
<div style="padding: 0 10px;width:80px;">{{$t('values_pic_tmpArea')}}</div>
<draggable animation="300" class="pic-tmparea-div"
style="border: 1px solid gray;padding: 10px;width: 45%;"
- :list="step3EWEIArea[0]" :options="{group:{name:'EWEIArea',pull:'clone'}}"
+ :list="step3EWEIArea[0]" :options="{group:{name:'EWEIArea',pull:'clone'}}"
@start="ev=>step3TmpAreaStart(ev,0)"
@end="step3TmpAreaMoveEnd">
<div v-for="q in step3EWEIArea[0]" :key="q.id" class="mullinediv-item2"
@@ -171,7 +171,7 @@
</div>
<div style="display:flex;margin-top: 200px;">
<div style="display: inline-block;min-width: 150px;text-align: right;padding-right: 5px;">
- <div class="mul-inlinediv-row mul-inlinediv-lineheight"
+ <div class="mul-inlinediv-row mul-inlinediv-lineheight"
v-for="(item,index) in step2ScoreRanges">
<span v-if="item.stepName=='涓嶇‘瀹氭槸鍚︾浉浼�'">
涓嶇‘瀹氭槸鍚︿笌浣犵浉浼� <span v-if="item.step<step2ScoreRanges.length">{{$t('values_step_names_unit')}}</span>
@@ -188,7 +188,7 @@
</div>
<!--
<div style="display: inline-block;min-width: 20px;text-align: right;">
- <div class="mul-inlinediv-row mul-inlinediv-lineheight"
+ <div class="mul-inlinediv-row mul-inlinediv-lineheight"
v-for="(item,index) in step2ScoreRanges">
{{$t('values_step_names_unit')}}
</div>
@@ -426,7 +426,7 @@
}
).catch(e => {})
}
-
+
document.body.ondrop = function(event) {
event.preventDefault();
event.stopPropagation();
@@ -477,7 +477,7 @@
_this.sortQuestions()
_this.caculateScoreRangeSelectedById(this.getStep2StepItem(this.step2SubStep).itemOrder)
}).catch(() => {
-
+
});
*/
this.step = "step2-0"
@@ -916,7 +916,7 @@
//璁剧疆鏈�鍚庣殑Step鐨凷tepName涓哄浐瀹氬��
if(_this.step2ScoreRanges[i]['step'] >= max){
if(max % 2 == 0){//鍋舵暟
-
+
} else {//濂囨暟
_this.step2ScoreRanges[i]['stepName'] = names[names.length-1]
}
@@ -1100,7 +1100,7 @@
answerItem.startTime = ''
}
answerItem.completed = true
- answerItem.content = this.getContentByQuestionId(answerItem.questionId)
+ answerItem.content = this.getContentByQuestionId(answerItem.questionId)
//this.getLikeTypeByScoreRangeItemOrder(answerItem.subjectId)
answerItem.questionReport = {
questionOrder: answerItem.questionId,
@@ -1143,7 +1143,7 @@
langType: question.langType, //绛旈璇█
partOrder: question.partOrder, //鍒嗙墖
imgUrl: question.imgUrl, //鍥剧墖鍦板潃
- answer: question.content //棰樼洰绛旀
+ answer: question.content //棰樼洰绛旀
})
}
}
@@ -1427,7 +1427,7 @@
justify-content: center;
width: 100%;
}
-
+
.mul-inlinediv-down {
min-width: 16px;
//line-height: 106px;
--
Gitblit v1.9.1