解决冲突

src/pages/process/fjct/[ze_id]/[zs_id].vue

@@ -256,6 +256,40 @@ let yjlc = [{
   value: '3',
   label: '沿用答题卡'
 }]
+function handleAutoCompleteTask(val) {
+  const { gid, pid, cid } = JSON.parse(sessionStorage.getItem('StepId'));
+  // handleCompleteTask(gid, pid, cid)
+  const _ykl_lc_ = JSON.parse(sessionStorage.getItem('ykl_lc'));
+  _ykl_lc_.processList[gid][pid][cid] = val || 1;
+  return request({
+    url: '/yzy/kmksyjlc/save',
+    data: {
+      ykl_id: _ykl_lc_.ykl_id,
+      yk: {
+        ykl_lc: JSON.stringify(_ykl_lc_),
+      },
+    },
+  }).then((res) => {
+    if (res.code === '1') {
+      ElMessage({
+        message: '操作成功',
+        type: 'success',
+        grouping: true,
+      });
+      sessionStorage.setItem('ykl_lc', JSON.stringify(_ykl_lc_));
+      nextTick(()=>{
+        router.back();
+      })
+
+    }
+  }).catch(() => {
+    ElMessage({
+      message: '操作失败',
+      type: 'error',
+      grouping: true,
+    });
+  });
+}
 
 const handleCancel = () => {
   router.back();
@@ -289,6 +323,8 @@ const handleSubmit = async (formEl) => {
           if (res.code === '1') {
             ElMessage.success("附件出题编辑成功！");
             // 需要跳转到新流程页面
+            handleAutoCompleteTask();
+
           }
         })
       }

src/pages/process/index.vue

@@ -367,7 +367,7 @@ function delProject(item) {
   })
 }
 function toReview(item) {
-  window.location.href = window.GLOBAL_CONFIG.yzy+'/webapps/page/single-review.html?ze_id='+item.ze_id;
+  window.location.href = window.GLOBAL_CONFIG.yzy+'/webapps/page/single-review-liankao.html?ze_id='+item.ze_id;
 }
 </script>
 <style lang="scss" scoped>

src/pages/process/kdsmjd/[ykj_id].vue

@@ -69,9 +69,18 @@ function getData() {
         barPercent.push(item.scan_percent);
       })
       barUnData = [res.data.kcjk.qks,res.data.kcjk.xhycs,res.data.kcjk.ymycs,res.data.kcjk.qkycs,res.data.kcjk.kgtycs,res.data.kcjk.xztycs,res.data.kcjk.pdtycs,res.data.kcjk.tktycs];
-      nextTick(() => {
-        initChart();
-      })
+
+      if (cur_sub.id === '1') {
+        nextTick(() => {
+          initChart();
+        })
+
+      } else {
+        nextTick(() => {
+          initUnChart();
+        })
+
+      }
 
     }
   })

src/pages/step/[id].vue

@@ -2,6 +2,7 @@
 import type { RouteLocationRaw } from 'vue-router'
 import request from '~/utils/request'
 // import { stepsMap } from '~/composables/steps'
+import { user } from '~/store/index'
 
 const props = defineProps<{
   id: string
@@ -22,10 +23,9 @@ sessionStorage.setItem('ykl_lc', JSON.stringify(ykl_lc))
 
 const stepsReactiveMap = reactive<unknown[][][]>(ykl_lc.processList)
 
-// 先上传后划块
 const steps = reactive(
   ykl_lc.ykj_yjlc === '1'
-    ? [
+    ? [// 先上传后划块
         {
           title: '组卷考试',
           children: [
@@ -58,7 +58,7 @@ const steps = reactive(
             {
               title: '答题卡扫描',
               children: [
-                { title: '连接扫描仪', optional: false, description: '启动客户端扫描学生答题卡并进行识别与上传' },
+                { title: '答题卡扫描', optional: false, description: '启动客户端扫描学生答题卡并进行识别与上传' },
               ],
             },
             {
@@ -81,7 +81,7 @@ const steps = reactive(
             {
               title: '答题卡二次扫描',
               children: [
-                { title: '连接扫描仪', optional: false, description: '启动客户端二次扫描批阅试卷' },
+                { title: '答题卡二次扫描', optional: false, description: '启动客户端二次扫描批阅试卷' },
               ],
             },
             {
@@ -133,7 +133,7 @@ const steps = reactive(
           ],
         },
       ]
-    : [
+    : [// 先划块后上传
         {
           title: '组卷考试',
           children: [
@@ -445,6 +445,38 @@ function handleCompleteTaskAuto() {
 }
 
 const TaskEventMap: { [key: string]: () => void } = {
+  附件出题: () => {
+    routerPush({ name: 'process-fjct-ze_id-zs_id', params: { ze_id: ykl_lc.ze_id, zs_id: ykl_lc.zs_id } })
+  },
+  预划考号区域: () => {
+    windowPushState(`${window.GLOBAL_CONFIG.base}/dtk/index.html`)
+  },
+  制作答题卡: () => {
+    windowPushState(`${window.GLOBAL_CONFIG.base}/dtk/index.html`)
+  },
+  // 先上传后划块
+  答题卡扫描: () => {
+    window.open(`BozeduYuejuan://${user.value.token},${ykl_lc.ze_id},${window.GLOBAL_CONFIG.yzy},upload_papers`, '_blank')
+    handleCompleteTaskAuto()
+  },
+  答题卡二次扫描: () => {
+    window.open(`BozeduYuejuan://${user.value.token},${ykl_lc.ze_id},${window.GLOBAL_CONFIG.yzy},review_papers`, '_blank')
+    handleCompleteTaskAuto()
+  },
+  // 先划块后上传 老流程
+  启动客户端: () => {
+    window.open(`BozeduYuejuan://${user.value.token},${ykl_lc.ze_id},${window.GLOBAL_CONFIG.yzy}`, '_blank')
+    handleCompleteTaskAuto()
+  },
+  平台接收试卷确认: () => {
+    handleCompleteTaskAuto()
+  },
+  批阅任务分配: () => {
+  },
+  阅卷: () => {
+  },
+  成绩发布: () => {
+  },
   考试关闭: () => {
     ElMessageBox({
       title: '提示',
@@ -458,15 +490,6 @@ const TaskEventMap: { [key: string]: () => void } = {
       handleJumpTask(gid, pid, cid)
     })
   },
-  预划考号区域: () => {
-    windowPushState(`${window.GLOBAL_CONFIG.base}/dtk/index.html`)
-  },
-  制作答题卡: () => {
-    windowPushState(`${window.GLOBAL_CONFIG.base}/dtk/index.html`)
-  },
-  附件出题: () => {
-    routerPush({ name: 'process-fjct-ze_id-zs_id', params: { ze_id: ykl_lc.ze_id, zs_id: ykl_lc.zs_id } })
-  },
 }
 </script>
 
@@ -502,8 +525,6 @@ const TaskEventMap: { [key: string]: () => void } = {
           </el-steps>
         </div>
         <div class="flex-auto p-4">
-          <!-- <div ref="Ref1" class="Ref1" h-10 w-10 bg-red-500 />
-      <div ref="Ref2" class="Ref2" mt-100 h-10 w-10 bg-red-500 /> -->
           <div class="h-full flex justify-between">
             <div
               v-for="(step, idx) in steps[currentStep].children " :key="idx"