diff --git a/api/app/lib/controllers/project/group.js b/api/app/lib/controllers/project/group.js index 24bda85..1de3be8 100644 --- a/api/app/lib/controllers/project/group.js +++ b/api/app/lib/controllers/project/group.js @@ -104,6 +104,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 @@ -218,7 +219,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 273d386..7b41dec 100644 --- a/web/client/src/sections/projectGroup/containers/bigscreen.jsx +++ b/web/client/src/sections/projectGroup/containers/bigscreen.jsx @@ -192,7 +192,6 @@ const Bigscreen = (props) => { clearInterval(timer); }; }, [proportion]); - return (
@@ -448,13 +447,21 @@ const Bigscreen = (props) => { } } } - return
-
{c.name}
-
{title}
-
{c.offnum + '/' + c.totnum}
-
- })}} containerStyle={{ position: "relative", height: "85%", }} - divHeight={"100%"} divId={"chart"} /> + if (c.offline % 1440 % 60) { + if (title) { + title = title + c.offline % 1440 % 60 + "分" + } else { + title = c.offline % 1440 % 60 + "分" + } + } + + return
+
{c.name}
+
{title}
+
{c.offnum + '/' + c.totnum}
+
+ })} } containerStyle={{ position: "relative", height: "85%", }} + divHeight={"100%"} divId={"interruptchart"}/>