From 1facf98bca8668a2f7a8b10e832253e5a7a17e9b Mon Sep 17 00:00:00 2001
From: wenlele <wen.lele@free-sun.com.cn>
Date: Thu, 29 Sep 2022 09:09:50 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=B1=95=E7=A4=BA=E4=BF=9D?=
 =?UTF-8?q?=E6=8A=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/sections/problem/actions/problem.jsx  | 25 +++++++++++++++++++
 .../sections/problem/components/tableData.jsx | 21 ++++++++++------
 .../sections/problem/containers/dataAlarm.jsx | 17 ++++++-------
 web/client/src/utils/webapi.js                |  3 +++
 4 files changed, 48 insertions(+), 18 deletions(-)

diff --git a/web/client/src/sections/problem/actions/problem.jsx b/web/client/src/sections/problem/actions/problem.jsx
index 5789fe3..dbe4e3f 100644
--- a/web/client/src/sections/problem/actions/problem.jsx
+++ b/web/client/src/sections/problem/actions/problem.jsx
@@ -121,4 +121,29 @@ export function putAlarmdataConfirm (data) {   //确认数据告警
       msg: { error: '确认数据告警失败' },
       reducer: { name: '' }
    });
+}
+
+export function getAlarmVideoList (query) {   //查询视频告警列表
+   return dispatch => basicAction({
+      type: 'get',
+      dispatch: dispatch,
+      query,
+      actionType: 'GET_ALARM_VIDEO_LIST',
+      url: `${ApiTable.getAlarmVideoList}`,
+      msg: { error: '查询视频告警列表失败' },
+      reducer: { name: '' }
+   });
+}
+
+
+
+export function getAlarmVideoDeviceKind () {   //查询视频设备类型
+   return dispatch => basicAction({
+      type: 'get',
+      dispatch: dispatch,
+      actionType: 'GET_ALARM_VIDEO_DEVICE_KIND',
+      url: `${ApiTable.getAlarmVideoDeviceKind}`,
+      msg: { error: '查询视频设备类型失败' },
+      reducer: { name: '' }
+   });
 }
\ No newline at end of file
diff --git a/web/client/src/sections/problem/components/tableData.jsx b/web/client/src/sections/problem/components/tableData.jsx
index 6ae2bc0..7033ded 100644
--- a/web/client/src/sections/problem/components/tableData.jsx
+++ b/web/client/src/sections/problem/components/tableData.jsx
@@ -48,11 +48,16 @@ const TableData = ({ route, dispatch, actions, collectData, setSetup, exhibition
             // })
             break;
          case 'videoAbnormal':
-            // dispatch(problem.getAlarmDataGroup()).then((res) => {
-
-
-            //    if (res.success) { }
-            // })
+            dispatch(problem.getAlarmVideoList({})).then((res) => {
+               if (res.success) {
+                  // console.log(res);
+               }
+            })
+            dispatch(problem.getAlarmVideoDeviceKind()).then((res) => {
+               if (res.success) {
+                  setGenre(res.payload.data.map(v => ({ name: v.kind, value: v.id })))
+               }
+            })
             break;
          default:
             dispatch(problem.getAlarmDataGroup()).then((res) => {
@@ -71,11 +76,11 @@ const TableData = ({ route, dispatch, actions, collectData, setSetup, exhibition
                         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) => {
-                        console.log(res);
+                        // console.log(res);
                         if (res.success) {
                            setCount(res.payload.data?.count || 0)
                            let tableDatas = res.payload.data?.rows?.map(v => ({
@@ -112,8 +117,8 @@ const TableData = ({ route, dispatch, actions, collectData, setSetup, exhibition
 
    }, [query, search])
 
+// console.log(query);
 
-console.log(query);
    return (
       <>
          <div style={{ backgroundColor: '#FFFFFF', paddingTop: 8 }}>
diff --git a/web/client/src/sections/problem/containers/dataAlarm.jsx b/web/client/src/sections/problem/containers/dataAlarm.jsx
index ed158ab..f4d9106 100644
--- a/web/client/src/sections/problem/containers/dataAlarm.jsx
+++ b/web/client/src/sections/problem/containers/dataAlarm.jsx
@@ -92,16 +92,13 @@ const DataAlarm = ({ match, dispatch, actions, user, loading, socket }) => {
          { name: '搜索', field: '1' },
          {
             name: '设备类型', field: '2',
-            data: [
-               { name: '枪机', value: '11' },
-               { name: '球机', value: '22' },
-               { name: '其他', value: '33' }]
+            data: genre,
          },
          {
             name: '异常状态', field: '3',
             data: [
-               { name: '当前', value: '11' },
-               { name: '历史', value: '22' }]
+               { name: '当前', value: 'new' },
+               { name: '历史', value: 'histroy' }]
          }],
       useAbnormal: [    // 应用异常(useAbnormal) 
          { name: '搜索', field: 'errType' },
@@ -174,7 +171,7 @@ const DataAlarm = ({ match, dispatch, actions, user, loading, socket }) => {
          name: '项目名称', sort: 3, value: 'projectName', render: (_, r, index) => {
             return <>
                {r.projectName?.map((v, index) => {
-                  return <div key={r.id + r.appName + index} style={{ width: 176, }}>
+                  return v.name ? <div key={r.id + r.appName + index} style={{ width: 176, }}>
                      {OutHidden({
                         number: 7,
                         name: v.name
@@ -186,8 +183,8 @@ const DataAlarm = ({ match, dispatch, actions, user, loading, socket }) => {
                         <img src={`/assets/images/install/${v.state == 'PMOS' ? 'icon_POMS' : 'icon_zhengque'}.png`} style={{ display: "inline-block", width: 10 }} />
                         <span style={{ display: "inline-block", color: v.state == 'PMOS' ? "rgb(255, 255, 255)" : "rgb(15, 126, 251)", width: 48, fontSize: 12, textAlign: "center" }}>{v.state}</span>
                      </div>
-                  </div>
-               }) 
+                  </div> : ""
+               })
                }
 
             </>
@@ -402,7 +399,7 @@ const DataAlarm = ({ match, dispatch, actions, user, loading, socket }) => {
             }}
          >
             <div style={{ display: 'flex', paddingLeft: 20 }}>
-               <span style={{ display: 'inline-block', width: 78 }}>确认信息:</span>            
+               <span style={{ display: 'inline-block', width: 78 }}>确认信息:</span>
                <TextArea maxCount={500} showClear onChange={(e) => setContent(e)} />
             </div>
          </Modal> : ""}
diff --git a/web/client/src/utils/webapi.js b/web/client/src/utils/webapi.js
index 2bb7c25..ceefa85 100644
--- a/web/client/src/utils/webapi.js
+++ b/web/client/src/utils/webapi.js
@@ -43,6 +43,9 @@ export const ApiTable = {
    getAlarmDataDetailAgg: 'alarm/data/detail_agg',    //查询数据告警详情聚集数据
    getAlarmDataDetail: 'alarm/data/detail',   //查询数据告警详情
    putAlarmdataConfirm: "alarm/data/confirm",     //确认数据告警
+   getAlarmVideoList: 'alarm/video/list',  //查询视频告警列表
+   getAlarmVideoDeviceKind: 'alarm/video/device_kind',  //查询视频设备类型
+
 
 
 };