Commit f946510b authored by 皮倩雯's avatar 皮倩雯

解决用户管理搜索状态无法操作机构功能

parent 2a84ea1f
Pipeline #38347 passed with stages
in 26 minutes 2 seconds
# PUBLIC_PATH = reactOMS, 默认转发 /cityinterface
PROXY=/Cityinterface:http://192.168.19.105:8049;/PandaOMS:http://192.168.19.105:8049;/Web4:http://192.168.19.105:8049;/CityTemp:http://192.168.19.105:8049
PROXY=/Cityinterface:http://192.168.19.105:8049;/PandaOMS:http://192.168.12.116:8015;/Web4:http://192.168.19.105:8049;/CityTemp:http://192.168.19.105:8049
# PROXY=/Cityinterface:http://192.168.12.121:8082;/PandaOMS:http://192.168.12.121:8082;/Web4:http://192.168.12.121:8082;/CityTemp:http://192.168.12.121:8082
# 可设置第二个代理,test为转发前缀,后面为代理转发的地址
# PROXY2 = test : http://localhost:8006/
......
......@@ -17,7 +17,7 @@ import {
} from 'antd';
import { EditTwoTone, DeleteOutlined, CloudSyncOutlined, SearchOutlined, PlusSquareFilled, MinusCircleOutlined, PlusOutlined, LogoutOutlined, DownloadOutlined, UploadOutlined, SyncOutlined } from '@ant-design/icons';
import { GetDataDictionaryList, EditDataDictionary, AddDataDictionary, DeleteDataDictionary, AddDataDictionaryList, SearchDataDictionaryList, ExportDataDictionary, ImportDataDictionary } from '@/services/dataCenter/api'
import { GetDataDictionaryList, EditDataDictionary, AddDataDictionary, DeleteDataDictionary, AddDataDictionaryList, SearchDataDictionaryList, ExportDataDictionary, ImportDataDictionary, DataDictionaryChangeOrder } from '@/services/dataCenter/api'
import styles from './WebDic.less';
import { useHistory } from 'react-router-dom';
import map from '@/pages/user/login/components/Login/map';
......
......@@ -414,7 +414,7 @@ const UserManage = () => {
<span className={styles.titleText}>{org.text}</span>
<span className={styles.tip1}>
<Tooltip title="" className={styles.fs1}>
<Dropdown overlay={orgButtonMenu} disabled={currentOrgOperate}>
<Dropdown overlay={orgButtonMenu} >
<PlusOutlined
style={{ marginLeft: 20 }}
onClick={e => e.stopPropagation()}
......@@ -427,7 +427,7 @@ const UserManage = () => {
</Dropdown>
</Tooltip>
<Dropdown overlay={orgButtonMenu1} disabled={currentOrgOperate}>
<Dropdown overlay={orgButtonMenu1} >
<EllipsisOutlined
style={{ marginLeft: 10, fontSize: '20px' }}
onClick={e => e.stopPropagation()}
......@@ -1316,9 +1316,7 @@ const UserManage = () => {
);
const kee = () => {
console.log(keep1);
setUserVisible(false);
onSelect(keep1);
};
return (
<PageContainer className={styles.userManageContainer}>
......
......@@ -29,3 +29,6 @@ export const ExportDataDictionary = params =>
//导入文件
export const ImportDataDictionary = params =>
post(`${PUBLISH_SERVICE}/DataManger/ImportDataDictionary`, params);
//拖拽组件
export const DataDictionaryChangeOrder = params =>
post(`${PUBLISH_SERVICE}/DataManger/DataDictionaryChangeOrder`, params);
\ No newline at end of file
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