zhangjie 1 yıl önce
ebeveyn
işleme
b37d7c1b56

+ 3 - 0
src/features/invigilation/RealtimeMonitoring/RealtimeMonitoring.vue

@@ -648,6 +648,9 @@ export default {
           return dataList;
         }
       }
+
+      this.setWarningMessageTimeCaches(warningMessageTimeCaches);
+      return dataList;
     },
     async fetchWarningNotice() {
       if (!this.filter.examId) return;

+ 22 - 12
src/features/invigilation/RealtimeMonitoring/WarningDetail.vue

@@ -29,28 +29,34 @@
             <span>{{ detailInfo.examStudentName }}</span>
           </p>
           <p>
-            <span>证件号:</span><span>{{ detailInfo.identity }}</span>
+            <span>证件号:</span>
+            <span>{{ detailInfo.identity }}</span>
           </p>
           <p>
-            <span>班级:</span><span>{{ detailInfo.classNo }}</span>
+            <span>班级:</span>
+            <span :title="detailInfo.classNo">{{ detailInfo.classNo }}</span>
           </p>
           <p>
-            <span>科目(代码):</span
-            ><span>{{ detailInfo.courseNameCode }}</span>
+            <span>科目(代码):</span>
+            <span>{{ detailInfo.courseNameCode }}</span>
           </p>
           <p>
-            <span>考试时间:</span
-            ><span
-              >{{ detailInfo.examActivityStartTime | datetimeFilter }}~{{
-                detailInfo.examActivityEndTime | datetimeFilter
-              }}</span
-            >
+            <span>考试时间:</span>
+            <span>{{ detailInfo.examActivityTime }}</span>
           </p>
           <p>
-            <span>考场:</span><span>{{ detailInfo.roomName }}</span>
+            <span>考场:</span>
+            <span :title="detailInfo.roomName">{{ detailInfo.roomName }}</span>
           </p>
           <p>
-            <span>监考员:</span><span>{{ detailInfo.invigilateUsers }}</span>
+            <span>监考员:</span>
+            <el-tooltip
+              popper-class="deteal-head-tips"
+              effect="dark"
+              :content="detailInfo.invigilateUsers"
+            >
+              <span>{{ detailInfo.invigilateUsers }}</span>
+            </el-tooltip>
           </p>
         </div>
         <div class="detail-body-head-right">
@@ -376,6 +382,7 @@ import {
   timeNumberToText,
   objTypeOf,
   snakeToHump,
+  dateFormatForAPI,
 } from "@/utils/utils";
 import MoveEle from "@/plugins/move-ele";
 import { mapState } from "vuex";
@@ -553,6 +560,9 @@ export default {
       this.detailInfo.examStudentLogList = this.parseStudentLogs(
         this.detailInfo.examStudentLogList
       );
+      this.detailInfo.examActivityTime = `${dateFormatForAPI(
+        this.detailInfo.examActivityStartTime
+      )}~${dateFormatForAPI(this.detailInfo.examActivityEndTime)}`;
       this.exceptionSummary = this.detailInfo.examStudentLogList
         .filter((item) => item.viewType === "warning")
         .slice(0, 3);

+ 21 - 3
src/styles/base.scss

@@ -388,16 +388,31 @@ body {
         line-height: 32px;
         height: 32px;
         margin: 0 15px 0 0;
-        color: #6d768e;
+        color: #202b4b;
 
         &:first-child {
           font-size: 18px;
-          color: #202b4b;
 
           i {
             margin-right: 10px;
           }
         }
+
+        span {
+          display: inline-block;
+          vertical-align: middle;
+        }
+
+        span:first-child {
+          color: #6d768e;
+        }
+
+        span:last-child {
+          max-width: 280px;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap;
+        }
       }
     }
 
@@ -418,6 +433,9 @@ body {
     position: relative;
   }
 }
+.deteal-head-tips {
+  max-width: 300px;
+}
 .warning-action {
   position: absolute;
   width: 292px;
@@ -751,7 +769,7 @@ body {
       height: 100%;
       border-left: 1px dashed #abb8c9;
       left: 50%;
-      top: 0;
+      top: 4px;
       z-index: 8;
     }
   }