Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue

疯狂的狮子li

2021-03-26 06e9feadee4121bd703e041749cc6db17738575d

Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue


 Conflicts:

	ruoyi-ui/src/views/system/user/profile/userAvatar.vue

 ruoyi-ui/src/components/RightToolbar/index.vue

@@ -43,7 +43,14 @@
      type: Array,

    },

  },



  created() {

    // 显隐列初始默认隐藏列

    for (let item in this.columns) {

      if (this.columns[item].visible === false) {

        this.value.push(parseInt(item));

      }

    }

  },

  methods: {

    // 搜索

    toggleSearch() {


 ruoyi-ui/src/views/system/user/profile/userAvatar.vue

@@ -1,7 +1,7 @@
<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
@@ -136,6 +136,11 @@
    // 实时预览
    realTime(data) {
      this.previews = data;
    },
    // 关闭窗口
    closeDialog() {
      this.options.img = store.getters.avatar
      this.visible = false;
    }
  }
};
@@ -164,4 +169,4 @@
  line-height: 110px;
  border-radius: 50%;
}
</style>
</style>