Commit 4b453311 authored by 皮倩雯's avatar 皮倩雯

修改用户管理界面UI

parent dfaf32e5
Pipeline #32487 skipped with stages
...@@ -419,7 +419,7 @@ const UserManage = () => { ...@@ -419,7 +419,7 @@ const UserManage = () => {
<span className={styles.titleText}>{org.text}</span> <span className={styles.titleText}>{org.text}</span>
<span className={styles.tip}> <span className={styles.tip}>
<Tooltip title="" className={styles.fs}> <Tooltip title="" className={styles.fs}>
<Dropdown overlay={orgButtonMenu} disabled={currentOrgOperate}> <Dropdown overlay={orgButtonMenu} disabled={currentOrgOperate} >
<PlusOutlined <PlusOutlined
style={{ marginLeft: 20 }} style={{ marginLeft: 20 }}
onClick={e => e.stopPropagation()} onClick={e => e.stopPropagation()}
...@@ -510,6 +510,8 @@ const UserManage = () => { ...@@ -510,6 +510,8 @@ const UserManage = () => {
// 点击树节点,获取当前机构下所有用户 // 点击树节点,获取当前机构下所有用户
const onSelect = (props, e) => { const onSelect = (props, e) => {
console.log(e)
console.log(props)
setTableLoading(true); setTableLoading(true);
if (e) { if (e) {
setOrgTitle(e.node.title.props.children[0].props.children); setOrgTitle(e.node.title.props.children[0].props.children);
...@@ -1174,11 +1176,14 @@ const UserManage = () => { ...@@ -1174,11 +1176,14 @@ const UserManage = () => {
setEditOrgExtentVisible(false); setEditOrgExtentVisible(false);
}; };
const addChange =e=>{
e.domEvent.stopPropagation()
}
/** ***操作按钮**** */ /** ***操作按钮**** */
// 机构操作 // 机构操作
const orgButtonMenu = ( const orgButtonMenu = (
<Menu> <Menu onClick={e =>addChange(e)}>
<Menu.Item key="1" onClick={e => addUser(e)} icon={<UserAddOutlined />}> <Menu.Item key="1" onClick={addUser} icon={<UserAddOutlined />}>
添加用户 添加用户
</Menu.Item> </Menu.Item>
<Menu.Item key="2" onClick={addSubOrg} icon={<UsergroupAddOutlined />}> <Menu.Item key="2" onClick={addSubOrg} icon={<UsergroupAddOutlined />}>
...@@ -1187,7 +1192,7 @@ const UserManage = () => { ...@@ -1187,7 +1192,7 @@ const UserManage = () => {
</Menu> </Menu>
); );
const orgButtonMenu1 = ( const orgButtonMenu1 = (
<Menu> <Menu onClick={e =>addChange(e)}>
<Menu.Item key="3" onClick={editOrg} icon={<EditOutlined />}> <Menu.Item key="3" onClick={editOrg} icon={<EditOutlined />}>
编辑当前机构 编辑当前机构
</Menu.Item> </Menu.Item>
...@@ -1224,6 +1229,7 @@ const UserManage = () => { ...@@ -1224,6 +1229,7 @@ const UserManage = () => {
{/* 左侧机构树 */} {/* 左侧机构树 */}
<Spin spinning={treeLoading} tip="loading..."> <Spin spinning={treeLoading} tip="loading...">
<Card <Card
style={{overflowY:'hidden'}}
className={classnames({ className={classnames({
[styles.orgContainer]: true, [styles.orgContainer]: true,
[styles.orgContainerHide]: !treeVisible, [styles.orgContainerHide]: !treeVisible,
...@@ -1234,6 +1240,7 @@ const UserManage = () => { ...@@ -1234,6 +1240,7 @@ const UserManage = () => {
style={{ style={{
fontSize: '15px ', fontSize: '15px ',
fontWeight: 'bold', fontWeight: 'bold',
marginLeft: '15px'
}} }}
> >
机构列表 机构列表
...@@ -1245,11 +1252,11 @@ const UserManage = () => { ...@@ -1245,11 +1252,11 @@ const UserManage = () => {
color: '#1890FF', color: '#1890FF',
fontSize: '25px', fontSize: '25px',
verticalAlign: 'middle', verticalAlign: 'middle',
float: 'right', marginLeft: '67%'
}} }}
/> />
</Tooltip> </Tooltip>
<hr style={{ width: '100%', color: '#eeecec' }} /> <hr style={{ width: '95%', color: '#eeecec' ,marginLeft: '15px'}} />
{treeData.length > 0 && ( {treeData.length > 0 && (
<Tree <Tree
showIcon="true" showIcon="true"
...@@ -1262,7 +1269,7 @@ const UserManage = () => { ...@@ -1262,7 +1269,7 @@ const UserManage = () => {
onSelect={onSelect} onSelect={onSelect}
height={ height={
treeData.length && treeData.length > 30 treeData.length && treeData.length > 30
? treeData.length * 13 ? treeData.length * 15+30
: 1000 : 1000
} }
treeData={treeData.map(t => mapTree(t))} treeData={treeData.map(t => mapTree(t))}
......
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