diff --git a/web/client/src/sections/problem/components/tableData.jsx b/web/client/src/sections/problem/components/tableData.jsx index 6af2197..6ac0a52 100644 --- a/web/client/src/sections/problem/components/tableData.jsx +++ b/web/client/src/sections/problem/components/tableData.jsx @@ -27,7 +27,7 @@ const TableData = ({ route, dispatch, actions, collectData, setSetup, exhibition let tableDatas = res.payload.data?.rows.map(v => ({ key: v.id, projectName: v.app?.projectCorrelations?.map(r => (r.name ? { name: r.name, state: 'PMOS' } : { - name: r.pepProject?.project_name, state: r.pepProject?.construction_status + name: r.pepProject?.projectName, state: r.pepProject?.constructionStatus }))?.filter(c => c), appName: v.app?.name, url: v.app?.url, @@ -38,6 +38,7 @@ const TableData = ({ route, dispatch, actions, collectData, setSetup, exhibition screenshot: v.screenshot, type: v.type ? typeData[v.type] : "", confirm: v.confirm, + confirmAuto: v.confirmAuto, })) setCount(tableDatas?.length || 0); setTableData(tableDatas) @@ -76,6 +77,7 @@ const TableData = ({ route, dispatch, actions, collectData, setSetup, exhibition platform: v.platform, confirm: v.confirmContent, camerOnline: v.camerOnline, + autoRestore: v.autoRestore, })) setCount(tableDatas?.length || 0); setTableData(tableDatas) diff --git a/web/client/src/sections/problem/containers/dataAlarm.jsx b/web/client/src/sections/problem/containers/dataAlarm.jsx index 76163f4..60fb2da 100644 --- a/web/client/src/sections/problem/containers/dataAlarm.jsx +++ b/web/client/src/sections/problem/containers/dataAlarm.jsx @@ -250,7 +250,7 @@ const DataAlarm = ({ match, dispatch, actions, user, loading, socket, iotVcmpWeb { name: '产生次数', sort: 19, value: 'detailCount', render: (_, r, index) => r.detailCount + '次' }, { name: '确认信息', sort: 20, value: 'confirm', render: (_, r, index) => { - return r.State == 3 ? '无' : r.State == 4 ? r.confirm || '无' : r.confirmTime ? r.confirm : '未确认' + return r.State == 3 || r.autoRestore || r.confirmAuto ? '无' : r.State == 4 ? r.confirm || '无' : r.confirmTime ? r.confirm : '未确认' } }, { name: '确认/恢复时间', sort: 21, value: 'confirmTime', render: (_, r, index) =>
{r.confirmTime ? r.confirmTime : "无"}
}, @@ -310,7 +310,7 @@ const DataAlarm = ({ match, dispatch, actions, user, loading, socket, iotVcmpWeb setConfirm(true) setSelected([r.key]) }}>确认 - : r.State == 3 ? + : r.State == 3 || r.autoRestore || r.confirmAuto ? : }