Merge branch 'master' into dev

* master:
  no message

# Conflicts:
#	src/router/index.js

src/router/basic.js

@@ -1,9 +1,96 @@
 /*
  * @Author: your name
  * @Date: 2021-11-24 14:45:04
- * @LastEditTime: 2021-11-24 14:47:16
+ * @LastEditTime: 2021-11-24 14:58:38
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: /LittleBeeSaas/src/router/basic.js
  */
-export default []
+export default [
+    {
+        path: '/Console',
+        name: "Console",
+        title: "控制台",
+        hide: false,
+        icon: 'container',
+        component: resolve => require(['@/views/Console'], resolve),
+        meta: {title: '控制台'}
+    },
+    {
+        path: '/Employee',
+        name: "Employee",
+        title: "员工管理",
+        icon: 'database',
+        hide: false,
+        component: resolve => require(['@/views/Employee'], resolve),
+        meta: {title: '员工管理'}
+    },
+    {
+        path: '/authority',
+        name: "Authority",
+        title: "权限管理",
+        icon: 'profile',
+        hide: false,
+        component: resolve => require(['@/views/Authority'], resolve),
+        meta: {title: '权限管理'},
+        children: [
+            {
+                path: '/Authority/_details',
+                name: "Authority_details",
+                title: "账单管理-详情",
+                icon: 'profile', 
+                hide: true,
+                component: resolve => require(['@/views/Authority/_details'], resolve),
+                meta: {title: '账单管理-详情'},
+            }
+        ]
+    },
+    {
+        path: '/attendance',
+        name: "Attendance",
+        title: "考勤管理",
+        icon: 'profile',
+        hide: false,
+        component: resolve => require(['@/views/Attendance'], resolve),
+        meta: {title: '考勤管理'},
+        children: [
+            {
+                path: '/attendance/record',
+                name: "Attendance_record",
+                title: "考勤记录",
+                icon: 'profile', 
+                hide: false,
+                component: resolve => require(['@/views/Attendance/_record'], resolve),
+                meta: {title: '考勤记录'},
+            },
+            {
+                path: '/attendance/application',
+                name: "Attendance_application",
+                title: "申请记录",
+                icon: 'profile', 
+                hide: false,
+                component: resolve => require(['@/views/Attendance/_application'], resolve),
+                meta: {title: '申请记录'},
+            },
+            {
+                path: '/attendance/attendanceteam',
+                name: "Attendance_attendanceteam",
+                title: "考勤小组",
+                icon: 'profile', 
+                hide: false,
+                component: resolve => require(['@/views/Attendance/_attendanceteam'], resolve),
+                meta: {title: '考勤小组'},
+            },
+            {
+                path: '/attendance/scheduling',
+                name: "Attendance_scheduling",
+                title: "排班计划",
+                icon: 'profile', 
+                hide: false,
+                component: resolve => require(['@/views/Attendance/_scheduling'], resolve),
+                meta: {title: '排班计划'},
+            },
+
+        ]
+    }
+]

src/router/index.js

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-11-18 17:30:38
- * @LastEditTime: 2021-11-24 14:55:28
+ * @LastEditTime: 2021-11-24 14:59:12
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: /ansu-business/src/router/index.js
@@ -29,7 +29,7 @@ const router = [
         name: "Layout",
         title: "外框",
         component: Layout,
-        // redirect: '/forecastShipping',
+        redirect: '/Console',
         meta: {title: '首页'},
         children: [...basic]
     },

src/views/Console/index.vue

@@ -4,7 +4,7 @@
  * @LastEditTime: 2021-11-22 17:00:21
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
- * @FilePath: /ansu-business/src/views/Waybill/index.vue
+ * @FilePath: /ansu-business/src/views/Console/index.vue
 -->
 <template>
     <div>
@@ -14,7 +14,7 @@
 
 <script>
 export default {
-    name: "ForecastShipping"
+    name: "Console"
 }
 </script>
 

src/views/Employee/index.vue

@@ -4,18 +4,21 @@
  * @LastEditTime: 2021-11-22 17:14:00
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
- * @FilePath: /ansu-business/src/views/Waybill/index.vue
+ * @FilePath: /ansu-business/src/views/Employee/index.vue
 -->
 <template>
     <div>
-33333
+        <div class="left">
+        </div>
+        <div class="right">
+        </div>
     </div>
 </template>
 
 <script>
 export default {
-    name: "Waybill"
-}
+    name: "Employee",//员工管理
+};
 </script>
 
 <style lang="less" scoped>