+ return r.SourceName ?
{r.SourceName}
-
{data}
+ {data ?
{data}
: ""}
: ""
}
},
{ name: '中断类型', sort: 6, value: 'AlarmGroupUnit' },
{ name: '告警信息', sort: 5, value: 'AlarmContent' },
{ name: '常见原因', sort: 7, value: 'AlarmCodeName' },
- { name: '产生时间', sort: 22, value: 'createTime' },
- { name: '更新时间', sort: 23, value: '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) => {
@@ -230,13 +239,13 @@ const DataAlarm = ({ match, dispatch, actions, user, loading, socket }) => {
{ 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 : '未确认'
+ 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: 19.5, value: 'sustainTime', render: (_, r, index) => {
- console.log(r.updateTime);
+ // console.log(r.updateTime);
let time = moment(r.updateTime).diff(moment(r.createTime), 'seconds')
// console.log(time);
return time < 60 ? '< 1分钟' : time > 3600 ? Math.floor(time / 3600) + '小时' + Math.floor((time - Math.floor(time / 3600) * 3600) / 60) + '分钟' : Math.floor((time - Math.floor(time / 3600) * 3600) / 60) + '分钟'
@@ -259,9 +268,15 @@ const DataAlarm = ({ match, dispatch, actions, user, loading, socket }) => {
return '当前'
}
},
- { name: '位置信息', sort: 11, value: '19' },
- { name: '设备类型', sort: 6, value: '20' },
- { name: '设备厂家', sort: 10, value: '21' },
+ { name: '位置信息', sort: 11, value: 'station', render: (_, r, index) => r.station?.map(v =>
{v.position}
) },
+ {
+ name: '设备类型', sort: 6, value: 'cameraKindId', render: (_, r, index) => {
+
+ }
+ },
+ { name: '设备厂家', sort: 10, value: 'venderName', render: (_, r, index) => r.platform ? '未知' : r.venderName },
+ { name: '通道号', sort: 10.1, value: 'cameraChannelNo' },
+ { name: '系列号', sort: 10.2, value: 'cameraSerialNo' },
{
name: '接入方式', sort: 9, value: 'platform', render: (_, r, index) => {
let accessType = { yingshi: "萤石云", nvr: "NVR", ipc: "IPC", cascade: "级联" }
@@ -271,28 +286,34 @@ const DataAlarm = ({ match, dispatch, actions, user, loading, socket }) => {
{ name: '应用名称', sort: 2, value: 'appName' },
{ name: 'URL地址', sort: 16, value: 'url' },
{ name: '异常类型', sort: 6, value: 'type' },
- { name: '解决方案', sort: 17, value: '111' },
+ { name: '解决方案', sort: 17, value: 'resolve', render: (_, r, index) => r.resolve?.map(v =>
{v.resolve}
) },
{ name: '在离线', sort: 18, value: 'camerOnline' },
{
name: '操作', sort: 25, value: 'text', render: (_, r, index) => {
return
- {r.State || r.State == 0 ? r.State >= 0 && r.State < 3 ?
+ {r.State && r.State >= 0 && r.State < 3 || route && ['videoAbnormal', 'useAbnormal'].includes(route) && !r.confirmTime ?
: r.State == 3 ?
:
- : ""
+
}
- {route ? ['dataLnterrupt', 'dataAbnormal', 'strategyHit'].includes(route) ? <>
+ {route && ['dataLnterrupt', 'dataAbnormal', 'strategyHit'].includes(route) ? <>
- : "" : ""
+ : route == 'videoAbnormal' ? <>
+
+
+ : ""
}
}
@@ -352,7 +373,7 @@ const DataAlarm = ({ match, dispatch, actions, user, loading, socket }) => {
return (
- route=='dataLnterrupt'|| route=='dataAbnormal'|| route=='strategyHit'?
+ // route=='dataLnterrupt'|| route=='dataAbnormal'|| route=='strategyHit'?
{/* 滞留提醒 */}
@@ -412,15 +433,23 @@ const DataAlarm = ({ match, dispatch, actions, user, loading, socket }) => {
onOk={() => {
if (route == 'useAbnormal') {
- dispatch(problem.postApiConfirm({ appAlarmId: selected, confirm: content })).then(res => {
- if (res.success) {
- setConfirm(false)
- setQuery({ limit: query.limit, page: query.page })
- }
-
+ TextAreaApi.current.validate().then((v) => {
+ dispatch(problem.postApiConfirm({ appAlarmId: selected, confirm: content })).then(res => {
+ if (res.success) {
+ setConfirm(false)
+ setQuery({ limit: query.limit, page: query.page })
+ }
+ })
})
} else if (route == 'videoAbnormal') {
- setConfirm(false)
+ TextAreaApi.current.validate().then((v) => {
+ dispatch(problem.postApiConfirm({ appAlarmId: selected, confirm: content })).then(res => {
+ if (res.success) {
+ setConfirm(false)
+ setQuery({ limit: query.limit, page: query.page })
+ }
+ })
+ })
} else {
TextAreaApi.current.validate().then((v) => {
dispatch(problem.putAlarmdataConfirm({ alarmId: selected, content: content })).then(res => {
@@ -466,7 +495,7 @@ const DataAlarm = ({ match, dispatch, actions, user, loading, socket }) => {
/> : ""
}
- :
+ // :
)
}