Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
finance-manage
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
finance-oa
finance-manage
Commits
b67f6a0f
Commit
b67f6a0f
authored
Oct 21, 2022
by
若依
Committed by
Gitee
Oct 21, 2022
Browse files
Options
Browse Files
Download
Plain Diff
!604 修复小屏幕上修改头像界面布局错位的问题
Merge pull request !604 from 也曾为你、像超人/master
parents
42d81045
b6153d1a
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
459 additions
and
445 deletions
+459
-445
ruoyi-ui/src/assets/styles/ruoyi.scss
ruoyi-ui/src/assets/styles/ruoyi.scss
+274
-273
ruoyi-ui/src/views/system/user/profile/userAvatar.vue
ruoyi-ui/src/views/system/user/profile/userAvatar.vue
+185
-172
No files found.
ruoyi-ui/src/assets/styles/ruoyi.scss
View file @
b67f6a0f
...
@@ -250,9 +250,10 @@
...
@@ -250,9 +250,10 @@
}
}
.avatar-upload-preview
{
.avatar-upload-preview
{
position
:
absolute
;
position
:
relative
;
top
:
50%
;
top
:
50%
;
transform
:
translate
(
50%
,
-50%
);
left
:
50%
;
transform
:
translate
(
-50%
,
-50%
);
width
:
200px
;
width
:
200px
;
height
:
200px
;
height
:
200px
;
border-radius
:
50%
;
border-radius
:
50%
;
...
...
ruoyi-ui/src/views/system/user/profile/userAvatar.vue
View file @
b67f6a0f
...
@@ -24,7 +24,7 @@
...
@@ -24,7 +24,7 @@
</el-row>
</el-row>
<br
/>
<br
/>
<el-row>
<el-row>
<el-col
:lg=
"2"
:
md=
"2"
>
<el-col
:lg=
"2"
:
sm=
"3"
:xs=
"3"
>
<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
size=
"small"
>
<el-button
size=
"small"
>
选择
选择
...
@@ -32,19 +32,19 @@
...
@@ -32,19 +32,19 @@
</el-button>
</el-button>
</el-upload>
</el-upload>
</el-col>
</el-col>
<el-col
:lg=
"
{span: 1, offset: 2}" :
md="2">
<el-col
:lg=
"
{span: 1, offset: 2}" :
sm="2" :xs="2">
<el-button
icon=
"el-icon-plus"
size=
"small"
@
click=
"changeScale(1)"
></el-button>
<el-button
icon=
"el-icon-plus"
size=
"small"
@
click=
"changeScale(1)"
></el-button>
</el-col>
</el-col>
<el-col
:lg=
"
{span: 1, offset: 1}" :
md="2">
<el-col
:lg=
"
{span: 1, offset: 1}" :
sm="2" :xs="2">
<el-button
icon=
"el-icon-minus"
size=
"small"
@
click=
"changeScale(-1)"
></el-button>
<el-button
icon=
"el-icon-minus"
size=
"small"
@
click=
"changeScale(-1)"
></el-button>
</el-col>
</el-col>
<el-col
:lg=
"
{span: 1, offset: 1}" :
md="2">
<el-col
:lg=
"
{span: 1, offset: 1}" :
sm="2" :xs="2">
<el-button
icon=
"el-icon-refresh-left"
size=
"small"
@
click=
"rotateLeft()"
></el-button>
<el-button
icon=
"el-icon-refresh-left"
size=
"small"
@
click=
"rotateLeft()"
></el-button>
</el-col>
</el-col>
<el-col
:lg=
"
{span: 1, offset: 1}" :
md="2">
<el-col
:lg=
"
{span: 1, offset: 1}" :
sm="2" :xs="2">
<el-button
icon=
"el-icon-refresh-right"
size=
"small"
@
click=
"rotateRight()"
></el-button>
<el-button
icon=
"el-icon-refresh-right"
size=
"small"
@
click=
"rotateRight()"
></el-button>
</el-col>
</el-col>
<el-col
:lg=
"
{span: 2, offset: 6}" :
md="2">
<el-col
:lg=
"
{span: 2, offset: 6}" :
sm="2" :xs="2">
<el-button
type=
"primary"
size=
"small"
@
click=
"uploadImg()"
>
提 交
</el-button>
<el-button
type=
"primary"
size=
"small"
@
click=
"uploadImg()"
>
提 交
</el-button>
</el-col>
</el-col>
</el-row>
</el-row>
...
@@ -56,6 +56,7 @@
...
@@ -56,6 +56,7 @@
import
store
from
"
@/store
"
;
import
store
from
"
@/store
"
;
import
{
VueCropper
}
from
"
vue-cropper
"
;
import
{
VueCropper
}
from
"
vue-cropper
"
;
import
{
uploadAvatar
}
from
"
@/api/system/user
"
;
import
{
uploadAvatar
}
from
"
@/api/system/user
"
;
import
{
debounce
}
from
'
@/utils
'
export
default
{
export
default
{
components
:
{
VueCropper
},
components
:
{
VueCropper
},
...
@@ -79,7 +80,8 @@ export default {
...
@@ -79,7 +80,8 @@ export default {
autoCropHeight
:
200
,
// 默认生成截图框高度
autoCropHeight
:
200
,
// 默认生成截图框高度
fixedBox
:
true
// 固定截图框大小 不允许改变
fixedBox
:
true
// 固定截图框大小 不允许改变
},
},
previews
:
{}
previews
:
{},
resizeHandler
:
null
};
};
},
},
methods
:
{
methods
:
{
...
@@ -90,6 +92,16 @@ export default {
...
@@ -90,6 +92,16 @@ export default {
// 打开弹出层结束时的回调
// 打开弹出层结束时的回调
modalOpened
()
{
modalOpened
()
{
this
.
visible
=
true
;
this
.
visible
=
true
;
if
(
!
this
.
resizeHandler
)
{
this
.
resizeHandler
=
debounce
(()
=>
{
this
.
refresh
()
},
100
)
}
window
.
addEventListener
(
"
resize
"
,
this
.
resizeHandler
)
},
// 刷新组件
refresh
()
{
this
.
$refs
.
cropper
.
refresh
();
},
},
// 覆盖默认的上传行为
// 覆盖默认的上传行为
requestUpload
()
{
requestUpload
()
{
...
@@ -141,6 +153,7 @@ export default {
...
@@ -141,6 +153,7 @@ export default {
closeDialog
()
{
closeDialog
()
{
this
.
options
.
img
=
store
.
getters
.
avatar
this
.
options
.
img
=
store
.
getters
.
avatar
this
.
visible
=
false
;
this
.
visible
=
false
;
window
.
removeEventListener
(
"
resize
"
,
this
.
resizeHandler
)
}
}
}
}
};
};
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment