Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
CivManage
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ReactWeb5
CivManage
Commits
f946510b
Commit
f946510b
authored
Nov 19, 2021
by
皮倩雯
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
解决用户管理搜索状态无法操作机构功能
parent
2a84ea1f
Pipeline
#38347
passed with stages
in 26 minutes 2 seconds
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
6 deletions
+8
-6
.env
.env
+1
-1
WebDic.js
src/pages/dataCenter/dictionary1/WebDic.js
+1
-1
UserManage.js
src/pages/userCenter/userManage/UserManage.js
+2
-4
api.jsx
src/services/dataCenter/api.jsx
+4
-0
No files found.
.env
View file @
f946510b
# PUBLIC_PATH = reactOMS, 默认转发 /cityinterface
PROXY=/Cityinterface:http://192.168.19.105:8049;/PandaOMS:http://192.168.1
9.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.1
2.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/
...
...
src/pages/dataCenter/dictionary1/WebDic.js
View file @
f946510b
...
...
@@ -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'
;
...
...
src/pages/userCenter/userManage/UserManage.js
View file @
f946510b
...
...
@@ -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
}
>
...
...
src/services/dataCenter/api.jsx
View file @
f946510b
...
...
@@ -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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment