From c51f9cb3a2a54fc774bf095a428847be9f6eddb9 Mon Sep 17 00:00:00 2001 From: wenlele Date: Sun, 9 Oct 2022 16:38:01 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E8=A7=88=E8=BF=87=E5=90=8E=E7=9A=84?= =?UTF-8?q?=20=E9=98=85=20=E5=AD=97=E6=A0=87=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/client/assets/images/problem/tick.png | Bin 0 -> 1890 bytes .../problem/components/inspection.jsx | 19 ++++++++++++++++-- .../sections/problem/components/tableData.jsx | 2 +- .../sections/problem/containers/dataAlarm.jsx | 6 +++--- 4 files changed, 21 insertions(+), 6 deletions(-) create mode 100644 web/client/assets/images/problem/tick.png diff --git a/web/client/assets/images/problem/tick.png b/web/client/assets/images/problem/tick.png new file mode 100644 index 0000000000000000000000000000000000000000..a28b4e164924fd6e775fefa469b1173ec0fd8558 GIT binary patch literal 1890 zcmV-o2c7tdP)Px+97#k$R9HvNSP4*-RTTaXtBAaWP>crzY7nR(NG@mrE@@hf*y5CFqgjnsmXPKG zIw~{fhMK9_Vx{G@BJE|Sk_je+D<}*qBDe$s0uN-p&AIRW&&ONf;b3`Y-pu>YfA6{9 zf6lqzx#tq@P@!AFC4_JVFaf|A06qXbbw4(DN%t!Puou7&L{!nybvgu02oVe5RR9kH zu(NWpCIANkY$BrFR?dM{z=ROP0jvfP!G;@~h1i!+ayQbmJY)6>-f zp017vQadANkUK{9a})Nqq^y$;U_KEYY7bzWz=ROC0M-F`jSXGB-XNBJbDlm+zk;f| z=JssM_bMk_Oo`})rH}gwkGmX{^)>>CCnAeRECLfkbO-PSfQK8JT13+BLQ4L*2%7p9 zs{k1fa(1*q+#^0ni1if?b~e23ZvdVmqDpfH%>vVbVz&pfmnJ5kpu+`Kw*<&|($Kyt zq{am+-aF0dVGf)LFkSe5<{fvks0QQL97l0^eW!p@jCi>@;>UR*2=?j5D)!tX#$h!F zYy;;Mdn!C3lR6ueA-Jrh2Nch}O++$}6=?-bxBLF&oQhnL-D%;o`eON$z4>(p5lK2?(F4|Xuc;01r-1Y?8mX5BO*+Nl8B0buIOALU`oUehr0=&$DV$LRii zr~v+{YDB;rhtX4IkAmc3aB;H3(ZXtkEzZR2-!7X_Ivk2Y^v>KbI%W&=_qG<}S{Q#n(ld^H(wAl)QytPB&e@|CwJUzb>%Tfx# z#-f8OPKwy`7DGx8vYtT)b9~#S?wo&9A5x+1N2F2tK-yr=6}q zRMJtCdH%hekhg9a>+^{yKmk?_pqtB#G}P3a7JR=RU2txLo?^f}*U!rtlZSc81r~f> zfMbO<`o-RTJ^;QwoaA%gxf#e`HxxFqZUZ0gzl50|oG}5$d0D+ZlJzx2!$QY-1wWU?;n?e{A8IAZOXSXbOgsP+zh+&!cy|LNf+P7 z4M5DG9@0j6O(S~E{u8}>I^p1wF!WG4Nd1_VN99q5tAXOx3uQO3bdn!tkMYt2vy{gM zbg_eoo>M|Ol{cFug3Vbq1VLWT()f|HRT#1)3$fwuNSPZfbxgL;ZOui=<`MF_x~>VT znSaRt2E@rnbNNx`#9-W1BKlMT#>{E9B=Kg_Y>z}22Q8cLI&=k7w&dbKLMS2wwS@cF z+T*eZNK2GFgky!(2wj{BwX1{F_3_a1-=Vxpj98v+g3Dq_;*mlKvqjw7%@IYLxJlB= z@|5#P$t=aOm4oGT!IfJ0#~;RwsC)3i3xQI{;XZk>28Z&mWB#K)u(Q>M_v5t7nEoE0 zrdx}_=GsR@qxfyR$DZh*?%20j>j{==TXVs>>5<&y0&_me$EH2SSUI^j7R0nB+|;a6 zObplNCd<5C1z2lvs$iYbu_u;@Qdy1Y&&BCc-4QzFU z$@$bQ04IAJINEDH!@_;#-bDl9q)UPP%e9hbt{b&|OJaSo> z%&N(pbF8}~E>#Q@QP&8sVJcz$|9%Z+%m{bf#hn>|TqGaWU3Gd}xaz#9yD+)^SDo#V cYG=Ox7eY}{R8XN!`2YX_07*qoM6N<$f__k@mH+?% literal 0 HcmV?d00001 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);