diff --git a/web/client/src/sections/problem/components/tableData.jsx b/web/client/src/sections/problem/components/tableData.jsx index 4bce85b..5a70c70 100644 --- a/web/client/src/sections/problem/components/tableData.jsx +++ b/web/client/src/sections/problem/components/tableData.jsx @@ -54,9 +54,9 @@ const TableData = ({ route, dispatch, actions, collectData, setSetup, exhibition let tableDatas = res.payload.data?.map(v => ({ key: v.alarmId, StructureName: v.struc, - // projectName: v.pomsProject?.map(r => (r.name ? { name: r.name, state: 'PMOS' } : { - // name: r.pepProject?.projectName, state: r.pepProject?.constructionStatus - // }))?.filter(c => c), + projectName: v.pomsProject?.map(r => (r.name ? { name: r.name, state: 'PMOS' } : { + name: r.pepProject?.projectName, state: r.pepProject?.constructionStatus + }))?.filter(c => c), createTime: v.createTime ? moment(v.createTime).format("YYYY-MM-DD HH:mm:ss") : "", updateTime: v.updateTime ? moment(v.updateTime).format("YYYY-MM-DD HH:mm:ss") : "", confirmTime: v.confirmTime ? moment(v.confirmTime).format("YYYY-MM-DD HH:mm:ss") : "", diff --git a/web/client/src/sections/problem/containers/dataAlarm.jsx b/web/client/src/sections/problem/containers/dataAlarm.jsx index ce4e403..f4d8bbd 100644 --- a/web/client/src/sections/problem/containers/dataAlarm.jsx +++ b/web/client/src/sections/problem/containers/dataAlarm.jsx @@ -34,6 +34,8 @@ const DataAlarm = ({ match, dispatch, actions, user, loading, socket }) => { const [alarmId, setAlarmId] = useState(false) //查看alarmId const [query, setQuery] = useState({ limit: 10, page: 0 }) //分页 const [tableData, setTableData] = useState([]) //表格数据 + const [videoModal, setVideoModal] = useState(false) //视频播放弹框 + const [videoData, setVideoData] = useState({}) //视频播放参数 @@ -180,7 +182,7 @@ const DataAlarm = ({ match, dispatch, actions, user, loading, socket }) => { name: '项目名称', sort: 3, value: 'projectName', render: (_, r, index) => { return <> {r.projectName?.map((v, index) => { - return v.name ?
+ return v.name ?
{OutHidden({ number: 7, name: v.name @@ -195,7 +197,6 @@ const DataAlarm = ({ match, dispatch, actions, user, loading, socket }) => {
: "" }) } - } }, @@ -310,8 +311,8 @@ const DataAlarm = ({ match, dispatch, actions, user, loading, socket }) => { : route == 'videoAbnormal' ? <> : "" } @@ -486,6 +487,43 @@ const DataAlarm = ({ match, dispatch, actions, user, loading, socket }) => {
: ""} + {videoModal ? setVideoModal(false)} + onOk={() => { + + + }} + > +
+ +
+ +
: ""} + {checkPop ?