diff --git a/web/src/views/system/dept/components/DeptUserCom/crud.tsx b/web/src/views/system/dept/components/DeptUserCom/crud.tsx index bcee5b0..bf2f9d6 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 f52db55..689bb1a 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;