Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-ui/src/views/system/user/profile/userAvatar.vue
| | |
|---|
| | | type: Array,
|
|---|
| | | },
|
|---|
| | | },
|
|---|
| | |
|
|---|
| | | created() {
|
|---|
| | | // 显隐列初始默认隐藏列
|
|---|
| | | for (let item in this.columns) {
|
|---|
| | | if (this.columns[item].visible === false) {
|
|---|
| | | this.value.push(parseInt(item));
|
|---|
| | | }
|
|---|
| | | }
|
|---|
| | | },
|
|---|
| | | methods: {
|
|---|
| | | // 搜索
|
|---|
| | | toggleSearch() {
|
|---|
| | |
|---|
| | | <template> |
|---|
| | | <div> |
|---|
| | | <div class="user-info-head" @click="editCropper()"><img v-bind:src="options.img" title="点击上传头像" class="img-circle img-lg" /></div> |
|---|
| | | <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body @opened="modalOpened"> |
|---|
| | | <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body @opened="modalOpened" @close="closeDialog()"> |
|---|
| | | <el-row> |
|---|
| | | <el-col :xs="24" :md="12" :style="{height: '350px'}"> |
|---|
| | | <vue-cropper |
|---|
| | |
|---|
| | | // 实时预览 |
|---|
| | | realTime(data) { |
|---|
| | | this.previews = data; |
|---|
| | | }, |
|---|
| | | // 关闭窗口 |
|---|
| | | closeDialog() { |
|---|
| | | this.options.img = store.getters.avatar |
|---|
| | | this.visible = false; |
|---|
| | | } |
|---|
| | | } |
|---|
| | | }; |
|---|
