({
key: v.id,
// serialNumber: v.serialNumber,
- projectName: v.app?.projectCorrelations?.map(r => r.name)?.filter(c => c),
+ projectName: v.app?.projectCorrelations?.map(r => (r.name?{ name: r.name, state: '自定义' }:{ name: r.pepProject?.project_name, state: r.pepProject?.construction_status
+ }))?.filter(c => c),
appName: v.app?.name,
url: v.app?.url,
createTime: v.createTime ? moment(v.createTime).format("YYYY-MM-DD HH:mm:ss") : "",
@@ -40,7 +41,7 @@ const TableData = ({ route, dispatch, actions, collectData, setSetup, exhibition
type: v.type ? typeData[v.type] : "",
confirm: v.confirm,
}))
- // console.log(tableDatas);
+ console.log(tableDatas);
setTableData(tableDatas)
}
})
@@ -61,7 +62,7 @@ const TableData = ({ route, dispatch, actions, collectData, setSetup, exhibition
let genreData = []
data?.map(v => {
v?.unit?.map(vv => {
- genreData.push({ name: vv.name, value: vv.id })
+ genreData.push({ name: vv.name, id: vv.id })
})
})
// console.log(genreData);
@@ -74,13 +75,13 @@ const TableData = ({ route, dispatch, actions, collectData, setSetup, exhibition
let tableDatas = res.payload.data?.rows?.map(v => ({
key: v.AlarmId,
StructureName: v.StructureName,
- projectName: v.pepProject?.map(r => r.projectName)?.filter(c => c),
+ projectName: [],
createTime: v.StartTime ? moment(v.StartTime).format("YYYY-MM-DD HH:mm:ss") : "",
updateTime: v.EndTime ? moment(v.EndTime).format("YYYY-MM-DD HH:mm:ss") : "",
confirmTime: v.confirmedTime ? moment(v.confirmedTime).format("YYYY-MM-DD HH:mm:ss") : "",
SourceName: v.SourceName,
AlarmGroupUnit: v.AlarmGroupUnit ? genreData.find(r => r.id == v.AlarmGroupUnit)?.name : "",
- Strategy: v.AlarmGroupUnit ? genreData[0]?.unit?.find(r => r.id == v.AlarmGroupUnit)?.name : "",
+ Strategy: v.AlarmGroupUnit ? genreData.find(r => r.id == v.AlarmGroupUnit)?.name : "",
type: v.AlarmGroupUnit ? genreData.find(r => r.id == v.AlarmGroupUnit)?.name : "",
AlarmCodeName: v.AlarmCodeName,
CurrentLevel: v.CurrentLevel,
diff --git a/web/client/src/sections/problem/containers/dataAlarm.jsx b/web/client/src/sections/problem/containers/dataAlarm.jsx
index 57baf2b..32d001f 100644
--- a/web/client/src/sections/problem/containers/dataAlarm.jsx
+++ b/web/client/src/sections/problem/containers/dataAlarm.jsx
@@ -13,6 +13,8 @@ import { request } from 'screenfull';
const DataAlarm = ({ match, dispatch, actions, user, loading, socket }) => {
let route = match.url.substring(match.url.lastIndexOf("/") + 1, match.url.length)
+
+ const { problem } = actions
const [abnormalLenght, setAbnormalLenght] = useState(0) //异常数量
const [collect, setCollect] = useState([]) //搜索结构
const [setup, setSetup] = useState(false); //表格设置是否显现
@@ -172,54 +174,37 @@ const DataAlarm = ({ match, dispatch, actions, user, loading, socket }) => {
name: '项目名称', value: 'projectName', render: (_, r, index) => {
return <>
{r.projectName?.map((v, index) => {
- let width
- let name = v
- switch (r.projectName?.length) {
- case 1:
- if (v.length > 25) width = 358
- break;
- case 2:
- if (v.length > 12) width = 173
- break;
- default:
- if (v.length > 7) width = 112
- break;
- }
- return (
- {index > 0 ? : ""}
- {OutHidden({ width, name })}
-
)
- })}
- {r.projectName?.length > 3 ?
-
- {r.projectName?.map(vv => {
- return
- {vv}、
-
- })}
- }>
-