From 713297256b3fdd3607b19fc42b99a486590f971e Mon Sep 17 00:00:00 2001
From: 84702473 <84702473@qq.com>
Date: 星期二, 11 四月 2023 20:23:28 +0800
Subject: [PATCH] 修改和添加文字

---
 src/views/exam/paper/values.vue |   44 +++++++++++++++++++++++++++++++-------------
 1 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/src/views/exam/paper/values.vue b/src/views/exam/paper/values.vue
index 2a6c5e9..de3dfc9 100644
--- a/src/views/exam/paper/values.vue
+++ b/src/views/exam/paper/values.vue
@@ -4,11 +4,17 @@
 			<el-header class="">
 				<h1>{{$t('values_title')}}</h1>
 			</el-header>
-			<el-main class="" style="padding-top: 3%;">
-				<div v-html="$t('values_title_description')">
+			<el-main class="">
+				<div>
+					<div v-html="$t('values_title_description')"></div>
+					<div>{{$t('values_title_description_1')}}<img class="tools-button" src="@/assets/exam-paper/good.png" style="width: 15px;"/></div>
+					<div>{{$t('values_title_description_2')}}<img class="tools-button" src="@/assets/exam-paper/nogood.png" style="width: 15px;"/></div>
+					<div>{{$t('values_title_description_3')}}<img class="tools-button" src="@/assets/exam-paper/question.png" style="width: 15px;"/></div>
+					<div>{{$t('values_title_description_4')}}<img class="tools-button" src="@/assets/exam-paper/scale.png" style="width: 15px;"/>{{$t('values_title_description_4_2')}}</div>
 				</div>
+				
 				<div style="display: flex;justify-content: flex-start;padding: 10px 0;">
-					<el-button @click="step1_start" type="primary" round v-if="!step1Start">{{$t('start')}}</el-button>
+					<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"
 						v-if="(step1Start && itemSize>0)">
 						{{$t('next')}}
@@ -50,15 +56,18 @@
 					</div>
 					<div style="display: flex;justify-content: space-between;">
 						<div style="line-height: 50px;text-indent: 2em;">
-							<span
+							<div
 								v-if="(step2SubStep == step2ScoreRanges.length) && (step2ScoreRanges.length % 2 == 1)">
 								{{$t('values_step_tips_for_3').replace('%N',getStep2StepItem(step2SubStep).quantity)}}
-							</span>
-							<span v-else>
+							</div>
+							<div v-else>
 								{{(step2SubStep % 2 == 1)?$t('values_step_tips_for_1').replace('%N',getStep2StepItem(step2SubStep).quantity):$t('values_step_tips_for_2').replace('%N',getStep2StepItem(step2SubStep).quantity)}}
-							</span>
+							</div>
+							<div style="color: red;">
+								{{$t('values_step_tips')}}
+							</div>
 						</div>
-						<div style="display: flex;justify-content: flex-end;">
+						<div style="">
 							<el-button type="primary" round @click="step2_pre" v-if="step2SubStep>1">{{$t('pre')}}
 							</el-button>
 							<el-button type="primary" round @click="step2_next">{{$t('next')}}</el-button>
@@ -111,10 +120,10 @@
 			<el-main class="">
 				<div style="position: fixed;z-index: 999; width:90%; top: 56px;">
 					<div style="display: flex;justify-content: flex-end;padding: 10px;background-color: #f5f7fa;">
-						<div style="padding-right: 20px;" v-html="$t('values_pic_tmpArea_desc')"></div>
+						<div style="padding-right: 20px;width:50%;" v-html="$t('values_pic_tmpArea_desc')"></div>
 						<div style="padding: 0 10px;">{{$t('values_pic_tmpArea')}}</div>
 						<draggable animation="300" class="pic-tmparea-div"
-							style="border: 1px solid gray;padding: 10px;width: 50%;"
+							style="border: 1px solid gray;padding: 10px;width: 45%;"
 							:list="step3EWEIArea[0]" :options="{group:{name:'EWEIArea',pull:'clone'}}" 
 							@start="ev=>step3TmpAreaStart(ev,0)"
 							@end="step3TmpAreaMoveEnd">
@@ -612,9 +621,18 @@
 					this.$message.error(_this.$t('values_nextStepTips_choices_all'))
 					return
 				}
-				this.step = "step2"
-				this.sortQuestions()
-				this.caculateScoreRangeSelectedById(this.getStep2StepItem(this.step2SubStep).itemOrder)
+				this.$confirm(_this.$t('values_nextStepTips_tips'), _this.$t('prompt'), {
+					confirmButtonText: _this.$t('determine'),
+					cancelButtonText: _this.$t('cancel'),
+					type: 'warning'
+				}).then(() => {
+					 _this.step = "step2"
+					 _this.sortQuestions()
+					 _this.caculateScoreRangeSelectedById(this.getStep2StepItem(this.step2SubStep).itemOrder)
+        }).catch(() => {
+            
+        });
+				
 			},
 			step2_pre() {
 				if (this.step2SubStep > 1) {

--
Gitblit v1.9.1