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
aef5a577
Commit
aef5a577
authored
Jun 09, 2022
by
邓超
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 修改消息平台传值为“”问题,修复运维痕迹报错问题
parent
28265e23
Pipeline
#52392
passed with stages
Changes
5
Pipelines
1
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
46 additions
and
54 deletions
+46
-54
index.jsx
src/pages/log/omsLog/index.jsx
+8
-16
index.jsx
src/pages/log/serviceLog/index.jsx
+10
-33
VisibleIISAgentConfig.jsx
...anage/components/IISAgentConfig/VisibleIISAgentConfig.jsx
+0
-0
siteConfigDrawer.js
...es/productCenter/webConfig/components/siteConfigDrawer.js
+19
-5
siteConfigDrawer.less
.../productCenter/webConfig/components/siteConfigDrawer.less
+9
-0
No files found.
src/pages/log/omsLog/index.jsx
View file @
aef5a577
...
...
@@ -37,8 +37,7 @@ const OmsLog = () => {
width
:
150
,
defaultSortOrder
:
'descend'
,
sortDirections
:
[
'descend'
,
'ascend'
],
sorter
:
(
a
,
b
)
=>
new
Date
(
a
.
LogTime
).
getTime
()
-
new
Date
(
b
.
LogTime
).
getTime
(),
sorter
:
(
a
,
b
)
=>
new
Date
(
a
.
LogTime
).
getTime
()
-
new
Date
(
b
.
LogTime
).
getTime
(),
},
{
title
:
'接口名称'
,
...
...
@@ -65,8 +64,8 @@ const OmsLog = () => {
width
:
850
,
ellipsis
:
'true'
,
render
:
record
=>
(
<
Tooltip
placement=
"left"
title=
{
decodeURI
(
record
)
}
>
{
decodeURI
(
record
)
}
<
Tooltip
placement=
"left"
title=
{
record
}
>
{
record
}
</
Tooltip
>
),
},
...
...
@@ -110,10 +109,7 @@ const OmsLog = () => {
const
searchStyle1
=
val
=>
{
let
n
;
if
(
showSearchStyle
)
{
n
=
val
.
replace
(
new
RegExp
(
label
,
'g'
),
`<span style='color:red'>
${
label
}
</span>`
,
);
n
=
val
.
replace
(
new
RegExp
(
label
,
'g'
),
`<span style='color:red'>
${
label
}
</span>`
);
}
else
{
n
=
val
;
}
...
...
@@ -180,10 +176,7 @@ const OmsLog = () => {
const
setTime
=
time
=>
{
setEndTime
(
moment
(
new
Date
(),
'YYYY-MM-DD HH:mm:ss'
));
setStartTime
(
moment
(
new
Date
(
new
Date
().
getTime
()
-
time
*
60
*
60
*
1000
),
'YYYY-MM-DD HH:mm:ss'
,
),
moment
(
new
Date
(
new
Date
().
getTime
()
-
time
*
60
*
60
*
1000
),
'YYYY-MM-DD HH:mm:ss'
),
);
};
const
handleReset
=
()
=>
{
...
...
@@ -249,8 +242,8 @@ const OmsLog = () => {
<
Button
type=
"primary"
style=
{
{
marginLeft
:
'10px'
}
}
onClick=
{
()
=>
{
getData
()
onClick=
{
()
=>
{
getData
()
;
setShowSearchStyle
(
true
);
}
}
>
...
...
@@ -278,8 +271,7 @@ const OmsLog = () => {
dataSource=
{
data
}
scroll=
{
{
x
:
'max-content'
,
y
:
'calc(100vh - 230px)'
}
}
pagination=
{
{
showTotal
:
(
total
,
range
)
=>
`第${range[0]}-${range[1]} 条/共 ${total} 条`
,
showTotal
:
(
total
,
range
)
=>
`第${range[0]}-${range[1]} 条/共 ${total} 条`
,
pageSizeOptions
:
[
10
,
20
,
50
,
100
],
defaultPageSize
:
20
,
showQuickJumper
:
true
,
...
...
src/pages/log/serviceLog/index.jsx
View file @
aef5a577
...
...
@@ -60,10 +60,7 @@ const ServiceLog = () => {
message
:
'时间设置有误'
,
description
:
'起始时间应该早于结束时间'
,
});
}
else
if
(
(
startMonth
!==
endMonth
&&
startYear
===
endYear
)
||
startYear
!==
endYear
)
{
}
else
if
((
startMonth
!==
endMonth
&&
startYear
===
endYear
)
||
startYear
!==
endYear
)
{
notification
.
info
({
message
:
'时间设置提示'
,
description
:
'不允许跨月份查询'
,
...
...
@@ -133,14 +130,11 @@ const ServiceLog = () => {
},
];
// 模糊查询匹配的样式
const
searchStyle
=
val
=>
{
// 模糊查询匹配的样式
const
searchStyle
=
val
=>
{
let
n
;
if
(
showSearchStyle
)
{
n
=
val
.
replace
(
new
RegExp
(
searchWord
,
'g'
),
`<span style='color:red'>
${
searchWord
}
</span>`
,
);
n
=
val
.
replace
(
new
RegExp
(
searchWord
,
'g'
),
`<span style='color:red'>
${
searchWord
}
</span>`
);
}
else
{
n
=
val
;
}
...
...
@@ -242,12 +236,7 @@ const ServiceLog = () => {
const
setTime
=
(
time
,
value
)
=>
{
setTimeInterval
(
value
);
setEndTime
(
moment
(
new
Date
(),
'YYYY-MM-DD HH:mm:ss'
));
setStartTime
(
moment
(
new
Date
(
new
Date
().
getTime
()
-
time
*
60
*
1000
),
'YYYY-MM-DD HH:mm:ss'
,
),
);
setStartTime
(
moment
(
new
Date
(
new
Date
().
getTime
()
-
time
*
60
*
1000
),
'YYYY-MM-DD HH:mm:ss'
));
};
// 设置返回状态
const
changeStatus
=
value
=>
{
...
...
@@ -337,9 +326,7 @@ const ServiceLog = () => {
<
Spin
spinning=
{
loading
}
tip=
"loading"
>
<
Row
style=
{
{
background
:
'white'
}
}
>
<
Col
span=
{
8
}
style=
{
{
paddingTop
:
'8px'
,
paddingLeft
:
'5px'
}
}
>
<
span
style=
{
{
fontSize
:
'14px'
,
fontWeight
:
'600'
}
}
>
访问量统计
</
span
>
<
span
style=
{
{
fontSize
:
'14px'
,
fontWeight
:
'600'
}
}
>
访问量统计
</
span
>
<
span
style=
{
{
paddingLeft
:
'60%'
}
}
>
间隔:
</
span
>
<
Select
defaultValue=
"每小时"
...
...
@@ -355,14 +342,10 @@ const ServiceLog = () => {
</
Select
>
</
Col
>
<
Col
span=
{
7
}
offset=
{
1
}
style=
{
{
paddingTop
:
'8px'
}
}
>
<
span
style=
{
{
fontSize
:
'14px'
,
fontWeight
:
'600'
}
}
>
接口调用频次统计
</
span
>
<
span
style=
{
{
fontSize
:
'14px'
,
fontWeight
:
'600'
}
}
>
接口调用频次统计
</
span
>
</
Col
>
<
Col
span=
{
7
}
offset=
{
1
}
style=
{
{
paddingTop
:
'8px'
}
}
>
<
span
style=
{
{
fontSize
:
'14px'
,
fontWeight
:
'600'
}
}
>
接口平均耗时统计
</
span
>
<
span
style=
{
{
fontSize
:
'14px'
,
fontWeight
:
'600'
}
}
>
接口平均耗时统计
</
span
>
</
Col
>
</
Row
>
<
Row
className=
{
styles
.
chart
}
>
...
...
@@ -403,12 +386,7 @@ const ServiceLog = () => {
Path
:
{
alias
:
'接口调用频次'
},
}
}
>
<
Axis
name=
"Path"
label=
""
title=
{
{
offset
:
20
}
}
className=
{
styles
.
fontColor
}
/>
<
Axis
name=
"Path"
label=
""
title=
{
{
offset
:
20
}
}
className=
{
styles
.
fontColor
}
/>
<
Axis
name=
"Count"
title
/>
<
Interval
position=
"Path*Count"
/>
<
Tooltip
shared
lock
/>
...
...
@@ -442,8 +420,7 @@ const ServiceLog = () => {
dataSource=
{
dataTable
}
scroll=
{
{
x
:
'max-content'
,
y
:
'calc(100vh - 580px)'
}
}
pagination=
{
{
showTotal
:
(
total
,
range
)
=>
`第${range[0]}-${range[1]} 条/共 ${total} 条`
,
showTotal
:
(
total
,
range
)
=>
`第${range[0]}-${range[1]} 条/共 ${total} 条`
,
pageSizeOptions
:
[
10
,
20
,
50
,
100
],
defaultPageSize
:
20
,
showQuickJumper
:
true
,
...
...
src/pages/platformCenter/messageManage/projectManage/components/IISAgentConfig/VisibleIISAgentConfig.jsx
View file @
aef5a577
This diff is collapsed.
Click to expand it.
src/pages/productCenter/webConfig/components/siteConfigDrawer.js
View file @
aef5a577
...
...
@@ -270,7 +270,10 @@ export default props => {
<
div
className
=
{
styles
.
colorBox
}
>
<
div
className
=
{
styles
.
colorSwatch
}
onClick
=
{()
=>
setDisplayColorPicker
(
!
displayColorPicker
)}
onClick
=
{
e
=>
{
e
.
stopPropagation
();
setDisplayColorPicker
(
!
displayColorPicker
);
}}
>
<
div
>
{
color
}
<
/div
>
<
div
...
...
@@ -282,11 +285,22 @@ export default props => {
}}
/
>
<
/div
>
<
div
className
=
{
styles
.
popover
}
>
{
displayColorPicker
?
(
{
displayColorPicker
?
(
<
div
className
=
{
styles
.
popover
}
>
<
div
onClick
=
{()
=>
setDisplayColorPicker
(
false
)}
style
=
{{
position
:
'fixed'
,
top
:
'0px'
,
right
:
'0px'
,
bottom
:
'0px'
,
left
:
'0px'
,
}}
/
>
<
SketchPicker
color
=
{
color
}
onChange
=
{
e
=>
colorChange
(
e
)}
width
=
"230px"
/>
)
:
null
}
<
/div
>
<
/div
>
)
:
null
}
<
/div
>
<
/Form.Item
>
<
Form
.
Item
label
=
"产品类型"
name
=
"productType"
>
...
...
src/pages/productCenter/webConfig/components/siteConfigDrawer.less
View file @
aef5a577
.siteConfigContainer {}
.mask {
position: fixed;
top: 0;
left: 0;
width: 100vh;
height: 100vh;
// z-index: 1;
}
.colorBox {
.colorSwatch {
display: flex;
...
...
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