Ver Fonte

代码优化

linxuxiang há 4 meses atrás
pai
commit
1b515179ed
3 ficheiros alterados com 16 adições e 6 exclusões
  1. 4 1
      src/views/train/multiple.vue
  2. 7 4
      src/views/train/run.vue
  3. 5 1
      src/views/train/test.vue

+ 4 - 1
src/views/train/multiple.vue

@@ -194,7 +194,10 @@ const getStartOneTest = () => {
 /**
  * 再测一次
 */
-const getAgain = () => {
+const getAgain = async () => {
+  let txt = '是否再测一次?'
+  await proxy?.$modal.confirm(txt);
+  getClearTimer();
   let loading = ElLoading.service({ text: '请稍等...', background: 'rgba(0, 0, 0, 0.8)', customClass: `sports ${parameter.value.project}` });
   cleanData();
   examState.value = 41;

+ 7 - 4
src/views/train/run.vue

@@ -20,7 +20,7 @@
                     <div class="left">
                       <div class="track">{{ (index + 1) + (8 * indexs) }}</div>
                       <div class="userInfo" @click="getChooseStudent(item.track)">
-                        <div class="pic pic2" v-if="item.student_id"> <img :src="item.face_pic  || item.logo_url" /></div>
+                        <div class="pic pic2" v-if="item.student_id"> <img :src="item.face_pic || item.logo_url" /></div>
                         <div class="pic" v-else>
                           <img src="@/assets/images/test/profilePicture.png" />
                         </div>
@@ -34,9 +34,10 @@
                         {{ item.timeStr || "-" }}
                       </div>
                       <div v-if="isBackRun && item.student_id" class="turns">往返次数:<span><i>{{ item.turns || "0"
-                            }}</i></span>
+                      }}</i></span>
                       </div>
-                      <div v-if="!isBackRun && item.student_id" class="turns">第<span><i>{{ item.times != undefined ? item.times.length : 0 }}</i></span>圈
+                      <div v-if="!isBackRun && item.student_id" class="turns">第<span><i>{{ item.times != undefined ?
+                        item.times.length : 0 }}</i></span>圈
                       </div>
                     </div>
                     <div class="menuBtn menuBtn2" v-if="examState == 43 && item.student_id">等待开始测试</div>
@@ -80,7 +81,7 @@
                     {{ item.timeStr || "-" }}
                   </div>
                   <div v-if="isBackRun && item.student_id" class="turns">往返次数:<span><i>{{ item.turns || "0"
-                        }}</i></span>
+                  }}</i></span>
                   </div>
                 </div>
                 <div class="menuBtn" v-if="examState > 3 && examState < 42 && !item.student_id"
@@ -431,6 +432,8 @@ const getStartOneTest = () => {
  * 再测一次
 */
 const getAgain = async () => {
+  let txt = '是否再测一次?'
+  await proxy?.$modal.confirm(txt);
   getClearTimer();
   let loading = ElLoading.service({ text: '请稍等...', background: 'rgba(0, 0, 0, 0.8)', customClass: `sports ${parameter.value.project}` });
   //预存测试人员

+ 5 - 1
src/views/train/test.vue

@@ -83,7 +83,8 @@
               </div>
             </div>
 
-            <div class="btn" @click="getReady" v-if="needStart && examState == 43 && faceCheckStu.student_id && !time.ready && readyState">开 始
+            <div class="btn" @click="getReady"
+              v-if="needStart && examState == 43 && faceCheckStu.student_id && !time.ready && readyState">开 始
             </div>
             <!-- <div v-if="needStart"> -->
             <!-- <div class="btn" @click="getOpenOneTestAndStartFace" v-if="examState < 41">开始识别</div> -->
@@ -372,6 +373,9 @@ const getStartOneTest = () => {
  * 再测一次
 */
 const getAgain = async () => {
+  let txt = '是否再测一次?'
+  await proxy?.$modal.confirm(txt);
+  getClearTimer();
   //预存测试人员
   let student = JSON.parse(JSON.stringify(faceCheckStu.value));
   //测试中