From dc2c454c2ae3fdfdddcad0fd609e1a0def3b67a5 Mon Sep 17 00:00:00 2001
From: 84702473 <84702473@qq.com>
Date: 星期五, 31 三月 2023 09:44:36 +0800
Subject: [PATCH] 添加弹窗提示框

---
 src/lang/zh.js                  |    6 +++++-
 src/lang/en.js                  |    8 ++++++--
 src/views/exam/paper/values.vue |   26 ++++++++++++++++++++------
 3 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/src/lang/en.js b/src/lang/en.js
index db1a52c..233d113 100644
--- a/src/lang/en.js
+++ b/src/lang/en.js
@@ -59,7 +59,10 @@
 	values_nextStepTips_add_enough:'Please add enough choices',
 	values_nextStepTips_choices_all:'Please make all choices',
 	values_title:'For each statement,click the pictures that aligns most with your view.',
-	values_title_description:'For each statement, click the icon that aligns most with your view. <br> If you think the main character is like you, click "up hand" icon.<br> If you think the main character is not like you, click "down hand" icon. <br> If you are not sure, click "question" icon.',
+	values_title_description:'For each statement, click the icon that aligns most with your view.',
+	values_title_description_1:'If you think the main character is like you, click ',
+	values_title_description_2:'If you think the main character is not like you, click ',
+	values_title_description_3:'If you are not sure, click ',
 	next:'Next',
 	pre:'Back',
 	commit:'Submit',
@@ -74,5 +77,6 @@
 	values_mostUnLikeMe:'Most unlike me',
 	values_no_select:'No picture left',
 	values_pic_tmpArea:'Picture Staging Area',
-	values_pic_tmpArea_desc:'Note: All pictures in the same row are in the same category.<br>&nbsp;&nbsp;You do not need to order them in a row. You only need to pay attention to the vertical order.'
+	values_pic_tmpArea_desc:'Note: All pictures in the same row are in the same category.<br>&nbsp;&nbsp;You do not need to order them in a row. You only need to pay attention to the vertical order.',
+	values_nextStepTips_tips:'Please refine the sort and rank the images by selecting them into the nine categories. Please note that the number of images you can put in each of the categories is fixed.'
 }
diff --git a/src/lang/zh.js b/src/lang/zh.js
index b900abb..4c039db 100644
--- a/src/lang/zh.js
+++ b/src/lang/zh.js
@@ -60,6 +60,9 @@
 	values_nextStepTips_choices_all:'璇峰仛鍑烘墍鏈夌殑閫夋嫨',
 	values_title:'棰勫厛鎺掑簭鎮ㄧ殑鍥炵瓟',
 	values_title_description:'瀵逛簬姣忎釜璇彞锛屽崟鍑讳笌瑙嗗浘鏈�瀵归綈鐨勫浘鏍囥��',
+	values_title_description_1:'濡傛灉浣犺涓轰富瑙掑拰浣犱竴鏍�, 鐐瑰嚮 ',
+	values_title_description_2:'濡傛灉浣犺涓轰富瑙掑拰浣犱笉涓�鏍�, 鐐瑰嚮 ',
+	values_title_description_3:'濡傛灉浣犱笉纭畾, 鐐瑰嚮 ',
 	next:'涓嬩竴姝�',
 	pre:'涓婁竴姝�',
 	commit:'鎻愪氦',
@@ -74,6 +77,7 @@
 	values_mostUnLikeMe:'鏈�涓嶅儚鎴�',
 	values_no_select:'鏃犲浘鍙��',
 	values_pic_tmpArea:'鍥剧墖鏆傚瓨鍖�',
-	values_pic_tmpArea_desc:'娉ㄦ剰锛氬悓涓�琛屼腑鐨勬墍鏈夊浘鐗囬兘灞炰簬鍚屼竴绫诲埆銆�<br>&nbsp;&nbsp;鎮ㄤ笉闇�瑕佽繛缁璐�備綘鍙渶瑕佹敞鎰忓瀭鐩撮『搴忋��'
+	values_pic_tmpArea_desc:'娉ㄦ剰锛氬悓涓�琛屼腑鐨勬墍鏈夊浘鐗囬兘灞炰簬鍚屼竴绫诲埆銆�<br>&nbsp;&nbsp;鎮ㄤ笉闇�瑕佽繛缁璐�備綘鍙渶瑕佹敞鎰忓瀭鐩撮『搴忋��',
+	values_nextStepTips_tips:'璇烽�氳繃灏嗗浘鍍忓垎涓轰節绫绘潵缁嗗寲鍥惧儚鐨勬帓搴忓拰鎺掑悕銆傝娉ㄦ剰锛屾偍鍙互鍦ㄦ瘡涓被鍒腑鏀剧疆鐨勫浘鍍忔暟閲忔槸鍥哄畾鐨勩��'
 	
 }
diff --git a/src/views/exam/paper/values.vue b/src/views/exam/paper/values.vue
index 2a6c5e9..7a4c865 100644
--- a/src/views/exam/paper/values.vue
+++ b/src/views/exam/paper/values.vue
@@ -4,11 +4,16 @@
 			<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>{{$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>
+				
 				<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')}}
@@ -612,9 +617,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