From b3651dc4eeea39bbf665b839b023236965418b1c Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Fri, 16 Jul 2021 10:12:10 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_regulatory
---
src/router/views/index.js | 101 ++++++++++++++++++++++++++++++++------------------
1 files changed, 64 insertions(+), 37 deletions(-)
diff --git a/src/router/views/index.js b/src/router/views/index.js
index c4a2d63..0da4ba9 100644
--- a/src/router/views/index.js
+++ b/src/router/views/index.js
@@ -28,27 +28,27 @@
{
path: '/wel',
component: () =>
- import('@/views/home/index')
- // component: Layout,
- // redirect: '/wel/index',
- // children: [{
- // path: 'index',
- // name: '首页',
- // meta: {
- // i18n: 'dashboard'
- // },
- // component: () =>
- // import( /* webpackChunkName: "views" */ '@/views/wel/index')
- // }, {
- // path: 'dashboard',
- // name: '控制台',
- // meta: {
- // i18n: 'dashboard',
- // menu: false,
- // },
- // component: () =>
- // import( /* webpackChunkName: "views" */ '@/views/wel/dashboard')
- // }]
+ import ('@/views/home/index')
+ // component: Layout,
+ // redirect: '/wel/index',
+ // children: [{
+ // path: 'index',
+ // name: '首页',
+ // meta: {
+ // i18n: 'dashboard'
+ // },
+ // component: () =>
+ // import( /* webpackChunkName: "views" */ '@/views/wel/index')
+ // }, {
+ // path: 'dashboard',
+ // name: '控制台',
+ // meta: {
+ // i18n: 'dashboard',
+ // menu: false,
+ // },
+ // component: () =>
+ // import( /* webpackChunkName: "views" */ '@/views/wel/dashboard')
+ // }]
},
@@ -64,7 +64,7 @@
i18n: 'test'
},
component: () =>
- import( /* webpackChunkName: "views" */ '@/views/util/test')
+ import ( /* webpackChunkName: "views" */ '@/views/util/test')
}]
}, {
path: '/dict-horizontal',
@@ -77,7 +77,7 @@
i18n: 'dict'
},
component: () =>
- import( /* webpackChunkName: "views" */ '@/views/util/demo/dict-horizontal')
+ import ( /* webpackChunkName: "views" */ '@/views/util/demo/dict-horizontal')
}]
}, {
path: '/dict-vertical',
@@ -90,7 +90,7 @@
i18n: 'dict'
},
component: () =>
- import( /* webpackChunkName: "views" */ '@/views/util/demo/dict-vertical')
+ import ( /* webpackChunkName: "views" */ '@/views/util/demo/dict-vertical')
}]
}, {
path: '/info',
@@ -103,7 +103,7 @@
i18n: 'info'
},
component: () =>
- import( /* webpackChunkName: "views" */ '@/views/system/userinfo')
+ import ( /* webpackChunkName: "views" */ '@/views/system/userinfo')
}]
}, {
path: '/work/process/leave',
@@ -116,7 +116,7 @@
i18n: 'work'
},
component: () =>
- import( /* webpackChunkName: "views" */ '@/views/work/process/leave/form')
+ import ( /* webpackChunkName: "views" */ '@/views/work/process/leave/form')
}, {
path: 'handle/:taskId/:processInstanceId/:businessId',
name: '处理请假流程',
@@ -124,7 +124,7 @@
i18n: 'work'
},
component: () =>
- import( /* webpackChunkName: "views" */ '@/views/work/process/leave/handle')
+ import ( /* webpackChunkName: "views" */ '@/views/work/process/leave/handle')
}, {
path: 'detail/:processInstanceId/:businessId',
name: '请假流程详情',
@@ -132,7 +132,7 @@
i18n: 'work'
},
component: () =>
- import( /* webpackChunkName: "views" */ '@/views/work/process/leave/detail')
+ import ( /* webpackChunkName: "views" */ '@/views/work/process/leave/detail')
}]
}, {
path: '/attach',
@@ -145,7 +145,7 @@
i18n: 'index',
},
component: () =>
- import( /* webpackChunkName: "views" */ '@/views/resource/attach')
+ import ( /* webpackChunkName: "views" */ '@/views/resource/attach')
}]
},
{
@@ -159,7 +159,7 @@
i18n: 'index',
},
component: () =>
- import( /* webpackChunkName: "views" */ '@/views/management/register')
+ import ( /* webpackChunkName: "views" */ '@/views/management/register')
}]
},
{
@@ -173,7 +173,7 @@
i18n: 'dict'
},
component: () =>
- import( /* webpackChunkName: "views" */ '@/views/desk/notice')
+ import ( /* webpackChunkName: "views" */ '@/views/desk/notice')
}]
},
{
@@ -187,7 +187,34 @@
i18n: 'index',
},
component: () =>
- import( /* webpackChunkName: "views" */ '@/views/resource/uploadNotice')
+ import ( /* webpackChunkName: "views" */ '@/views/resource/uploadNotice')
+ }]
+ }, {
+ path: '/workreport',
+ component: Layout,
+ redirect: '/workreport/workreport',
+ children: [{
+ path: 'workreport',
+ name: '发起的汇报',
+ meta: {
+ i18n: 'dict'
+ },
+ component: () =>
+ import ( /* webpackChunkName: "views" */ '@/views/workreport/workreport')
+ }]
+ },
+ {
+ path: '/workreport',
+ component: Layout,
+ redirect: '/workreport/workreply',
+ children: [{
+ path: 'workreply',
+ name: '接收的汇报',
+ meta: {
+ i18n: 'dict'
+ },
+ component: () =>
+ import ( /* webpackChunkName: "views" */ '@/views/workreport/workreply')
}]
}, {
path: '/management',
@@ -200,7 +227,7 @@
i18n: 'index',
},
component: () =>
- import( /* webpackChunkName: "views" */ '@/views/management/peopleDetails')
+ import ( /* webpackChunkName: "views" */ '@/views/management/peopleDetails')
}]
}, {
path: '/securityCompany',
@@ -213,12 +240,12 @@
i18n: 'index',
},
component: () =>
- import( /* webpackChunkName: "views" */ '@/views/securityCompany/companyDetails')
+ import ( /* webpackChunkName: "views" */ '@/views/securityCompany/companyDetails')
}]
}, {
path: '/map',
component: () =>
- import( /* webpackChunkName: "views" */ '@/views/mapHome/index')
+ import ( /* webpackChunkName: "views" */ '@/views/mapHome/index')
}, {
path: '/regulatoryInformation',
redirect: '/regulatoryInformation/index',
@@ -230,7 +257,7 @@
i18n: 'index',
},
component: () =>
- import( /* webpackChunkName: "views" */ '@/views/regulatoryInformation/index')
+ import ( /* webpackChunkName: "views" */ '@/views/regulatoryInformation/index')
}]
}
-]
+]
\ No newline at end of file
--
Gitblit v1.9.3