From ca22cdd5550cfa0defb0f430c538698182cdaec1 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期一, 30 十二月 2024 16:42:49 +0800
Subject: [PATCH] Merge branch 'master' of http://dlindusit.com:53929/r/iailab-plat-ui-vue3

---
 src/router/modules/remaining.ts |   48 +++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 43 insertions(+), 5 deletions(-)

diff --git a/src/router/modules/remaining.ts b/src/router/modules/remaining.ts
index 825f9f0..6b64a95 100644
--- a/src/router/modules/remaining.ts
+++ b/src/router/modules/remaining.ts
@@ -50,6 +50,15 @@
       noTagsView: true
     }
   },
+  // {
+  //   path: '/shasteel',
+  //   component: () => import('@/views/micro/index.vue'),
+  //   name: 'shasteel',
+  //   meta: {
+  //     hidden: true,
+  //     noTagsView: true
+  //   },
+  // },
   {
     path: '/home2',
     component: () => import('@/views/Home/Index2.vue'),
@@ -63,6 +72,7 @@
     path: '/',
     component: Layout,
     name: 'Home',
+    redirect: '/index',
     meta: {
       hidden: true,
       noTagsView: true
@@ -278,9 +288,9 @@
         }
       },
       {
-        path: 'manager/simple/workflow/model/edit',
-        component: () => import('@/views/bpm/simpleWorkflow/index.vue'),
-        name: 'SimpleWorkflowDesignEditor',
+        path: 'manager/simple/model',
+        component: () => import('@/views/bpm/simple/SimpleModelDesign.vue'),
+        name: 'SimpleModelDesign',
         meta: {
           noCache: true,
           hidden: true,
@@ -311,7 +321,12 @@
           canTo: true,
           title: '流程详情',
           activeMenu: '/bpm/task/my'
-        }
+        },
+        props: (route) => ({
+          id: route.query.id,
+          taskId: route.query.taskId,
+          activityId: route.query.activityId
+        })
       },
       {
         path: 'oa/leave/create',
@@ -349,7 +364,7 @@
     children: [
       {
         path: 'package/history/:projectId',
-        component: () => import('@/views/mpk/ProjectPackageHistory.vue'),
+        component: () => import('@/views/model/mpk/project/ProjectPackageHistory.vue'),
         name: 'ProjectPackageHistory',
         meta: {
           title: '打包历史',
@@ -385,6 +400,29 @@
       }
     ]
   },
+  {
+    path: '/file',
+    component: Layout,
+    name: 'file',
+    meta: {
+      hidden: true
+    },
+    children: [
+      {
+        path: 'form/:id?',
+        component: () => import('@/views/model/mpk/file/MpkForm.vue'),
+        name: 'MpkForm',
+        meta: {
+          title: 'MDK表单',
+          noCache: true,
+          hidden: true,
+          canTo: true,
+          icon: '',
+          activeMenu: '/model/file'
+        }
+      }
+    ]
+  },
 ]
 
 export default remainingRouter

--
Gitblit v1.9.3