From 62ad8d166e375cb76f9bebb3f24da2d6585b4863 Mon Sep 17 00:00:00 2001
From: wangting <wangting@vci-tech.com>
Date: 星期一, 13 一月 2025 16:39:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-ui/src/views/system/userInfo/userAvatar.vue | 11 ++++++-----
Source/plt-web/plt-web-ui/src/store/modules/user.js | 1 -
Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/linkType/index.vue | 4 +---
3 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/Source/plt-web/plt-web-ui/src/store/modules/user.js b/Source/plt-web/plt-web-ui/src/store/modules/user.js
index 216bac7..fc95d95 100644
--- a/Source/plt-web/plt-web-ui/src/store/modules/user.js
+++ b/Source/plt-web/plt-web-ui/src/store/modules/user.js
@@ -244,7 +244,6 @@
return new Promise((resolve) => {
getButtons().then(res => {
const data = res.data.data;
- console.log('getButton', data)
commit('SET_PERMISSION', data);
resolve();
})
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/linkType/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/linkType/index.vue
index 4ffacbf..f36555c 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/linkType/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/linkType/index.vue
@@ -210,7 +210,6 @@
prop="name">
</el-table-column>
<el-table-column
- fixed="right"
label="鎿嶄綔"
width="60">
<template slot-scope="scope">
@@ -251,7 +250,6 @@
prop="name">
</el-table-column>
<el-table-column
- fixed="right"
label="鎿嶄綔"
width="60">
<template slot-scope="scope">
@@ -374,8 +372,8 @@
</avue-crud>
<span slot="footer" class="dialog-footer">
- <el-button @click="bizTypeVisible = false">鍙� 娑�</el-button>
<el-button type="primary" @click="bizTypeAddHandler">纭� 瀹�</el-button>
+ <el-button @click="bizTypeVisible = false">鍙� 娑�</el-button>
</span>
</el-dialog>
diff --git a/Source/plt-web/plt-web-ui/src/views/system/userInfo/userAvatar.vue b/Source/plt-web/plt-web-ui/src/views/system/userInfo/userAvatar.vue
index 1ee2aea..37864cc 100644
--- a/Source/plt-web/plt-web-ui/src/views/system/userInfo/userAvatar.vue
+++ b/Source/plt-web/plt-web-ui/src/views/system/userInfo/userAvatar.vue
@@ -95,11 +95,11 @@
// 鎵撳紑寮瑰嚭灞傜粨鏉熸椂鐨勫洖璋�
modalOpened() {
this.visible = true;
- if (!this.resizeHandler) {
- this.resizeHandler = debounce(() => {
- this.refresh()
- }, 100)
- }
+ // if (!this.resizeHandler) {
+ // this.resizeHandler = debounce(() => {
+ // this.refresh()
+ // }, 100)
+ // }
window.addEventListener("resize", this.resizeHandler)
},
// 鍒锋柊缁勪欢
@@ -138,6 +138,7 @@
// 涓婁紶鍥剧墖
uploadImg() {
this.$refs.cropper.getCropBlob(data => {
+ console.log(data);
let formData = new FormData();
formData.append("avatarfile", data, this.options.filename);
uploadAvatar(formData).then(response => {
--
Gitblit v1.9.3