From 71d0f2e30e7055b62175935876c7fcea2cd89398 Mon Sep 17 00:00:00 2001
From: wenlele <wen.lele@free-sun.com.cn>
Date: Sun, 9 Oct 2022 14:52:10 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E6=8F=90=E9=86=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../problem/components/inspection.jsx         | 13 +++++++--
 .../sections/problem/components/tableData.jsx |  1 +
 .../sections/problem/containers/dataAlarm.jsx | 29 +++++++++++++++----
 3 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/web/client/src/sections/problem/components/inspection.jsx b/web/client/src/sections/problem/components/inspection.jsx
index c99bf08..cd2ec2f 100644
--- a/web/client/src/sections/problem/components/inspection.jsx
+++ b/web/client/src/sections/problem/components/inspection.jsx
@@ -1,9 +1,10 @@
 
 import React, { useState, useEffect, useRef } from "react";
 import { connect } from "react-redux";
-import { Button, Form, Modal, Skeleton, Pagination, Table } from "@douyinfe/semi-ui";
+import { Button, Form, Modal, Skeleton, Pagination, Notification } from "@douyinfe/semi-ui";
 import moment from "moment";
 import PerfectScrollbar from "perfect-scrollbar";
+import copy from "copy-to-clipboard";
 import './inspection.less'
 import { log } from "ezuikit-js";
 
@@ -213,7 +214,7 @@ 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 >{v.app?.name}</span>
+                     <span style={{ color: '#4A4A4A' ,fontWeight: 500}}>{v.app?.name}</span>
                   </div>
                </div>)}
 
@@ -284,6 +285,14 @@ const Inspection = ({ dispatch, actions, user, route, statistic }) => {
                <span>截取时间:{moment(pictureData.createTime).format("YYYY-MM-DD HH:mm:ss")}</span>
                <img src={`/assets/images/problem/link.png`}
                   style={{ width: 16, height: 16, marginLeft: 6 }}
+                  onClick={() => {
+                     console.log(pictureData);
+                     copy(pictureData?.router || "无相关地址");
+                     Notification.success({
+                        content: "复制成功",
+                        duration: 2,
+                     })
+                  }}
                />
             </div>
             <img src={`/_file-server/${pictureData.screenshot}`}
diff --git a/web/client/src/sections/problem/components/tableData.jsx b/web/client/src/sections/problem/components/tableData.jsx
index d560b6b..1653d3e 100644
--- a/web/client/src/sections/problem/components/tableData.jsx
+++ b/web/client/src/sections/problem/components/tableData.jsx
@@ -254,6 +254,7 @@ const TableData = ({ route, dispatch, actions, collectData, setSetup, exhibition
                                  state: v.state,
                                  keywordTarget: v.keywordTarget,
                                  keyword: v.keyword,
+                                 kindId:v.kindId,
                                  groupUnitId: v.groupUnitId,
                                  errType: v.errType,
                                  confirmState: v.confirmState,
diff --git a/web/client/src/sections/problem/containers/dataAlarm.jsx b/web/client/src/sections/problem/containers/dataAlarm.jsx
index 4add6e8..c6bbf0b 100644
--- a/web/client/src/sections/problem/containers/dataAlarm.jsx
+++ b/web/client/src/sections/problem/containers/dataAlarm.jsx
@@ -108,11 +108,11 @@ const DataAlarm = ({ match, dispatch, actions, user, loading, socket, iotVcmpWeb
       videoAbnormal: [   // 视频异常(videoAbnormal)
          { name: '搜索', field: '1' },
          {
-            name: '设备类型', field: '2',
+            name: '设备类型', field: 'kindId',
             data: genre,
          },
          {
-            name: '异常状态', field: '3',
+            name: '异常状态', field: 'state',
             data: [
                { name: '当前', value: 'new' },
                { name: '历史', value: 'histroy' }]
@@ -148,7 +148,8 @@ const DataAlarm = ({ match, dispatch, actions, user, loading, socket, iotVcmpWeb
             name: '异常类型', field: '4',
             data: [
                { name: '离线', value: '11' }]
-         }],
+         }
+      ],
       common: {
          name: '告警时间',
          field: 'time'
@@ -160,7 +161,7 @@ const DataAlarm = ({ match, dispatch, actions, user, loading, socket, iotVcmpWeb
       dataLnterrupt: ['index', 'projectName', 'StructureName', 'SourceName', 'AlarmGroupUnit', 'AlarmCodeName', 'sustainTime', 'createTime', 'AlarmContent', 'CurrentLevel', 'updateTime', 'detailCount', 'confirm', 'confirmTime',],
       dataAbnormal: ['index', 'projectName', 'StructureName', 'SourceName', 'type', 'alarmType', 'createTime', 'sustainTime', 'AlarmContent', 'CurrentLevel', 'updateTime', 'detailCount', 'confirm', 'confirmTime'],
       strategyHit: ['index', 'projectName', 'StructureName', 'SourceName', 'Strategy', 'State', 'createTime', 'sustainTime', 'AlarmContent', 'CurrentLevel', 'updateTime', 'detailCount', 'confirm', 'confirmTime'],
-      videoAbnormal: ['index', 'projectName', 'StructureName', 'SourceName', 'station', 'cameraKindId', 'venderName', 'cameraSerialNo', 'cameraChannelNo', 'platform', 'AlarmContent', 'resolve', 'createTime', 'updateTime', 'confirm', 'confirmTime', 'camerOnline'],
+      videoAbnormal: ['index', 'projectName', 'StructureName', 'SourceName', 'station', 'cameraKindId', 'venderName', 'point', 'cameraSerialNo', 'cameraChannelNo', 'platform', 'AlarmContent', 'resolve', 'createTime', 'updateTime', 'confirm', 'confirmTime', 'camerOnline'],
       useAbnormal: ['index', 'projectName', 'appName', 'url', 'type', 'alarmContent', 'createTime', 'updateTime', 'confirm', 'confirmTime'],
       deviceAbnormal: ['index', 'projectName', 'StructureName', 'SourceName', 'station', 'alarmContent', 'venderName', 'AlarmContent', 'AlarmCodeName', 'createTime', 'updateTime', 'confirm', 'confirmTime'],
    }
@@ -228,6 +229,7 @@ const DataAlarm = ({ match, dispatch, actions, user, loading, socket, iotVcmpWeb
             </div> : ""
          }
       },
+      { name: '测点', sort: 4.1, value: 'point', render: (_, r, index) => r.station?.map(v => <div key={v.resolve + v.id} style={{ lineHeight: "22px" }}>{v.name}</div>) },
       { name: '中断类型', sort: 6, value: 'AlarmGroupUnit' },
       { name: '告警信息', sort: 5, value: 'AlarmContent' },
       { name: '常见原因', sort: 7, value: 'AlarmCodeName' },
@@ -448,6 +450,7 @@ const DataAlarm = ({ match, dispatch, actions, user, loading, socket, iotVcmpWeb
                      dispatch(problem.postApiConfirm({ appAlarmId: selected, confirm: content })).then(res => {
                         if (res.success) {
                            setConfirm(false)
+                           setSelected([])
                            setQuery({ limit: query.limit, page: query.page })
                         }
                      })
@@ -457,6 +460,7 @@ const DataAlarm = ({ match, dispatch, actions, user, loading, socket, iotVcmpWeb
                      dispatch(problem.putAlarmVideoConfirm({ alarmId: selected, content: content })).then(res => {
                         if (res.success) {
                            setConfirm(false)
+                           setSelected([])
                            setQuery({ limit: query.limit, page: query.page })
                         }
                      })
@@ -475,7 +479,8 @@ const DataAlarm = ({ match, dispatch, actions, user, loading, socket, iotVcmpWeb
                            }) || tableData
                            setTableData(data)
                            setConfirm(false)
-                           console.log(data)
+                           setSelected([])
+                           // console.log(data)
                         }
                      })
                   })
@@ -494,6 +499,20 @@ const DataAlarm = ({ match, dispatch, actions, user, loading, socket, iotVcmpWeb
                      field='textData'
                      onChange={(e) => setContent(e)} />
                </Form>
+               {(() => {
+                  let data
+                  if (selected.length == 1) {
+                     data = tableData.find(v => v.key == selected[0])
+                  }
+                  return data ? <div style={{ width: 450, marginLeft: 80, background: '#FFF6E9', fontWeight: 400, color: '#FE9812', fontSize: 13 }}>
+                     当前告警源-{data?.SourceName}，在项目{data?.projectName?.map((v, index) => {
+                        if (index > 0) {
+                           return '、' + v.name
+                        } else {
+                           return v.name
+                        }
+                     })}中被多次绑定（可能拥有不同的名称），确认后，该设备的同类型告警也会被一同确认。</div> : ""
+               })()}
             </div>
          </Modal> : ""}