bzkf3 2 anni fa
parent
commit
1739922cdf
5 ha cambiato i file con 21 aggiunte e 14 eliminazioni
  1. 9 6
      public/config.js
  2. 0 1
      public/dtk/assets/index.5dd05d2c.js
  3. 1 1
      public/dtk/index.html
  4. 1 0
      shims.d.ts
  5. 10 6
      src/pages/step/[id].vue

+ 9 - 6
public/config.js

@@ -5,10 +5,11 @@ const local = {
   web_pc: 'https://yzy.dev.bozedu.net/',
   qqyxt: 'https://qqyxt.dev.bozedu.net/',
   yzy: 'https://yzy.dev.bozedu.net/',
-  api:'https://openapi.dev.bozedu.net/',
+  api: 'https://openapi.dev.bozedu.net/',
   uc: 'https://uc.dev.bozedu.net/',
   origin: window.location.origin,
-  base:'/'
+  base: '',
+  build: ''
 }
 
 // 测试服环境
@@ -17,9 +18,10 @@ const development = {
   origin: window.location.origin,
   qqyxt: 'https://qqyxt.dev.bozedu.net/',
   yzy: 'https://yzy.dev.bozedu.net/',
-  api:'https://openapi.dev.bozedu.net/',
+  api: 'https://openapi.dev.bozedu.net/',
   uc: 'https://uc.dev.bozedu.net/',
-  base:'/webapps/page'
+  base: '/webapps/page',
+  build: '/webapps/page/liankao'
 }
 
 // // 正式服环境
@@ -28,9 +30,10 @@ const production = {
   origin: window.location.origin,
   qqyxt: 'https://qqyxt.bozedu.net/',
   yzy: 'https://yzy.bozedu.net/',
-  api:'https://openapi.bozedu.net/',
+  api: 'https://openapi.bozedu.net/',
   uc: 'https://uc.bozedu.net/',
-  base:'webapps/page'
+  base: 'webapps/page',
+  build: '/webapps/page/liankao'
 }
 
 function isWhich() {

File diff suppressed because it is too large
+ 0 - 1
public/dtk/assets/index.5dd05d2c.js


+ 1 - 1
public/dtk/index.html

@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>自定义答题卡</title>
     <script src="./config.js"></script>
-    <script type="module" crossorigin src="./assets/index.5dd05d2c.js"></script>
+    <script type="module" crossorigin src="./assets/index.26656681.js"></script>
     <link rel="modulepreload" href="./assets/vendor.fb7751d4.js">
     <link rel="stylesheet" href="./assets/vendor.e1b158b3.css">
     <link rel="stylesheet" href="./assets/index.cb418333.css">

+ 1 - 0
shims.d.ts

@@ -22,6 +22,7 @@ declare interface Window {
     yzy: string
     uc: string
     base: string
+    build: string
   }
   // handleCompleteTask: (gid: number, pid: number, idy: number) => void
   // handleAutoCompleteTask: () => void

+ 10 - 6
src/pages/step/[id].vue

@@ -47,7 +47,7 @@ const steps = reactive(
             {
               title: '预划流程完成',
               children: [
-                { title: '预划流程完成', optional: false, description: '试卷内容和答题卡已确认,可进行考试' },
+                { title: '预划流程完成', optional: false, description: '试卷内容和答题卡已确认,可进行下一步' },
               ],
             },
           ],
@@ -266,7 +266,7 @@ const lineList: any[][][] = []
 //   })
 // })
 
-function handleSwitchGid(id: number) {
+function handleSwitchCurrentStep(id: number) {
   currentStep = id
 }
 
@@ -453,14 +453,18 @@ 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}/liankao/dtk/index.html`)
+    windowPushState(`${window.GLOBAL_CONFIG.build}/dtk/index.html`)
   },
   '制作答题卡': () => {
-    windowPushState(`${window.GLOBAL_CONFIG.base}/liankao/dtk/index.html`)
+    windowPushState(`${window.GLOBAL_CONFIG.build}/dtk/index.html`)
   },
   '考场设置(可选)': () => {
     windowPushState(`${window.GLOBAL_CONFIG.base}/exam-room-set.html?id=${ykl_lc.ze_id}`)
   },
+  '预划流程完成': async () => {
+    await handleCompleteTaskAuto()
+    currentStep = 1
+  },
   '组卷流程完成': async () => {
     await handleCompleteTaskAuto()
     currentStep = 1
@@ -584,10 +588,10 @@ const TaskEventMap: { [key: string]: () => void } = {
     <div class="flex-auto w-1200px m-auto">
       <div class="flex flex-auto justify-start divide-x-4 divide-blue-700">
         <div class="h-full w-220px">
-          <el-steps direction="vertical" :active="gid">
+          <el-steps direction="vertical" :active="currentStep">
             <el-step
               v-for="({ title, children }, idx) in steps" :key="title" class="cursor-pointer hover:bg-light-600"
-              :class="idx === currentStep && 'bg-light-400'" @click="handleSwitchGid(idx)"
+              :class="idx === currentStep && 'bg-light-400'" @click="handleSwitchCurrentStep(idx)"
             >
               <template #title>
                 <div class="mb-4 font-normal">