diff --git a/base-vue/src/views/main-navbar.vue b/base-vue/src/views/main-navbar.vue index 67113bc..58877ce 100644 --- a/base-vue/src/views/main-navbar.vue +++ b/base-vue/src/views/main-navbar.vue @@ -28,7 +28,7 @@ <el-menu-item class="site-navbar__avatar" index="3"> <el-dropdown :show-timeout="0" placement="bottom"> <span class="el-dropdown-link"> - <img :src="this.$imgPath+''+img" :alt="userName">{{ userName }} + <img v-show="img" :src="this.$imgPath+''+img" :alt="userName">{{ userName }} </span> <el-dropdown-menu slot="dropdown"> <el-dropdown-item @click.native="updatePasswordHandle()">修改密码</el-dropdown-item> diff --git a/base-vue/src/views/modules/contract/temp-add-or-update.vue b/base-vue/src/views/modules/contract/temp-add-or-update.vue index 3dd5802..75c22b8 100644 --- a/base-vue/src/views/modules/contract/temp-add-or-update.vue +++ b/base-vue/src/views/modules/contract/temp-add-or-update.vue @@ -187,7 +187,7 @@ export default { ` // 添加弹窗内容到打印任务 LODOP.ADD_PRINT_HTM(0, '5%', '90%', '90%', printHtml) - LODOP.PREVIEW() + // LODOP.PREVIEW() LODOP.PRINT() }, } diff --git a/base-vue/src/views/modules/sys/user-add-or-update.vue b/base-vue/src/views/modules/sys/user-add-or-update.vue index 70a250b..07710dd 100644 --- a/base-vue/src/views/modules/sys/user-add-or-update.vue +++ b/base-vue/src/views/modules/sys/user-add-or-update.vue @@ -34,7 +34,7 @@ </el-select> </el-form-item> - <el-form-item label="头像"> + <!-- <el-form-item label="头像"> <el-upload class="avatar-uploader" action="http://localhost:8070/base-fast/file/fileController/upload" @@ -44,7 +44,7 @@ <img v-if="imageUrl" :src="imageUrl" class="avatar" style="width: 50px;height: 50px;"> <i v-else class="el-icon-plus avatar-uploader-icon"></i> </el-upload> - </el-form-item> + </el-form-item> --> <el-form-item label="角色" size="mini" prop="roleIdList"> <el-checkbox-group v-model="dataForm.roleIdList"> <el-checkbox v-for="role in roleList" :key="role.roleId" :label="role.roleId">{{ role.roleName }}</el-checkbox> @@ -189,7 +189,17 @@ handleAvatarSuccess(res){ this.dataForm.img = res; this.imageUrl = "http://localhost:8070/base-fast/file/fileController/download?fileName="+res; - },handleDownload(path){ + }, + beforeAvatarUpload(file) { + let isLt2M = true + isLt2M = file.size / 1024 / 1024 < 100 + if (!isLt2M) { + this.$message.error('上传文件大小不能超过 100MB!') + return + } + return isLt2M + }, + handleDownload(path){ // 处理文件的下载操作 window.location.href = "http://localhost:8070/base-fast/file/fileController/downloadFile?fileName="+path; diff --git a/base-vue/src/views/modules/sys/user.vue b/base-vue/src/views/modules/sys/user.vue index 9098744..c0cec61 100644 --- a/base-vue/src/views/modules/sys/user.vue +++ b/base-vue/src/views/modules/sys/user.vue @@ -45,7 +45,7 @@ label="姓名"> </el-table-column> - <el-table-column + <!-- <el-table-column prop="img" header-align="center" align="center" @@ -53,7 +53,7 @@ <template slot-scope="scope"> <img :src="$imgPath+''+scope.row.img" width="50" height="50"> </template> - </el-table-column> + </el-table-column> --> <el-table-column prop="gender" header-align="center"