diff --git a/hb_client/src/router/index.js b/hb_client/src/router/index.js index 980eabf..0efd28e 100644 --- a/hb_client/src/router/index.js +++ b/hb_client/src/router/index.js @@ -153,8 +153,7 @@ export const asyncRoutes = [ meta: { title: '产品管理', icon: 'example', perms: ['mtm_productprocess'] } }, ] - } - , + }, { path: '/pm', component: Layout, @@ -208,8 +207,7 @@ export const asyncRoutes = [ } ] - } - , + }, { path: '/wpm', component: Layout, @@ -339,8 +337,7 @@ export const asyncRoutes = [ hidden: true } ] - } - , + }, { path: '/qm', component: Layout, @@ -407,7 +404,6 @@ export const asyncRoutes = [ ] }, - { path: '/personnel', component: Layout, @@ -435,8 +431,7 @@ export const asyncRoutes = [ }, ] - } - , + }, { path: '/inm', component: Layout, @@ -492,29 +487,67 @@ export const asyncRoutes = [ ] }, - - - { - path: '/procurement', - component: Layout, - redirect: '/procurement/vendor', - name: 'procurement', - meta: { title: '采购管理', icon: 'example', perms: ['procurement_set'] }, - children: [ - { - path: 'vendor', - name: 'vendor', - component: () => import('@/views/procurement/vendor'), - meta: { title: '供应商', icon: 'example', perms: ['vendor_manage'] } - }, - { - path: 'vendor', - name: 'vendor', - component: () => import('@/views/procurement/vendor'), - meta: { title: '采购订单', icon: 'example', perms: ['vendor_manage'] } - } - ] - }, + { + path: '/procurement', + component: Layout, + redirect: '/procurement/vendor', + name: 'procurement', + meta: { title: '采购管理', icon: 'example', perms: ['procurement_set'] }, + children: [ + { + path: 'vendor', + name: 'vendor', + component: () => import('@/views/procurement/vendor'), + meta: { title: '供应商', icon: 'example', perms: ['vendor_manage'] } + }, + { + path: 'vendor', + name: 'vendor', + component: () => import('@/views/procurement/vendor'), + meta: { title: '采购订单', icon: 'example', perms: ['vendor_manage'] } + } + ] + }, + { + path: '/statistics', + component: Layout, + redirect: '/statistics/progressStatistics', + name: 'statistics', + meta: { title: '统计分析', icon: 'example', perms: ['workflow_manage'] }, + children: [ + { + path: 'progressStatistics', + name: 'progressStatistics', + component: () => import('@/views/statistics/progressStatistics'), + meta: { title: '进度统计', icon: 'example', perms: ['workflow_index'] } + }, + { + path: 'materialStatistics', + name: 'materialStatistics', + component: () => import('@/views/statistics/materialStatistics'), + meta: { title: '物料统计', icon: 'example', perms: ['workflow_index'] } + }, + { + path: 'personStatistics', + name: 'personStatistics', + component: () => import('@/views/statistics/personStatistics'), + meta: { title: '人员统计', icon: 'example', perms: ['workflow_index'] } + }, + { + path: 'costStatistics', + name: 'costStatistics', + component: () => import('@/views/statistics/costStatistics'), + meta: { title: '成本统计', icon: 'example', perms: ['workflow_index'] } + }, + { + path: 'testStatistics', + name: 'testStatistics', + component: () => import('@/views/statistics/testStatistics'), + meta: { title: '检验统计', icon: 'example', perms: ['workflow_index'] } + }, + + ] + }, { path: '/workflow', component: Layout, @@ -700,6 +733,12 @@ export const asyncRoutes = [ component: () => import('@/views/testModel/faceLogin'), meta: { title: '人脸识别登录', icon: 'example' } }, + { + path: 'caram', + name: 'caram', + component: () => import('@/views/testModel/caram'), + meta: { title: '相机调用', icon: 'example' } + }, { path: 'markImage', name: 'markImage', diff --git a/hb_client/src/views/statistics/charts.vue b/hb_client/src/views/statistics/charts.vue new file mode 100644 index 0000000..fcf7c81 --- /dev/null +++ b/hb_client/src/views/statistics/charts.vue @@ -0,0 +1,69 @@ + + + + + diff --git a/hb_client/src/views/dashboard/largeScreen.vue b/hb_client/src/views/statistics/costStatistics.vue similarity index 67% rename from hb_client/src/views/dashboard/largeScreen.vue rename to hb_client/src/views/statistics/costStatistics.vue index ed331a3..3d4342c 100644 --- a/hb_client/src/views/dashboard/largeScreen.vue +++ b/hb_client/src/views/statistics/costStatistics.vue @@ -1,10 +1,10 @@ diff --git a/hb_client/src/views/statistics/materialStatistics.vue b/hb_client/src/views/statistics/materialStatistics.vue new file mode 100644 index 0000000..d7b83f5 --- /dev/null +++ b/hb_client/src/views/statistics/materialStatistics.vue @@ -0,0 +1,364 @@ + + + + + diff --git a/hb_client/src/views/statistics/personStatistics.vue b/hb_client/src/views/statistics/personStatistics.vue new file mode 100644 index 0000000..ee6fefe --- /dev/null +++ b/hb_client/src/views/statistics/personStatistics.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/hb_client/src/views/statistics/progressStatistics.vue b/hb_client/src/views/statistics/progressStatistics.vue new file mode 100644 index 0000000..dece4b0 --- /dev/null +++ b/hb_client/src/views/statistics/progressStatistics.vue @@ -0,0 +1,175 @@ + + + + + diff --git a/hb_client/src/views/statistics/testStatistics.vue b/hb_client/src/views/statistics/testStatistics.vue new file mode 100644 index 0000000..b8153af --- /dev/null +++ b/hb_client/src/views/statistics/testStatistics.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/hb_client/src/views/testModel/caram.vue b/hb_client/src/views/testModel/caram.vue new file mode 100644 index 0000000..1d33058 --- /dev/null +++ b/hb_client/src/views/testModel/caram.vue @@ -0,0 +1,117 @@ + + + + +