From 3357b5f0f0919f7a52cd32a6d6de0acb14e0daaf Mon Sep 17 00:00:00 2001
From: dengzedong <dengzedong@email>
Date: 星期二, 17 十二月 2024 17:29:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/router/modules/remaining.ts | 35 +++++++++++++++++++++++++----------
1 files changed, 25 insertions(+), 10 deletions(-)
diff --git a/src/router/modules/remaining.ts b/src/router/modules/remaining.ts
index e3af362..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: '打包历史',
@@ -386,24 +401,24 @@
]
},
{
- path: '/mpk',
+ path: '/file',
component: Layout,
- name: 'mpk',
+ name: 'file',
meta: {
hidden: true
},
children: [
{
path: 'form/:id?',
- component: () => import('@/views/mpk/MpkForm.vue'),
+ component: () => import('@/views/model/mpk/file/MpkForm.vue'),
name: 'MpkForm',
meta: {
- title: 'Mpk表单',
+ title: 'MDK表单',
noCache: true,
hidden: true,
canTo: true,
icon: '',
- activeMenu: '/model/mpk'
+ activeMenu: '/model/file'
}
}
]
--
Gitblit v1.9.3