From 10f4b726d4427079df4ac22d66f170bad927df02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BE=99=E8=BF=90=E6=A8=A1?= <1724894114@qq.com>
Date: Mon, 9 Dec 2024 22:48:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B6=E5=B1=82=E8=8F=9C?=
=?UTF-8?q?=E5=8D=95=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/assets/icons/index.js | 3 +++
src/assets/icons/menu/AdvancedSetting.vue | 23 +++++++++++++++++++++++
src/assets/icons/menu/Bom.vue | 15 +++++++++++++++
src/assets/icons/menu/Warehouse.vue | 15 +++++++++++++++
src/layout/components/NavMenu.vue | 6 +++---
src/style/fix.scss | 2 ++
6 files changed, 61 insertions(+), 3 deletions(-)
create mode 100644 src/assets/icons/menu/AdvancedSetting.vue
create mode 100644 src/assets/icons/menu/Bom.vue
create mode 100644 src/assets/icons/menu/Warehouse.vue
diff --git a/src/assets/icons/index.js b/src/assets/icons/index.js
index 4675135..04b91a3 100644
--- a/src/assets/icons/index.js
+++ b/src/assets/icons/index.js
@@ -126,6 +126,9 @@ export { default as Reports } from './menu/ReportForms.vue'
export { default as ShipmentMag } from './menu/Shipment.vue'
export { default as Inventory } from './menu/Stock.vue'
export { default as Service } from './menu/Service.vue'
+export { default as Bom } from './menu/Bom.vue'
+export { default as Warehouse } from './menu/Warehouse.vue'
+export { default as AdvancedSetting } from './menu/AdvancedSetting.vue'
// 二层菜单
export { default as Controller } from './childMenu/Console.vue'
export { default as CostFeeRecords } from './childMenu/CostControl.vue'
diff --git a/src/assets/icons/menu/AdvancedSetting.vue b/src/assets/icons/menu/AdvancedSetting.vue
new file mode 100644
index 0000000..8931859
--- /dev/null
+++ b/src/assets/icons/menu/AdvancedSetting.vue
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
diff --git a/src/assets/icons/menu/Bom.vue b/src/assets/icons/menu/Bom.vue
new file mode 100644
index 0000000..9e166c4
--- /dev/null
+++ b/src/assets/icons/menu/Bom.vue
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
diff --git a/src/assets/icons/menu/Warehouse.vue b/src/assets/icons/menu/Warehouse.vue
new file mode 100644
index 0000000..e00ea5b
--- /dev/null
+++ b/src/assets/icons/menu/Warehouse.vue
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
diff --git a/src/layout/components/NavMenu.vue b/src/layout/components/NavMenu.vue
index d475642..c395a28 100644
--- a/src/layout/components/NavMenu.vue
+++ b/src/layout/components/NavMenu.vue
@@ -3,9 +3,9 @@
-
+
-
+
{{navMenu.meta.title}}
@@ -13,7 +13,7 @@
-
+
{{navMenu.meta.title}}
diff --git a/src/style/fix.scss b/src/style/fix.scss
index 469e387..a9e8eac 100644
--- a/src/style/fix.scss
+++ b/src/style/fix.scss
@@ -91,6 +91,7 @@
}
.el-menu {border: none!important;}
+.el-menu ::v-deep .nav-top-menu{margin-right: 0 !important;}
.el-menu .el-menu-item.is-active{background: var(--el-menu-hover-bg-color);position: relative;}
.el-menu .el-menu-item.is-active:after{content: "";position: absolute;top: 0;right: 0;height: 100%;width: 4px;background: var(--el-color-primary);}
.el-menu .el-menu-item a {color: inherit;text-decoration: none;display: block;width:100%;height:100%;position: absolute;top:0;left:0;}
@@ -158,6 +159,7 @@
.el-checkbox-button__inner {font-size: 12px;}
.el-checkbox .el-checkbox__label{font-weight: 400;font-size: 12px;}
.el-sub-menu .el-icon {font-size: 16px;color: #aaa;display: flex;align-items: center;justify-content: flex-start;margin-right: 0;}
+.nav-top-menu .el-icon {font-size: 16px;color: #aaa;display: flex;align-items: center;justify-content: flex-start;margin-right: 0;}
.el-sub-menu.is-active .el-sub-menu__title{color: var(--el-color-primary)}
.el-sub-menu.is-active .el-sub-menu__title .el-icon{color: var(--el-color-primary)}
.el-sub-menu .el-sub-menu__icon-arrow {font-size: 12px;}