Commit aef5a577 authored by 邓超's avatar 邓超

fix: 修改消息平台传值为“”问题,修复运维痕迹报错问题

parent 28265e23
Pipeline #52392 passed with stages
...@@ -37,8 +37,7 @@ const OmsLog = () => { ...@@ -37,8 +37,7 @@ const OmsLog = () => {
width: 150, width: 150,
defaultSortOrder: 'descend', defaultSortOrder: 'descend',
sortDirections: ['descend', 'ascend'], sortDirections: ['descend', 'ascend'],
sorter: (a, b) => sorter: (a, b) => new Date(a.LogTime).getTime() - new Date(b.LogTime).getTime(),
new Date(a.LogTime).getTime() - new Date(b.LogTime).getTime(),
}, },
{ {
title: '接口名称', title: '接口名称',
...@@ -65,8 +64,8 @@ const OmsLog = () => { ...@@ -65,8 +64,8 @@ const OmsLog = () => {
width: 850, width: 850,
ellipsis: 'true', ellipsis: 'true',
render: record => ( render: record => (
<Tooltip placement="left" title={decodeURI(record)}> <Tooltip placement="left" title={record}>
{decodeURI(record)} {record}
</Tooltip> </Tooltip>
), ),
}, },
...@@ -110,10 +109,7 @@ const OmsLog = () => { ...@@ -110,10 +109,7 @@ const OmsLog = () => {
const searchStyle1 = val => { const searchStyle1 = val => {
let n; let n;
if (showSearchStyle) { if (showSearchStyle) {
n = val.replace( n = val.replace(new RegExp(label, 'g'), `<span style='color:red'>${label}</span>`);
new RegExp(label, 'g'),
`<span style='color:red'>${label}</span>`,
);
} else { } else {
n = val; n = val;
} }
...@@ -180,10 +176,7 @@ const OmsLog = () => { ...@@ -180,10 +176,7 @@ const OmsLog = () => {
const setTime = time => { const setTime = time => {
setEndTime(moment(new Date(), 'YYYY-MM-DD HH:mm:ss')); setEndTime(moment(new Date(), 'YYYY-MM-DD HH:mm:ss'));
setStartTime( setStartTime(
moment( moment(new Date(new Date().getTime() - time * 60 * 60 * 1000), 'YYYY-MM-DD HH:mm:ss'),
new Date(new Date().getTime() - time * 60 * 60 * 1000),
'YYYY-MM-DD HH:mm:ss',
),
); );
}; };
const handleReset = () => { const handleReset = () => {
...@@ -249,8 +242,8 @@ const OmsLog = () => { ...@@ -249,8 +242,8 @@ const OmsLog = () => {
<Button <Button
type="primary" type="primary"
style={{ marginLeft: '10px' }} style={{ marginLeft: '10px' }}
onClick={() =>{ onClick={() => {
getData() getData();
setShowSearchStyle(true); setShowSearchStyle(true);
}} }}
> >
...@@ -278,8 +271,7 @@ const OmsLog = () => { ...@@ -278,8 +271,7 @@ const OmsLog = () => {
dataSource={data} dataSource={data}
scroll={{ x: 'max-content', y: 'calc(100vh - 230px)' }} scroll={{ x: 'max-content', y: 'calc(100vh - 230px)' }}
pagination={{ pagination={{
showTotal: (total, range) => showTotal: (total, range) => `第${range[0]}-${range[1]} 条/共 ${total} 条`,
`第${range[0]}-${range[1]} 条/共 ${total} 条`,
pageSizeOptions: [10, 20, 50, 100], pageSizeOptions: [10, 20, 50, 100],
defaultPageSize: 20, defaultPageSize: 20,
showQuickJumper: true, showQuickJumper: true,
......
...@@ -60,10 +60,7 @@ const ServiceLog = () => { ...@@ -60,10 +60,7 @@ const ServiceLog = () => {
message: '时间设置有误', message: '时间设置有误',
description: '起始时间应该早于结束时间', description: '起始时间应该早于结束时间',
}); });
} else if ( } else if ((startMonth !== endMonth && startYear === endYear) || startYear !== endYear) {
(startMonth !== endMonth && startYear === endYear) ||
startYear !== endYear
) {
notification.info({ notification.info({
message: '时间设置提示', message: '时间设置提示',
description: '不允许跨月份查询', description: '不允许跨月份查询',
...@@ -133,14 +130,11 @@ const ServiceLog = () => { ...@@ -133,14 +130,11 @@ const ServiceLog = () => {
}, },
]; ];
// 模糊查询匹配的样式 // 模糊查询匹配的样式
const searchStyle = val => { const searchStyle = val => {
let n; let n;
if (showSearchStyle) { if (showSearchStyle) {
n = val.replace( n = val.replace(new RegExp(searchWord, 'g'), `<span style='color:red'>${searchWord}</span>`);
new RegExp(searchWord, 'g'),
`<span style='color:red'>${searchWord}</span>`,
);
} else { } else {
n = val; n = val;
} }
...@@ -242,12 +236,7 @@ const ServiceLog = () => { ...@@ -242,12 +236,7 @@ const ServiceLog = () => {
const setTime = (time, value) => { const setTime = (time, value) => {
setTimeInterval(value); setTimeInterval(value);
setEndTime(moment(new Date(), 'YYYY-MM-DD HH:mm:ss')); setEndTime(moment(new Date(), 'YYYY-MM-DD HH:mm:ss'));
setStartTime( setStartTime(moment(new Date(new Date().getTime() - time * 60 * 1000), 'YYYY-MM-DD HH:mm:ss'));
moment(
new Date(new Date().getTime() - time * 60 * 1000),
'YYYY-MM-DD HH:mm:ss',
),
);
}; };
// 设置返回状态 // 设置返回状态
const changeStatus = value => { const changeStatus = value => {
...@@ -337,9 +326,7 @@ const ServiceLog = () => { ...@@ -337,9 +326,7 @@ const ServiceLog = () => {
<Spin spinning={loading} tip="loading"> <Spin spinning={loading} tip="loading">
<Row style={{ background: 'white' }}> <Row style={{ background: 'white' }}>
<Col span={8} style={{ paddingTop: '8px', paddingLeft: '5px' }}> <Col span={8} style={{ paddingTop: '8px', paddingLeft: '5px' }}>
<span style={{ fontSize: '14px', fontWeight: '600' }}> <span style={{ fontSize: '14px', fontWeight: '600' }}>访问量统计</span>
访问量统计
</span>
<span style={{ paddingLeft: '60%' }}>间隔:</span> <span style={{ paddingLeft: '60%' }}>间隔:</span>
<Select <Select
defaultValue="每小时" defaultValue="每小时"
...@@ -355,14 +342,10 @@ const ServiceLog = () => { ...@@ -355,14 +342,10 @@ const ServiceLog = () => {
</Select> </Select>
</Col> </Col>
<Col span={7} offset={1} style={{ paddingTop: '8px' }}> <Col span={7} offset={1} style={{ paddingTop: '8px' }}>
<span style={{ fontSize: '14px', fontWeight: '600' }}> <span style={{ fontSize: '14px', fontWeight: '600' }}>接口调用频次统计</span>
接口调用频次统计
</span>
</Col> </Col>
<Col span={7} offset={1} style={{ paddingTop: '8px' }}> <Col span={7} offset={1} style={{ paddingTop: '8px' }}>
<span style={{ fontSize: '14px', fontWeight: '600' }}> <span style={{ fontSize: '14px', fontWeight: '600' }}>接口平均耗时统计</span>
接口平均耗时统计
</span>
</Col> </Col>
</Row> </Row>
<Row className={styles.chart}> <Row className={styles.chart}>
...@@ -403,12 +386,7 @@ const ServiceLog = () => { ...@@ -403,12 +386,7 @@ const ServiceLog = () => {
Path: { alias: '接口调用频次' }, Path: { alias: '接口调用频次' },
}} }}
> >
<Axis <Axis name="Path" label="" title={{ offset: 20 }} className={styles.fontColor} />
name="Path"
label=""
title={{ offset: 20 }}
className={styles.fontColor}
/>
<Axis name="Count" title /> <Axis name="Count" title />
<Interval position="Path*Count" /> <Interval position="Path*Count" />
<Tooltip shared lock /> <Tooltip shared lock />
...@@ -442,8 +420,7 @@ const ServiceLog = () => { ...@@ -442,8 +420,7 @@ const ServiceLog = () => {
dataSource={dataTable} dataSource={dataTable}
scroll={{ x: 'max-content', y: 'calc(100vh - 580px)' }} scroll={{ x: 'max-content', y: 'calc(100vh - 580px)' }}
pagination={{ pagination={{
showTotal: (total, range) => showTotal: (total, range) => `第${range[0]}-${range[1]} 条/共 ${total} 条`,
`第${range[0]}-${range[1]} 条/共 ${total} 条`,
pageSizeOptions: [10, 20, 50, 100], pageSizeOptions: [10, 20, 50, 100],
defaultPageSize: 20, defaultPageSize: 20,
showQuickJumper: true, showQuickJumper: true,
......
...@@ -270,7 +270,10 @@ export default props => { ...@@ -270,7 +270,10 @@ export default props => {
<div className={styles.colorBox}> <div className={styles.colorBox}>
<div <div
className={styles.colorSwatch} className={styles.colorSwatch}
onClick={() => setDisplayColorPicker(!displayColorPicker)} onClick={e => {
e.stopPropagation();
setDisplayColorPicker(!displayColorPicker);
}}
> >
<div>{color}</div> <div>{color}</div>
<div <div
...@@ -282,11 +285,22 @@ export default props => { ...@@ -282,11 +285,22 @@ export default props => {
}} }}
/> />
</div> </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" /> <SketchPicker color={color} onChange={e => colorChange(e)} width="230px" />
) : null} </div>
</div> ) : null}
</div> </div>
</Form.Item> </Form.Item>
<Form.Item label="产品类型" name="productType"> <Form.Item label="产品类型" name="productType">
......
.siteConfigContainer {} .siteConfigContainer {}
.mask {
position: fixed;
top: 0;
left: 0;
width: 100vh;
height: 100vh;
// z-index: 1;
}
.colorBox { .colorBox {
.colorSwatch { .colorSwatch {
display: flex; display: flex;
......
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