Browse Source

日常开发

林旭祥 7 months ago
parent
commit
0d0306fb42
2 changed files with 33 additions and 5 deletions
  1. 2 2
      src/components/OptionWindow/index.vue
  2. 31 3
      src/utils/ws.ts

+ 2 - 2
src/components/OptionWindow/index.vue

@@ -297,8 +297,8 @@ const confirm = () => {
 
   if (props.parentData.id) {
     optionForm.value.taskId = props.parentData.id;
-    optionForm.value.testType = props.parentData.exam_type;
-    optionForm.value.taskCate = props.parentData.exam_type;
+    optionForm.value.standard = props.parentData.exam_type; //0考试 1体测
+    optionForm.value.taskCate = props.parentData.exam_type ? 1 : 0; //0自由 1常规
   }
 
   loading.value = true;

+ 31 - 3
src/utils/ws.ts

@@ -56,7 +56,11 @@ export const initWs = (data: any, callback: any) => {
       //单WS多区
       testList.forEach((item: any) => {
         let examId = `${parameter.project}_${item}`;
-        getExamStarts(examId);
+        if (parameter.taskId) {
+          getTaskStarts(examId);
+        } else {
+          getExamStarts(examId);
+        }
         getNetWork(examId, (e: any) => {
           if (!e.status) {
             callback({ cmd: 'disconnect_request', exam_id: examId, data: { message: '工作站未响应' } });
@@ -66,7 +70,11 @@ export const initWs = (data: any, callback: any) => {
     } else {
       //单WS单区
       let examId = parameter.examId;
-      getExamStarts();
+      if (parameter.taskId) {
+        getTaskStarts(examId);
+      } else {
+        getExamStarts(examId);
+      }
       getNetWork(examId, (e: any) => {
         if (!e.status) {
           callback({ cmd: 'disconnect_request', exam_id: examId, data: { message: '工作站未响应' } });
@@ -164,7 +172,7 @@ export const initWs = (data: any, callback: any) => {
  * get_exam_status:心跳,
  * exam_ends:结束测试,
  * fe_reconnect:重连,
- * task_starts:开启工作站
+ * task_starts:课程开启测试
  * exam_starts:开启测试,
  * join_exam_room:加入房间,
  * @param data发送数据:
@@ -193,6 +201,26 @@ export const sendMessage = (type: string, data: any, callback?: () => void) => {
   }
 };
 
+/**
+ * 课程连接成功
+ */
+const getTaskStarts = (data?: any) => {
+  let examId = data ? data : parameter.examId;
+  sendMessage(
+    'task_starts',
+    {
+      data: 'start_' + examId,
+      class_id: parameter.classes,
+      exam_type: parameter.standard,
+      task_cate: parameter.taskCate,
+      gesture: parameter.gesture,
+      demo: parameter.demo,
+      test_time: testTime
+    },
+    () => {}
+  );
+};
+
 /**
  * 连接成功
  */