Merge branch 'master' into luohl

* master:
  ~

src/components/step/link/szcjckqx.vue

@@ -21,8 +21,9 @@ const RoleList = [
   { user_role_id: '69', user_role_name: '县级管理员' },
   { user_role_id: '72', user_role_name: '校级管理员' },
   { user_role_id: '75', user_role_name: '所有教师' },
-  { user_role_id: 'pyjs', user_role_name: '批阅教师' },
-  { user_role_id: 'pyzz', user_role_name: '批阅组长' },
+  // { user_role_id: 'pyjs', user_role_name: '批阅教师' },
+  // { user_role_id: 'pyzz', user_role_name: '批阅组长' },
+  { user_role_id: 'jyy', user_role_name: '教研员' },
   { user_role_id: 'jczz', user_role_name: '检查组长' },
   { user_role_id: '76', user_role_name: '学生' },
 ]

src/pages/step/[id].vue

@@ -32,8 +32,8 @@ const steps = reactive(
             {
               title: '出题组卷',
               children: [
-                { title: '章节知识点出题', optional: true, description: '选择相应的章节知识点从题库中选取题目组成试卷' },
-                { title: '智能出题', optional: true, description: '填写题型数量难易度等信息系统自动生成试卷' },
+                { title: '章节知识点出题', optional: true, disabled: true, description: '选择相应的章节知识点从题库中选取题目组成试卷' },
+                { title: '智能出题', optional: true, disabled: true, description: '填写题型数量难易度等信息系统自动生成试卷' },
                 { title: '附件出题', optional: true, description: '根据上传附件试卷进行考试' },
               ],
             },
@@ -140,8 +140,8 @@ const steps = reactive(
             {
               title: '出题组卷',
               children: [
-                { title: '章节知识点出题', optional: true, description: '选择相应的章节知识点从题库中选取题目组成试卷' },
-                { title: '智能出题', optional: true, description: '填写题型数量难易度等信息系统自动生成试卷' },
+                { title: '章节知识点出题', optional: true, disabled: true, description: '选择相应的章节知识点从题库中选取题目组成试卷' },
+                { title: '智能出题', optional: true, disabled: true, description: '填写题型数量难易度等信息系统自动生成试卷' },
                 { title: '附件出题', optional: true, description: '根据上传附件试卷进行考试' },
               ],
             },
@@ -429,7 +429,7 @@ function handleCompleteTask(gid: number, pid: number, cid: number, val?: unknown
 }
 
 async function handleJumpTask(gid: number, pid: number, idy: number) {
-  // todo: 验证任务是否完成
+  // 验证任务是否完成
   if (judgeStepCompleted(stepsReactiveMap[gid][pid][idy])) {
     return ElMessage({
       message: '该任务已完成',
@@ -492,7 +492,7 @@ const TaskEventMap: { [key: string]: () => void } = {
   },
   '压缩包上传情况': () => {
     // todo: 需调整【压缩包】上传情况
-    // windowPushState(`${window.GLOBAL_CONFIG.base}/`)
+    routerPush(`/process/paper-scan/${ykl_lc.ze_id}`)
     handleCompleteTaskAuto()
   },
   '答题卡二次扫描': () => {
@@ -670,10 +670,12 @@ const TaskEventMap: { [key: string]: () => void } = {
                   </template>
                   <template v-else>
                     <div
-                      class="min-w-60px cursor-pointer rounded bg-light-50 py-3px text-center text-xs"
+                      class="min-w-60px rounded bg-light-50 py-3px text-center text-xs"
+                      :class="task.disabled ? 'cursor-not-allowed' : 'cursor-pointer'"
                       @click="beforeClickTask(currentStep, idx, idy) && (TaskEventMap[task.title] ? TaskEventMap[task.title]() : handleCompleteTaskAuto())"
                     >
-                      {{ judgeStepCompleted(stepsReactiveMap[currentStep][idx][idy]) ? '已经完成' : '立即开始' }}
+                      {{ judgeStepCompleted(stepsReactiveMap[currentStep][idx][idy]) ? '已经完成' : task.disabled ? '暂未开放' : '立即开始'
+                      }}
                     </div>
                   </template>
                 </template>