Commit aca11922 by zhangleyuan

feat:处理姓名字端的显示

parent ed7ad85b
...@@ -33,6 +33,7 @@ interface RecordTypes { ...@@ -33,6 +33,7 @@ interface RecordTypes {
phone: string; phone: string;
avatar?: string; avatar?: string;
weChatAccount?: string; weChatAccount?: string;
depNameList:Array<string>
} }
interface RoleItemType { interface RoleItemType {
...@@ -170,6 +171,17 @@ function EmployeeManage() { ...@@ -170,6 +171,17 @@ function EmployeeManage() {
}, },
}, },
{ {
title: "部门",
dataIndex: "depNameList",
key: "depNameList",
render: (val:string,record:RecordTypes) => {
return record.depNameList.map((item,index)=>{
return <span>{item}{index<(record.depNameList.length -1)?'、':''}</span>;
})
},
},
{
title: "身份", title: "身份",
dataIndex: "role", dataIndex: "role",
key: "role", key: "role",
......
...@@ -5,6 +5,7 @@ import BaseService from "@/domains/basic-domain/baseService"; ...@@ -5,6 +5,7 @@ import BaseService from "@/domains/basic-domain/baseService";
import User from "@/common/js/user"; import User from "@/common/js/user";
import { LIVE_SHARE } from "@/domains/course-domain/constants"; import { LIVE_SHARE } from "@/domains/course-domain/constants";
import { Modal, message } from 'antd'; import { Modal, message } from 'antd';
import WWOpenDataCom from '@/components/WWOpenDataCom';
import './CollegeManagePage.less'; import './CollegeManagePage.less';
import storage from '@/common/js/storage'; import storage from '@/common/js/storage';
...@@ -246,7 +247,10 @@ export default class CollegeManagePage extends React.Component { ...@@ -246,7 +247,10 @@ export default class CollegeManagePage extends React.Component {
<img className="box-image" src="https://image.xiaomaiketang.com/xm/fe4NCjr7XF.png" /> <img className="box-image" src="https://image.xiaomaiketang.com/xm/fe4NCjr7XF.png" />
<div className="user"> <div className="user">
<img className="image" src={avatar} /> <img className="image" src={avatar} />
<span className="name">{name}</span> <span className="name">
{/* {name} */}
<WWOpenDataCom type="userName" openid={name}/>
</span>
<span <span
className="logout" className="logout"
onClick={() => { onClick={() => {
...@@ -270,7 +274,9 @@ export default class CollegeManagePage extends React.Component { ...@@ -270,7 +274,9 @@ export default class CollegeManagePage extends React.Component {
<div className="college-box"> <div className="college-box">
<div className="user"> <div className="user">
<img className="image" src={avatar} /> <img className="image" src={avatar} />
<span className="name">{name}</span> <span className="name">
<WWOpenDataCom type="userName" openid={name}/>
</span>
</div> </div>
<div> <div>
<div className="title-box"> <div className="title-box">
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: 吴文洁 * @Author: 吴文洁
* @Date: 2019-09-10 18:26:03 * @Date: 2019-09-10 18:26:03
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @LastEditTime: 2021-08-02 16:40:31 * @LastEditTime: 2021-08-02 17:05:45
* @Description: * @Description:
*/ */
import React, { useRef, useContext, useEffect, useState } from 'react'; import React, { useRef, useContext, useEffect, useState } from 'react';
...@@ -377,7 +377,9 @@ function Header(props) { ...@@ -377,7 +377,9 @@ function Header(props) {
}} }}
src={avatar || baseImg} src={avatar || baseImg}
/> />
<span className='name'>{nickName}</span> <span className='name'>
<WWOpenDataCom type="userName" openid={nickName}/>
</span>
</div> </div>
</Dropdown> </Dropdown>
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment