Browse Source

预览过后的 阅 字标识

dev
wenlele 2 years ago
parent
commit
c51f9cb3a2
  1. BIN
      web/client/assets/images/problem/tick.png
  2. 19
      web/client/src/sections/problem/components/inspection.jsx
  3. 2
      web/client/src/sections/problem/components/tableData.jsx
  4. 6
      web/client/src/sections/problem/containers/dataAlarm.jsx

BIN
web/client/assets/images/problem/tick.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

19
web/client/src/sections/problem/components/inspection.jsx

@ -103,6 +103,19 @@ const Inspection = ({ dispatch, actions, user, route, statistic }) => {
<div style={{ flex: 1, position: 'relative' }}>
<Form
onSubmit={(v) => {
// 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 }) => {
<img src={`/_file-server/${v.screenshot}`} style={{ width: 400, height: 182 }} />
<div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'flex-end', margin: '10px 6px 0', color: '#005ABD' }}>
<span style={{ fontSize: 12 }}>获取时间{moment(v.createTime).format("YYYY-MM-DD HH:mm:ss")}</span>
<span style={{ color: '#4A4A4A' ,fontWeight: 500}}>{v.app?.name}</span>
<span style={{ color: '#4A4A4A', fontWeight: 500 }}>{v.app?.name}</span>
</div>
{v.notedPepUser ? <img src="/assets/images/problem/tick.png" style={{ width: 19, position: "absolute", top: -6, right: -10 }} /> : ""}
</div>)}
</div>

2
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 => ({

6
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) => <div style={{ width: 130 }}>{r.createTime || '无'}</div> },
{ name: '更新时间', sort: 23, value: 'updateTime', render: (_, r, index) => <div style={{ width: 130 }}>{r.updateTime || '无'}</div> },
// { 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) => <div style={{ width: 130 }}>{r.confirmTime ? r.confirmTime : "无"}</div> },
{
name: '持续时间', sort: 19.5, value: 'sustainTime', render: (_, r, index) => {
// console.log(r.updateTime);

Loading…
Cancel
Save