From 13aa6dbb992917a477903d167b034391cfb4e32a Mon Sep 17 00:00:00 2001
From: H0nGzA1 <2505811377@qq.com>
Date: Tue, 11 Apr 2023 22:43:33 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=F0=9F=90=9B=20=E5=A4=B4=E5=83=8F?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/dvadmin/system/views/file_list.py   |  4 ---
 web/src/components/avatarSelector/index.vue | 35 ++++++++++++++++++---
 web/src/layout/navBars/breadcrumb/user.vue  | 10 +++---
 web/src/stores/userInfo.ts                  | 17 +++++++---
 web/src/utils/tools.ts                      |  5 +++
 web/src/views/system/personal/index.vue     | 33 +++++++++----------
 6 files changed, 70 insertions(+), 34 deletions(-)

diff --git a/backend/dvadmin/system/views/file_list.py b/backend/dvadmin/system/views/file_list.py
index 1da0c5f..e079884 100644
--- a/backend/dvadmin/system/views/file_list.py
+++ b/backend/dvadmin/system/views/file_list.py
@@ -1,9 +1,5 @@
 from rest_framework import serializers
-from rest_framework.decorators import action
-from rest_framework.parsers import FileUploadParser, FormParser, MultiPartParser
-
 from dvadmin.system.models import FileList
-from dvadmin.utils.json_response import SuccessResponse
 from dvadmin.utils.serializers import CustomModelSerializer
 from dvadmin.utils.viewset import CustomModelViewSet
 
diff --git a/web/src/components/avatarSelector/index.vue b/web/src/components/avatarSelector/index.vue
index cafd4d9..f979cb0 100644
--- a/web/src/components/avatarSelector/index.vue
+++ b/web/src/components/avatarSelector/index.vue
@@ -1,7 +1,7 @@
 <template>
 	<div class="user-info-head" @click="editCropper()">
 		<el-avatar :size="100" :src="options.img" />
-		<el-dialog :title="title" v-model="open" width="600px" append-to-body @opened="modalOpened" @close="closeDialog">
+		<el-dialog :title="title" v-model="dialogVisiable" width="600px" append-to-body @opened="modalOpened" @close="closeDialog">
 			<el-row>
 				<el-col class="flex justify-center">
 					<vue-cropper
@@ -48,7 +48,7 @@
 import 'vue-cropper/dist/index.css';
 import { VueCropper } from 'vue-cropper';
 import { useUserInfo } from '/@/stores/userInfo';
-import { getCurrentInstance, nextTick, reactive, ref } from 'vue';
+import { getCurrentInstance, nextTick, reactive, ref, computed, onMounted, defineExpose } from 'vue';
 import { base64ToFile } from '/@/utils/tools';
 const userStore = useUserInfo();
 const { proxy } = getCurrentInstance();
@@ -57,10 +57,26 @@ const open = ref(false);
 const visible = ref(false);
 const title = ref('修改头像');
 const emit = defineEmits(['uploadImg']);
+const props = defineProps({
+	modelValue: {
+		type: Boolean,
+		default: false,
+		required: true,
+	},
+});
+const dialogVisiable = computed({
+	get() {
+		return props.modelValue;
+	},
+	set(newVal) {
+		emit('update:modelValue', newVal);
+	},
+});
 
 //图片裁剪数据
 const options = reactive({
 	img: userStore.userInfos.avatar, // 裁剪图片的地址
+	fileName: '',
 	autoCrop: true, // 是否默认生成截图框
 	autoCropWidth: 200, // 默认生成截图框宽度
 	autoCropHeight: 200, // 默认生成截图框高度
@@ -70,7 +86,7 @@ const options = reactive({
 
 /** 编辑头像 */
 function editCropper() {
-	open.value = true;
+	dialogVisiable.value = true;
 }
 /** 打开弹出层结束时的回调 */
 function modalOpened() {
@@ -102,6 +118,7 @@ function beforeUpload(file) {
 		reader.readAsDataURL(file);
 		reader.onload = () => {
 			options.img = reader.result;
+			options.fileName = file.name;
 		};
 	}
 }
@@ -113,7 +130,7 @@ function uploadImg() {
 		img.src = data;
 		img.onload = async () => {
 			let _data = compress(img);
-			const imgFile = base64ToFile(_data, 'testname');
+			const imgFile = base64ToFile(_data, options.fileName);
 			emit('uploadImg', imgFile);
 		};
 	});
@@ -138,9 +155,17 @@ function compress(img) {
 
 /** 关闭窗口 */
 function closeDialog() {
-	options.img = userStore.userInfos.avatar;
 	options.visible = false;
+	options.img = userStore.userInfos.avatar;
 }
+
+const updateAvatar = (img) => {
+	options.img = img;
+};
+
+defineExpose({
+	updateAvatar,
+});
 </script>
 
 <style lang="scss" scoped>
diff --git a/web/src/layout/navBars/breadcrumb/user.vue b/web/src/layout/navBars/breadcrumb/user.vue
index eb7bceb..91be209 100644
--- a/web/src/layout/navBars/breadcrumb/user.vue
+++ b/web/src/layout/navBars/breadcrumb/user.vue
@@ -39,7 +39,7 @@
 		<div class="layout-navbars-breadcrumb-user-icon">
 			<el-popover placement="bottom" trigger="click" transition="el-zoom-in-top" :width="300" :persistent="false">
 				<template #reference>
-					<el-badge :value="messageCenter.unread" :hidden="messageCenter.unread===0">
+					<el-badge :value="messageCenter.unread" :hidden="messageCenter.unread === 0">
 						<el-icon :title="$t('message.user.title4')">
 							<ele-Bell />
 						</el-icon>
@@ -59,7 +59,7 @@
 		</div>
 		<el-dropdown :show-timeout="70" :hide-timeout="50" @command="onHandleCommandClick">
 			<span class="layout-navbars-breadcrumb-user-link">
-				<img :src="userInfos.photo" class="layout-navbars-breadcrumb-user-link-photo mr5" />
+				<img :src="userInfos.avatar" class="layout-navbars-breadcrumb-user-link-photo mr5" />
 				{{ userInfos.userName === '' ? 'common' : userInfos.userName }}
 				<el-icon class="el-icon--right">
 					<ele-ArrowDown />
@@ -68,7 +68,7 @@
 			<template #dropdown>
 				<el-dropdown-menu>
 					<el-dropdown-item command="/home">{{ $t('message.user.dropdown1') }}</el-dropdown-item>
-          <el-dropdown-item command="/personal">{{ $t('message.user.dropdown2') }}</el-dropdown-item>
+					<el-dropdown-item command="/personal">{{ $t('message.user.dropdown2') }}</el-dropdown-item>
 					<el-dropdown-item command="wareHouse">{{ $t('message.user.dropdown6') }}</el-dropdown-item>
 					<el-dropdown-item divided command="logOut">{{ $t('message.user.dropdown5') }}</el-dropdown-item>
 				</el-dropdown-menu>
@@ -208,8 +208,8 @@ onMounted(() => {
 });
 
 //消息中心的未读数量
-import {messageCenterStore} from "/@/stores/messageCenter";
-const messageCenter = messageCenterStore()
+import { messageCenterStore } from '/@/stores/messageCenter';
+const messageCenter = messageCenterStore();
 </script>
 
 <style scoped lang="scss">
diff --git a/web/src/stores/userInfo.ts b/web/src/stores/userInfo.ts
index 1bfd307..21342ad 100644
--- a/web/src/stores/userInfo.ts
+++ b/web/src/stores/userInfo.ts
@@ -1,9 +1,7 @@
 import { defineStore } from 'pinia';
-import Cookies from 'js-cookie';
 import { UserInfosStates } from './interface';
 import { Session } from '/@/utils/storage';
 import { request } from '../utils/service';
-
 /**
  * 用户信息
  * @methods setUserInfos 设置用户信息
@@ -30,6 +28,18 @@ export const useUserInfo = defineStore('userInfo', {
 		},
 	}),
 	actions: {
+		async updateUserInfos() {
+			let userInfos: any = await this.getApiUserInfo();
+			this.userInfos.userName = userInfos.data.name;
+			this.userInfos.avatar = userInfos.data.avatar;
+			this.userInfos.name = userInfos.data.name;
+			this.userInfos.email = userInfos.data.email;
+			this.userInfos.mobile = userInfos.data.mobile;
+			this.userInfos.gender = userInfos.data.gender;
+			this.userInfos.dept_info = userInfos.data.dept_info;
+			this.userInfos.role_info = userInfos.data.role_info;
+			Session.set('userInfo', this.userInfos);
+		},
 		async setUserInfos() {
 			// 存储用户信息到浏览器缓存
 			if (Session.get('userInfo')) {
@@ -37,8 +47,7 @@ export const useUserInfo = defineStore('userInfo', {
 			} else {
 				let userInfos: any = await this.getApiUserInfo();
 				this.userInfos.userName = userInfos.data.name;
-				this.userInfos.avatar =
-					userInfos.data.avatar || 'https://img2.baidu.com/it/u=1978192862,2048448374&fm=253&fmt=auto&app=138&f=JPEG?w=504&h=500';
+				this.userInfos.avatar = userInfos.data.avatar;
 				this.userInfos.name = userInfos.data.name;
 				this.userInfos.email = userInfos.data.email;
 				this.userInfos.mobile = userInfos.data.mobile;
diff --git a/web/src/utils/tools.ts b/web/src/utils/tools.ts
index 15645ae..a31df5b 100644
--- a/web/src/utils/tools.ts
+++ b/web/src/utils/tools.ts
@@ -67,6 +67,11 @@ export function errorCreate(msg: any, notification = true) {
 	// throw error;
 }
 
+/**
+ * @description base64转file
+ * @param {String} base64 base64字符串
+ * @param {String} fileName 文件名
+ */
 export function base64ToFile(base64: any, fileName: string) {
 	// 将base64按照 , 进行分割 将前缀  与后续内容分隔开
 	let data = base64.split(',');
diff --git a/web/src/views/system/personal/index.vue b/web/src/views/system/personal/index.vue
index d6d295e..a84fddf 100644
--- a/web/src/views/system/personal/index.vue
+++ b/web/src/views/system/personal/index.vue
@@ -6,9 +6,7 @@
 				<el-card shadow="hover" header="个人信息">
 					<div class="personal-user">
 						<div class="personal-user-left">
-							<!-- <el-avatar :size="100" v-if="state.personalForm.avatar" :src="state.personalForm.avatar" /> -->
-							<!-- <el-avatar :size="100" v-else src="https://cube.elemecdn.com/0/88/03b0d39583f48206768a7534e55bcpng.png" /> -->
-							<avatarSelector @uploadImg="uploadImg"></avatarSelector>
+							<avatarSelector v-model="selectImgVisible" @uploadImg="uploadImg" ref="avatarSelectorRef"></avatarSelector>
 						</div>
 						<div class="personal-user-right">
 							<el-row>
@@ -181,11 +179,11 @@ import { getBaseURL } from '/@/utils/baseUrl';
 import { Session } from '/@/utils/storage';
 import { useRouter } from 'vue-router';
 import { useUserInfo } from '/@/stores/userInfo';
-const userStore = useUserInfo();
+import { successMessage } from '/@/utils/message';
 
 // 头像裁剪组件
 const avatarSelector = defineAsyncComponent(() => import('/@/components/avatarSelector/index.vue'));
-
+const avatarSelectorRef = ref(null);
 // 当前时间提示语
 const currentTime = computed(() => {
 	return formatAxis(new Date());
@@ -195,13 +193,9 @@ const rules = reactive({
 	name: [{ required: true, message: '请输入昵称', trigger: 'blur' }],
 	mobile: [{ pattern: /^1[3-9]\d{9}$/, message: '请输入正确手机号' }],
 });
-// 定义变量内容
-const uploadAvatar = reactive({
-	action: getBaseURL() + 'api/system/file/',
-	headers: {
-		Authorization: 'JWT ' + Session.get('token'),
-	},
-});
+
+let selectImgVisible = ref(false);
+
 const state = reactive<PersonalState>({
 	newsInfoList: [],
 	personalForm: {
@@ -345,13 +339,20 @@ const settingPassword = () => {
 };
 
 const uploadImg = (data: any) => {
-	console.log(data);
 	let formdata = new FormData();
-	formdata.append('key', 'test_file');
 	formdata.append('file', data);
 	api.uploadAvatar(formdata).then((res: any) => {
-		// userStore.setUserInfos()
-		console.log(res);
+		if (res.code === 2000) {
+			selectImgVisible.value = false;
+			state.personalForm.avatar = getBaseURL() + res.data.url;
+			api.updateUserInfo(state.personalForm).then((res: any) => {
+				successMessage('更新成功');
+				getUserInfo();
+				useUserInfo().updateUserInfos();
+				// @ts-ignore
+				avatarSelectorRef.value.updateAvatar(state.personalForm.avatar);
+			});
+		}
 	});
 };
 </script>