Ver código fonte

Merge branch 'master' into luohl

* master:
  方便测试调整:阅卷todo
luohailiang 1 ano atrás
pai
commit
f5977cc927
2 arquivos alterados com 9 adições e 3 exclusões
  1. 4 0
      auto-imports.d.ts
  2. 5 3
      src/pages/step/[id].vue

+ 4 - 0
auto-imports.d.ts

@@ -12,6 +12,8 @@ declare global {
   const $shallowRef: typeof import('vue/macros')['$shallowRef']
   const $toRef: typeof import('vue/macros')['$toRef']
   const EffectScope: typeof import('vue')['EffectScope']
+  const ElMessage: typeof import('element-plus/es')['ElMessage']
+  const ElMessageBox: typeof import('element-plus/es')['ElMessageBox']
   const asyncComputed: typeof import('@vueuse/core')['asyncComputed']
   const autoResetRef: typeof import('@vueuse/core')['autoResetRef']
   const computed: typeof import('vue')['computed']
@@ -298,6 +300,8 @@ declare module 'vue' {
     readonly $shallowRef: UnwrapRef<typeof import('vue/macros')['$shallowRef']>
     readonly $toRef: UnwrapRef<typeof import('vue/macros')['$toRef']>
     readonly EffectScope: UnwrapRef<typeof import('vue')['EffectScope']>
+    readonly ElMessage: UnwrapRef<typeof import('element-plus/es')['ElMessage']>
+    readonly ElMessageBox: UnwrapRef<typeof import('element-plus/es')['ElMessageBox']>
     readonly asyncComputed: UnwrapRef<typeof import('@vueuse/core')['asyncComputed']>
     readonly autoResetRef: UnwrapRef<typeof import('@vueuse/core')['autoResetRef']>
     readonly computed: UnwrapRef<typeof import('vue')['computed']>

+ 5 - 3
src/pages/step/[id].vue

@@ -321,7 +321,7 @@ function routerPush(path: RouteLocationRaw) {
   router.push(path)
 }
 function windowPushState(path: string) {
-  // !未启用
+  // ! 未启用
   sessionStorage.setItem('historyLocation', location.href)
   window.open(`${location.origin}/${path}`, '_self')
   // location.replace(`${location.origin}/${path}`)
@@ -499,7 +499,7 @@ const TaskEventMap: { [key: string]: () => void } = {
     handleCompleteTaskAuto()
   },
   '压缩包上传情况': () => {
-    // todo: 需调整【压缩包】上传情况
+    // TODO: 需调整【压缩包】上传情况
     routerPush(`/process/ysb/${ykl_lc.ykl_id}/${ykl_lc.ze_id}`)
     handleCompleteTaskAuto()
   },
@@ -520,7 +520,9 @@ const TaskEventMap: { [key: string]: () => void } = {
     windowPushState(`${window.GLOBAL_CONFIG.base}/taskassignment-liankao.html`)
   },
   '阅卷': () => {
-    windowPushState(`${window.GLOBAL_CONFIG.base}/single-review-liankao.html?ze_id=${ykl_lc.ze_id}`)
+    // todo: 需调整【阅卷】
+    // windowPushState(`${window.GLOBAL_CONFIG.base}/single-review-liankao.html?ze_id=${ykl_lc.ze_id}`)
+    handleCompleteTaskAuto()
   },
   '成绩发布': () => {
     let loading = false