Merge remote-tracking branch 'origin/master'

src/router/menus.js

@@ -79,23 +79,38 @@ export default [
     },
     {
         source: 'home-3',
-        name: '综合查询统计',
-        code: 'static',
+        name: '人资管理',
+        code: 'humanmanager',
         children: [
             {
                 source: 'home-3',
-                name: '预算与实际统计',
-                code: 'static-actual',
+                name: '公司制度',
+                code: 'humanmanager-companysystem',
             },
             {
                 source: 'home-3',
-                name: '项目统计',
-                code: 'static-project',
+                name: '员工档案',
+                code: 'humanmanager-archive',
             },
             {
                 source: 'home-3',
-                name: '任务统计',
-                code: 'static-plan',
+                name: '员工合同',
+                code: 'humanmanager-contract',
+            },
+            {
+                source: 'home-3',
+                name: '薪酬管理',
+                code: 'humanmanager-salary',
+            },
+            {
+                source: 'home-3',
+                name: '入职管理',
+                code: 'humanmanager-entry',
+            },
+            {
+                source: 'home-3',
+                name: '离职管理',
+                code: 'humanmanager-dimission',
             },
 
         ]
@@ -130,16 +145,39 @@ export default [
     },
     {
         source: 'home-3',
-        name: '风险预警',
-        code: 'risk',
+        name: '综合查询统计',
+        code: 'static',
         children: [
             {
                 source: 'home-3',
-                name: '风险预警',
-                code: 'risk-warning',
+                name: '预算与实际统计',
+                code: 'static-actual',
+            },
+            {
+                source: 'home-3',
+                name: '项目统计',
+                code: 'static-project',
+            },
+            {
+                source: 'home-3',
+                name: '任务统计',
+                code: 'static-plan',
             },
-
 
         ]
     },
+    // {
+    //     source: 'home-3',
+    //     name: '风险预警',
+    //     code: 'risk',
+    //     children: [
+    //         {
+    //             source: 'home-3',
+    //             name: '风险预警',
+    //             code: 'risk-warning',
+    //         },
+
+
+    //     ]
+    // },
 ]

src/router/modules/base.js

@@ -265,20 +265,68 @@ export default [
         ],
     },
     {
-        path: '/risk',
-        name: 'risk',
-        redirect: '/risk/warning',
-        meta: {title: '风险预警'},
+        path: '/humanmanager',
+        name: 'humanmanager',
+        redirect: '/humanmanager/companysystem',
+        meta: {title: '人资管理'},
         component: Layout,
         children: [
             {
-                path: '/risk/warning',
-                name: 'risk-warning',
-                meta: {title: '风险预警'},
-                component: () => import('~src/views/risk/warning.vue')
+                path: '/humanmanager/companysystem',
+                name: 'humanmanager-companysystem',
+                meta: {title: '公司制度'},
+                component: () => import('~src/views/humanmanager/companysystem.vue')
             },
+            {
+                path: '/humanmanager/archive',
+                name: 'humanmanager-archive',
+                meta: {title: '员工档案'},
+                component: () => import('~src/views/humanmanager/archive.vue')
+            },
+            {
+                path: '/humanmanager/contract',
+                name: 'humanmanager-contract',
+                meta: {title: '员工合同'},
+                component: () => import('~src/views/humanmanager/contract.vue')
+            },
+            {
+                path: '/humanmanager/salary',
+                name: 'humanmanager-salary',
+                meta: {title: '薪酬管理'},
+                component: () => import('~src/views/humanmanager/salary.vue')
+            },
+            {
+                path: '/humanmanager/entry',
+                name: 'humanmanager-entry',
+                meta: {title: '入职管理'},
+                component: () => import('~src/views/humanmanager/entry.vue')
+            },
+            {
+                path: '/humanmanager/dimission',
+                name: 'humanmanager-dimission',
+                meta: {title: '离职管理'},
+                component: () => import('~src/views/humanmanager/dimission.vue')
+            },
+    
+    
+
         ],
     },
+    // {
+    //     path: '/risk',
+    //     name: 'risk',
+    //     redirect: '/risk/warning',
+    //     meta: {title: '风险预警'},
+    //     component: Layout,
+    //     children: [
+    //         {
+    //             path: '/risk/warning',
+    //             name: 'risk-warning',
+    //             meta: {title: '风险预警'},
+    //             component: () => import('~src/views/risk/warning.vue')
+    //         },
+    //     ],
+    // },
     {
         path: '/403',
         name: '403',

src/router/modules/token.js

@@ -29,5 +29,13 @@ export default [
     'risk-warning',
     'static-project',
     'static-plan',
-    'static-actual'
+    'static-actual',
+    'humanmanager',
+    'humanmanager-companysystem',
+    'humanmanager-archive',
+    'humanmanager-contract',
+    'humanmanager-salary',
+    'humanmanager-entry',
+    'humanmanager-dimission',
+
 ]

src/views/humanmanager/archive.vue

@@ -0,0 +1,10 @@
+<!--  -->
+<template>
+  <div >222</div>
+</template>
+
+<script setup>
+import {ref, watch} from  'vue'
+</script>
+<style lang='scss' scoped>
+</style>

src/views/humanmanager/companysystem.vue

@@ -0,0 +1,10 @@
+<!--  -->
+<template>
+  <div >333</div>
+</template>
+
+<script setup>
+import {ref, watch} from  'vue'
+</script>
+<style lang='scss' scoped>
+</style>

src/views/humanmanager/contract.vue

@@ -0,0 +1,10 @@
+<!--  -->
+<template>
+  <div >444</div>
+</template>
+
+<script setup>
+import {ref, watch} from  'vue'
+</script>
+<style lang='scss' scoped>
+</style>

src/views/humanmanager/dimission.vue

@@ -0,0 +1,10 @@
+
+<template>
+  <div >111</div>
+</template>
+
+<script setup>
+import {ref, watch} from  'vue'
+</script>
+<style lang='scss' scoped>
+</style>

src/views/humanmanager/entry.vue

@@ -0,0 +1,10 @@
+<!--  -->
+<template>
+  <div > 666</div>
+</template>
+
+<script setup>
+import {ref, watch} from  'vue'
+</script>
+<style lang='scss' scoped>
+</style>

src/views/humanmanager/salary.vue

@@ -0,0 +1,10 @@
+<!--  -->
+<template>
+  <div >555</div>
+</template>
+
+<script setup>
+import {ref, watch} from  'vue'
+</script>
+<style lang='scss' scoped>
+</style>