zhangjie 3 years ago
parent
commit
02abf75dc1

+ 22 - 12
src/features/examwork/ExamManagement/ExamEdit.vue

@@ -112,7 +112,11 @@
             </el-form-item>
           </el-row>
           <el-row>
-            <el-form-item v-if="enableBreakProxy" label="断点时长(分钟)">
+            <el-form-item
+              v-if="enableBreakProxy"
+              prop="breakExpireSeconds"
+              label="断点时长(分钟)"
+            >
               <MinuteInput v-model.trim="form.breakExpireSeconds">
               </MinuteInput>
             </el-form-item>
@@ -787,6 +791,23 @@ export default {
             });
           },
         },
+        breakExpireSeconds: {
+          trigger: "change",
+          validator: (rule, value) => {
+            // console.log(value);
+            return new Promise((resolve, reject) => {
+              if (
+                this.enableBreakProxy &&
+                this.form.monitorRecord.length &&
+                value > 25 * 60
+              ) {
+                reject("开启回放情况下,断点时长不得超过25分钟");
+              } else {
+                resolve();
+              }
+            });
+          },
+        },
         inProcessLivenessFixedRange: {
           validator: (rule, value) => {
             return new Promise((resolve, reject) => {
@@ -817,17 +838,6 @@ export default {
           },
           // message: "格式错误",
         },
-        breakExpireSeconds: {
-          validator: (rule, value) => {
-            return new Promise((resolve, reject) => {
-              if (this.form.monitorRecord.length && value > 20 * 60) {
-                reject("视频回放开启后,断点失效时间必须小于20分钟");
-              } else {
-                resolve();
-              }
-            });
-          },
-        },
         ipAllow: {
           validator: (rule, value) => {
             // console.log(value);

+ 3 - 1
src/features/invigilation/RealtimeMonitoring/VideoCommunication.vue

@@ -214,7 +214,7 @@ export default {
       const localStream = createStream({
         userId: this.userMonitor.monitorUserId,
         audio: true,
-        video: isVideo,
+        video: !!isVideo,
       });
       const errorTips = {
         NotFoundError: "找不到硬件设备,请确保硬件设备已经正常插入。",
@@ -223,10 +223,12 @@ export default {
           "暂时无法访问摄像头/麦克风,请确保当前没有其他应用请求访问摄像头/麦克风,并重试。",
         OverConstrainedError: "设备异常",
         AbortError: "设备异常",
+        RtcError: "无应答客户端",
       };
 
       let initLocalStreamResult = true;
       await localStream.initialize().catch((error) => {
+        console.dir(error);
         console.log(errorTips[error.name]);
         this.notifyError(errorTips[error.name] || "未知错误");
         initLocalStreamResult = false;

+ 1 - 1
src/features/invigilation/RealtimeMonitoring/WarningDetail.vue

@@ -642,7 +642,7 @@ export default {
       const localStream = createStream({
         userId: this.userMonitor.monitorUserId,
         audio: true,
-        video: isVideo,
+        video: !!isVideo,
       });
       const errorTips = {
         NotFoundError: "找不到硬件设备,请确保硬件设备正常。",