From 75f043dfa6660716364e66ee0b3cf99f44255686 Mon Sep 17 00:00:00 2001
From: DYL0109 <dn18191638832@163.com>
Date: 星期三, 16 四月 2025 19:20:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop1.0' into dyl_dev
---
zhitan-vue/src/views/system/user/profile/userAvatar.vue | 101 ++++++++++++++++++++++++--------------------------
1 files changed, 48 insertions(+), 53 deletions(-)
diff --git a/zhitan-vue/src/views/system/user/profile/userAvatar.vue b/zhitan-vue/src/views/system/user/profile/userAvatar.vue
index 3b39636..94b898e 100644
--- a/zhitan-vue/src/views/system/user/profile/userAvatar.vue
+++ b/zhitan-vue/src/views/system/user/profile/userAvatar.vue
@@ -26,12 +26,7 @@
<br />
<el-row>
<el-col :lg="2" :md="2">
- <el-upload
- action="#"
- :http-request="requestUpload"
- :show-file-list="false"
- :before-upload="beforeUpload"
- >
+ <el-upload action="#" :http-request="requestUpload" :show-file-list="false" :before-upload="beforeUpload">
<el-button>
閫夋嫨
<el-icon class="el-icon--right"><Upload /></el-icon>
@@ -51,7 +46,7 @@
<el-button icon="RefreshRight" @click="rotateRight()"></el-button>
</el-col>
<el-col :lg="{ span: 2, offset: 6 }" :md="2">
- <el-button type="primary" @click="uploadImg()">鎻� 浜�</el-button>
+ <!-- <el-button type="primary" @click="uploadImg()">鎻� 浜�</el-button> -->
</el-col>
</el-row>
</el-dialog>
@@ -59,92 +54,92 @@
</template>
<script setup>
-import "vue-cropper/dist/index.css";
-import { VueCropper } from "vue-cropper";
-import { uploadAvatar } from "@/api/system/user";
-import useUserStore from "@/store/modules/user";
+import "vue-cropper/dist/index.css"
+import { VueCropper } from "vue-cropper"
+import { uploadAvatar } from "@/api/system/user"
+import useUserStore from "@/store/modules/user"
-const userStore = useUserStore();
-const { proxy } = getCurrentInstance();
+const userStore = useUserStore()
+const { proxy } = getCurrentInstance()
-const open = ref(false);
-const visible = ref(false);
-const title = ref("淇敼澶村儚");
+const open = ref(false)
+const visible = ref(false)
+const title = ref("淇敼澶村儚")
//鍥剧墖瑁佸壀鏁版嵁
const options = reactive({
- img: userStore.avatar, // 瑁佸壀鍥剧墖鐨勫湴鍧�
- autoCrop: true, // 鏄惁榛樿鐢熸垚鎴浘妗�
- autoCropWidth: 200, // 榛樿鐢熸垚鎴浘妗嗗搴�
- autoCropHeight: 200, // 榛樿鐢熸垚鎴浘妗嗛珮搴�
- fixedBox: true, // 鍥哄畾鎴浘妗嗗ぇ灏� 涓嶅厑璁告敼鍙�
- outputType: "png", // 榛樿鐢熸垚鎴浘涓篜NG鏍煎紡
- filename: 'avatar', // 鏂囦欢鍚嶇О
- previews: {} //棰勮鏁版嵁
-});
+ img: userStore.avatar, // 瑁佸壀鍥剧墖鐨勫湴鍧�
+ autoCrop: true, // 鏄惁榛樿鐢熸垚鎴浘妗�
+ autoCropWidth: 200, // 榛樿鐢熸垚鎴浘妗嗗搴�
+ autoCropHeight: 200, // 榛樿鐢熸垚鎴浘妗嗛珮搴�
+ fixedBox: true, // 鍥哄畾鎴浘妗嗗ぇ灏� 涓嶅厑璁告敼鍙�
+ outputType: "png", // 榛樿鐢熸垚鎴浘涓篜NG鏍煎紡
+ filename: "avatar", // 鏂囦欢鍚嶇О
+ previews: {}, //棰勮鏁版嵁
+})
/** 缂栬緫澶村儚 */
function editCropper() {
- open.value = true;
+ open.value = true
}
/** 鎵撳紑寮瑰嚭灞傜粨鏉熸椂鐨勫洖璋� */
function modalOpened() {
- visible.value = true;
+ visible.value = true
}
/** 瑕嗙洊榛樿涓婁紶琛屼负 */
function requestUpload() {}
/** 鍚戝乏鏃嬭浆 */
function rotateLeft() {
- proxy.$refs.cropper.rotateLeft();
+ proxy.$refs.cropper.rotateLeft()
}
/** 鍚戝彸鏃嬭浆 */
function rotateRight() {
- proxy.$refs.cropper.rotateRight();
+ proxy.$refs.cropper.rotateRight()
}
/** 鍥剧墖缂╂斁 */
function changeScale(num) {
- num = num || 1;
- proxy.$refs.cropper.changeScale(num);
+ num = num || 1
+ proxy.$refs.cropper.changeScale(num)
}
/** 涓婁紶棰勫鐞� */
function beforeUpload(file) {
if (file.type.indexOf("image/") == -1) {
- proxy.$modal.msgError("鏂囦欢鏍煎紡閿欒锛岃涓婁紶鍥剧墖绫诲瀷,濡傦細JPG锛孭NG鍚庣紑鐨勬枃浠躲��");
+ proxy.$modal.msgError("鏂囦欢鏍煎紡閿欒锛岃涓婁紶鍥剧墖绫诲瀷,濡傦細JPG锛孭NG鍚庣紑鐨勬枃浠躲��")
} else {
- const reader = new FileReader();
- reader.readAsDataURL(file);
+ const reader = new FileReader()
+ reader.readAsDataURL(file)
reader.onload = () => {
- options.img = reader.result;
- options.filename = file.name;
- };
+ options.img = reader.result
+ options.filename = file.name
+ }
}
}
/** 涓婁紶鍥剧墖 */
function uploadImg() {
- proxy.$refs.cropper.getCropBlob(data => {
- let formData = new FormData();
- formData.append("avatarfile", data, options.filename);
- uploadAvatar(formData).then(response => {
- open.value = false;
- options.img = import.meta.env.VITE_APP_BASE_API + response.imgUrl;
- userStore.avatar = options.img;
- proxy.$modal.msgSuccess("淇敼鎴愬姛");
- visible.value = false;
- });
- });
+ proxy.$refs.cropper.getCropBlob((data) => {
+ let formData = new FormData()
+ formData.append("avatarfile", data, options.filename)
+ uploadAvatar(formData).then((response) => {
+ open.value = false
+ options.img = import.meta.env.VITE_APP_BASE_API + response.imgUrl
+ userStore.avatar = options.img
+ proxy.$modal.msgSuccess("淇敼鎴愬姛")
+ visible.value = false
+ })
+ })
}
/** 瀹炴椂棰勮 */
function realTime(data) {
- options.previews = data;
+ options.previews = data
}
/** 鍏抽棴绐楀彛 */
function closeDialog() {
- options.img = userStore.avatar;
- options.visible = false;
+ options.img = userStore.avatar
+ options.visible = false
}
</script>
-<style lang='scss' scoped>
+<style lang="scss" scoped>
.user-info-head {
position: relative;
display: inline-block;
@@ -168,4 +163,4 @@
line-height: 110px;
border-radius: 50%;
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.3