Skip to content

C
CivManage
Commit 124932cc authored by 陈前坚's avatar 陈前坚
Browse files
Options

perf: 冻结用户和app配置

parent 43cf21aa
Show whitespace changes
Inline Side-by-side
Showing with 534 additions and 300 deletions
src/pages/appConfig/AppMenu.js
View file @ 124932cc
import React, { useState, useEffect } from 'react'; import React, { useState, useEffect, useCallback } from 'react';
import { message, Form, Input, notification, Button, Select } from 'antd'; import {
import { get, post } from '../../services'; message,
notification,
Form,
Spin,
Tree,
Tooltip,
Modal,
Input,
Button,
} from 'antd';
import {
FileAddTwoTone,
FolderAddTwoTone,
EditTwoTone,
DeleteTwoTone,
} from '@ant-design/icons';
import { getTree, addMenuApi, getRoleList } from '../../services/appConfig/api';
import ListCardItem from '../orgnazation/listCardItem';
import styles from './AppMenu.less';
const SevenParams = () => { const SevenParams = () => {
const { Option } = Select; const [treeLoading, setTreeLoading] = useState(true);
// const [transParams, setTransParams] = useState({});
// 根据转换类型 transType 渲染 输入框参数 params const [treeData, setTreeData] = useState([]); // 菜单树
const [transType, setTransType] = useState('1'); const [rolelist, setRolelist] = useState([]);
const [sevenForm] = Form.useForm();
const transTypeChange = value => { const [menuID, setMenuID] = useState('');
// console.log(`selected ${value}`); const [menuTitle, setMenuTitle] = useState('菜单管理');
setTransType(value);
get(`/Cityinterface/rest/services/OMS.svc/M_GetSevenParamsByTransType`, { const [addMenuVisible, setAddMenuVisible] = useState(false);
_version: 9999, const [addMenuGroupVisible, setAddMenuGroupVisible] = useState(false);
_dc: new Date().getTime(), const [tipVisible, setTipVisible] = useState(false);
transType: value, // const [editMenuVisible, setEditMenuVisible] = useState(false);
const [deleteMenuVisible, setDeleteMenuVisible] = useState(false);
const [addMenuForm] = Form.useForm();
const [addMenuGroupForm] = Form.useForm();
const getRoleValueCallback = useCallback((value, index) => {
// roleValueList[index] = value;
// setRoleValueList({ ...roleValueList });
}, []);
// 获取菜单树
useEffect(() => {
updateTrees();
}, []);
const updateTrees = () => {
setTreeLoading(true);
getTree()
.then(res => {
if (res.length > 0) {
setTreeLoading(false);
setTreeData(res[0].children[0].children[2].children);
console.log(res[0].children[0].children[2].children);
}
}) })
.catch(err => {
setTreeLoading(false);
message.error(err);
});
};
// 获取角色列表
useEffect(() => {
getRoleList()
.then(res => { .then(res => {
if (res) { if (res && res.list) {
sevenForm.setFieldsValue({ setRolelist(res.list);
// transType 1 2 } else {
angle: res.angle, notification.error({
m: res.m, message: '获取失败',
// transType 1 3 5 6 description: res.message,
x_off: res.x_off,
y_off: res.y_off,
// transType 2
x0_gps: res.x0_gps,
x0_local: res.x0_local,
y0_gps: res.y0_gps,
y0_local: res.y0_local,
// transType 3 4 6
seven_m: res.seven_m,
seven_x_angle: res.seven_x_angle,
seven_x_off: res.seven_x_off,
seven_y_angle: res.seven_y_angle,
seven_y_off: res.seven_y_off,
seven_z_angle: res.seven_z_angle,
seven_z_off: res.seven_z_off,
// transType 4
four_angle: res.four_angle,
four_m: res.four_m,
four_x_off: res.four_x_off,
four_y_off: res.four_y_off,
}); });
} }
}) })
.catch(err => { .catch(err => {
message.error(err); message.error(err);
}); });
}, []);
// 渲染菜单树
const mapTree = menu => {
const haveChildren =
Array.isArray(menu.children) && menu.children.length > 0;
return {
title: (
<>
<span>{menu.text}</span>
<div className={styles.iconWraper1}>
{menu.menuType === 'MiniAppMenuGroup' && (
<>
<Tooltip title="添加菜单组">
<FolderAddTwoTone
onClick={e => addMenuGroup(e, menu.text, menu.menuID)}
/>
</Tooltip>
</>
)}
{menu.menuType === 'MiniAppMenuGroupTwo' && (
<>
<Tooltip title="添加菜单">
<FileAddTwoTone
onClick={e => addMenu(e, menu.text, menu.menuID)}
/>
</Tooltip>
</>
)}
<Tooltip title="编辑当前菜单">
<EditTwoTone onClick={e => editMenu(e, menu.text, menu.menuID)} />
</Tooltip>
<Tooltip title="删除当前菜单">
<DeleteTwoTone
onClick={e => deleteMenu(e, menu.text, menu.menuID)}
/>
</Tooltip>
</div>
</>
),
key: menu.menuID,
// icon: <SolutionOutlined />,
// 判断它是否存在子集，若果存在就进行再次进行遍历操作，知道不存在子集便对其他的元素进行操作
children: haveChildren ? menu.children.map(i => mapTree(i)) : [],
};
}; };
const submitSevenParams = () => { // 左侧目录树相关操作
const sevenFormData = new FormData(); const addMenu = (e, title, id) => {
sevenFormData.append('ellipseType', sevenForm.getFieldValue('ellipseType')); setAddMenuVisible(true);
sevenFormData.append('transType', sevenForm.getFieldValue('transType')); setMenuTitle(`在${title}下添加菜单`);
sevenFormData.append('middleLine', sevenForm.getFieldValue('middleLine')); setMenuID(id);
sevenFormData.append('rev', sevenForm.getFieldValue('rev')); addMenuForm.setFieldsValue({
if (transType === '1') { menuName: '',
sevenFormData.append('x_off', sevenForm.getFieldValue('x_off')); shortName: '',
sevenFormData.append('y_off', sevenForm.getFieldValue('y_off')); imageUrl: '',
sevenFormData.append('angle', sevenForm.getFieldValue('angle')); pageUrl: '',
sevenFormData.append('m', sevenForm.getFieldValue('m')); funParam: '',
} });
if (transType === '2') { };
sevenFormData.append('angle', sevenForm.getFieldValue('angle')); const addMenuGroup = (e, title, id) => {
sevenFormData.append('m', sevenForm.getFieldValue('m')); setAddMenuGroupVisible(true);
sevenFormData.append('x0_local', sevenForm.getFieldValue('x0_local')); setMenuTitle(`在${title}下添加菜单组`);
sevenFormData.append('y0_local', sevenForm.getFieldValue('y0_local')); setMenuID(id);
sevenFormData.append('x0_gps', sevenForm.getFieldValue('x0_gps')); };
sevenFormData.append('y0_gps', sevenForm.getFieldValue('y0_gps')); const editMenu = (e, title, id) => {
} setAddMenuVisible(true);
if (transType === '3') { setMenuTitle(`编辑${title}`);
sevenFormData.append('x_off', sevenForm.getFieldValue('x_off')); setMenuID(id);
sevenFormData.append('y_off', sevenForm.getFieldValue('y_off')); addMenuApi(`/Cityinterface/rest/services/OMS.svc/M_GetMenu`, {
sevenFormData.append( _version: 9999,
'seven_x_off', _dc: new Date().getTime(),
sevenForm.getFieldValue('seven_x_off'), menuID: id,
); })
sevenFormData.append( .then(res => {
'seven_y_off', if (res.success) {
sevenForm.getFieldValue('seven_y_off'), addMenuForm.setFieldsValue({
); menuName: res.menuName,
sevenFormData.append( menuAlias: res.menuAlias,
'seven_z_off', menuIcon: res.menuIcon,
sevenForm.getFieldValue('seven_z_off'), relatedRoleList: res.relatedRoleList || [],
); });
sevenFormData.append( } else {
'seven_x_angle', notification.error({
sevenForm.getFieldValue('seven_x_angle'), message: '提交失败',
); description: res.message,
sevenFormData.append( });
'seven_y_angle',
sevenForm.getFieldValue('seven_y_angle'),
);
sevenFormData.append(
'seven_z_angle',
sevenForm.getFieldValue('seven_z_angle'),
);
sevenFormData.append('seven_m', sevenForm.getFieldValue('seven_m'));
}
if (transType === '4') {
sevenFormData.append('x_off', sevenForm.getFieldValue('x_off'));
sevenFormData.append('y_off', sevenForm.getFieldValue('y_off'));
sevenFormData.append(
'seven_x_off',
sevenForm.getFieldValue('seven_x_off'),
);
sevenFormData.append(
'seven_y_off',
sevenForm.getFieldValue('seven_y_off'),
);
sevenFormData.append(
'seven_z_off',
sevenForm.getFieldValue('seven_z_off'),
);
sevenFormData.append(
'seven_x_angle',
sevenForm.getFieldValue('seven_x_angle'),
);
sevenFormData.append(
'seven_y_angle',
sevenForm.getFieldValue('seven_y_angle'),
);
sevenFormData.append(
'seven_z_angle',
sevenForm.getFieldValue('seven_z_angle'),
);
sevenFormData.append('seven_m', sevenForm.getFieldValue('seven_m'));
sevenFormData.append('four_x_off', sevenForm.getFieldValue('four_x_off'));
sevenFormData.append('four_y_off', sevenForm.getFieldValue('four_y_off'));
sevenFormData.append('four_angle', sevenForm.getFieldValue('four_angle'));
sevenFormData.append('four_m', sevenForm.getFieldValue('four_m'));
} }
if (transType === '5') { })
sevenFormData.append('x_off', sevenForm.getFieldValue('x_off')); .catch(err => {
sevenFormData.append('y_off', sevenForm.getFieldValue('y_off')); message.error(err);
});
};
const deleteMenu = (e, title, id) => {
setDeleteMenuVisible(true);
setMenuTitle(`删除菜单${title}`);
setMenuID(id);
};
// 提交添加菜单
const submitAddMenu = () => {
console.log(menuID);
let menuName = addMenuForm.getFieldValue('menuName');
let shortName = addMenuForm.getFieldValue('shortName');
let imageUrl = addMenuForm.getFieldValue('imageUrl');
let pageUrl = addMenuForm.getFieldValue('pageUrl');
let funParam = addMenuForm.getFieldValue('funParam');
if (menuName && shortName && imageUrl && pageUrl) {
addMenuApi(menuID, menuName, shortName, imageUrl, pageUrl, funParam)
.then(res => {
if (res.success) {
setAddMenuVisible(false);
notification.success({
message: '提交成功',
});
updateTrees();
} else {
notification.error({
message: '提交失败',
description: res.message,
});
} }
if (transType === '6') { })
sevenFormData.append( .catch(err => {
'seven_x_off', message.error(err);
sevenForm.getFieldValue('seven_x_off'), });
); } else {
sevenFormData.append( setTipVisible(true);
'seven_y_off',
sevenForm.getFieldValue('seven_y_off'),
);
sevenFormData.append(
'seven_z_off',
sevenForm.getFieldValue('seven_z_off'),
);
sevenFormData.append(
'seven_x_angle',
sevenForm.getFieldValue('seven_x_angle'),
);
sevenFormData.append(
'seven_y_angle',
sevenForm.getFieldValue('seven_y_angle'),
);
sevenFormData.append(
'seven_z_angle',
sevenForm.getFieldValue('seven_z_angle'),
);
sevenFormData.append('seven_m', sevenForm.getFieldValue('seven_m'));
sevenFormData.append('x_off', sevenForm.getFieldValue('x_off'));
sevenFormData.append('y_off', sevenForm.getFieldValue('y_off'));
} }
};
post( // 提交添加菜单组
`/Cityinterface/rest/services/OMS.svc/M_SetSevenParams?_version=9999`, const submitAddMenuGroup = () => {
sevenFormData, let menuName = addMenuGroupForm.getFieldValue('menuName');
) let shortName = addMenuGroupForm.getFieldValue('shortName');
let imageUrl = addMenuGroupForm.getFieldValue('imageUrl');
let pageUrl = addMenuGroupForm.getFieldValue('pageUrl');
let funParam = addMenuGroupForm.getFieldValue('funParam');
if (menuName && shortName && imageUrl && pageUrl) {
addMenuApi(menuID, menuName, shortName, imageUrl, pageUrl, funParam)
.then(res => { .then(res => {
if (res.success) { if (res.success) {
setAddMenuGroupVisible(false);
notification.success({ notification.success({
message: '提交成功', message: '提交成功',
}); });
updateTrees();
} else { } else {
notification.error({ notification.error({
message: '提交失败', message: '提交失败',
...@@ -186,164 +234,184 @@ const SevenParams = () => { ...@@ -186,164 +234,184 @@ const SevenParams = () => {
.catch(err => { .catch(err => {
message.error(err); message.error(err);
}); });
} else {
setTipVisible(true);
}
}; };
// 提交删除菜单
useEffect(() => { const submitDeleteMenu = () => {
get(`/Cityinterface/rest/services/OMS.svc/M_GetSevenParams`, { addMenuApi(`/Cityinterface/rest/services/OMS.svc/W4_DeleteMenu`, {
_version: 9999, _version: 9999,
_dc: new Date().getTime(), _dc: new Date().getTime(),
menuID,
subSystemValue: '手持系统',
}) })
.then(res => { .then(res => {
if (res.success) { if (res.success) {
sevenForm.setFieldsValue({ setDeleteMenuVisible(false);
middleLine: res.transParams.middleLine, notification.success({
rev: res.transParams.rev, message: '删除成功',
x_off: res.params.x_off, });
y_off: res.params.y_off, updateTrees();
angle: res.params.angle, } else {
m: res.params.m, notification.error({
message: '删除失败',
description: res.message,
}); });
} }
}) })
.catch(err => { .catch(err => {
setTreeLoading(false);
message.error(err); message.error(err);
}); });
}, []); };
return ( return (
<Form <div className={styles.contentContainer}>
form={sevenForm} <div className={styles.menuContainer}>
labelCol={{ span: 4, offset: 4 }} {treeData.length > 0 && (
wrapperCol={{ span: 16, offset: 1 }} <Spin spinning={treeLoading} tip="loading...">
style={{ width: '900px' }} <Tree
onFinish={submitSevenParams} showIcon="true"
initialValues={{ ellipseType: '1', transType: '1' }} showLine={{ showLeafIcon: false }}
defaultExpandAll="true"
// selectedKeys={[currentSelectMenu]}
// onSelect={onSelect}
treeData={treeData.map(t => mapTree(t))}
/>
</Spin>
)}
</div>
<div className={styles.previewContainer}>123</div>
{/* 必填项提示 */}
<Modal
title="提示"
visible={tipVisible}
onCancel={() => setTipVisible(false)}
width="300px"
centered
footer={[
<Button
key="back"
type="primary"
onClick={() => setTipVisible(false)}
> >
<Form.Item name="ellipseType" label="椭球类型"> 关闭
<Select> </Button>,
<Option value="1">54椭球</Option> ]}
<Option value="2">80椭球</Option> >
<Option value="3">84椭球</Option> <p>
<Option value="4">2000椭球</Option> 标记<span className={styles.redText}>*</span>的为必填项
</Select> </p>
</Form.Item> </Modal>
<Form.Item name="transType" label="转换类型"> {/* 添加菜单 */}
<Select onChange={transTypeChange}> <Modal
<Option value="1">四参数</Option> title={menuTitle}
<Option value="2">六参数</Option> visible={addMenuVisible}
<Option value="3">七参数</Option> onOk={submitAddMenu}
<Option value="4">七参数+四参数</Option> onCancel={() => setAddMenuVisible(false)}
<Option value="5">中央经线投影（二参数）</Option> okText="确认"
<Option value="6">七参数+二参数反转</Option> cancelText="取消"
</Select> centered
</Form.Item> >
<Form form={addMenuForm}>
<Form.Item <Form.Item
name="middleLine" name="menuName"
label="中央经线" label="菜单名称"
rules={[{ required: true, message: '不能为空' }]} rules={[{ required: true, message: '不能为空' }]}
> >
<Input placeholder="请输入中央经线" /> <Input placeholder="请输入菜单名称" />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
name="rev" name="shortName"
label="rev" label="菜单别名"
rules={[{ required: true, message: '不能为空' }]} rules={[{ required: true, message: '不能为空' }]}
> >
<Input placeholder="请输入rev" /> <Input placeholder="请输入菜单别名" />
</Form.Item> </Form.Item>
{(transType === '1' || transType === '2') && ( <Form.Item
<> name="imageUrl"
<Form.Item name="angle" label="angle"> label="菜单图标"
<Input placeholder="请输入旋转角度" /> rules={[{ required: true, message: '不能为空' }]}
</Form.Item> >
<Form.Item name="m" label="m"> <Input placeholder="请输入菜单图标" />
<Input placeholder="请输入尺度因子" />
</Form.Item>
</>
)}
{(transType === '1' ||
transType === '3' ||
transType === '5' ||
transType === '6') && (
<>
<Form.Item name="x_off" label="x_off">
<Input placeholder="请输入x坐标平移量" />
</Form.Item>
<Form.Item name="y_off" label="y_off">
<Input placeholder="请输入y坐标平移量" />
</Form.Item>
</>
)}
{transType === '2' && (
<>
<Form.Item name="x0_gps" label="x0_gps">
<Input placeholder="请输入gps-x坐标" />
</Form.Item>
<Form.Item name="y0_gps" label="y0_gps">
<Input placeholder="请输入gps-y坐标" />
</Form.Item>
<Form.Item name="x0_local" label="x0_local">
<Input placeholder="请输入local-x坐标" />
</Form.Item>
<Form.Item name="y0_local" label="y0_local">
<Input placeholder="请输入local-y坐标" />
</Form.Item>
</>
)}
{(transType === '3' || transType === '4' || transType === '6') && (
<>
<Form.Item name="seven_m" label="seven_m">
<Input placeholder="请输入尺度因子" />
</Form.Item>
<Form.Item name="seven_x_off" label="seven_x_off">
<Input placeholder="请输入x方向偏移量" />
</Form.Item>
<Form.Item name="seven_y_off" label="seven_y_off">
<Input placeholder="请输入y方向偏移量" />
</Form.Item>
<Form.Item name="seven_z_off" label="seven_z_off">
<Input placeholder="请输入z方向偏移量" />
</Form.Item>
<Form.Item name="seven_x_angle" label="seven_x_angle">
<Input placeholder="请输入x方向偏转角度" />
</Form.Item>
<Form.Item name="seven_y_angle" label="seven_y_angle">
<Input placeholder="请输入y方向偏转角度" />
</Form.Item> </Form.Item>
<Form.Item name="seven_z_angle" label="seven_z_angle"> <Form.Item
<Input placeholder="请输入z方向偏转角度" /> name="pageUrl"
label="功能路径"
rules={[{ required: true, message: '不能为空' }]}
>
<Input placeholder="请输入功能路径" />
</Form.Item> </Form.Item>
</> <Form.Item name="funParam" label="功能参数">
)} <Input placeholder="请输入功能参数" />
{transType === '4' && (
<>
<Form.Item name="four_x_off" label="four_x_off">
<Input placeholder="请输入x方向偏移量" />
</Form.Item> </Form.Item>
<Form.Item name="four_y_off" label="four_y_off"> </Form>
<Input placeholder="请输入y方向偏移量" /> <ListCardItem
itemid="1"
key="1"
userList={rolelist}
OUName="关联角色"
getValueCallback={getRoleValueCallback}
/>
</Modal>
{/* 添加菜单组 */}
<Modal
title={menuTitle}
visible={addMenuGroupVisible}
onOk={submitAddMenuGroup}
onCancel={() => setAddMenuGroupVisible(false)}
okText="确认"
cancelText="取消"
centered
>
<Form form={addMenuGroupForm}>
<Form.Item
name="menuName"
label="分组名称"
rules={[{ required: true, message: '不能为空' }]}
>
<Input placeholder="请输入分组名称" />
</Form.Item> </Form.Item>
<Form.Item name="four_angle" label="four_angle"> <Form.Item
<Input placeholder="请输入偏转角度" /> name="shortName"
label="分组别名"
rules={[{ required: true, message: '不能为空' }]}
>
<Input placeholder="请输入分组别名" />
</Form.Item> </Form.Item>
<Form.Item name="four_m" label="four_m"> <Form.Item
<Input placeholder="请输入尺度因子" /> name="imageUrl"
label="菜单图标"
rules={[{ required: true, message: '不能为空' }]}
>
<Input placeholder="请输入菜单图标" />
</Form.Item> </Form.Item>
</>
)}
<Form.Item <Form.Item
wrapperCol={{ name="pageUrl"
sm: { label="离线图标"
span: 16, rules={[{ required: true, message: '不能为空' }]}
offset: 16,
},
}}
> >
<Button type="primary" htmlType="submit"> <Input placeholder="请输入离线图标" />
提交 </Form.Item>
</Button> <Form.Item name="funParam" label="功能参数">
<Input placeholder="请输入功能参数" />
</Form.Item> </Form.Item>
</Form> </Form>
</Modal>
{/* 删除菜单 */}
<Modal
title={menuTitle}
visible={deleteMenuVisible}
onOk={submitDeleteMenu}
onCancel={() => setDeleteMenuVisible(false)}
okText="确认"
cancelText="取消"
centered
>
<span>确定删除？</span>
</Modal>
</div>
); );
}; };
......
src/pages/appConfig/AppMenu.less 0 → 100644
View file @ 124932cc
.contentContainer{
// min-height: calc(100vh - 194px);
display: flex;
.menuContainer{
min-width: 300px;
.ant-tree-list{
padding: 10px;
border:1px solid #abaeb1;
height:calc(100vh - 300px);
.ant-tree-switcher{
line-height: 1;
color:#1890FF;
}
}
}
.previewContainer{
margin-left: 12px;
flex: 1;
float: left;
// background: white;
.ant-table-pagination-right{
padding-right: 12px;
}
}
.ant-tree-treenode{
width: 100% !important;
.ant-tree-node-content-wrapper{
display: inline-block;
width: 100%;
}
.iconWraper1{
float: right;
span{
display: none;
}
}
}
.ant-tree-treenode:hover{
.iconWraper1>span{
margin-left: 12px;
font-size: 18px;
display: inline-block;
}
}
}
.redText{
color: red;
cursor: pointer;
}
// .ant-modal-root{
// .ant-tree-switcher{
// line-height: 1;
// color:#1890FF;
// }
// }
// .menuContainer{
// width: 300px;
// padding: 10px;
// background: #1890FF;
// }
\ No newline at end of file
src/pages/appConfig/index.js
View file @ 124932cc
import React from 'react'; import React from 'react';
import { Tabs } from 'antd'; import { Tabs, Card } from 'antd';
import { PageContainer } from '@ant-design/pro-layout'; import { PageContainer } from '@ant-design/pro-layout';
import SevenParams from './SevenParams'; import SevenParams from './SevenParams';
// import AppMenu from './AppMenu'; import AppMenu from './AppMenu';
const AppConfigPage = () => { const AppConfigPage = () => {
const { TabPane } = Tabs; const { TabPane } = Tabs;
return ( return (
<PageContainer> <PageContainer>
<Tabs defaultActiveKey="1"> <Card>
<TabPane tab="七参数" key="1"> <Tabs defaultActiveKey="1" type="card">
<TabPane tab="应用配置" key="1">
<SevenParams /> <SevenParams />
</TabPane> </TabPane>
<TabPane tab="菜单管理" key="2"> <TabPane tab="菜单管理" key="2" type="card">
{/* <AppMenu /> */} <AppMenu />
123
</TabPane> </TabPane>
</Tabs> </Tabs>
</Card>
</PageContainer> </PageContainer>
); );
}; };
......
src/pages/userCenter/UserManage.js
View file @ 124932cc
...@@ -76,6 +76,7 @@ const UserManage = () => { ...@@ -76,6 +76,7 @@ const UserManage = () => {
const [deleteUserVisible, setDeleteUserVisible] = useState(false); const [deleteUserVisible, setDeleteUserVisible] = useState(false);
const [orgTitle, setOrgTitle] = useState('机构'); const [orgTitle, setOrgTitle] = useState('机构');
const [tableTitle, setTableTitle] = useState('机构');
const [orgID, setOrgID] = useState(); const [orgID, setOrgID] = useState();
const [newOrgID, setNewOrgID] = useState(); const [newOrgID, setNewOrgID] = useState();
const [currentUser, setCurrentUser] = useState({}); const [currentUser, setCurrentUser] = useState({});
...@@ -118,6 +119,12 @@ const UserManage = () => { ...@@ -118,6 +119,12 @@ const UserManage = () => {
key: 'userName', key: 'userName',
width: 100, width: 100,
}, },
{
title: '所在机构',
dataIndex: 'OUName',
key: 'OUName',
width: 150,
},
{ {
title: '手机号码', title: '手机号码',
dataIndex: 'phone', dataIndex: 'phone',
...@@ -141,7 +148,7 @@ const UserManage = () => { ...@@ -141,7 +148,7 @@ const UserManage = () => {
title: '操作', title: '操作',
key: 'action', key: 'action',
fixed: 'right', fixed: 'right',
width: 300, width: 250,
align: 'center', align: 'center',
render: (text, record) => ( render: (text, record) => (
<Space size="middle"> <Space size="middle">
...@@ -169,12 +176,27 @@ const UserManage = () => { ...@@ -169,12 +176,27 @@ const UserManage = () => {
style={{ fontSize: '16px' }} style={{ fontSize: '16px' }}
/> />
</Tooltip> </Tooltip>
{(record.state === '0' || record.state === null) && (
<>
<Tooltip title="冻结用户"> <Tooltip title="冻结用户">
<StopOutlined <StopOutlined
onClick={() => freezeUser(record)} onClick={() => freezeUser(record)}
style={{ fontSize: '16px', color: '#1890FF' }} style={{ fontSize: '16px', color: '#1890FF' }}
/> />
</Tooltip> </Tooltip>
</>
)}
{record.state === '1' && (
<>
<Tooltip title="解冻用户">
<StopOutlined
onClick={() => freezeUser(record)}
style={{ fontSize: '16px' }}
/>
</Tooltip>
</>
)}
<Tooltip title="删除用户"> <Tooltip title="删除用户">
<DeleteTwoTone <DeleteTwoTone
onClick={() => deleteUser(record)} onClick={() => deleteUser(record)}
...@@ -289,6 +311,7 @@ const UserManage = () => { ...@@ -289,6 +311,7 @@ const UserManage = () => {
// 获取用户机构树 // 获取用户机构树
useEffect(() => { useEffect(() => {
setTreeLoading(true);
updateTrees(); updateTrees();
}, []); }, []);
...@@ -303,9 +326,12 @@ const UserManage = () => { ...@@ -303,9 +326,12 @@ const UserManage = () => {
setOrgID(props[0] || currentSelectOrg); setOrgID(props[0] || currentSelectOrg);
getOneOUUserListNew(props[0] || currentSelectOrg) getOneOUUserListNew(props[0] || currentSelectOrg)
.then(res => { .then(res => {
if (res.success) { if (res.IsSuccess) {
setTableLoading(false); setTableLoading(false);
const table = res.root.map((item, index) => { const temp = flatten(getUsers(res.Data));
console.log(temp);
setTableTitle(temp.length);
const table = temp.map((item, index) => {
item.key = index; item.key = index;
item.phone = item.phone || '-'; item.phone = item.phone || '-';
item.ddid = item.ddid ? '已绑定' : '未绑定'; item.ddid = item.ddid ? '已绑定' : '未绑定';
...@@ -320,7 +346,25 @@ const UserManage = () => { ...@@ -320,7 +346,25 @@ const UserManage = () => {
message.error(err); message.error(err);
}); });
}; };
// 返回数据结构处理，扁平化
const getUsers = orgObj => {
let result = orgObj.Users;
result.map(item => {
item.OUID = orgObj.GroupId;
item.OUName = orgObj.GroupName;
return item;
});
if (orgObj.Childs.length > 0)
result = [...result, ...orgObj.Childs.map(o => getUsers(o))];
return result;
};
const flatten = arr => {
while (arr.some(item => Array.isArray(item))) {
arr = [].concat(...arr);
}
return arr;
};
const getTableTitle = () => `当前机构用户总数（ ${tableTitle} ）`;
// 左侧目录树相关操作 // 左侧目录树相关操作
const searchUser = () => { const searchUser = () => {
setSearchUserVisible(true); setSearchUserVisible(true);
...@@ -586,7 +630,7 @@ const UserManage = () => { ...@@ -586,7 +630,7 @@ const UserManage = () => {
}); });
}; };
const submitChangeOrg = () => const submitChangeOrg = () =>
addToOrg(currentUser.userID, orgID, newOrgID) addToOrg(currentUser.userID, currentUser.OUID, newOrgID)
.then(res => { .then(res => {
if (res.success) { if (res.success) {
setChangeOrgVisible(false); setChangeOrgVisible(false);
...@@ -658,7 +702,13 @@ const UserManage = () => { ...@@ -658,7 +702,13 @@ const UserManage = () => {
message.error(err); message.error(err);
}); });
const submitFreezeUser = () => { const submitFreezeUser = () => {
postSetUserState(currentUser.userID, +!currentUser.state) let state = '';
if (currentUser.state === '0') {
state = '1';
} else {
state = '0';
}
postSetUserState(currentUser.userID, state)
.then(res => { .then(res => {
if (res.success) { if (res.success) {
setFreezeUserVisible(false); setFreezeUserVisible(false);
...@@ -746,6 +796,7 @@ const UserManage = () => { ...@@ -746,6 +796,7 @@ const UserManage = () => {
</div> </div>
<div className={styles.userContainer}> <div className={styles.userContainer}>
<Table <Table
title={getTableTitle}
bordered bordered
columns={columns} columns={columns}
dataSource={tableData} dataSource={tableData}
...@@ -1008,7 +1059,7 @@ const UserManage = () => { ...@@ -1008,7 +1059,7 @@ const UserManage = () => {
</Form> </Form>
</Modal> </Modal>
<Modal <Modal
title="请确认冻结用户" title="请确认"
visible={freezeUserVisible} visible={freezeUserVisible}
onOk={submitFreezeUser} onOk={submitFreezeUser}
onCancel={() => setFreezeUserVisible(false)} onCancel={() => setFreezeUserVisible(false)}
......
src/services/appConfig/api.js
View file @ 124932cc
import { get, post } from '@/services/index'; import { get, post } from '@/services/index';
/** ***网站配置*** */
// 七参数初始化 // 七参数初始化
export const getSevenParams = () => export const getSevenParams = () =>
get(`/Cityinterface/rest/services/OMS.svc/M_GetSevenParams`, { get(`/Cityinterface/rest/services/OMS.svc/M_GetSevenParams`, {
...@@ -19,3 +20,45 @@ export const postSevenParams = sevenFormData => ...@@ -19,3 +20,45 @@ export const postSevenParams = sevenFormData =>
`/Cityinterface/rest/services/OMS.svc/M_SetSevenParams?_version=9999`, `/Cityinterface/rest/services/OMS.svc/M_SetSevenParams?_version=9999`,
sevenFormData, sevenFormData,
); );
/** ***菜单管理*** */
// 获取菜单树
export const getTree = () =>
get(`/Cityinterface/rest/services/OMS.svc/MiniAppSiteTree`, {
_version: 9999,
_dc: new Date().getTime(),
node: -2,
userMode: 'super',
// subSystemValue: '手持系统',
// subSystemName: '手持系统',
select: '',
});
// 添加菜单
export const addMenuApi = (
menuID,
menuName,
shortName,
imageUrl,
pageUrl,
funParam,
) =>
get(`/Cityinterface/rest/services/OMS.svc/MiniApp_AddMenu`, {
_version: 9999,
_dc: new Date().getTime(),
parentID: menuID,
menuName,
shortName,
imageUrl,
pageUrl,
funParam,
subSystemValue: 'miniapp',
relatedRoleList: '',
});
// 添加菜单
export const getRoleList = () =>
get(`/Cityinterface/rest/services/OMS.svc/P_GetRoleListPlain`, {
_version: 9999,
_dc: new Date().getTime(),
subSystemValue: 'miniapp',
});
src/services/userCenter/userManage/api.js
View file @ 124932cc
import { get, post } from '@/services/index'; // import { get, post } from '@/services/index';
import qs from 'qs'; import qs from 'qs';
import { CITY_SERVICE, get, post, PUBLISH_SERVICE } from '@/services/index';
export const getUserTree = (selectOU, node) => export const getUserTree = (selectOU, node) =>
get(`/Cityinterface/rest/services/OMS.svc/U_GetOUTree`, { get(`/Cityinterface/rest/services/OMS.svc/U_GetOUTree`, {
...@@ -9,11 +10,18 @@ export const getUserTree = (selectOU, node) => ...@@ -9,11 +10,18 @@ export const getUserTree = (selectOU, node) =>
node, node,
}); });
// export const getOneOUUserListNew = OUID =>
// get(`/Cityinterface/rest/services/OMS.svc/U_GetOneOUUserListNew`, {
// _version: 9999,
// _dc: new Date().getTime(),
// OUID,
// });
export const getOneOUUserListNew = OUID => export const getOneOUUserListNew = OUID =>
get(`/Cityinterface/rest/services/OMS.svc/U_GetOneOUUserListNew`, { get(`${PUBLISH_SERVICE}/UserCenter/GroupUserList`, {
_version: 9999, _version: 9999,
_dc: new Date().getTime(), _dc: new Date().getTime(),
OUID, GroupId: OUID,
}); });
/** /**
......
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