From af63c0fccd0645d9441b833dcf84c5356e2ba476 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BE=99=E8=BF=90=E6=A8=A1?= <1724894114@qq.com>
Date: Thu, 27 Jun 2024 10:10:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=89=8D=E7=AB=AF=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E5=92=8C=E9=A1=B6=E9=83=A8=E5=AF=BC=E8=88=AA=E6=A1=86?=
 =?UTF-8?q?=E6=9E=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/icons/Bell.vue         | 13 +++++++++++++
 src/assets/icons/index.js         |  2 ++
 src/config/route.js               |  6 +++---
 src/layout/components/userbar.vue | 11 +++++++++--
 src/layout/index.vue              |  4 ++--
 src/style/fix.scss                |  2 ++
 src/views/home/console/index.vue  | 29 +++++++++++++++++++++++++++++
 src/views/home/index.vue          |  8 +++++---
 8 files changed, 65 insertions(+), 10 deletions(-)
 create mode 100644 src/assets/icons/Bell.vue
 create mode 100644 src/views/home/console/index.vue

diff --git a/src/assets/icons/Bell.vue b/src/assets/icons/Bell.vue
new file mode 100644
index 0000000..d8c21fe
--- /dev/null
+++ b/src/assets/icons/Bell.vue
@@ -0,0 +1,13 @@
+<template>
+	<svg t="1719402671307" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2155" width="200" height="200"><path d="M512 170.66666667l55.52355555 13.65333333c115.59822222 28.21688889 200.24888889 133.80266667 200.2488889 251.22133333v289.45066667l20.9351111 20.93511111 28.2168889 29.12711111h-609.8488889l28.2168889-29.12711111 20.9351111-20.93511111V435.54133333c0-117.41866667 83.74044445-223.91466667 200.2488889-251.22133333l55.52355555-13.65333333M512 2.27555555c-41.87022222 0-72.81777778 34.58844445-72.81777778 77.3688889v34.58844444C294.45688889 147.91111111 183.40977778 278.98311111 183.40977778 435.54133333v260.32355556L84.19555555 797.80977778v50.97244444h855.6088889v-50.97244444l-99.21422223-101.94488889V435.54133333c0-156.55822222-111.04711111-287.63022222-255.77244444-322.21866666v-32.768c0-36.40888889-20.02488889-69.17688889-54.61333333-76.45866667-6.37155555-1.82044445-12.74311111-1.82044445-18.20444445-1.82044445z m100.12444445 919.32444445H411.87555555c0 56.43377778 43.69066667 100.12444445 100.12444445 100.12444445s100.12444445-43.69066667 100.12444445-100.12444445z" p-id="2156"></path></svg>
+</template>
+
+<script>
+export default {
+	name: "Bell"
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/assets/icons/index.js b/src/assets/icons/index.js
index 69ba889..c7ac7d2 100644
--- a/src/assets/icons/index.js
+++ b/src/assets/icons/index.js
@@ -40,3 +40,5 @@ export { default as ReportForms } from './menu/ReportForms.vue'
 export { default as Shipment } from './menu/Shipment.vue'
 export { default as Stock } from './menu/Stock.vue'
 
+export { default as Bell } from './Bell.vue'
+
diff --git a/src/config/route.js b/src/config/route.js
index 52196de..1fa2ef2 100644
--- a/src/config/route.js
+++ b/src/config/route.js
@@ -15,14 +15,14 @@ const routes = [
 		children: [{
 			name: "dashboard",
 			path: "/dashboard",
-			component: "home",
+			component: "home/console",
 			meta: {
 				icon: "sc-icon-Console",
 				title: "控制台",
 			}
 		},{
-			name: "usercenter",
-			path: "/usercenter",
+			name: "userCenter",
+			path: "/user-center",
 			component: "userCenter",
 			meta: {
 				icon: "sc-icon-UserInfo",
diff --git a/src/layout/components/userbar.vue b/src/layout/components/userbar.vue
index 9d85e74..df1f347 100644
--- a/src/layout/components/userbar.vue
+++ b/src/layout/components/userbar.vue
@@ -11,7 +11,10 @@
 		</div>
 		<div class="msg panel-item" @click="showMsg">
 			<el-badge :hidden="msgList.length==0" :value="msgList.length" class="badge" type="danger">
-				<el-icon><el-icon-chat-dot-round /></el-icon>
+				<el-icon>
+<!--					<el-icon-chat-dot-round />-->
+					<sc-icon-Bell />
+				</el-icon>
 			</el-badge>
 			<el-drawer title="新消息" v-model="msg" :size="400" append-to-body destroy-on-close>
 				<el-container>
@@ -184,7 +187,11 @@
 	}
 </script>
 
-<style scoped>
+<style scoped lang="scss">
+	.badge{
+		display: flex;
+		align-items: center;
+	}
 	.user-bar {
 		display: flex;
 		align-items: center;
diff --git a/src/layout/index.vue b/src/layout/index.vue
index 0a15d14..ee426f9 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -55,8 +55,8 @@
 		<header class="adminui-header">
 			<div class="adminui-header-left">
 				<div class="logo-bar">
-<!--					<img class="logo" src="https://dm-auto.oss-cn-shanghai.aliyuncs.com/xw_cloud/image/login_logo.png">-->
-					<span>{{ $CONFIG.APP_NAME }}</span>
+					<img class="logo" src="https://dm-auto.oss-cn-shanghai.aliyuncs.com/xw_cloud/image/login_logo.png">
+<!--					<span>{{ $CONFIG.APP_NAME }}</span>-->
 				</div>
 				<Topbar v-if="!ismobile"></Topbar>
 			</div>
diff --git a/src/style/fix.scss b/src/style/fix.scss
index 09c6720..05ff168 100644
--- a/src/style/fix.scss
+++ b/src/style/fix.scss
@@ -70,6 +70,8 @@
 .el-radio-button__inner {font-size: 12px;}
 .el-checkbox-button__inner {font-size: 12px;}
 .el-sub-menu .el-icon {font-size: 15px;color: #aaa;}
+.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;}
 
 .aminui-side-split li.active {background-color: var(--el-color-primary);}
diff --git a/src/views/home/console/index.vue b/src/views/home/console/index.vue
new file mode 100644
index 0000000..18abb00
--- /dev/null
+++ b/src/views/home/console/index.vue
@@ -0,0 +1,29 @@
+<template>
+	<div class="consoleView">
+		<el-row :gutter="20">
+			<el-col :span="10" :md="10" :sm="10" :xs="24">8990</el-col>
+			<el-col :span="10">8990</el-col>
+			<el-col :span="4">8990</el-col>
+		</el-row>
+		<el-row :gutter="20">
+			<el-col :span="9">8990</el-col>
+			<el-col :span="9">8990</el-col>
+			<el-col :span="6">8990</el-col>
+		</el-row>
+		<el-row :gutter="20">
+			<el-col :span="9">8990</el-col>
+			<el-col :span="9">8990</el-col>
+			<el-col :span="6">8990</el-col>
+		</el-row>
+	</div>
+</template>
+
+<script>
+export default {
+	name: "index"
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index dae58c7..e31a792 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -11,6 +11,7 @@
 	</div>
 	<work v-if="dashboard=='1'" @on-mounted="onMounted"></work>
 	<widgets v-else @on-mounted="onMounted"></widgets>
+
 </template>
 
 <script>
@@ -27,11 +28,11 @@
 		data(){
 			return {
 				pageLoading: true,
-				dashboard: '0'
+				dashboard: '1'
 			}
 		},
 		created(){
-			this.dashboard = this.$TOOL.data.get("USER_INFO").dashboard || '0';
+			// this.dashboard = this.$TOOL.data.get("USER_INFO").dashboard || '0';
 		},
 		mounted(){
 
@@ -44,5 +45,6 @@
 	}
 </script>
 
-<style>
+<style scoped lang="scss">
+
 </style>