diff --git a/src/assets/images/logo.png b/src/assets/images/logo.png index 5c87787..ad01042 100644 Binary files a/src/assets/images/logo.png and b/src/assets/images/logo.png differ diff --git a/src/router/basic.js b/src/router/basic.js index c77eb3f..9d595e8 100644 --- a/src/router/basic.js +++ b/src/router/basic.js @@ -1,7 +1,7 @@ /* * @Author: your name * @Date: 2021-11-24 14:45:04 - * @LastEditTime: 2021-11-24 14:58:38 + * @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 @@ -51,6 +51,7 @@ export default [ title: "考勤管理", icon: 'profile', hide: false, + redirect: '/attendance/record', component: resolve => require(['@/views/Attendance'], resolve), meta: {title: '考勤管理'}, children: [ diff --git a/src/router/index.js b/src/router/index.js index 5240be9..bdbddbf 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1,7 +1,7 @@ /* * @Author: your name * @Date: 2021-11-18 17:30:38 - * @LastEditTime: 2021-11-24 14:59:12 + * @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,7 +16,6 @@ Router.prototype.push = function push(location) { Vue.use(Router); import Layout from "@/views/Layout" -// import test from "./test" import basic from "./basic" // 基础功能 // import payment from "./payment" // 缴费管理 // import smartMall from "./smartMall" // 智慧商城 diff --git a/src/router/test.js b/src/router/test.js deleted file mode 100644 index d69b0e5..0000000 --- a/src/router/test.js +++ /dev/null @@ -1,58 +0,0 @@ -/* - * @Author: your name - * @Date: 2021-11-24 14:43:24 - * @LastEditTime: 2021-11-24 14:43:25 - * @LastEditors: Please set LastEditors - * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE - * @FilePath: /LittleBeeSaas/src/router/test.js - */ - -export default [ - { - 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: '我的设置'} - } -] diff --git a/src/styles/antd.less b/src/styles/antd.less index 2da5faa..b6cc3b9 100644 --- a/src/styles/antd.less +++ b/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; +} \ No newline at end of file diff --git a/src/views/Layout/index.vue b/src/views/Layout/index.vue index 1d559a3..3b56b5d 100644 --- a/src/views/Layout/index.vue +++ b/src/views/Layout/index.vue @@ -1,7 +1,7 @@ - - - - -