From 534d03d9a68836e613319ab89f5bfcfc677f5806 Mon Sep 17 00:00:00 2001
From: icssoa <615206459@qq.com>
Date: Thu, 15 Jul 2021 18:20:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=A8=A1=E5=9D=97=20?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20dict=20=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/base/components/avatar/index.vue  | 22 +++++++++++--------
 .../excel-export/components/export-btn.vue    | 20 ++++++++++++++++-
 src/core/router/index.ts                      |  9 ++------
 3 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/src/cool/modules/base/components/avatar/index.vue b/src/cool/modules/base/components/avatar/index.vue
index 4978d51..a8022f3 100644
--- a/src/cool/modules/base/components/avatar/index.vue
+++ b/src/cool/modules/base/components/avatar/index.vue
@@ -3,7 +3,7 @@
 		<el-image :src="src" alt="">
 			<template #error>
 				<div class="image-slot">
-					<i class="el-icon-picture-outline"></i>
+					<i class="el-icon-user-solid" :style="{ color }"></i>
 				</div>
 			</template>
 		</el-image>
@@ -20,12 +20,20 @@ export default defineComponent({
 	props: {
 		src: String,
 		size: {
-			type: String,
-			default: "large"
+			type: [String, Number],
+			default: 36
 		},
 		shape: {
 			type: String,
 			default: "circle"
+		},
+		backgroundColor: {
+			type: String,
+			default: "#f7f7f7"
+		},
+		color: {
+			type: String,
+			default: "#ccc"
 		}
 	},
 
@@ -35,7 +43,8 @@ export default defineComponent({
 		const style = computed(() => {
 			return {
 				height: size,
-				width: size
+				width: size,
+				backgroundColor: props.backgroundColor
 			};
 		});
 
@@ -49,7 +58,6 @@ export default defineComponent({
 <style lang="scss" scoped>
 .cl-avatar {
 	overflow: hidden;
-	background-color: #f7f7f7;
 
 	&.large {
 		height: 50px;
@@ -95,9 +103,5 @@ export default defineComponent({
 			}
 		}
 	}
-
-	.el-icon-picture-outline {
-		color: #ccc;
-	}
 }
 </style>
diff --git a/src/cool/modules/excel-export/components/export-btn.vue b/src/cool/modules/excel-export/components/export-btn.vue
index b92680b..4107b34 100644
--- a/src/cool/modules/excel-export/components/export-btn.vue
+++ b/src/cool/modules/excel-export/components/export-btn.vue
@@ -73,7 +73,25 @@ export default defineComponent({
 							maxExportLimit: props.maxExportLimit,
 							isExport: true
 						})
-						.then((res: any) => res.list)
+						.then((res: any) => {
+							return res.list.map((e: any) => {
+								for (const i in e) {
+									const col: any = props.columns.find((c: any) => c.prop == i);
+
+									if (col) {
+										if (col.dict) {
+											const d = col.dict.find((d: any) => d.value == e[i]);
+
+											if (d) {
+												e[i] = d.label;
+											}
+										}
+									}
+								}
+
+								return e;
+							});
+						})
 						.catch((err: string) => {
 							console.error(err);
 							return null;
diff --git a/src/core/router/index.ts b/src/core/router/index.ts
index 45c3de0..bbdd4bd 100644
--- a/src/core/router/index.ts
+++ b/src/core/router/index.ts
@@ -87,13 +87,8 @@ function useRouter() {
 		if (!lock) {
 			lock = true;
 
-			if (err.code == "MODULE_NOT_FOUND") {
-				console.error(err.ElMessage.replace("Cannot find module ", ""), "路由组件不存在");
-
-				ElMessage.error(`路由组件路径错误`);
-			} else {
-				console.error(err);
-			}
+			ElMessage.error(`页面不存在或者未配置`);
+			console.error(err);
 
 			setTimeout(() => {
 				lock = false;