日常开发

src/assets/styles/index.scss

@@ -1,4 +1,10 @@
 @import 'animate.css';
+
+@font-face {
+  font-family: "Saira Black";
+  src: url('~@/assets/font/SairaBlack.ttf');
+}
+
 :root {
   font-size: calc(100vw / 106);
 }

src/views/login/index.vue

@@ -141,7 +141,7 @@ $waiPadding: 6.51rem;
       border-radius: 1.42rem;
       opacity: 1;
       background: linear-gradient(68deg, #1D2F3D -85%, #304453 96%);
-      box-shadow: inset 0px 1px 0px 2px rgba(255, 255, 255, 0.5577);
+      box-shadow: inset 0px 1px 0px 2px rgba(255, 255, 255, 0.3);
 
       .login-item {
         width: 100%;

src/views/train/test.vue

@@ -38,7 +38,7 @@
               <div @click="getRetestFace" v-if="examState == 43 || examState == 42">重新识别</div>
             </div>
             <div v-if="faceCheckStu.student_id">
-              <div>成绩：{{ currentResultObj.count }} {{ unit }}</div>
+              <div class="chengji">成绩：{{ currentResultObj.count }} {{ unit }}</div>
               <div>得分：{{ currentResultObj.score }}</div>
               <div>
                 <div v-if="['jumprope'].includes(parameter.project)">中断</div>
@@ -62,8 +62,8 @@
         </div>
         <div class="main-left-bottom">
           <div class="bottom-left">
-            <div class="tips"><img src="/src/assets/images/test/tips.png"></div>
-            <div class="pic"><img :src="'/src/assets/images/test/tips/' + parameter.project + '.png'"></div>
+            <div class="tips"><img src="/src/assets/images/test/tips.png" /></div>
+            <div class="pic"><img :src="'/src/assets/images/test/tips/' + parameter.project + '.png'" /></div>
           </div>
           <div class="bottom-right">
             {{ currentResultObj?._comments?.join() }}
@@ -74,9 +74,20 @@
         <div class="title">测试记录</div>
         <ul>
           <li v-for="(item, index) in  reportList " :key="index">
-            <el-avatar :src="item.face_pic || item.logo_url" />
-            {{ item.student_name }}
-            {{ item.result }}
+            <div class="left">
+              <div class="pic"><img :src="item.face_pic || item.logo_url" /></div>
+              <div class="txt">
+                <div>
+                  <div class="name">{{ item.student_name }}</div>
+                  <div class="className">5年级</div>
+                </div>
+              </div>
+            </div>
+            <div class="right">
+              <div class="score">{{ item.result }}
+              </div>
+              <div class="unit">{{ unit }}</div>
+            </div>
           </li>
         </ul>
         <div class="erweima"> <img src="@/assets/images/login/erweima.png" />
@@ -339,7 +350,7 @@ const getExit = () => {
   getClearTimer();//清除计时器
   examEnds();//通知工作站关闭
   speckCancel()//停止播报;
-  router.push({ path: '/' });//跳转
+  //router.push({ path: '/' });//跳转
 };
 
 /**
@@ -365,6 +376,13 @@ const getClearTimer = (data?: any) => {
  * 选择学生
 */
 const getChooseStudent = () => {
+  if (examState.value < 41) {
+    if (needStart.value) {
+      proxy?.$modal.msgError("请点击开始识别");
+    } else {
+      proxy?.$modal.msgError("请等待");
+    }
+  }
   if (examState.value == 41) {
     chooseStudentRef.value.open();
     //然后定时自动关闭
@@ -935,8 +953,8 @@ $waiPadding: 6.51rem;
     overflow: hidden;
 
     .title {
-      height: 5vh;
-      line-height: 5vh;
+      height: 8vh;
+      line-height: 8vh;
       width: 100%;
       text-align: center;
       color: #1A293A;
@@ -948,8 +966,72 @@ $waiPadding: 6.51rem;
       height: 100%;
       overflow-y: scroll;
 
+      li {
+        border-bottom: 1px solid #48677E;
+        padding: 8px 10px;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+
+        .left {
+          display: flex;
+
+          .pic {
+            width: 7.5vh;
+            height: 7.5vh;
+            border-radius: 50%;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            overflow: hidden;
+            box-sizing: border-box;
+            border: 1px solid rgba(255, 255, 255, 0.5);
+            margin-right: 13px;
+
+            img {
+              height: 100%;
+            }
+          }
+
+          .txt {
+            display: flex;
+            align-items: center;
+
+            .name {
+              color: #F9F9F9;
+              font-size: 1.38rem;
+            }
+
+            .className {
+              color: #13ED84;
+              font-size: 1.1rem;
+            }
+          }
+
+        }
+
+        .right {
+          display: flex;
+          font-weight: bold;
+          align-items: center;
+
+          .score {
+            color: #ffffff;
+            font-size: 1.1rem;
+
+          }
+
+          .unit {
+            color: #ffffff;
+            font-size: 0.8rem;
+            margin-left: 2px;
+          }
+        }
+
+      }
+
       &::-webkit-scrollbar {
-        width: 10px;
+        width: 0px;
       }
 
       &::-webkit-scrollbar-thumb {
@@ -957,13 +1039,13 @@ $waiPadding: 6.51rem;
         border-radius: 4px;
         border-style: dashed;
         border-color: transparent;
-        background-color: rgba(26, 62, 78, 0.9);
+        background-color: rgba(216, 216, 216, 0.8);
         background-clip: padding-box;
       }
 
       &::-webkit-scrollbar-button:hover {
         border-radius: 6px;
-        background: rgba(26, 62, 78, 1);
+        background: rgba(216, 216, 216, 0.8);
       }
     }
 
@@ -972,7 +1054,7 @@ $waiPadding: 6.51rem;
       padding: 1vh 0;
 
       img {
-        width: 7rem;
+        width: 5rem;
       }
 
       span {
@@ -986,4 +1068,8 @@ $waiPadding: 6.51rem;
 
 
 }
+
+.chengji {
+  font-family: "Saira Black";
+}
 </style>