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
43377ac9
Commit
43377ac9
authored
Nov 16, 2021
by
皮倩雯
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改数据字典搜索功能交互逻辑
parent
0ec0835b
Pipeline
#38005
skipped with stages
Changes
7
Pipelines
1
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
20 additions
and
6 deletions
+20
-6
.env
.env
+1
-1
WebDic.js
src/pages/dataCenter/dictionary1/WebDic.js
+0
-0
ProjectManage.jsx
...tformCenter/messageManage/projectManage/ProjectManage.jsx
+10
-4
ProjectManage.less
...formCenter/messageManage/projectManage/ProjectManage.less
+1
-0
TemplateManage.jsx
...ormCenter/messageManage/templateManage/TemplateManage.jsx
+1
-0
siteManage.jsx
src/pages/userCenter/siteManageV2/siteManage.jsx
+1
-1
siteManage.less
src/pages/userCenter/siteManageV2/siteManage.less
+6
-0
No files found.
.env
View file @
43377ac9
# 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.65:8085
;/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 @
43377ac9
This diff is collapsed.
Click to expand it.
src/pages/platformCenter/messageManage/projectManage/ProjectManage.jsx
View file @
43377ac9
...
...
@@ -45,10 +45,10 @@ const ProjectManage = () => {
dataIndex
:
'name'
,
key
:
'name'
,
render
:
(
text
,
record
)
=>
(
<
div
>
{
record
.
type
==
'定时推送'
?
text
:
<
div
style=
{
{
display
:
'flex'
,
alignItems
:
'center'
}
}
>
<
div
>
{
record
.
type
==
'定时推送'
?
text
:
<
div
style=
{
{
display
:
'flex'
,
alignItems
:
'center'
}
}
>
<
Tooltip
title=
{
text
}
>
<
FieldTimeOutlined
style=
{
{
fontSize
:
'16px'
,
color
:
'#1890FF'
,
marginRight
:
'0.1rem'
}
}
style=
{
{
fontSize
:
'16px'
,
color
:
'#1890FF'
,
marginRight
:
'0.1rem'
}
}
/>
</
Tooltip
>
{
text
}
...
...
@@ -269,7 +269,7 @@ const ProjectManage = () => {
const
pagenation
=
{
showTotal
:
(
total
,
range
)
=>
`第
${
range
[
0
]}
-
${
range
[
1
]}
条/共
${
total
}
条`
,
pageSizeOptions
:
[
10
,
20
,
50
,
100
],
defaultPageSize
:
'10'
,
defaultPageSize
:
10
,
showQuickJumper
:
true
,
showSizeChanger
:
true
,
};
...
...
@@ -316,7 +316,13 @@ const ProjectManage = () => {
</
div
>
<
div
className=
{
styles
.
list_view
}
>
<
Table
bordered
columns=
{
columns
}
dataSource=
{
dataList
}
pagination=
{
pagenation
}
rowKey=
'ID'
/>
<
Table
bordered
columns=
{
columns
}
dataSource=
{
dataList
}
pagination=
{
pagenation
}
rowKey=
'ID'
/>
</
div
>
<
EditModal
visible=
{
visibleParams
.
editVisible
}
...
...
src/pages/platformCenter/messageManage/projectManage/ProjectManage.less
View file @
43377ac9
...
...
@@ -56,6 +56,7 @@
.ant-table-container{
max-height: calc(100vh - 240px)!important;
min-height:calc(100vh - 240px)!important;
overflow-y: scroll;
}
}
...
...
src/pages/platformCenter/messageManage/templateManage/TemplateManage.jsx
View file @
43377ac9
...
...
@@ -76,6 +76,7 @@ const TemplateManage = () => {
const
selectFocus
=
(
obj
)
=>
{
GetThirdpartyTemplates
(
obj
).
then
(
res
=>
{
if
(
res
.
msg
===
"Ok"
)
{
console
.
log
(
res
.
data
)
setOption
(
res
.
data
);
}
else
{
notification
.
error
({
...
...
src/pages/userCenter/siteManageV2/siteManage.jsx
View file @
43377ac9
...
...
@@ -102,7 +102,7 @@ const SiteManageV2 = () => {
return
{
title
:
(
<
div
className=
{
styles
.
title
}
>
<
div
>
{
org
.
text
}
</
div
>
<
div
className=
{
styles
.
titleText
}
>
{
org
.
text
}
</
div
>
<
div
className=
{
styles
.
tip
}
>
<
Tooltip
title=
"添加下级站点"
className=
{
styles
.
fs
}
>
<
PlusSquareOutlined
style=
{
{
fontSize
:
'16px'
,
color
:
'#1890FF'
}
}
onClick=
{
e
=>
addSite
(
e
,
org
)
}
/>
...
...
src/pages/userCenter/siteManageV2/siteManage.less
View file @
43377ac9
...
...
@@ -403,6 +403,12 @@
width: 100%;
}
}
.titleText{
width: 12rem;
overflow:hidden;
white-space:nowrap;
text-overflow:ellipsis;
}
.fs{
font-size: 18px;
margin-left: 10px;
...
...
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