ソースを参照

样式和文字修改

林旭祥 8 ヶ月 前
コミット
1fa7a83060

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

@@ -18,7 +18,7 @@
               <img src="@/assets/images/test/profilePicture.png" />
             </div>
             <div class="name" :class="{ 'name2': faceCheckStu.student_id }">
-              {{ faceCheckStu.student_id ? faceCheckStu.name : gesture ? "请举手看摄像头人脸识别" : "请看摄像头进行人脸识别" }}
+              {{ faceCheckStu.student_id ? faceCheckStu.name : gesture ? "请举手看摄像头人脸识别" : "请看摄像头进行人脸识别" }}
             </div>
           </div>
         </div>
@@ -150,7 +150,7 @@ defineExpose({
       .name {
         width: 100%;
         color: #1A293A;
-        font-size: 2.0rem;
+        font-size: 1.9rem;
       }
 
       .name2 {

+ 1 - 1
src/components/OptionWindow/index.vue

@@ -35,7 +35,7 @@
             </div> -->
             <div class="switchList">
               <div class="li">
-                <span>举手识别</span>
+                <span>举手识别</span>
                 <el-switch v-model="optionForm.gesture" :active-value="true" :inactive-value="false"
                   style="--el-switch-on-color: #08FFA9; --el-switch-off-color: #ACACAC" />
               </div>

+ 25 - 12
src/views/train/index.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="train">
     <Header @confirmExit="getExit" :showTool="false" closeClass="close2"></Header>
-    <div class="menu" :class="projectList.length <= 6 ? 'menu1' : 'menu2'">
+    <div class="menu" :class="projectList.length <= 12 ? 'menu1' : 'menu2'">
       <swiper :slides-per-view="6" :modules="[Grid]" :grid="{
-        fill: projectList.length <= 6 ? 'row' : 'column',
-        rows: projectList.length <= 6 ? 1 : 2,
+        fill: projectList.length <= 12 ? 'row' : 'column',
+        rows: 2,
       }" :space-between="20" :slides-per-group="12">
         <swiper-slide v-for="(item, index) in projectList " :key="index" @click="getOption(item)">
           <div class="li">
@@ -142,7 +142,7 @@ $waiPadding: 6.51rem;
     // margin-right: 1rem;
     // margin-bottom: 1rem;
     width: 100%;
-    height: 100%;
+    height: calc((72vh / 2) - 10px);
     padding: 2.2vh 0;
     border-radius: 1.6rem;
     box-sizing: border-box;
@@ -197,15 +197,24 @@ $waiPadding: 6.51rem;
 }
 
 .menu1 {
+  .swiper-slide {
+    margin-bottom: 20px;
 
-  .swiper-slide:nth-child(odd) {
-    background: radial-gradient(96% 96% at 2% 32%, #FFFFFF 0%, #FCFDFD 54%, #E1E4E7 100%);
-  }
+    .li {
+      background: radial-gradient(96% 96% at 2% 32%, #FFFFFF 0%, #FCFDFD 54%, #E1E4E7 100%);
+    }
 
-  .swiper-slide:nth-child(even) {
-    background: radial-gradient(167% 126% at 97% 6%, #35FFC6 0%, #00FFE8 100%);
+    &:nth-child(2),
+    &:nth-child(4),
+    &:nth-child(6),
+    &:nth-child(7),
+    &:nth-child(9),
+    &:nth-child(11) {
+      .li {
+        background: radial-gradient(167% 126% at 97% 6%, #35FFC6 0%, #00FFE8 100%);
+      }
+    }
   }
-
 }
 
 .menu2 {
@@ -235,7 +244,9 @@ $waiPadding: 6.51rem;
     &:nth-child(40),
     &:nth-child(41),
     &:nth-child(44) {
-      background: radial-gradient(96% 96% at 2% 32%, #FFFFFF 0%, #FCFDFD 54%, #E1E4E7 100%);
+      .li {
+        background: radial-gradient(96% 96% at 2% 32%, #FFFFFF 0%, #FCFDFD 54%, #E1E4E7 100%);
+      }
     }
 
     &:nth-child(2),
@@ -260,7 +271,9 @@ $waiPadding: 6.51rem;
     &:nth-child(39),
     &:nth-child(42),
     &:nth-child(43) {
-      background: radial-gradient(167% 126% at 97% 6%, #35FFC6 0%, #00FFE8 100%);
+      .li {
+        background: radial-gradient(167% 126% at 97% 6%, #35FFC6 0%, #00FFE8 100%);
+      }
     }
   }
 }

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

@@ -313,7 +313,7 @@ const returnData = (data: any) => {
     if (flag) {
       console.log("变更状态:", 41)
       examState.value = 41;
-      let txt = parameter.value.gesture ? "请举手看摄像头人脸识别" : "请看摄像头进行人脸识别";
+      let txt = parameter.value.gesture ? "请举手看摄像头人脸识别" : "请看摄像头进行人脸识别";
       speckText(txt);
     }
   }

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

@@ -21,7 +21,7 @@
               :leave-active-class="proxy?.animate.dialog.leave">
               <div class="time" v-show="needStart && [42].includes(examState)">{{
                 time.countdownNum
-              }}</div>
+                }}</div>
             </Transition>
             <div class="tips" v-if="examState == 41">
               <img v-if="parameter.gesture" src="@/assets/images/test/ready1.png" />
@@ -502,7 +502,7 @@ const getCounting = (type: string) => {
  * 人脸窗口
 */
 const getFaceWindow = (data: boolean) => {
-  let txt = parameter.value.gesture === true ? "请举手看摄像头人脸识别" : "请看摄像头进行人脸识别";
+  let txt = parameter.value.gesture === true ? "请举手看摄像头人脸识别" : "请看摄像头进行人脸识别";
   speckText(txt);
   //data=true为弹出框,data=false为不要弹出框
   if (data) {