|
|
@ -1,10 +1,13 @@ |
|
|
import React, { useState, useEffect, useRef } from "react"; |
|
|
import React, { useState, useEffect, useRef } from "react"; |
|
|
import { connect } from "react-redux"; |
|
|
import { connect } from "react-redux"; |
|
|
import { Button, Form, Modal, Skeleton, Pagination, Table, Tooltip, Toast } from "@douyinfe/semi-ui"; |
|
|
import { |
|
|
|
|
|
Button, Form, Modal, Skeleton, Pagination, Table, Tooltip, Toast, |
|
|
|
|
|
CheckboxGroup, Checkbox, |
|
|
|
|
|
} from "@douyinfe/semi-ui"; |
|
|
import { SkeletonScreen, } from "$components"; |
|
|
import { SkeletonScreen, } from "$components"; |
|
|
import moment from "moment"; |
|
|
import moment from "moment"; |
|
|
|
|
|
|
|
|
const TableData = ({alarmDataGroup, route, dispatch, actions, collectData, setSetup, exhibition, pepProjectId, |
|
|
const TableData = ({ alarmDataGroup, route, dispatch, actions, collectData, setSetup, exhibition, pepProjectId, |
|
|
selected, setSelected, setIfBulk, setConfirm, genre, setGenre, query, setQuery, tableData, setTableData, location, user, statusId, setStatusId }) => { |
|
|
selected, setSelected, setIfBulk, setConfirm, genre, setGenre, query, setQuery, tableData, setTableData, location, user, statusId, setStatusId }) => { |
|
|
const { problem } = actions |
|
|
const { problem } = actions |
|
|
|
|
|
|
|
|
@ -19,6 +22,11 @@ const TableData = ({alarmDataGroup, route, dispatch, actions, collectData, setSe |
|
|
const groupId = useRef() |
|
|
const groupId = useRef() |
|
|
let title = { dataLnterrupt: "数据中断详情", dataAbnormal: "数据异常详情", strategyHit: "策略命中详情", videoAbnormal: "视频异常详情", useAbnormal: "应用异常详情", deviceAbnormal: "设备异常详情" } |
|
|
let title = { dataLnterrupt: "数据中断详情", dataAbnormal: "数据异常详情", strategyHit: "策略命中详情", videoAbnormal: "视频异常详情", useAbnormal: "应用异常详情", deviceAbnormal: "设备异常详情" } |
|
|
const [exportUrl, setExportUrl] = useState('') |
|
|
const [exportUrl, setExportUrl] = useState('') |
|
|
|
|
|
const [typeSet, setTypeSet] = useState(false) |
|
|
|
|
|
const [typeId, setTypeId] = useState([]) |
|
|
|
|
|
const [check, setCheck] = useState([]) |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
useEffect(() => { |
|
|
useEffect(() => { |
|
|
switch (route) { |
|
|
switch (route) { |
|
|
case 'useAbnormal': |
|
|
case 'useAbnormal': |
|
|
@ -51,8 +59,8 @@ const TableData = ({alarmDataGroup, route, dispatch, actions, collectData, setSe |
|
|
case 'videoAbnormal': |
|
|
case 'videoAbnormal': |
|
|
dispatch(problem.getAlarmVideoList({ ...search.current, pepProjectId: pepProjectId })).then((res) => { |
|
|
dispatch(problem.getAlarmVideoList({ ...search.current, pepProjectId: pepProjectId })).then((res) => { |
|
|
if (res.success) { |
|
|
if (res.success) { |
|
|
let tableDatas = res.payload.data?.map(v => ({ |
|
|
let tableDatas = res.payload.data?.map((v, index) => ({ |
|
|
key: v.alarmId, |
|
|
key: v.AlarmId + index, |
|
|
id: v.alarmId, |
|
|
id: v.alarmId, |
|
|
StructureName: v.struc, |
|
|
StructureName: v.struc, |
|
|
projectName: v.pomsProject?.map(r => (r.name ? { id: r.id, name: r.name, state: 'PMOS' } : { |
|
|
projectName: v.pomsProject?.map(r => (r.name ? { id: r.id, name: r.name, state: 'PMOS' } : { |
|
|
@ -82,12 +90,16 @@ const TableData = ({alarmDataGroup, route, dispatch, actions, collectData, setSe |
|
|
}) |
|
|
}) |
|
|
break; |
|
|
break; |
|
|
default: |
|
|
default: |
|
|
if (genre?.length > 0) { |
|
|
if (genre?.length > 0 && (route === 'dataAbnormal' ? typeId?.length > 0 : true)) { |
|
|
dispatch(problem.getAlarmDataList({...(route === 'deviceAbnormal' ? { timestamps: moment().valueOf() } : {}), ...query, ...search.current, groupId: groupId.current.map(v => v.id).join(), pepProjectId: pepProjectId })).then((res) => { |
|
|
dispatch(problem.getAlarmDataList({ |
|
|
|
|
|
...(route === 'dataLnterrupt' ? { timestamps: true } : {}), |
|
|
|
|
|
...query, ...(search.current || {}), groupId: groupId.current.map(v => v.id).join(), pepProjectId: pepProjectId, |
|
|
|
|
|
...((route === 'dataAbnormal' && !search.current?.groupUnitId?.length) ? { groupUnitId: typeId?.length > 0 ? typeId?.join(',') : "", } : {}), |
|
|
|
|
|
})).then((res) => { |
|
|
if (res.success) { |
|
|
if (res.success) { |
|
|
setCount(res.payload.data?.count || 0) |
|
|
setCount(res.payload.data?.count || 0) |
|
|
let tableDatas = res.payload.data?.rows?.map(v => ({ |
|
|
let tableDatas = res.payload.data?.rows?.map((v, index) => ({ |
|
|
key: v.AlarmId, |
|
|
key: v.AlarmId + index, |
|
|
id: v.AlarmId, |
|
|
id: v.AlarmId, |
|
|
StructureName: v.StructureName, |
|
|
StructureName: v.StructureName, |
|
|
projectName: v.pomsProject?.map(r => (r.name ? { id: r.id, name: r.name, state: 'PMOS' } : { |
|
|
projectName: v.pomsProject?.map(r => (r.name ? { id: r.id, name: r.name, state: 'PMOS' } : { |
|
|
@ -99,7 +111,7 @@ const TableData = ({alarmDataGroup, route, dispatch, actions, collectData, setSe |
|
|
SourceName: v.SourceName, |
|
|
SourceName: v.SourceName, |
|
|
AlarmGroupUnit: v.AlarmGroupUnit ? genre?.find(r => r.value == v.AlarmGroupUnit)?.name : "无", |
|
|
AlarmGroupUnit: v.AlarmGroupUnit ? genre?.find(r => r.value == v.AlarmGroupUnit)?.name : "无", |
|
|
Strategy: v.AlarmGroupUnit ? genre?.find(r => r.value == v.AlarmGroupUnit)?.name : "", |
|
|
Strategy: v.AlarmGroupUnit ? genre?.find(r => r.value == v.AlarmGroupUnit)?.name : "", |
|
|
type: route == 'deviceAbnormal' ? v.DeviceStatus == 0 ? "离线" : '' : v.AlarmGroupUnit ? genre?.find(r => r.value == v.AlarmGroupUnit)?.name : "", |
|
|
type: (v.AlarmGroup == 4 || v.AlarmGroup == 5) ? v.DeviceStatus == 0 ? "离线" : '' : v.AlarmGroupUnit ? genre?.find(r => r.value == v.AlarmGroupUnit)?.name : "", |
|
|
cameraKindId: v.AlarmGroupUnit ? genre?.find(r => r.value == v.AlarmGroupUnit)?.name : "", |
|
|
cameraKindId: v.AlarmGroupUnit ? genre?.find(r => r.value == v.AlarmGroupUnit)?.name : "", |
|
|
AlarmCodeName: v.AlarmCodeName, |
|
|
AlarmCodeName: v.AlarmCodeName, |
|
|
CurrentLevel: v.CurrentLevel, |
|
|
CurrentLevel: v.CurrentLevel, |
|
|
@ -108,8 +120,9 @@ const TableData = ({alarmDataGroup, route, dispatch, actions, collectData, setSe |
|
|
State: v.State, |
|
|
State: v.State, |
|
|
alarmType: v.alarmType, |
|
|
alarmType: v.alarmType, |
|
|
confirm: v.confirmedContent, |
|
|
confirm: v.confirmedContent, |
|
|
station: v.StructureLongitude && v.StructureLatitude ? v.StructureLongitude + '. ' + v.StructureLatitude : "", |
|
|
station: v.StructureLongitude && v.StructureLatitude ? v.StructureLongitude + ',' + v.StructureLatitude : "", |
|
|
projectLocal: v.Project, |
|
|
projectLocal: v.Project, |
|
|
|
|
|
AlarmGroup: v.AlarmGroup, |
|
|
})) |
|
|
})) |
|
|
setTableData(tableDatas) |
|
|
setTableData(tableDatas) |
|
|
} |
|
|
} |
|
|
@ -117,22 +130,21 @@ const TableData = ({alarmDataGroup, route, dispatch, actions, collectData, setSe |
|
|
} |
|
|
} |
|
|
break; |
|
|
break; |
|
|
} |
|
|
} |
|
|
}, [query, genre, pepProjectId]) |
|
|
}, [query, genre, pepProjectId, typeId]) |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
useEffect(() => { |
|
|
useEffect(() => { |
|
|
|
|
|
if (alarmDataGroup?.length > 0) { |
|
|
if (location) { |
|
|
if (location) { |
|
|
search.current = { ...search.current, ...location, state: 'new' } |
|
|
search.current = { ...search.current, ...location, state: 'new' } |
|
|
api.current?.setValues({ ...location, state: 'new' }) |
|
|
api.current?.setValues({ ...location, state: 'new' }) |
|
|
} |
|
|
} |
|
|
if (route !== 'videoAbnormal' && route !== 'useAbnormal') { |
|
|
if (route !== 'videoAbnormal' && route !== 'useAbnormal') { |
|
|
// dispatch(problem.getAlarmDataGroup()).then((res) => { |
|
|
|
|
|
// if (res.success) { |
|
|
|
|
|
let data |
|
|
let data |
|
|
if (route == 'dataLnterrupt') data = alarmDataGroup?.filter(v => v.desc == '数据中断') |
|
|
if (route == 'dataLnterrupt') data = alarmDataGroup?.filter(v => (v.desc == '数据中断' || v.desc == '掉线' || v.desc == '不活跃')) |
|
|
if (route == 'dataAbnormal') data = alarmDataGroup?.filter(v => v.desc == '数据异常') |
|
|
if (route == 'dataAbnormal') data = alarmDataGroup?.filter(v => (v.desc == '数据异常' || v.desc == '策略命中')) |
|
|
if (route == 'strategyHit') data = alarmDataGroup?.filter(v => v.desc == '策略命中') |
|
|
// if (route == 'strategyHit') data = alarmDataGroup?.filter(v => v.desc == '策略命中') |
|
|
if (route == 'deviceAbnormal') data = alarmDataGroup?.filter(v => v.desc == '掉线' || v.desc == '不活跃') |
|
|
// if (route == 'deviceAbnormal') data = alarmDataGroup?.filter(v => v.desc == '掉线' || v.desc == '不活跃') |
|
|
groupId.current = data |
|
|
groupId.current = data |
|
|
let genreData = [] |
|
|
let genreData = [] |
|
|
data?.map(v => { |
|
|
data?.map(v => { |
|
|
@ -141,8 +153,13 @@ const TableData = ({alarmDataGroup, route, dispatch, actions, collectData, setSe |
|
|
}) |
|
|
}) |
|
|
}) |
|
|
}) |
|
|
setGenre(genreData) |
|
|
setGenre(genreData) |
|
|
// } |
|
|
if (route == 'dataAbnormal') { |
|
|
// }) |
|
|
dispatch(problem.getExceptionTypeCheck({ userId: user?.id, })).then(res => { |
|
|
|
|
|
if (res.success) { |
|
|
|
|
|
setTypeId(res.payload.data?.typeId || [8, 40, 41, 48, 49]) |
|
|
|
|
|
} |
|
|
|
|
|
}) |
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
if (route == 'useAbnormal') { |
|
|
if (route == 'useAbnormal') { |
|
|
setGenre({ element: "元素异常", apiError: "接口报错 ", timeout: "加载超时" }) |
|
|
setGenre({ element: "元素异常", apiError: "接口报错 ", timeout: "加载超时" }) |
|
|
@ -160,7 +177,14 @@ const TableData = ({alarmDataGroup, route, dispatch, actions, collectData, setSe |
|
|
} |
|
|
} |
|
|
}) |
|
|
}) |
|
|
} |
|
|
} |
|
|
}, [route]) |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
return () => { |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
}, [route, alarmDataGroup]) |
|
|
|
|
|
|
|
|
const handleExport = () => { |
|
|
const handleExport = () => { |
|
|
let url = '' |
|
|
let url = '' |
|
|
let { keywordTarget, keyword = '', errType = '', state = '', kindId = '', statusId = '', groupUnitId = '', confirmState = '', onlineState = '', sustainTimeStart = '', sustainTimeEnd = '' } = search.current |
|
|
let { keywordTarget, keyword = '', errType = '', state = '', kindId = '', statusId = '', groupUnitId = '', confirmState = '', onlineState = '', sustainTimeStart = '', sustainTimeEnd = '' } = search.current |
|
|
@ -212,16 +236,16 @@ const TableData = ({alarmDataGroup, route, dispatch, actions, collectData, setSe |
|
|
}) |
|
|
}) |
|
|
break; |
|
|
break; |
|
|
default: |
|
|
default: |
|
|
dispatch(problem.getAlarmDataList({...(route === 'deviceAbnormal' ? { timestamps: moment().valueOf() } : {}), ...query, ...search.current, limit: 1, sustainTimeStart, sustainTimeEnd, groupId: groupId.current.map(v => v.id).join(), pepProjectId: pepProjectId })).then((res) => { |
|
|
dispatch(problem.getAlarmDataList({ ...(route === 'dataLnterrupt' ? { timestamps: true } : {}), ...query, ...search.current, limit: 1, sustainTimeStart, sustainTimeEnd, groupId: groupId.current.map(v => v.id).join(), pepProjectId: pepProjectId })).then((res) => { |
|
|
if (res.success) { |
|
|
if (res.success) { |
|
|
if (res.payload.data.count) { |
|
|
if (res.payload.data.count) { |
|
|
let groups = { |
|
|
let groups = { |
|
|
"dataLnterrupt": "1", |
|
|
"dataLnterrupt": "1,4,5", |
|
|
"dataAbnormal": "2", |
|
|
"dataAbnormal": "2,3", |
|
|
"strategyHit": "3", |
|
|
// "strategyHit": "3", |
|
|
"deviceAbnormal": "4,5" |
|
|
// "deviceAbnormal": "4,5" |
|
|
} |
|
|
} |
|
|
url = `alarm/data/list?token=${user.token}&toExport=1×tamp=${moment().valueOf()}&state=${state}&keywordTarget=${keywordTarget}&keyword=${keyword}&kindId=${kindId}` |
|
|
url = `alarm/data/list?token=${user.token}&toExport=1×tamp=${true}&state=${state}&keywordTarget=${keywordTarget}&keyword=${keyword}&kindId=${kindId}` |
|
|
+ `&groupUnitId=${groupUnitId}&errType=${errType}&confirmState=${confirmState}&onlineState=${onlineState}&sustainTimeStart=${sustainTimeStart}` |
|
|
+ `&groupUnitId=${groupUnitId}&errType=${errType}&confirmState=${confirmState}&onlineState=${onlineState}&sustainTimeStart=${sustainTimeStart}` |
|
|
+ `&sustainTimeEnd=${sustainTimeEnd}&pepProjectId=${pepProjectId || ''}&groupId=${groups[route]}` |
|
|
+ `&sustainTimeEnd=${sustainTimeEnd}&pepProjectId=${pepProjectId || ''}&groupId=${groups[route]}` |
|
|
setExportUrl(url); |
|
|
setExportUrl(url); |
|
|
@ -252,7 +276,8 @@ const TableData = ({alarmDataGroup, route, dispatch, actions, collectData, setSe |
|
|
onSubmit={(values) => console.log(values)} |
|
|
onSubmit={(values) => console.log(values)} |
|
|
getFormApi={(formApi) => (api.current = formApi)} |
|
|
getFormApi={(formApi) => (api.current = formApi)} |
|
|
layout="horizontal" |
|
|
layout="horizontal" |
|
|
style={{ position: "relative", width: "100%", flex: 1,display:'flex' }} |
|
|
allowEmpty={false} |
|
|
|
|
|
style={{ position: "relative", width: "100%", flex: 1, display: 'flex' }} |
|
|
> |
|
|
> |
|
|
{(() => { |
|
|
{(() => { |
|
|
let frame = [] |
|
|
let frame = [] |
|
|
@ -277,6 +302,36 @@ const TableData = ({alarmDataGroup, route, dispatch, actions, collectData, setSe |
|
|
</Form.InputGroup>) |
|
|
</Form.InputGroup>) |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
} else { |
|
|
|
|
|
if (route == 'dataAbnormal' && v.special) { |
|
|
|
|
|
frame.push(<div style={{ marginRight: 16, display: "flex" }}> |
|
|
|
|
|
<Form.Select |
|
|
|
|
|
label={v.name + ':'} |
|
|
|
|
|
labelPosition="left" |
|
|
|
|
|
field={v.field} |
|
|
|
|
|
key={v.field} |
|
|
|
|
|
maxLength="10" |
|
|
|
|
|
initValue={v.field == 'state' ? 'new' : undefined} |
|
|
|
|
|
style={{ width: 116, color: "#F9F9F9", }} |
|
|
|
|
|
placeholder="全部" |
|
|
|
|
|
filter |
|
|
|
|
|
showClear |
|
|
|
|
|
> |
|
|
|
|
|
{v.data?.filter(d => typeId?.includes(d.value))?.map((item) => { |
|
|
|
|
|
return ( |
|
|
|
|
|
<Form.Select.Option key={item.value} value={item.value}> |
|
|
|
|
|
{item.name} |
|
|
|
|
|
</Form.Select.Option> |
|
|
|
|
|
); |
|
|
|
|
|
})} |
|
|
|
|
|
</Form.Select> |
|
|
|
|
|
<img title='设置' src="/assets/images/problem/setup.png" style={{ width: 20, height: 20, marginTop: 6, cursor: 'pointer' }} |
|
|
|
|
|
onClick={() => { |
|
|
|
|
|
setCheck(typeId) |
|
|
|
|
|
setTypeSet(true) |
|
|
|
|
|
}} /> |
|
|
|
|
|
</div> |
|
|
|
|
|
) |
|
|
} else { |
|
|
} else { |
|
|
frame.push(<Form.Select |
|
|
frame.push(<Form.Select |
|
|
label={v.name + ':'} |
|
|
label={v.name + ':'} |
|
|
@ -298,6 +353,9 @@ const TableData = ({alarmDataGroup, route, dispatch, actions, collectData, setSe |
|
|
); |
|
|
); |
|
|
})} |
|
|
})} |
|
|
</Form.Select>) |
|
|
</Form.Select>) |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
} |
|
|
} |
|
|
}) |
|
|
}) |
|
|
frame.push(<Form.DatePicker |
|
|
frame.push(<Form.DatePicker |
|
|
@ -379,9 +437,6 @@ const TableData = ({alarmDataGroup, route, dispatch, actions, collectData, setSe |
|
|
placeholder={SkeletonScreen()} |
|
|
placeholder={SkeletonScreen()} |
|
|
> |
|
|
> |
|
|
{(() => { |
|
|
{(() => { |
|
|
console.log((route == 'useAbnormal' || route == 'videoAbnormal') ? |
|
|
|
|
|
(tableData?.slice(query.page * query.limit, (query.page + 1) * query.limit) || []) |
|
|
|
|
|
: tableData); |
|
|
|
|
|
return <Table |
|
|
return <Table |
|
|
columns={exhibition} |
|
|
columns={exhibition} |
|
|
dataSource={ |
|
|
dataSource={ |
|
|
@ -405,7 +460,7 @@ const TableData = ({alarmDataGroup, route, dispatch, actions, collectData, setSe |
|
|
rowSelection={{ |
|
|
rowSelection={{ |
|
|
selectedRowKeys: selected || [], |
|
|
selectedRowKeys: selected || [], |
|
|
getCheckboxProps: record => ({ |
|
|
getCheckboxProps: record => ({ |
|
|
disabled: record.confirmTime ? true : false, |
|
|
disabled: (record.confirmTime || record.State > 2 || record.projectLocal) ? true : false, |
|
|
// name: record.name, |
|
|
// name: record.name, |
|
|
}), |
|
|
}), |
|
|
onSelect: (record, selected) => { |
|
|
onSelect: (record, selected) => { |
|
|
@ -442,7 +497,7 @@ const TableData = ({alarmDataGroup, route, dispatch, actions, collectData, setSe |
|
|
return v.id |
|
|
return v.id |
|
|
} |
|
|
} |
|
|
} else { |
|
|
} else { |
|
|
if (!(v.State > 2)) { |
|
|
if (!(v.State > 2) && !v.projectLocal) { |
|
|
return v.id |
|
|
return v.id |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
@ -472,9 +527,61 @@ const TableData = ({alarmDataGroup, route, dispatch, actions, collectData, setSe |
|
|
}} |
|
|
}} |
|
|
/> |
|
|
/> |
|
|
</div> : ""} |
|
|
</div> : ""} |
|
|
|
|
|
{ |
|
|
|
|
|
exportUrl ? <iframe src={`/_api/${exportUrl}`} style={{ display: 'none' }} /> : '' |
|
|
|
|
|
} |
|
|
</div> |
|
|
</div> |
|
|
|
|
|
|
|
|
|
|
|
{/* 异常类型勾选 */} |
|
|
|
|
|
{typeSet ? <Modal |
|
|
|
|
|
title={'异常类型勾选'} |
|
|
|
|
|
|
|
|
|
|
|
visible={typeSet} |
|
|
|
|
|
// header={null} |
|
|
|
|
|
// footer={null} |
|
|
|
|
|
size={'large'} |
|
|
|
|
|
// style={{ padding: 0 }} |
|
|
|
|
|
// bodyStyle={{ padding: 0 }} |
|
|
|
|
|
className="" |
|
|
|
|
|
onCancel={() => setTypeSet(false)} |
|
|
|
|
|
onOk={() => { |
|
|
|
|
|
dispatch(problem.postExceptionTypeCheck({ userId: user?.id, typeId: check })).then(res => { |
|
|
|
|
|
if (res.success) { |
|
|
|
|
|
api.current?.setValue('groupUnitId',) |
|
|
|
|
|
setTypeId(check) |
|
|
|
|
|
setTypeSet(false) |
|
|
|
|
|
} |
|
|
|
|
|
}) |
|
|
|
|
|
}} |
|
|
|
|
|
> |
|
|
|
|
|
|
|
|
|
|
|
<CheckboxGroup |
|
|
|
|
|
style={{ width: "100%", fontSize: 14, marginLeft: 32 }} |
|
|
|
|
|
key="primary1" |
|
|
|
|
|
direction="horizontal" |
|
|
|
|
|
value={check} |
|
|
|
|
|
// aria-label="表格属性设置" |
|
|
|
|
|
onChange={(check) => { |
|
|
|
|
|
setCheck(check); |
|
|
|
|
|
}} |
|
|
|
|
|
> |
|
|
|
|
|
{genre?.map((itm) => { |
|
|
|
|
|
return ( |
|
|
|
|
|
<Checkbox |
|
|
|
|
|
key={itm.value} |
|
|
|
|
|
value={itm.value} |
|
|
|
|
|
disabled={[8, 40, 41, 48, 49].includes(itm.value) ? true : false} |
|
|
|
|
|
style={{ width: "20%", height: 16, margin: "0 0 20px 0" }} |
|
|
|
|
|
> |
|
|
|
|
|
{itm.name} |
|
|
|
|
|
</Checkbox> |
|
|
|
|
|
); |
|
|
|
|
|
})} |
|
|
|
|
|
</CheckboxGroup> |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
</Modal> : ""} |
|
|
|
|
|
|
|
|
</div> |
|
|
</div> |
|
|
</> |
|
|
</> |
|
|
) |
|
|
) |
|
|
@ -482,7 +589,7 @@ const TableData = ({alarmDataGroup, route, dispatch, actions, collectData, setSe |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
function mapStateToProps (state) { |
|
|
function mapStateToProps (state) { |
|
|
const { auth, global, members,alarmDataGroup } = state; |
|
|
const { auth, global, members, alarmDataGroup } = state; |
|
|
// console.log(global); |
|
|
// console.log(global); |
|
|
return { |
|
|
return { |
|
|
user: auth.user, |
|
|
user: auth.user, |
|
|
@ -490,7 +597,7 @@ function mapStateToProps (state) { |
|
|
global: global, |
|
|
global: global, |
|
|
pepProjectId: global.pepProjectId, |
|
|
pepProjectId: global.pepProjectId, |
|
|
// members: members, |
|
|
// members: members, |
|
|
alarmDataGroup:alarmDataGroup.data||[] |
|
|
alarmDataGroup: alarmDataGroup.data || [] |
|
|
}; |
|
|
}; |
|
|
} |
|
|
} |
|
|
export default connect(mapStateToProps)(TableData); |
|
|
export default connect(mapStateToProps)(TableData); |
|
|
|
zhaobing
1 year ago