diff --git a/web/src/stores/userInfo.ts b/web/src/stores/userInfo.ts index 04d296aee2f7672c7d4d85b7063ae6700781530a..01aea201a031b3e6a6963045dec922600d3387b7 100644 --- a/web/src/stores/userInfo.ts +++ b/web/src/stores/userInfo.ts @@ -2,6 +2,9 @@ import { defineStore } from 'pinia'; import { UserInfosStates } from './interface'; import { Session } from '/@/utils/storage'; import { request } from '../utils/service'; +import { getBaseURL } from '../utils/baseUrl'; +import headerImage from '/@/assets/img/headerImage.png'; + /** * 用户信息 * @methods setUserInfos 设置用户信息 @@ -72,7 +75,7 @@ export const useUserInfo = defineStore('userInfo', { method: 'get', }).then((res:any)=>{ this.userInfos.username = res.data.name; - this.userInfos.avatar = res.data.avatar; + this.userInfos.avatar = (res.data.avatar && getBaseURL(res.data.avatar)) || headerImage; this.userInfos.name = res.data.name; this.userInfos.email = res.data.email; this.userInfos.mobile = res.data.mobile; diff --git a/web/src/views/system/dept/components/DeptUserCom/crud.tsx b/web/src/views/system/dept/components/DeptUserCom/crud.tsx index bcee5b09a5fad3f46df39fb01929ae106d585dcc..bf2f9d6a10585f77a55a9ca659f738cd97d8bed4 100644 --- a/web/src/views/system/dept/components/DeptUserCom/crud.tsx +++ b/web/src/views/system/dept/components/DeptUserCom/crud.tsx @@ -263,10 +263,10 @@ export const createCrudOptions = function ({ crudExpose, context }: CreateCrudOp }), column: { minWidth: 200, //最小列宽 - formatter({value,row,index}){ - const values = row.role_info.map((item:any) => item.name); - return values.join(',') - } + // formatter({value,row,index}){ + // const values = row.role_info.map((item:any) => item.name); + // return values.join(',') + // } }, form: { rules: [ @@ -385,12 +385,12 @@ export const createCrudOptions = function ({ crudExpose, context }: CreateCrudOp }, avatar: { title: '头像', - type: 'avatar-cropper', + type: 'avatar-uploader', form: { show: false, }, column:{ - width:150, + width:100, showOverflowTooltip: true, } }, diff --git a/web/src/views/system/dept/components/DeptUserCom/index.vue b/web/src/views/system/dept/components/DeptUserCom/index.vue index f52db556bac883188084e8c17a4814c77548046f..689bb1a9dfb5473399f48cdf5439e432fb63f5be 100644 --- a/web/src/views/system/dept/components/DeptUserCom/index.vue +++ b/web/src/views/system/dept/components/DeptUserCom/index.vue @@ -42,6 +42,15 @@ + @@ -69,6 +78,7 @@ import { ECharts, EChartsOption, init } from 'echarts'; import { getDeptInfoById, resetPwd } from './api'; import { warningNotification, successNotification } from '/@/utils/message'; import { HeadDeptInfoType } from '../../types'; +import {getBaseURL} from '/@/utils/baseUrl'; let deptCountChart: ECharts; let deptSexChart: ECharts; diff --git a/web/src/views/system/personal/index.vue b/web/src/views/system/personal/index.vue index 79f29d347ae13140e337ebddd7c1176c6d3f60a5..216ae770624d353662f437cc3ced6e80eaf8bf95 100644 --- a/web/src/views/system/personal/index.vue +++ b/web/src/views/system/personal/index.vue @@ -32,7 +32,7 @@
角色:
- {{ item.name }} + {{ item.name }}
diff --git a/web/src/views/system/user/crud.tsx b/web/src/views/system/user/crud.tsx index dd24c406010a65c5b56702ed869b125739e5ce62..4e8b41c95bc9c2cd0503fec669ef70430f3188db 100644 --- a/web/src/views/system/user/crud.tsx +++ b/web/src/views/system/user/crud.tsx @@ -257,10 +257,10 @@ export const createCrudOptions = function ({crudExpose}: CreateCrudOptionsProps) }), column: { minWidth: 200, //最小列宽 - formatter({value,row,index}){ - const values = row.role_info.map((item:any) => item.name); - return values.join(',') - } + // formatter({value,row,index}){ + // const values = row.role_info.map((item:any) => item.name); + // return values.join(',') + // } }, form: { rules: [ @@ -382,12 +382,13 @@ export const createCrudOptions = function ({crudExpose}: CreateCrudOptionsProps) }, avatar: { title: '头像', - type: 'avatar-cropper', + type: 'avatar-uploader', + align: 'center', form: { show: false, }, column: { - minWidth: 400, //最小列宽 + minWidth: 100, //最小列宽 }, }, ...commonCrudConfig({ diff --git a/web/src/views/system/user/index.vue b/web/src/views/system/user/index.vue index 71085d1ba30005bbe2e108fa4b125bfe1faf2366..117a5597cf66fcf7d8188bc62042ee9128fbc808 100644 --- a/web/src/views/system/user/index.vue +++ b/web/src/views/system/user/index.vue @@ -33,6 +33,15 @@ + @@ -50,6 +59,8 @@ import {ref, onMounted, watch, toRaw, h} from 'vue'; import XEUtils from 'xe-utils'; import {getElementLabelLine} from 'element-tree-line'; import importExcel from '/@/components/importExcel/index.vue' +import {getBaseURL} from '/@/utils/baseUrl'; + const ElementTreeLine = getElementLabelLine(h);