From 4190a72da77d212d71c4fc1c2fb73412d73ab59d Mon Sep 17 00:00:00 2001 From: wenlele Date: Wed, 28 Sep 2022 18:14:22 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/client/assets/images/problem/export.png | Bin 1302 -> 6539 bytes web/client/assets/images/problem/setup.png | Bin 2069 -> 9404 bytes .../src/sections/problem/actions/problem.jsx | 2 +- .../sections/problem/components/tableData.jsx | 33 ++--- .../sections/problem/containers/dataAlarm.jsx | 116 +++++++++--------- 5 files changed, 75 insertions(+), 76 deletions(-) diff --git a/web/client/assets/images/problem/export.png b/web/client/assets/images/problem/export.png index 2227ba826ac1880e0b311b71c0afb97665b1c8f6..db58c910ef3fcf385928c03cec28c7f13672cf03 100644 GIT binary patch literal 6539 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 literal 1302 zcmV+x1?l>UP)Px(&`Cr=R9HvVn0-u@RT#j3=e;)!RKg8$Wi831oXH3o!&=C_i%t4Kv#E72YG13Z zY}1-^eQM@(trDwQo3l2(aHp>PEUmWg1)JX_T1loMEf*HJi7254?`h{=5H4`v_aIlX z_s?^l^E|)zdEV#ayn<`|5!!q+${yC1wGx!ZpOoYt(AA{}=nX!EG`H$1wUiU$Jc3V1 zNSx2gtbgrvUVXq2kvM}PmUDaFA{GkM3i5IQcOt|gyEpH)FXjC}TF1IL1uVhuE{-jr z!}$!p37_^F&=dR?%zU5`9yl9_%|{6~fqol(Rs_1Al;+i{HJW zC&+#P6o(OFB9gbk^Z;=P<2MZBIeZfWT_O7i&~WCHknj&pXICN3M*s&N)j-gy=T@7*~NX1f#xUPuO+^TlS{smMN-r&t3eMp(t2DKZ9(~ECHO{gGg zWn=)yP#Dcfnh-M5H=zid$>BvI zF_=n;`-`gy7y#3y6)`2`a1`Rp+j@C`gUxlEbKVp(HmIeRk6q_%4HpF$Ajv|~#dV!e z%3DFEhgNz8IP?27S}yJY;z6{691;m6>Je;1vXL~`R=fTh^<_N4r@>s+J3wz)0kpn@ zWUQ^1!fE#tIObEDw_QuVvyiv^DP&8yjoNx}y>zf8_%5cL+pc58(0C?iC6hfeksFf+ zgqCYhUts_7MmANP;`jRI4s(VmrqDHyY0Bf8k2au!+Z^10l!Z!lYDzpyr;lV>PD<3e zq&}?md+K;)T{SgzZJUSo`8# zOwUP)8W}r4b#UFDIv)Gz=QbT;GJf}F%TQ|os>x!e%GTq{$6GdP9YB>hx6Rqzmfd0v ze)p`t0@i~}o>OoO#YLkmb?E>q1#^7I_~7dkszBD`cSjG261Mc<^T9zhm}ixofA$z2 zA3rQ6fc{;7<6Ut$tSiYFY}pnq0mJR=SEVQTdM0_JlVSo`_Dch<#clU=XWSjEx$kIH z#s6{*n>h~(=d z;3CS55UVM5Khf7RV_T^ARyX2WTuJlA@Q{))z(M&NnPjC7?q)mog<7-KZP;JW)DOcQ zV&mMg6lS(vB|0HqnN}AnmU_d&vh62`a~jOfAKuM#S8iBnH+4;qTM9B}1FNAf-`^mm z#YL%800iksd2eVXRwMt(h70Vg?qTG&OjnIfTflZ5y}dMP*wzx!22|Qqb{`F@pXgJ7 z0#(c-jfe&$2M}TxQtZRf45<}qsq0I%t#@(nsz|lP-d^0b+}2&_KTbd2N9LieQUCw| M07*qoM6N<$f;E9}2LJ#7 diff --git a/web/client/assets/images/problem/setup.png b/web/client/assets/images/problem/setup.png index 58aa2945a114e16ed2cdb057cf8f71173bd721aa..ebbf5de1d159bc14345075dc6fe32cacd22cf74f 100644 GIT binary patch literal 9404 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 ({ key: v.id, // serialNumber: v.serialNumber, - projectName: v.app?.projectCorrelations?.map(r => (r.name?{ name: r.name, state: '自定义' }:{ name: r.pepProject?.project_name, state: r.pepProject?.construction_status + projectName: v.app?.projectCorrelations?.map(r => (r.name ? { name: r.name, state: '自定义' } : { + name: r.pepProject?.project_name, state: r.pepProject?.construction_status }))?.filter(c => c), appName: v.app?.name, url: v.app?.url, @@ -58,14 +59,14 @@ const TableData = ({ route, dispatch, actions, collectData, setSetup, exhibition if (route == 'dataAbnormal') data = res.payload.data?.filter(v => v.desc == '数据异常') if (route == 'strategyHit') data = res.payload.data?.filter(v => v.desc == '策略命中') if (route == 'deviceAbnormal') data = res.payload.data?.filter(v => v.desc == '掉线' || v.desc == '不活跃') - console.log(data); + // console.log(data); let genreData = [] data?.map(v => { v?.unit?.map(vv => { - genreData.push({ name: vv.name, id: vv.id }) + genreData.push({ name: vv.name, value: vv.id }) }) }) - // console.log(genreData); + console.log(genreData); setGenre(genreData) if (data && data[0]?.id) { dispatch(problem.getAlarmDataList({ ...query, ...search, groupId: data.map(v => v.id).join(), pepProjectId: '' })).then((res) => { @@ -75,14 +76,16 @@ const TableData = ({ route, dispatch, actions, collectData, setSetup, exhibition let tableDatas = res.payload.data?.rows?.map(v => ({ key: v.AlarmId, StructureName: v.StructureName, - projectName: [], + projectName: v.pomsProject?.map(r => (r.name ? { name: r.name, state: '自定义' } : { + name: r.pepProject?.projectName, state: r.pepProject?.constructionStatus + }))?.filter(c => c), createTime: v.StartTime ? moment(v.StartTime).format("YYYY-MM-DD HH:mm:ss") : "", updateTime: v.EndTime ? moment(v.EndTime).format("YYYY-MM-DD HH:mm:ss") : "", confirmTime: v.confirmedTime ? moment(v.confirmedTime).format("YYYY-MM-DD HH:mm:ss") : "", SourceName: v.SourceName, - AlarmGroupUnit: v.AlarmGroupUnit ? genreData.find(r => r.id == v.AlarmGroupUnit)?.name : "", - Strategy: v.AlarmGroupUnit ? genreData.find(r => r.id == v.AlarmGroupUnit)?.name : "", - type: v.AlarmGroupUnit ? genreData.find(r => r.id == v.AlarmGroupUnit)?.name : "", + AlarmGroupUnit: v.AlarmGroupUnit ? genreData.find(r => r.value == v.AlarmGroupUnit)?.name : "", + Strategy: v.AlarmGroupUnit ? genreData.find(r => r.value == v.AlarmGroupUnit)?.name : "", + type: v.AlarmGroupUnit ? genreData.find(r => r.value == v.AlarmGroupUnit)?.name : "", AlarmCodeName: v.AlarmCodeName, CurrentLevel: v.CurrentLevel, detailCount: v.detailCount, @@ -122,7 +125,7 @@ const TableData = ({ route, dispatch, actions, collectData, setSetup, exhibition let frame = [] collectData[route]?.map((v, index) => { if (index == 0) { - frame.push( + frame.push( {[{ name: "告警源", value: "source" }, { name: "项目", value: "pepProject" }, { name: "结构物", value: "struc" },].map(vv => { return {vv.name} @@ -136,7 +139,7 @@ const TableData = ({ route, dispatch, actions, collectData, setSetup, exhibition labelPosition="left" field={v.field} key={v.field} - style={{ width: 116, marginRight: 10, color: "#F9F9F9", }} + style={{ width: 116, marginRight: 16, color: "#F9F9F9", }} placeholder="全部" filter showClear @@ -171,7 +174,8 @@ const TableData = ({ route, dispatch, actions, collectData, setSetup, exhibition display: "flex", justifyContent: "space-between", alignItems: "flex-end", - marginRight: 10 + marginRight: 20, + marginBottom: 16 }} > @@ -191,15 +195,16 @@ const TableData = ({ route, dispatch, actions, collectData, setSetup, exhibition // sustainTimeStart: v.time ? moment(v.time[0]).format("YYYY-MM-DD HH:mm:ss") : "", // sustainTimeEnd: v.time ? moment(v.time[1]).format("YYYY-MM-DD HH:mm:ss") : "", // }); - + console.log(v.time); setSearch({ state: v.state, keywordTarget: v.keywordTarget, keyword: v.keyword, groupUnitId: v.groupUnitId, - sustainTimeStart: v.time ? moment(v.time[0]).format("YYYY-MM-DD HH:mm:ss") : "", - sustainTimeEnd: v.time ? moment(v.time[1]).format("YYYY-MM-DD HH:mm:ss") : "", + sustainTimeStart: v.time && v.time.length > 0 ? moment(v.time[0]).format("YYYY-MM-DD HH:mm:ss") : "", + sustainTimeEnd: v.time && v.time.length > 0 ? moment(v.time[1]).format("YYYY-MM-DD HH:mm:ss") : "", }); + setSelected([]) setQuery({ limit: 10, page: 0 }) }); }} diff --git a/web/client/src/sections/problem/containers/dataAlarm.jsx b/web/client/src/sections/problem/containers/dataAlarm.jsx index 32d001f..0252979 100644 --- a/web/client/src/sections/problem/containers/dataAlarm.jsx +++ b/web/client/src/sections/problem/containers/dataAlarm.jsx @@ -165,13 +165,13 @@ const DataAlarm = ({ match, dispatch, actions, user, loading, socket }) => { //所有表格信息 const columnAll = [ { - name: "序号", value: "index", render: (_, r, index) => { + name: "序号", sort: 1, value: "index", render: (_, r, index) => { return index + 1; }, }, - { name: '问题编号', value: 'serialNumber', render: (_, r, index) => r.serialNumber }, + { name: '问题编号', sort: 1, value: 'serialNumber', render: (_, r, index) => r.serialNumber }, { - name: '项目名称', value: 'projectName', render: (_, r, index) => { + name: '项目名称', sort: 3, value: 'projectName', render: (_, r, index) => { return <> {r.projectName?.map((v, index) => { return
@@ -193,9 +193,9 @@ const DataAlarm = ({ match, dispatch, actions, user, loading, socket }) => { } }, - { name: '结构物名称', value: 'StructureName' }, + { name: '结构物名称', sort: 4, value: 'StructureName' }, { - name: '告警源', value: 'SourceName', render: (_, r, index) => { + name: '告警源', sort: 2, value: 'SourceName', render: (_, r, index) => { let data = '' if (route == 'dataLnterrupt' || route == 'dataAbnormal') { data = '传感器' @@ -207,47 +207,69 @@ const DataAlarm = ({ match, dispatch, actions, user, loading, socket }) => {
} }, - { name: '中断类型', value: 'AlarmGroupUnit' }, - { name: '告警信息', value: 'AlarmContent' }, - { name: '常见原因', value: 'AlarmCodeName' }, - { name: '产生时间', value: 'createTime' }, - { name: '更新时间', value: 'updateTime' }, - { name: '服务器地址', value: '9' }, + { 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: 12, value: '9' }, { - name: '告警等级', value: 'CurrentLevel', render: (_, r, index) => { + name: '告警等级', sort: 13, value: 'CurrentLevel', render: (_, r, index) => { let data = { 1: '一级', 2: '二级', 3: '三级' } return data[r.CurrentLevel] } }, - { name: '产生次数', value: 'detailCount', render: (_, r, index) => r.detailCount + '次' }, - { name: '确认信息', value: 'confirm', render: (_, r, index) => r.confirm }, - { name: '确认/恢复时间', value: 'confirmTime', }, + { name: '产生次数', sort: 19, value: 'detailCount', render: (_, r, index) => r.detailCount + '次' }, + { name: '确认信息', sort: 20, value: 'confirm', render: (_, r, index) => r.confirm }, + { name: '确认/恢复时间', sort: 21, value: 'confirmTime', }, { - name: '异常信息', value: 'alarmContent', render: (_, r, index) => { + name: '异常信息', sort: 14, value: 'alarmContent', render: (_, r, index) => { return <>{r.alarmContent} {r.screenshot ? (setAnomaly(r.screenshot), setPictures(true))} /> : ""} } }, - { name: '异常原因', value: 'alarmType' }, - { name: '策略类型', value: 'Strategy' }, + { name: '异常原因', sort: 8, value: 'alarmType' }, + { name: '策略类型', sort: 6, value: 'Strategy' }, { - name: '命中状态', value: 'State', render: (_, r, index) => { + name: '命中状态', sort: 15, value: 'State', render: (_, r, index) => { if (r.State == 3 || r.State == 4) { return '历史' } return '当前' } }, - { name: '位置信息', value: '19' }, - { name: '设备类型', value: '20' }, - { name: '设备厂家', value: '21' }, - { name: '接入方式', value: '22' }, - { name: '应用名称', value: 'appName' }, - { name: 'URL地址', value: 'url' }, - { name: '异常类型', value: 'type' }, - { name: '解决方案', value: '111' }, - { name: '在离线', value: '56115' }, + { name: '位置信息', sort: 11, value: '19' }, + { name: '设备类型', sort: 6, value: '20' }, + { name: '设备厂家', sort: 10, value: '21' }, + { name: '接入方式', sort: 9, value: '22' }, + { name: '应用名称', sort: 2, value: 'appName' }, + { name: 'URL地址', sort: 16, value: 'url' }, + { name: '异常类型', sort: 6, value: 'type' }, + { name: '解决方案', sort: 17, value: '111' }, + { name: '在离线', sort: 18, value: '56115' }, + { + name: '操作', sort: 25, value: 'text', render: (_, r, index) => { + return
+ {r.State || r.State == 0 ? r.State >= 0 && r.State < 3 ? : + : "" + } + {route ? ['dataLnterrupt', 'dataAbnormal', 'strategyHit'].includes(route) ? <> + + + + : "" : "" + } +
+ } + }, ] @@ -265,7 +287,7 @@ const DataAlarm = ({ match, dispatch, actions, user, loading, socket }) => { // data = ['AlarmCodeName'] // data.splice(1, 0, ...arr) // } else { - data.splice(1, 0, ...arr) + data.splice(1, 0, ...arr, 'text') // } @@ -275,33 +297,12 @@ const DataAlarm = ({ match, dispatch, actions, user, loading, socket }) => { let TableDisplay = data?.map(v => { let datas = columnAll?.find(vv => v == vv.value) if (datas) { - return { title: datas.name, dataIndex: datas.value, rowKey: datas.value, render: datas.render } + return { title: datas.name, sort: datas.sort, dataIndex: datas.value, rowKey: datas.value, render: datas.render } } }) - // console.log(TableDisplay); + TableDisplay.sort((a, b) => a.sort - b.sort) - TableDisplay.push({ - title: '操作', - dataIndex: 'text', - rowKey: 'text', - render: (_, r) => { - return
- {r.confirmTime ? : - - } - {route ? ['dataLnterrupt', 'dataAbnormal', 'strategyHit'].includes(route) ? <> - - - - : "" : "" - } -
- } - }) // console.log(TableDisplay); // console.log(setup); setExhibition(TableDisplay) @@ -319,18 +320,10 @@ const DataAlarm = ({ match, dispatch, actions, user, loading, socket }) => { + // console.log(selected); - const distinguish = (route) => { - switch (route) { - case value: - break; - - default: - break; - } - } return (
{/* 滞留提醒 */} @@ -396,6 +389,7 @@ const DataAlarm = ({ match, dispatch, actions, user, loading, socket }) => { } else if (route == 'videoAbnormal') { setConfirm(false) } else { + console.log(selected); dispatch(problem.putAlarmdataConfirm({ alarmId: selected, content: content })).then(res => { if (res.success) { setConfirm(false)