Browse Source

确认修改

dev
wenlele 3 years ago
parent
commit
f02f1c79ac
  1. 4
      web/client/src/components/outHidden.jsx
  2. 11
      web/client/src/sections/problem/components/tableData.jsx
  3. 69
      web/client/src/sections/problem/containers/dataAlarm.jsx

4
web/client/src/components/outHidden.jsx

@ -1,10 +1,10 @@
import React, { useState, useEffect } from "react"; import React, { useState, useEffect } from "react";
import { Tooltip } from "@douyinfe/semi-ui"; import { Tooltip } from "@douyinfe/semi-ui";
function OutHidden ({ name, width, height, color, background, numberHidden, number }) { function OutHidden ({ name, width, height, color, background, number }) {
return <> return <>
{numberHidden ? {number ?
<div style={{ display: 'inline-block' }}> <div style={{ display: 'inline-block' }}>
<Tooltip content={name}> <Tooltip content={name}>
<div style={{ <div style={{

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

@ -29,7 +29,8 @@ const TableData = ({ route, dispatch, actions, collectData, setSetup, exhibition
let tableDatas = res.payload.data?.rows.map(v => ({ let tableDatas = res.payload.data?.rows.map(v => ({
key: v.id, key: v.id,
// serialNumber: v.serialNumber, // 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, appName: v.app?.name,
url: v.app?.url, url: v.app?.url,
createTime: v.createTime ? moment(v.createTime).format("YYYY-MM-DD HH:mm:ss") : "", 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] : "", type: v.type ? typeData[v.type] : "",
confirm: v.confirm, confirm: v.confirm,
})) }))
// console.log(tableDatas); console.log(tableDatas);
setTableData(tableDatas) setTableData(tableDatas)
} }
}) })
@ -61,7 +62,7 @@ const TableData = ({ route, dispatch, actions, collectData, setSetup, exhibition
let genreData = [] let genreData = []
data?.map(v => { data?.map(v => {
v?.unit?.map(vv => { v?.unit?.map(vv => {
genreData.push({ name: vv.name, value: vv.id }) genreData.push({ name: vv.name, id: vv.id })
}) })
}) })
// console.log(genreData); // console.log(genreData);
@ -74,13 +75,13 @@ const TableData = ({ route, dispatch, actions, collectData, setSetup, exhibition
let tableDatas = res.payload.data?.rows?.map(v => ({ let tableDatas = res.payload.data?.rows?.map(v => ({
key: v.AlarmId, key: v.AlarmId,
StructureName: v.StructureName, 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") : "", 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") : "", 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") : "", confirmTime: v.confirmedTime ? moment(v.confirmedTime).format("YYYY-MM-DD HH:mm:ss") : "",
SourceName: v.SourceName, SourceName: v.SourceName,
AlarmGroupUnit: v.AlarmGroupUnit ? genreData.find(r => r.id == v.AlarmGroupUnit)?.name : "", 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 : "", type: v.AlarmGroupUnit ? genreData.find(r => r.id == v.AlarmGroupUnit)?.name : "",
AlarmCodeName: v.AlarmCodeName, AlarmCodeName: v.AlarmCodeName,
CurrentLevel: v.CurrentLevel, CurrentLevel: v.CurrentLevel,

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

@ -13,6 +13,8 @@ import { request } from 'screenfull';
const DataAlarm = ({ match, dispatch, actions, user, loading, socket }) => { const DataAlarm = ({ match, dispatch, actions, user, loading, socket }) => {
let route = match.url.substring(match.url.lastIndexOf("/") + 1, match.url.length) let route = match.url.substring(match.url.lastIndexOf("/") + 1, match.url.length)
const { problem } = actions
const [abnormalLenght, setAbnormalLenght] = useState(0) // const [abnormalLenght, setAbnormalLenght] = useState(0) //
const [collect, setCollect] = useState([]) // const [collect, setCollect] = useState([]) //
const [setup, setSetup] = useState(false); // const [setup, setSetup] = useState(false); //
@ -172,54 +174,37 @@ const DataAlarm = ({ match, dispatch, actions, user, loading, socket }) => {
name: '项目名称', value: 'projectName', render: (_, r, index) => { name: '项目名称', value: 'projectName', render: (_, r, index) => {
return <> return <>
{r.projectName?.map((v, index) => { {r.projectName?.map((v, index) => {
let width return <div key={r.id + r.appName + index} style={{ width: 176, }}>
let name = v {OutHidden({
switch (r.projectName?.length) { number: 7,
case 1: name: v.name
if (v.length > 25) width = 358 })}
break; <div style={{
case 2: width: 58, height: 18, background: 'linear-gradient(rgb(235, 245, 255) 0%, rgb(235, 245, 255) 0%, rgb(211, 232, 255) 100%)',
if (v.length > 12) width = 173 borderRadius: 2, display: "inline-block", marginLeft: 6
break; }}>
default: <img src="/assets/images/install/icon_zhengque.png" style={{ display: "inline-block", width: 10 }} />
if (v.length > 7) width = 112 <span style={{ display: "inline-block", width: 48, fontSize: 12, textAlign: "center" }}>{v.state}</span>
break; </div>
} </div>
return (<div key={r.id + r.appName + index} style={{ display: 'inline-block', height: 20 }}> })
{index > 0 ? <span style={{ width: 1, height: 12, border: '1px solid #DCDEE0', margin: '3px 8px', display: 'inline-block', }}></span> : ""} }
{OutHidden({ width, name })}
</div>)
})}
{r.projectName?.length > 3 ?
<Tooltip
trigger="click"
// style={{ lineHeight: 2 }}
content={
<div style={{ display: 'flex', flexWrap: 'wrap' }}>
{r.projectName?.map(vv => {
return <div key={vv}>
{vv}<span style={{ color: '#FFFFFF' }}></span>
</div>
})}
</div>}>
<span style={{ fontSize: 14, color: '#005ABD', marginLeft: 8, cursor: "pointer", }}>
{'+' + (r.projectName?.length - 3)}
</span>
</Tooltip> : ""}
</> </>
} }
}, },
{ name: '结构物名称', value: 'StructureName' }, { name: '结构物名称', value: 'StructureName' },
{ {
name: '告警源', value: 'SourceName', render: (_, r, index) => { name: '告警源', value: 'SourceName', render: (_, r, index) => {
// let data = '' let data = ''
// if (route == 'dataLnterrupt' || route == 'dataAbnormal') { if (route == 'dataLnterrupt' || route == 'dataAbnormal') {
// data = '' data = '传感器'
// } }
// if (route == 'strategyHit') data = '' if (route == 'strategyHit') data = '测点'
return <> return <div style={{ width: 136, display: 'flex', justifyContent: 'space-between' }}>
{/* <div style={{ width: 44, lineHeight: '18px', textAlign: "center", border: '1px solid #0F7EFB', fontWeight: 400, color: '#0F7EFB', fontSize: 12 }}>{data}</div> */} <div style={{ display: "inline-block", width: 84, }}>{r.SourceName}</div>
{r.SourceName}</> <div style={{ display: "inline-block", width: 44, height: 18, lineHeight: '18px', textAlign: "center", border: '1px solid #0F7EFB', fontWeight: 400, color: '#0F7EFB', fontSize: 12 }}>{data}</div>
</div>
} }
}, },
{ name: '中断类型', value: 'AlarmGroupUnit' }, { name: '中断类型', value: 'AlarmGroupUnit' },

Loading…
Cancel
Save