diff --git a/api/app/lib/controllers/project/group.js b/api/app/lib/controllers/project/group.js index 9042255..175d3ee 100644 --- a/api/app/lib/controllers/project/group.js +++ b/api/app/lib/controllers/project/group.js @@ -126,6 +126,7 @@ async function delGroup (ctx) { } async function groupStatistic (ctx) { + console.log('ssssssaqqq',ctx.app.camunda) try { const { models } = ctx.fs.dc; const { userId } = ctx.fs.api @@ -240,7 +241,7 @@ async function groupStatistic (ctx) { strucCount += strucIdArr_.length //所有结构物的告警 const ss = alarmRes.filter(p => strucIdArr_.some(q => q.strucId == p.StructureId)) - todayAlarms += ss.reduce((p, c) => { + todayAlarms= ss.reduce((p, c) => { return p + c.alarmCount }, 0) // diff --git a/web/client/src/layout/components/header/index.jsx b/web/client/src/layout/components/header/index.jsx index 5859ed6..d01f168 100644 --- a/web/client/src/layout/components/header/index.jsx +++ b/web/client/src/layout/components/header/index.jsx @@ -23,7 +23,6 @@ const Header = (props) => { const [customProjGroupModalVis, setCustomProjGroupModalVis] = useState(false) const [customProjGroupDelPopVis, setCustomProjGroupDelPopVis] = useState(false) const [customProjGroupEditData, setCustomProjGroupEditData] = useState(null) - let userRole = user?.pomsUserInfo?.role let modalRole = [] if (userRole) { @@ -282,12 +281,13 @@ const Header = (props) => { footer={ <> {modalRole.length > 0 ? modalRole.map((item, index) => { + console.log('item1',item) if (item.hasOwnProperty('items')) { return ( {item.hasOwnProperty('items') && item.items.map((ite, idx) => ( diff --git a/web/client/src/sections/projectGroup/containers/bigscreen.jsx b/web/client/src/sections/projectGroup/containers/bigscreen.jsx index cc258e8..133b9c5 100644 --- a/web/client/src/sections/projectGroup/containers/bigscreen.jsx +++ b/web/client/src/sections/projectGroup/containers/bigscreen.jsx @@ -198,7 +198,6 @@ const Bigscreen = (props) => { clearInterval(timer); }; }, [proportion]); - return (
@@ -387,31 +386,31 @@ const Bigscreen = (props) => { {alarmData && alarmData.length > 0 ? (
-
超阈值个数
+
超阈值个数
-
手动恢复个数
+
手动恢复个数
{alarmData?.map((item, index) => { return (
-
+
{index === 0 ? : index === 1 ? : index === 2 ? : index > 2 ? {index + 1} : '' }
-
{item.name?.length > 5 ? {item.name.substring(0, 5) + '...'} : item.name}
-
+
{item.name?.length > 5 ? {item.name.substring(0, 5) + '...'} : item.name}
+
{item.dealAlarmCount} -
0 ? ((item.dealAlarmCount / biggest) * 100 + '%') : 0), height: '100%', zIndex: 2 }}>
+
0 ? ((item.dealAlarmCount / biggest) * 100 + '%') : 0), height: '100%', zIndex: 2 }}>
{item.alarmCount} -
0 ? ((item.alarmCount / biggest) * 100 + '%') : 0), height: '100%', zIndex: 2 }}>
+
0 ? ((item.alarmCount / biggest) * 100 + '%') : 0), height: '100%', zIndex: 2 }}>
) @@ -419,7 +418,7 @@ const Bigscreen = (props) => { divHeight={"100%"} divId={"chart"} />
-
+
{xData?.map(item => { return
{item}
})} @@ -454,13 +453,15 @@ const Bigscreen = (props) => { } } } - return
-
{c.name}
-
{title}
-
{c.offnum + '/' + c.totnum}
-
- })}} containerStyle={{ position: "relative", height: "85%", }} - divHeight={"100%"} divId={"chart"} /> + + + return
+
{c.name}
+
{title}
+
{c.offnum + '/' + c.totnum}
+
+ })} } containerStyle={{ position: "relative", height: "85%", }} + divHeight={"100%"} divId={"interruptchart"}/>