林旭祥 vor 8 Monaten
Ursprung
Commit
73c13f706c
2 geänderte Dateien mit 22 neuen und 5 gelöschten Zeilen
  1. 13 2
      src/components/ReportWindow/index.vue
  2. 9 3
      src/utils/index.ts

+ 13 - 2
src/components/ReportWindow/index.vue

@@ -9,7 +9,8 @@
           <div class="left-top">
             <div class="left-top-center">
               <div class="pic" v-if="faceCheckStu.face_pic || faceCheckStu.logo_url || faceCheckStu.student_icon_url">
-                <img :src="faceCheckStu.face_pic || faceCheckStu.logo_url || faceCheckStu.student_icon_url" /></div>
+                <img :src="faceCheckStu.face_pic || faceCheckStu.logo_url || faceCheckStu.student_icon_url" />
+              </div>
               <div class="pic" v-else>
                 <img src="@/assets/images/test/profilePicture.png" />
               </div>
@@ -20,7 +21,10 @@
             </div>
           </div>
           <div class="left-bottom">
-            <div class="left-bottom-title">测试结果</div>
+            <div class="left-bottom-title">
+              <div>测试结果</div>
+              <div class="time">{{ proxy?.$utils.getDate(faceCheckStu.ctime || faceCheckStu.finish_time) }}</div>
+            </div>
             <div class="left-bottom-content">
               <div class="achievement">
                 <div class="item">
@@ -359,6 +363,13 @@ defineExpose({
           padding: 10px 20px;
           box-sizing: border-box;
           background: radial-gradient(122% 126% at 97% 6%, #35FFC6 0%, #00FFE8 100%);
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+
+          .time {
+            font-size: 0.9rem;
+          }
         }
 
         .left-bottom-content {

+ 9 - 3
src/utils/index.ts

@@ -64,7 +64,7 @@ let utils = {
   },
 
   /**
-   * 时间格式
+   * 秒转为时间
    */
   timeFormat: (val: number) => {
     let h = parseInt(((val / 60 / 60) % 24).toString());
@@ -76,6 +76,11 @@ let utils = {
     return `${m}:${s}`;
   },
 
+  // 时间戳转为日期
+  timestampFormat: (data: any) => {
+    return dayjs(data).format('YYYY-MM-DD HH:mm:ss');
+  },
+
   /**
    * 跑步成绩格式化
    */
@@ -174,7 +179,8 @@ let utils = {
     }
   },
 
-  getDate() {
+  // 当前时间
+  getDate: () => {
     let now = new Date();
     let year = now.getFullYear();
     let month = now.getMonth();
@@ -191,7 +197,7 @@ let utils = {
   },
 
   // 全屏
-  fullScreen() {
+  fullScreen: () => {
     if (document.fullscreenElement) {
       document.exitFullscreen();
     }