林旭祥 před 5 měsíci
rodič
revize
3d53b66f86
2 změnil soubory, kde provedl 7 přidání a 7 odebrání
  1. 2 2
      src/components/ReportList/index.vue
  2. 5 5
      src/views/train/test.vue

+ 2 - 2
src/components/ReportList/index.vue

@@ -12,7 +12,7 @@
             </div>
           </div>
         </div>
-        <div class="right" v-if="['basketballv1'].includes(parameter.project)">
+        <div class="right" v-if="['basketballv1','footballv1'].includes(parameter.project)">
           <div class="score">{{ proxy?.$utils.runTime(item.result, true, false) }}
           </div>
         </div>
@@ -83,7 +83,7 @@ const getReportList = () => {
         }
         let result = null;
         if (item.result.toString().indexOf(".") != -1) {
-          if (['jump', 'longjump', 'run50', 'run70', 'run100', 'run200', 'run400', 'run800', 'run1000', 'run15x4', 'run50x8', 'run10x4', 'basketballv1', 'basketballv1'].includes(type)) {
+          if (['jump', 'longjump', 'run50', 'run70', 'run100', 'run200', 'run400', 'run800', 'run1000', 'run15x4', 'run50x8', 'run10x4', 'basketballv1', 'footballv1'].includes(type)) {
             result = item.result.toFixed(2)
           } else {
             result = item.result.toFixed(1);

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

@@ -19,7 +19,7 @@
           <div class="top-right">
             <Transition :enter-active-class="proxy?.animate.dialog.enter"
               :leave-active-class="proxy?.animate.dialog.leave">
-              <div class="time" v-show="needStart && [42].includes(examState)">{{
+              <div class="time" v-show="needStart && [42].includes(examState) && !['basketballv1','footballv1'].includes(parameter.project)">{{
                 time.countdownNum
               }}</div>
             </Transition>
@@ -29,7 +29,7 @@
             </div>
             <div class="complete" :class="{ 'complete2': needStart && [42].includes(examState) }"
               v-if="faceCheckStu.student_id && time.ready <= 0 && examState != 43 && examState != 41">
-              <div class="scoreBox" v-if="['basketballv1'].includes(parameter.project)">
+              <div class="scoreBox" v-if="['basketballv1','footballv1'].includes(parameter.project)">
                 <div class="score">{{ currentResultObj.count || 0 }}</div>
               </div>
               <div class="scoreBox" v-else>
@@ -570,7 +570,7 @@ const getAchievement = (data: any) => {
       data?.[dic.typeResultKey[type]]?.toFixed(2);
     count = Math.round(count) / 100;
   }
-  if (["basketballv1"].includes(type)) {
+  if (["basketballv1","footballv1"].includes(type)) {
     count = proxy?.$utils.runTime(data?.[dic.typeResultKey[type]], true, 1)
   }
   data.count = count || "0";
@@ -659,8 +659,8 @@ const getAchievement = (data: any) => {
       speckText("请重新测试");
       return false;
     }
-    if (["basketballv1"].includes(type)) {
-      speckText(faceCheckStu?.value.name + "成绩为" + (chineseNumber(proxy?.$utils.runTime(count, false, 0,
+    if (["basketballv1","footballv1"].includes(type)) {
+      speckText(faceCheckStu?.value.name + "成绩为" + (chineseNumber(proxy?.$utils.runTime(data?.[dic.typeResultKey[type]], false, 0,
         1)) || 0) + ",请下一位准备!" || "");
     } else {
       speckText(faceCheckStu?.value.name + "成绩为" + (chineseNumber(count) || 0) + unit.value + ",请下一位准备!" || "");