cxw-010203

* master:
  no message

# Conflicts:
#	src/router/index.js

src/router/basic.js

@@ -0,0 +1,97 @@
+/*
+ * @Author: your name
+ * @Date: 2021-11-24 14:45:04
+ * @LastEditTime: 2021-11-24 15:27:01
+ * @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 [
+    {
+        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,
+        redirect: '/attendance/record',
+        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-23 18:03:43
+ * @LastEditTime: 2021-11-24 17:43:23
  * @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
@@ -16,63 +16,21 @@ Router.prototype.push = function push(location) {
 Vue.use(Router);
 
 import Layout from "@/views/Layout"
+import basic from "./basic" // 基础功能
+// import payment from "./payment" // 缴费管理
+// import smartMall from "./smartMall" // 智慧商城 
+// import operation from "./operation" // 运营管理
+// import set from "./set" // 设置
+
 const router = [
     {
         path: "/",
         name: "Layout",
         title: "外框",
         component: Layout,
-        redirect: '/forecastShipping',
+        redirect: '/Console',
         meta: {title: '首页'},
-        children: [
-            {
-                path: '/forecastShipping',
-                name: "ForecastShipping",
-                title: "预报寄件",
-                hide: false,
-                icon: 'container',
-                component: resolve => require(['@/views/ForecastShipping'], resolve),
-                meta: {title: '预报寄件'}
-            },
-            {
-                path: '/waybill',
-                name: "Waybill",
-                title: "运单管理",
-                icon: 'database',
-                hide: false,
-                component: resolve => require(['@/views/Waybill'], resolve),
-                meta: {title: '运单管理'}
-            },
-            {
-                path: '/billing',
-                name: "Billing",
-                title: "账单管理",
-                icon: 'profile',
-                hide: false,
-                component: resolve => require(['@/views/Billing'], resolve),
-                meta: {title: '账单管理'},
-                children: [
-                    {
-                        path: '/billing/_details',
-                        name: "Billing_details",
-                        title: "账单管理-详情",
-                        icon: 'profile', 
-                        hide: true,
-                        component: resolve => require(['@/views/Billing/_details'], resolve),
-                        meta: {title: '账单管理-详情'},
-                    }
-                ]
-            },
-            {
-                path: '/mySettings',
-                name: "MySettings",
-                title: "我的设置",
-                hide: false,
-                icon: 'setting',
-                component: resolve => require(['@/views/MySettings'], resolve),
-                meta: {title: '我的设置'}
-            }
-        ]
+        children: [...basic]
     },
     {
         path: "/login",

src/router/operation.js

@@ -0,0 +1,9 @@
+/*
+ * @Author: your name
+ * @Date: 2021-11-24 14:52:24
+ * @LastEditTime: 2021-11-24 14:52:24
+ * @LastEditors: Please set LastEditors
+ * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ * @FilePath: /LittleBeeSaas/src/router/operation.js
+ */
+export default []

src/router/payment.js

@@ -0,0 +1,9 @@
+/*
+ * @Author: your name
+ * @Date: 2021-11-24 14:48:01
+ * @LastEditTime: 2021-11-24 14:48:02
+ * @LastEditors: Please set LastEditors
+ * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ * @FilePath: /LittleBeeSaas/src/router/payment.js
+ */
+export default []

src/router/set.js

@@ -0,0 +1,9 @@
+/*
+ * @Author: your name
+ * @Date: 2021-11-24 14:55:05
+ * @LastEditTime: 2021-11-24 14:55:06
+ * @LastEditors: Please set LastEditors
+ * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ * @FilePath: /LittleBeeSaas/src/router/set.js
+ */
+export default []

src/router/smartMall.js

@@ -0,0 +1,9 @@
+/*
+ * @Author: your name
+ * @Date: 2021-11-24 14:50:31
+ * @LastEditTime: 2021-11-24 14:50:31
+ * @LastEditors: Please set LastEditors
+ * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ * @FilePath: /LittleBeeSaas/src/router/smartMall.js
+ */
+export default []

src/styles/antd.less

@@ -16,6 +16,9 @@
 .ant-menu-inline {
     border-right: 1px solid transparent !important;
 }
+.ant-menu-inline-collapsed {
+    border-right: 1px solid transparent !important;
+}
 .ant-menu-inline > .ant-menu-item {
     color: #fff;
 }
@@ -31,3 +34,28 @@
 .ant-menu-submenu-inline > .ant-menu-submenu-title .ant-menu-submenu-arrow::after {
     background-image: linear-gradient(to right, rgba(247, 249, 251, 1), rgba(247, 249, 251, 1)) !important;
 }
+.ant-menu-inline-collapsed > .ant-menu-submenu > .ant-menu-submenu-title {
+    color: #fff !important;
+}
+.ant-menu:not(.ant-menu-horizontal) .ant-menu-item-selected .anticon {
+    color: #1990fe !important;
+}
+.ant-menu-inline-collapsed > .ant-menu-item {
+    color: #fff !important;
+}
+.ant-menu-inline-collapsed > .ant-menu-item .anticon {
+    color: #fff !important;
+}
+.ant-menu-inline-collapsed > .ant-menu-submenu-selected {
+    color: #1990fe !important;
+}
+.ant-menu-vertical > .ant-menu-item {
+    color: #fff !important;
+}
+.ant-menu:not(.ant-menu-horizontal) .ant-menu-item-selected {
+    color: #1990fe !important;
+}
+
+.ant-menu-inline-collapsed .ant-menu-submenu-selected .ant-menu-submenu-title{
+    color: #1990fe !important;
+}

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>

src/views/Layout/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-11-18 17:27:08
- * @LastEditTime: 2021-11-24 10:22:05
+ * @LastEditTime: 2021-11-24 15:34:41
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: /ansu-business/src/views/Layout/index.vue
@@ -9,7 +9,7 @@
 <template>
     <a-layout id="components-layout-demo-custom-trigger">
         <a-layout-sider v-model="collapsed" :trigger="null" collapsible>
-            <div class="logo"><img class="m1" src="../../assets/images/logo.png" /><span class="s1" v-if="!collapsed">安速货运</span></div>
+            <div class="logo"><img class="m1" src="../../assets/images/logo.png" /><span class="s1" v-if="!collapsed">小蜜蜂SaaS</span></div>
             <yMenu :csd="collapsed"></yMenu>
         </a-layout-sider>
         <a-layout>
@@ -81,7 +81,7 @@ export default {
     },
     methods: {
         handlerBread(row) {
-            let path = row.fullPath || "/";
+            let path = row.path || "/";
             this.$router.push(path);
         },
         handlerTags(n) {
@@ -108,10 +108,14 @@ export default {
     justify-content: center;
     align-items: center;
     .m1 {
-        width: 74px;
+       height: 24px;
+       background: #fff;
+       padding: 3px;
+       border-radius: 2px;
     }
     .s1 {
         display: block;
+        color: #d6d6d6;
         font-size: 16px;
         margin-left: 10px;
         font-weight: 500;

src/views/MySettings/index.vue

@@ -1,23 +0,0 @@
-<!--
- * @Author: your name
- * @Date: 2021-11-22 15:56:04
- * @LastEditTime: 2021-11-22 17:13:55
- * @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
--->
-<template>
-    <div>
-        2222
-    </div>
-</template>
-
-<script>
-export default {
-    name: "MySettings"
-}
-</script>
-
-<style lang="less" scoped>
-
-</style>