wenlele 2 years ago
parent
commit
89603de5c9
  1. 7
      web/client/src/sections/problem/components/tableData.jsx
  2. 6
      web/client/src/sections/problem/containers/dataAlarm.jsx

7
web/client/src/sections/problem/components/tableData.jsx

@ -48,6 +48,11 @@ const TableData = ({ route, dispatch, actions, collectData, setSetup, exhibition
}) })
break; break;
case 'videoAbnormal': case 'videoAbnormal':
// dispatch(problem.getAlarmDataGroup()).then((res) => {
// if (res.success) { }
// })
break; break;
default: default:
dispatch(problem.getAlarmDataGroup()).then((res) => { dispatch(problem.getAlarmDataGroup()).then((res) => {
@ -108,7 +113,7 @@ const TableData = ({ route, dispatch, actions, collectData, setSetup, exhibition
}, [query, search]) }, [query, search])
console.log(query);
return ( return (
<> <>
<div style={{ backgroundColor: '#FFFFFF', paddingTop: 8 }}> <div style={{ backgroundColor: '#FFFFFF', paddingTop: 8 }}>

6
web/client/src/sections/problem/containers/dataAlarm.jsx

@ -187,7 +187,7 @@ const DataAlarm = ({ match, dispatch, actions, user, loading, socket }) => {
<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> <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> </div>
}) })
} }
</> </>
@ -345,6 +345,8 @@ const DataAlarm = ({ match, dispatch, actions, user, loading, socket }) => {
selected={selected} selected={selected}
setSelected={setSelected} setSelected={setSelected}
setGenre={setGenre} setGenre={setGenre}
query={query}
setQuery={setQuery}
/> />
{setup ? ( {setup ? (
<Setup <Setup
@ -400,7 +402,7 @@ const DataAlarm = ({ match, dispatch, actions, user, loading, socket }) => {
}} }}
> >
<div style={{ display: 'flex', paddingLeft: 20 }}> <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)} /> <TextArea maxCount={500} showClear onChange={(e) => setContent(e)} />
</div> </div>
</Modal> : ""} </Modal> : ""}

Loading…
Cancel
Save