0930 invi md 02

src/features/invigilation/ExamReport/ExamReport.vue

@@ -49,7 +49,14 @@
           <el-form-item>
             <el-input
               v-model.trim="filter.name"
-              placeholder="姓名/证件号"
+              placeholder="姓名"
+              clearable
+            ></el-input>
+          </el-form-item>
+          <el-form-item>
+            <el-input
+              v-model.trim="filter.identity"
+              placeholder="证件号"
               clearable
             ></el-input>
           </el-form-item>
@@ -113,6 +120,7 @@ export default {
         roomCode: "",
         courseCode: "",
         name: "",
+        identity: "",
       },
       examBatchs: [],
       examActivities: [],

src/features/invigilation/InvigilationDetail/InvigilationDetail.vue

@@ -71,7 +71,14 @@
           <el-form-item>
             <el-input
               v-model.trim="filter.name"
-              placeholder="姓名/证件号"
+              placeholder="姓名"
+              clearable
+            ></el-input>
+          </el-form-item>
+          <el-form-item>
+            <el-input
+              v-model.trim="filter.identity"
+              placeholder="证件号"
               clearable
             ></el-input>
           </el-form-item>
@@ -258,6 +265,7 @@ export default {
         courseCode: null,
         auditStatus: null,
         name: "",
+        identity: "",
         maxMultipleFaceCount: undefined,
         minMultipleFaceCount: undefined,
         maxExceptionCount: undefined,

src/features/invigilation/OnlinePatrol/OnlinePatrol.vue

@@ -75,7 +75,14 @@
           <el-form-item>
             <el-input
               v-model.trim="filter.name"
-              placeholder="姓名/证件号"
+              placeholder="姓名"
+              clearable
+            ></el-input>
+          </el-form-item>
+          <el-form-item>
+            <el-input
+              v-model.trim="filter.identity"
+              placeholder="证件号"
               clearable
             ></el-input>
           </el-form-item>
@@ -256,6 +263,7 @@ export default {
         monitorStatusSource: null,
         status: null,
         name: "",
+        identity: "",
         maxMultipleFaceCount: undefined,
         minMultipleFaceCount: undefined,
         maxExceptionCount: undefined,

src/features/invigilation/OnlinePatrol/PatrolWarningDetail.vue

@@ -58,7 +58,7 @@
             <div class="student-video-item">
               <flv-media
                 ref="FirstViewVideo"
-                :data="firstViewVideo"
+                :live-url="firstViewVideo.liveUrl"
                 v-if="firstViewVideoReady"
               ></flv-media>
               <div class="student-video-none" v-else>
@@ -67,8 +67,8 @@
             </div>
             <div class="student-video-item">
               <flv-media
-                ref="ThirdViewVideo"
-                :data="secondViewVideo"
+                ref="SecondViewVideo"
+                :live-url="secondViewVideo.liveUrl"
                 v-if="secondViewVideoReady"
               ></flv-media>
               <div class="student-video-none" v-else>
@@ -188,14 +188,10 @@ export default {
       serialIds: [],
       exceptionSummary: [],
       firstViewVideo: {
-        id: "111",
-        src: "",
-        name: "第一视角",
+        liveUrl: "",
       },
       secondViewVideo: {
-        id: "222",
-        src: "",
-        name: "第二视角",
+        liveUrl: "",
       },
       firstViewVideoReady: false,
       secondViewVideoReady: false,
@@ -344,8 +340,8 @@ export default {
     },
     // video relative
     initSubscribeVideo() {
-      if (this.firstViewVideo.id) this.firstViewVideoReady = true;
-      if (this.secondViewVideo.id) this.secondViewVideoReady = true;
+      if (this.firstViewVideo.liveUrl) this.firstViewVideoReady = true;
+      if (this.secondViewVideo.liveUrl) this.secondViewVideoReady = true;
     },
     closeSubscribeVideo() {
       this.firstViewVideoReady = false;

src/features/invigilation/ProgressDetail/ProgressDetail.vue

@@ -51,7 +51,14 @@
           <el-form-item>
             <el-input
               v-model.trim="filter.name"
-              placeholder="姓名/证件号"
+              placeholder="姓名"
+              clearable
+            ></el-input>
+          </el-form-item>
+          <el-form-item>
+            <el-input
+              v-model.trim="filter.identity"
+              placeholder="证件号"
               clearable
             ></el-input>
           </el-form-item>
@@ -140,6 +147,7 @@ export default {
         roomCode: "",
         courseCode: "",
         name: "",
+        identity: "",
       },
       current: 1,
       total: 0,

src/features/invigilation/RealtimeMonitoring/RealtimeMonitoring.vue

@@ -121,10 +121,17 @@
               :controls="false"
             ></el-input-number>
           </el-form-item>
+          <el-form-item>
+            <el-input
+              v-model.trim="filter.name"
+              placeholder="姓名"
+              clearable
+            ></el-input>
+          </el-form-item>
           <el-form-item>
             <el-input
               v-model.trim="filter.identity"
-              placeholder="姓名/证件号"
+              placeholder="证件号"
               clearable
             ></el-input>
           </el-form-item>
@@ -313,6 +320,7 @@ export default {
         paperDownload: null,
         status: null,
         monitorStatusSource: null,
+        name: null,
         identity: null,
         maxWarningCount: undefined,
         minWarningCount: undefined,

src/features/invigilation/RealtimeMonitoring/WarningDetail.vue

@@ -72,7 +72,7 @@
             <div class="student-video-item">
               <flv-media
                 ref="FirstViewVideo"
-                :data="firstViewVideo"
+                :live-url="firstViewVideo.liveUrl"
                 v-if="firstViewVideoReady"
               ></flv-media>
               <div class="student-video-none" v-else>
@@ -81,8 +81,8 @@
             </div>
             <div class="student-video-item">
               <flv-media
-                ref="ThirdViewVideo"
-                :data="secondViewVideo"
+                ref="SecondViewVideo"
+                :live-url="secondViewVideo.liveUrl"
                 v-if="secondViewVideoReady"
               ></flv-media>
               <div class="student-video-none" v-else>
@@ -311,14 +311,10 @@ export default {
       serialIds: [],
       exceptionSummary: [],
       firstViewVideo: {
-        id: "111",
-        src: "",
-        name: "第一视角",
+        liveUrl: "",
       },
       secondViewVideo: {
-        id: "222",
-        src: "",
-        name: "第二视角",
+        liveUrl: "",
       },
       firstViewVideoReady: false,
       secondViewVideoReady: false,
@@ -554,8 +550,8 @@ export default {
     },
     // video relative
     initSubscribeVideo() {
-      if (this.firstViewVideo.id) this.firstViewVideoReady = true;
-      if (this.secondViewVideo.id) this.secondViewVideoReady = true;
+      if (this.firstViewVideo.liveUrl) this.firstViewVideoReady = true;
+      if (this.secondViewVideo.liveUrl) this.secondViewVideoReady = true;
     },
     closeSubscribeVideo() {
       this.firstViewVideoReady = false;

src/features/invigilation/ReexamApply/ReexamApply.vue

@@ -52,7 +52,14 @@
           <el-form-item>
             <el-input
               v-model.trim="filter.name"
-              placeholder="姓名/证件号"
+              placeholder="姓名"
+              clearable
+            ></el-input>
+          </el-form-item>
+          <el-form-item>
+            <el-input
+              v-model.trim="filter.identity"
+              placeholder="证件号"
               clearable
             ></el-input>
           </el-form-item>
@@ -137,6 +144,7 @@ export default {
         roomCode: null,
         courseCode: null,
         name: "",
+        identity: "",
       },
       current: 1,
       total: 0,

src/features/invigilation/ReexamChecked/ReexamChecked.vue

@@ -66,7 +66,14 @@
           <el-form-item>
             <el-input
               v-model.trim="filter.name"
-              placeholder="姓名/证件号"
+              placeholder="姓名"
+              clearable
+            ></el-input>
+          </el-form-item>
+          <el-form-item>
+            <el-input
+              v-model.trim="filter.identity"
+              placeholder="证件号"
               clearable
             ></el-input>
           </el-form-item>
@@ -171,6 +178,7 @@ export default {
         roomCode: null,
         courseCode: null,
         name: "",
+        identity: "",
         applyName: "",
         reasonStartTime: "",
         reasonEndTime: "",

src/features/invigilation/ReexamPending/ReexamPending.vue

@@ -66,7 +66,14 @@
           <el-form-item>
             <el-input
               v-model.trim="filter.name"
-              placeholder="姓名/证件号"
+              placeholder="姓名"
+              clearable
+            ></el-input>
+          </el-form-item>
+          <el-form-item>
+            <el-input
+              v-model.trim="filter.identity"
+              placeholder="证件号"
               clearable
             ></el-input>
           </el-form-item>
@@ -174,6 +181,7 @@ export default {
         roomCode: null,
         courseCode: null,
         name: "",
+        identity: "",
         applyName: "",
         reasonStartTime: "",
         reasonEndTime: "",

src/features/invigilation/StudentLogManage/StudentLogManage.vue

@@ -66,8 +66,15 @@
           </el-form-item>
           <el-form-item>
             <el-input
-              v-model.trim="filter.content"
-              placeholder="姓名/证件号"
+              v-model.trim="filter.name"
+              placeholder="姓名"
+              clearable
+            ></el-input>
+          </el-form-item>
+          <el-form-item>
+            <el-input
+              v-model.trim="filter.identity"
+              placeholder="证件号"
               clearable
             ></el-input>
           </el-form-item>
@@ -145,6 +152,7 @@ export default {
         roomCode: null,
         courseCode: null,
         name: "",
+        identity: "",
       },
       current: 1,
       total: 0,

src/features/invigilation/WarningManage/WarningManage.vue

@@ -69,7 +69,14 @@
           <el-form-item>
             <el-input
               v-model.trim="filter.name"
-              placeholder="姓名/证件号"
+              placeholder="姓名"
+              clearable
+            ></el-input>
+          </el-form-item>
+          <el-form-item>
+            <el-input
+              v-model.trim="filter.identity"
+              placeholder="证件号"
               clearable
             ></el-input>
           </el-form-item>
@@ -214,6 +221,7 @@ export default {
         courseCode: null,
         approveStatus: null,
         name: "",
+        identity: "",
         maxMultipleFaceCount: undefined,
         minMultipleFaceCount: undefined,
         maxExceptionCount: undefined,
@@ -343,5 +351,12 @@ export default {
     }
     next();
   },
+  beforeRouteEnter(to, from, next) {
+    if (from.name === "WarningDetail") {
+      next((vm) => vm.$nextTick(() => vm.getList()));
+    } else {
+      next();
+    }
+  },
 };
 </script>

src/features/invigilation/common/FlvMedia.vue

@@ -15,7 +15,6 @@ export default {
   props: {
     liveUrl: {
       type: String,
-      required: true,
     },
   },
   data() {

src/styles/base.scss

@@ -115,14 +115,14 @@ body {
       padding: 20px 20px 10px;
 
       &-action {
-        padding-bottom: 10px;
+        padding-bottom: 15px;
         white-space: nowrap;
         display: flex;
         align-items: flex-end;
       }
 
       .el-form-item {
-        margin-bottom: 10px;
+        margin-bottom: 15px;
       }
       .el-form-item__label {
         margin-bottom: 0;

src/utils/utils.js

@@ -88,7 +88,8 @@ export function objAssign(target, sources) {
 
 /**
  * 文件流下载
- * @param {Object} option 文件下载设置
+ * @param {Function} fetchFunc 下载程序，返回promise
+ * @param {String} fileName 保存的文件名
  */
 export async function downloadBlob(fetchFunc, fileName) {
   const res = await fetchFunc().catch(() => {});