diff --git a/src/page/index/top/index.vue b/src/page/index/top/index.vue
index 8dd2017..04938f2 100644
--- a/src/page/index/top/index.vue
+++ b/src/page/index/top/index.vue
@@ -50,7 +50,7 @@
-->
-
![]()
+
{{ userInfo.real_name }}
diff --git a/src/router/views/index.js b/src/router/views/index.js
index da50f9d..db7f3ee 100644
--- a/src/router/views/index.js
+++ b/src/router/views/index.js
@@ -36,7 +36,7 @@ export default [
component: () => import(/* webpackChunkName: "views" */ '@/views/wel/dashboard.vue'),
},
{
- path: '/taskCope',
+ path: '/wel/taskCope',
component: () => import(/* webpackChunkName: "page" */ '@/views/zhgd-work/taskCope/index.vue'),
name: '工序接收',
meta: {
@@ -46,26 +46,7 @@ export default [
},
},
// workReport
- {
- path: '/workReport',
- component: () => import(/* webpackChunkName: "page" */ '@/views/zhgd-work/workReport/index.vue'),
- name: '工序报工',
- meta: {
- keepAlive: true,
- isTab: false,
- isAuth: false,
- },
- },
- {
- path: '/workCheck',
- component: () => import(/* webpackChunkName: "page" */ '@/views/zhgd-work/workCheck/index.vue'),
- name: '工序检验',
- meta: {
- keepAlive: true,
- isTab: false,
- isAuth: false,
- },
- },
+
// {
// path: 'search',
// name: '菜单搜索',
@@ -139,6 +120,53 @@ export default [
},
],
},
+ {
+ path: '/zhgd-work',
+ component: Layout,
+ redirect: '/zhgd-work/taskCope',
+ children: [
+ {
+ path: 'taskCope',
+ name: '工序接收',
+ meta: {
+ i18n: 'info',
+ },
+ component: () => import(/* webpackChunkName: "views" */ '@/views/zhgd-work/taskCope/index.vue'),
+ },
+
+ ],
+ },
+ {
+ path: '/workReport',
+ component: Layout,
+ redirect: '/workReport/index',
+ children: [
+ {
+ path: 'index',
+ component: () => import(/* webpackChunkName: "page" */ '@/views/zhgd-work/workReport/index.vue'),
+ name: '工序报工',
+ meta: {
+ i18n: 'info',
+ },
+ },
+ ],
+ },
+ {
+ path: '/workCheck',
+ component: Layout,
+ redirect: '/workCheck/index',
+ children: [
+ {
+ path: 'index',
+ component: () => import(/* webpackChunkName: "page" */ '@/views/zhgd-work/workCheck/index.vue'),
+ name: '工序检验',
+ meta: {
+ i18n: 'info',
+ },
+ },
+ ],
+ },
+
{
path: '/work/process/leave',
component: Layout,
@@ -209,5 +237,5 @@ export default [
}
]
},
-
+
];
diff --git a/src/views/processManagement/components/addinPlantMaintenanceDialog.vue b/src/views/processManagement/components/addinPlantMaintenanceDialog.vue
index 8e491e2..d0f46cd 100644
--- a/src/views/processManagement/components/addinPlantMaintenanceDialog.vue
+++ b/src/views/processManagement/components/addinPlantMaintenanceDialog.vue
@@ -1,5 +1,5 @@
-
+
插入一行
删除选中行
@@ -172,7 +172,7 @@