diff --git a/web/client/assets/images/problem/tick.png b/web/client/assets/images/problem/tick.png new file mode 100644 index 0000000..a28b4e1 Binary files /dev/null and b/web/client/assets/images/problem/tick.png differ diff --git a/web/client/src/sections/problem/components/inspection.jsx b/web/client/src/sections/problem/components/inspection.jsx index cd2ec2f..a129dee 100644 --- a/web/client/src/sections/problem/components/inspection.jsx +++ b/web/client/src/sections/problem/components/inspection.jsx @@ -103,6 +103,19 @@ const Inspection = ({ dispatch, actions, user, route, statistic }) => {
{ + // console.log({ + // appId: v.appId, + // noted: v.noted, + // projectId: v.projectId, + // timeStart: v.time == 'true' ? + // moment().startOf('day').format('YYYY-MM-DD HH:mm:ss') : + // v.time == 'false' ? + // moment().day(moment().day() - 1).startOf('day').format('YYYY-MM-DD HH:mm:ss') : "", + // timeEnd: v.time == 'true' ? + // moment().endOf('day').format('YYYY-MM-DD HH:mm:ss') : + // v.time == 'false' ? + // moment().day(moment().day() - 1).endOf('day').format('YYYY-MM-DD HH:mm:ss') : "", + // }); setCheckPatrol({ appId: v.appId, noted: v.noted, @@ -204,7 +217,8 @@ const Inspection = ({ dispatch, actions, user, route, statistic }) => { display: 'inline-block', margin: '8px 20px 8px 0', boxShadow: ' 0px 2px 12px 1px #F2F3F5', - borderRadius: 2, border: '1px solid rgba(220,222,224,0.2)' + borderRadius: 2, border: '1px solid rgba(220,222,224,0.2)', + position: 'relative', }} onClick={() => { setPicturePop(true) @@ -214,8 +228,9 @@ const Inspection = ({ dispatch, actions, user, route, statistic }) => {
获取时间:{moment(v.createTime).format("YYYY-MM-DD HH:mm:ss")} - {v.app?.name} + {v.app?.name}
+ {v.notedPepUser ? : ""}
)} diff --git a/web/client/src/sections/problem/components/tableData.jsx b/web/client/src/sections/problem/components/tableData.jsx index 1653d3e..a9652ee 100644 --- a/web/client/src/sections/problem/components/tableData.jsx +++ b/web/client/src/sections/problem/components/tableData.jsx @@ -22,7 +22,7 @@ const TableData = ({ route, dispatch, actions, collectData, setSetup, exhibition switch (route) { case 'useAbnormal': dispatch(problem.getAlarmLnspectionApi({ ...search, pepProjectId: '' })).then((res) => { - console.log(res.payload.data) + // console.log(res.payload.data) if (res.success) { let typeData = { element: "元素异常", apiError: "接口报错 ", timeout: "加载超时" } let tableDatas = res.payload.data?.rows.map(v => ({ diff --git a/web/client/src/sections/problem/containers/dataAlarm.jsx b/web/client/src/sections/problem/containers/dataAlarm.jsx index c6bbf0b..f5303f4 100644 --- a/web/client/src/sections/problem/containers/dataAlarm.jsx +++ b/web/client/src/sections/problem/containers/dataAlarm.jsx @@ -233,8 +233,8 @@ const DataAlarm = ({ match, dispatch, actions, user, loading, socket, iotVcmpWeb { name: '中断类型', sort: 6, value: 'AlarmGroupUnit' }, { name: '告警信息', sort: 5, value: 'AlarmContent' }, { name: '常见原因', sort: 7, value: 'AlarmCodeName' }, - { name: '产生时间', sort: 22, value: 'createTime', render: (_, r, index) => r.createTime || '无' }, - { name: '更新时间', sort: 23, value: 'updateTime', render: (_, r, index) => r.updateTime || '无' }, + { name: '产生时间', sort: 22, value: 'createTime', render: (_, r, index) =>
{r.createTime || '无'}
}, + { name: '更新时间', sort: 23, value: 'updateTime', render: (_, r, index) =>
{r.updateTime || '无'}
}, // { name: '服务器地址', sort: 12, value: '9' }, { name: '告警等级', sort: 13, value: 'CurrentLevel', render: (_, r, index) => { @@ -251,7 +251,7 @@ const DataAlarm = ({ match, dispatch, actions, user, loading, socket, iotVcmpWeb return r.State == 3 ? '无' : r.State == 4 ? r.confirm : r.confirm || '未确认' } }, - { name: '确认/恢复时间', sort: 21, value: 'confirmTime', render: (_, r, index) => r.confirmTime ? r.confirmTime : "无" }, + { name: '确认/恢复时间', sort: 21, value: 'confirmTime', render: (_, r, index) =>
{r.confirmTime ? r.confirmTime : "无"}
}, { name: '持续时间', sort: 19.5, value: 'sustainTime', render: (_, r, index) => { // console.log(r.updateTime);