Ver Fonte

日常开发

林旭祥 há 4 meses atrás
pai
commit
d046db9e61
4 ficheiros alterados com 269 adições e 194 exclusões
  1. 1 1
      src/layout/index.vue
  2. 244 192
      src/views/train/multiple.vue
  3. 11 0
      src/views/train/run.vue
  4. 13 1
      src/views/train/test.vue

+ 1 - 1
src/layout/index.vue

@@ -29,7 +29,7 @@ const getCountDown = () => {
     if (['/ranking', '/login/mobile'].includes(router.currentRoute.value.fullPath)) {
       router.push({ path: '/ranking' });
     }
-  }, 1000 * 60 * 15)
+  }, 1000 * 60 * 5)
 };
 
 const getClearTimer = () => {

Diff do ficheiro suprimidas por serem muito extensas
+ 244 - 192
src/views/train/multiple.vue


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

@@ -120,6 +120,7 @@
       <div class="btn" @click="getConfirmEnd" v-if="examState == 42">结 束</div>
       <div class="btn" @click="getAgain" v-if="showTestAgain">再测一次</div>
       <div class="btn" @click="getRetestFace" v-if="examState == 43">重新识别</div>
+      <div class="btn exitBtn" @click="confirmExit" v-if="examState != 0">退 出</div>
     </div>
     <ChooseStudent ref="chooseStudentRef" :selectType="isLongRun ? 'multiple' : 'single'" @returnData="returnStudent" />
   </div>
@@ -1224,5 +1225,15 @@ $waiPadding: 6.51rem;
       background: #f99f02;
     }
   }
+
+  .exitBtn {
+    color: #ffffff;
+    background: radial-gradient(159% 126% at 5% 93%, #931b1b 0%, #ec5624 0%, #ff6860 76%);
+    box-shadow: 3px 6px 4px 1px rgba(0, 0, 0, 0.1874), inset 0px 1px 0px 2px rgba(255, 255, 255, 0.5577);
+
+    &:hover {
+      background: #ec5624;
+    }
+  }
 }
 </style>

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

@@ -37,7 +37,9 @@
               <div class="scoreBox">
                 <div class="score" v-if="currentResultObj?.count && currentResultObj.count>=0">{{ currentResultObj.count }}</div>
                 <div class="prompt" v-else>请开始测试</div>
-                <div class="unit" v-if="!['basketballv1', 'footballv1'].includes(parameter.project) && currentResultObj.count && !needStart">{{ unit }}</div>
+                <div class="unit" v-if="!['basketballv1', 'footballv1'].includes(parameter.project) && currentResultObj.count && !needStart">
+                  {{ unit }}
+                </div>
               </div>
               <div class="fractionViolation">
                 <div class="fraction">
@@ -1398,6 +1400,16 @@ $waiPadding: 6.51rem;
           width: auto;
           padding: 0 10px;
         }
+
+        .exitBtn {
+          color: #ffffff;
+          background: radial-gradient(159% 126% at 5% 93%, #931b1b 0%, #ec5624 0%, #ff6860 76%);
+          box-shadow: 3px 6px 4px 1px rgba(0, 0, 0, 0.1874), inset 0px 1px 0px 2px rgba(255, 255, 255, 0.5577);
+
+          &:hover {
+            background: #ec5624;
+          }
+        }
       }
 
       i {

Alguns ficheiros não foram mostrados porque muitos ficheiros mudaram neste diff