Merge remote-tracking branch 'origin/master'

 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();
        })

 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>


 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 => {