林旭祥 8 місяців тому
батько
коміт
4d57556277

+ 1 - 0
src/components/ChooseStudent/index.vue

@@ -109,6 +109,7 @@ const { optionForm, optionWindow, classList, tableData, page, selectValue } = to
 const open = (data: any) => {
   getClass();
   getStudent();
+  selectValue.value = [];
   optionWindow.value.show = true;
 };
 

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

@@ -4,10 +4,9 @@
     <transition :enter-active-class="proxy?.animate.dialog.enter" :leave-active-class="proxy?.animate.dialog.leave">
       <div class="time" v-show="[42].includes(examState)">{{
         time.countdownNum
-      }}</div>
+        }}</div>
     </transition>
     <div class="main">
-
       <div class="testBox"
         :class="{ 'testBox1': styleType == 1, 'testBox2': styleType == 2, 'testBox3': styleType == 3 }">
         <div class="ul" :class="{ 'overlap': ![0, 3, 40, 41].includes(examState), 'ready': [41].includes(examState) }"

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

@@ -4,7 +4,7 @@
     <transition :enter-active-class="proxy?.animate.dialog.enter" :leave-active-class="proxy?.animate.dialog.leave">
       <div class="time" v-show="[42].includes(examState)">{{
         countdownNumFormat
-        }}</div>
+      }}</div>
     </transition>
     <div class="main">
       <template v-if="isLongRun">
@@ -522,7 +522,14 @@ const sprintStudent = (data: any) => {
  * 处理长跑返回被选学生
 */
 const longStudent = (data: any) => {
-  let list = data.map((item: any, index: any) => {
+  let ids = faceStudentList.value.map((item: any, index: any) => {
+    return item.student_id;
+  });
+  //排除掉已经存在的
+  let newList = data.filter((item: any, index: any) => {
+    return !ids.includes(item.id)
+  })
+  let list = newList.map((item: any, index: any) => {
     let obj = {
       result_id: resultId.value,
       face_pic: item.face_pic || item.logo_url,
@@ -532,7 +539,7 @@ const longStudent = (data: any) => {
     }
     return obj;
   })
-  faceStudentList.value = list;
+  faceStudentList.value.push(...list)
 };
 
 /**
@@ -798,7 +805,7 @@ $waiPadding: 6.51rem;
   background-size: 100% 100%;
   position: absolute;
   right: 50%;
-  top: -4vh;
+  top: -4.5vh;
   margin-right: -10vh;
   font-family: 'Saira-BlackItalic';
 }