From d8aa3268259cd68175933f7e12c017797c329356 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BE=99=E8=BF=90=E6=A8=A1?= <1724894114@qq.com>
Date: Wed, 10 Jul 2024 10:47:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8F=9C=E5=8D=95=E6=A0=8F?=
 =?UTF-8?q?=20=E5=A2=9E=E5=8A=A0=E5=A4=9A=E7=AA=97=E5=8F=A3=E5=AF=BC?=
 =?UTF-8?q?=E8=88=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/icons/index.js        |   6 +-
 src/config/route.js              | 122 +++++++++++++------------------
 src/layout/components/topbar.vue |   1 -
 src/layout/index.vue             |   2 +-
 src/style/app.scss               |   8 +-
 src/style/fix.scss               |   3 +-
 src/style/media.scss             |   3 +-
 src/views/home/console/index.vue |   2 +-
 8 files changed, 63 insertions(+), 84 deletions(-)

diff --git a/src/assets/icons/index.js b/src/assets/icons/index.js
index 8e6505d..05beda9 100644
--- a/src/assets/icons/index.js
+++ b/src/assets/icons/index.js
@@ -56,10 +56,10 @@ export { default as Loading } from './menu/Loading.vue'
 export { default as Authentication } from './menu/Authenticat.vue'
 export { default as Tags } from './menu/Tags.vue'
 export { default as Order } from './menu/WorkOrder.vue'
-export { default as Finance } from './menu/Finance.vue'
+export { default as FinanceMag } from './menu/Finance.vue'
 export { default as Reports } from './menu/ReportForms.vue'
-export { default as Shipment } from './menu/Shipment.vue'
-export { default as Stock } from './menu/Stock.vue'
+export { default as ShipmentMag } from './menu/Shipment.vue'
+export { default as Inventory } from './menu/Stock.vue'
 
 export { default as Gather } from './home/gather.vue'
 export { default as HomeChart } from './home/chart.vue'
diff --git a/src/config/route.js b/src/config/route.js
index f114c4a..d64bc85 100644
--- a/src/config/route.js
+++ b/src/config/route.js
@@ -5,28 +5,6 @@
 // 示例如下
 
 const routes = [
-	{
-		name: "add-permission",
-		path:"/setting/company/add-permission",
-		component:"setting/company/add-permission",
-		meta: {
-			code:"permission_system_company_permission",
-			icon: "sc-icon-Home",
-			title: "功能授权",
-			hidden: true
-		},
-	},
-	{
-		name: "company-user-permission",
-		path:"/setting/user/company-user-list",
-		component:"setting/user/company-user-list",
-		meta: {
-			code:"permission_system_user_list",
-			icon: "sc-icon-Home",
-			title: "用户列表",
-			hidden: true
-		},
-	},
 	{
 		name: "view-permission",
 		path:"/setting/user/view-permission",
@@ -40,56 +18,56 @@ const routes = [
 	},
 
 
-	{
-		name: "home",
-		path: "/home",
-		meta: {
-			icon: "sc-icon-Home",
-			title: "首页",
-			hidden: true
-		},
-		children: [{
-			name: "dashboard",
-			path: "/dashboard",
-			component: "home/console",
-			meta: {
-				icon: "sc-icon-Console",
-				title: "控制台",
-			}
-		},{
-			name: "userCenter",
-			path: "/user-center",
-			component: "userCenter",
-			meta: {
-				icon: "sc-icon-UserInfo",
-				title: "个人信息",
-			}
-		},{
-			name: "document",
-			path: "/document",
-			component: "docsManager/index",
-			meta: {
-				icon: "sc-icon-UserInfo",
-				title: "文档管理",
-			}
-		},{
-			name: "earlyWarning",
-			path: "/early-warning",
-			component: "earlyManager/index",
-			meta: {
-				icon: "sc-icon-UserInfo",
-				title: "预警管理",
-			}
-		},{
-			name: "mail",
-			path: "/mail",
-			component: "userCenter",
-			meta: {
-				icon: "sc-icon-UserInfo",
-				title: "我的邮件",
-			}
-		}]
-	},
+	// {
+	// 	name: "home",
+	// 	path: "/home",
+	// 	meta: {
+	// 		icon: "sc-icon-Home",
+	// 		title: "首页",
+	// 		hidden: true
+	// 	},
+	// 	children: [{
+	// 		name: "dashboard",
+	// 		path: "/dashboard",
+	// 		component: "home/console",
+	// 		meta: {
+	// 			icon: "sc-icon-Console",
+	// 			title: "控制台",
+	// 		}
+	// 	},{
+	// 		name: "userCenter",
+	// 		path: "/user-center",
+	// 		component: "userCenter",
+	// 		meta: {
+	// 			icon: "sc-icon-UserInfo",
+	// 			title: "个人信息",
+	// 		}
+	// 	},{
+	// 		name: "document",
+	// 		path: "/document",
+	// 		component: "docsManager/index",
+	// 		meta: {
+	// 			icon: "sc-icon-UserInfo",
+	// 			title: "文档管理",
+	// 		}
+	// 	},{
+	// 		name: "earlyWarning",
+	// 		path: "/early-warning",
+	// 		component: "earlyManager/index",
+	// 		meta: {
+	// 			icon: "sc-icon-UserInfo",
+	// 			title: "预警管理",
+	// 		}
+	// 	},{
+	// 		name: "mail",
+	// 		path: "/mail",
+	// 		component: "userCenter",
+	// 		meta: {
+	// 			icon: "sc-icon-UserInfo",
+	// 			title: "我的邮件",
+	// 		}
+	// 	}]
+	// },
 	{
 		name: "order",
 		path: "/order",
diff --git a/src/layout/components/topbar.vue b/src/layout/components/topbar.vue
index b0f559f..16549e1 100644
--- a/src/layout/components/topbar.vue
+++ b/src/layout/components/topbar.vue
@@ -44,7 +44,6 @@
 </script>
 
 <style scoped>
-	.el-breadcrumb {margin-left: 15px;}
 	.el-breadcrumb .el-breadcrumb__inner .icon {font-size: 14px;margin-right: 5px;float: left;}
 	.breadcrumb-enter-active,.breadcrumb-leave-active {transition: all 0.3s;}
 	.breadcrumb-enter-from,.breadcrumb-leave-active {opacity: 0;transform: translateX(20px);}
diff --git a/src/layout/index.vue b/src/layout/index.vue
index 57f4fb5..66a1734 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -79,7 +79,7 @@
 			</div>
 			<Side-m v-if="ismobile"></Side-m>
 			<div class="aminui-body el-container">
-<!--				<Tags v-if="!ismobile && layoutTags"></Tags>-->
+				<Tags v-if="!ismobile && layoutTags"></Tags>
 				<div class="adminui-main" id="adminui-main">
 					<router-view v-slot="{ Component }">
 						<keep-alive :include="this.$store.state.keepAlive.keepLiveRoute">
diff --git a/src/style/app.scss b/src/style/app.scss
index 06c802c..4ac5b0f 100644
--- a/src/style/app.scss
+++ b/src/style/app.scss
@@ -27,7 +27,7 @@ a,button,input,textarea{-webkit-tap-highlight-color:rgba(0,0,0,0);box-sizing: bo
 .adminui-header {height: 50px;background: #fff;color: #222;display: flex;justify-content:space-between;}
 .adminui-header-left {display: flex;align-items: center;padding-left:20px;}
 .adminui-header-right {display: flex;align-items: center;}
-.adminui-header .logo-bar {font-size: 18px;font-weight: bold;display: flex;align-items: center;width: 170px;}
+.adminui-header .logo-bar {font-size: 18px;font-weight: bold;display: flex;align-items: center;width: 160px;height: 100%;border-right: 1px solid #f2f2f2;}
 .adminui-header .logo-bar .logo {height: 42px;}
 .adminui-header .nav {display: flex;height: 100%;margin-left: 40px;}
 .adminui-header .nav li {padding:0 10px;margin: 0 10px 0 0;font-size: 14px;color: rgba(255, 255, 255, 0.6);list-style: none;height: 100%;display: flex;align-items: center;cursor: pointer;}
@@ -54,7 +54,7 @@ a,button,input,textarea{-webkit-tap-highlight-color:rgba(0,0,0,0);box-sizing: bo
 .adminui-side-split-scroll::-webkit-scrollbar-track {background-color: rgba(255, 255, 255, 0);}
 .adminui-side-split-scroll::-webkit-scrollbar-track:hover {background-color: rgba(255, 255, 255, 0);}
 
-.aminui-side {display: flex;flex-flow: column;flex-shrink:0;width:180px;background: #fff;box-shadow: 2px 0 8px 0 rgba(29,35,41,.05);border-right: none;transition:width 0.3s;}
+.aminui-side {display: flex;flex-flow: column;flex-shrink:0;width:180px;background: #fff;box-shadow: 2px 0 8px 0 rgba(29,35,41,.05);border-right: 1px solid #f2f2f2;transition:width 0.3s;}
 .adminui-side-top {border-bottom: none;height:50px;line-height: 50px;display: flex;justify-content: space-between;}
 .adminui-side-top p {padding:0 0 0 20px;font-size: 14px;font-weight: 500;color: #38373F;}
 .adminui-side-top .adminui-side-collapse{width: 64px;display: flex;align-items: center;justify-content: center;cursor: pointer;}
@@ -73,13 +73,13 @@ a,button,input,textarea{-webkit-tap-highlight-color:rgba(0,0,0,0);box-sizing: bo
 
 //border-bottom: 1px solid #ebeef5;background: #fff;box-shadow: 0 1px 4px rgba(0,21,41,.08);
 .adminui-topbar {height: 50px;display: flex;justify-content:space-between;}
-.adminui-topbar .left-panel {display: flex;align-items: center;}
+.adminui-topbar .left-panel {display: flex;align-items: center;margin-left: 10px;}
 .adminui-topbar .right-panel {display: flex;align-items: center;}
 
 .right-panel-search {display: flex;align-items: center;}
 .right-panel-search > * + * {margin-left:10px;}
 
-.adminui-tags {height:35px;background: #fff;border-bottom: 1px solid #e8e8e8;}
+.adminui-tags {height:35px;background: #fff;box-shadow: 0 2px 8px rgba(29, 35, 41, 0.05); border-bottom: 0;border-top: 1px solid #e8e8e8;}
 .adminui-tags ul {display: flex;overflow: hidden;}
 .adminui-tags li {cursor: pointer;display: inline-block;float: left;height:34px;line-height: 34px;position: relative;flex-shrink: 0;}
 .adminui-tags li::after {content: " ";width:1px;height:100%;position: absolute;right:0;background-image: linear-gradient(#fff, #e6e6e6);}
diff --git a/src/style/fix.scss b/src/style/fix.scss
index b12f7d7..e07678b 100644
--- a/src/style/fix.scss
+++ b/src/style/fix.scss
@@ -54,7 +54,8 @@
 }
 
 .el-menu {border: none!important;}
-.el-menu .el-menu-item.is-active{background: var(--el-menu-hover-bg-color)}
+.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;}
 .el-form-item-msg {font-size: 12px;color: #999;clear: both;width: 100%;}
 .el-container {height: 100%;}
diff --git a/src/style/media.scss b/src/style/media.scss
index 01cd3e1..376d1ae 100644
--- a/src/style/media.scss
+++ b/src/style/media.scss
@@ -29,6 +29,7 @@
 		.right-panel .right-panel-search {display: block;}
 		.right-panel .right-panel-search >* {width: 100%;margin: 0;margin-top: 15px;}
 	}
+	.adminui-header .logo-bar{border-right: 0;}
 	.adminui-main > .el-container >*:first-child:not(.el-aside):not(.el-header) {border: 0;margin-top: 0;}
 	.adminui-main > .el-container >*:first-child:not(.el-aside):not(.el-header) + .el-aside {margin-top: 0;}
 	.adminui-main > .el-container > .el-aside {border-bottom: 1px solid var(--el-border-color-light)!important;}
@@ -43,7 +44,7 @@
 	.adminui-main > .el-container > .el-container > .el-header .right-panel {display: block;margin-top: 15px;}
 
 	.sc-page {width: 100%;margin: 0;}
-	
+
 	.common-main .el-form {width: 100% !important;}
 	.common-header-logo label {display: none;}
 	.common-header-title {display: none;}
diff --git a/src/views/home/console/index.vue b/src/views/home/console/index.vue
index f0566b8..33ded0c 100644
--- a/src/views/home/console/index.vue
+++ b/src/views/home/console/index.vue
@@ -171,7 +171,7 @@ export default {
 
 <style scoped lang="scss">
 	.consoleView{
-		height: calc(100vh - 70px);
+		height: calc(100vh - 105px);
 		display: flex;
 		flex-direction: column;
 		.headerBox{