Merge branch 'master' into luohl

* master:
  ~

components.d.ts

@@ -15,6 +15,8 @@ declare module '@vue/runtime-core' {
     ElBreadcrumb: typeof import('element-plus/es')['ElBreadcrumb']
     ElBreadcrumbItem: typeof import('element-plus/es')['ElBreadcrumbItem']
     ElButton: typeof import('element-plus/es')['ElButton']
+    ElCarousel: typeof import('element-plus/es')['ElCarousel']
+    ElCarouselItem: typeof import('element-plus/es')['ElCarouselItem']
     ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
     ElCheckboxGroup: typeof import('element-plus/es')['ElCheckboxGroup']
     ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
@@ -35,6 +37,7 @@ declare module '@vue/runtime-core' {
     ElSteps: typeof import('element-plus/es')['ElSteps']
     ElTable: typeof import('element-plus/es')['ElTable']
     ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
+    ElUpload: typeof import('element-plus/es')['ElUpload']
     'I:mdi:horizontalLine': typeof import('~icons/mdi/horizontal-line')['default']
     'I:mdi:tick': typeof import('~icons/mdi/tick')['default']
     LeftSider: typeof import('./src/components/leftSider/index.vue')['default']
@@ -48,4 +51,7 @@ declare module '@vue/runtime-core' {
     TinymceVue: typeof import('./src/components/TinymceVue/index.vue')['default']
     Xgstda: typeof import('./src/components/step/link/xgstda.vue')['default']
   }
+  export interface ComponentCustomProperties {
+    vLoading: typeof import('element-plus/es')['ElLoadingDirective']
+  }
 }

src/pages/step/[id].vue

@@ -1,4 +1,5 @@
 <script setup lang="ts" generic="T extends any, O extends any">
+import type { RouteLocationRaw } from 'vue-router'
 import request from '~/utils/request'
 // import { stepsMap } from '~/composables/steps'
 
@@ -314,7 +315,7 @@ onMounted(() => {
 
 const router = useRouter()
 
-function routerPush(path: string) {
+function routerPush(path: RouteLocationRaw) {
   router.push(path)
 }
 function windowPushState(path: string) {
@@ -463,6 +464,9 @@ const TaskEventMap: { [key: string]: () => void } = {
   制作答题卡: () => {
     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>
 
@@ -562,8 +566,4 @@ const TaskEventMap: { [key: string]: () => void } = {
 :deep(.el-step__description .el-step:last-of-type .el-step__line) {
   display: none;
 }
-
-.z10 {
-  z-index: 10;
-}
 </style>

src/styles/main.css

@@ -44,3 +44,7 @@ html.dark {
   color: #003eee;
   text-align: center;
 }
+
+.z10 {
+  z-index: 10;
+}