free-sun
/
OperationalService
15
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'dev' of https://gitea.anxinyun.cn/gao.zhiyuan/OperationalService into dev

dev
CODE 1 year ago
parent
55bae0a7ed e3d4e5d166
commit
5b27c8f79f
3 changed files with 21 additions and 19 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      api/app/lib/controllers/project/group.js
  2. 4
      web/client/src/layout/components/header/index.jsx
  3. 33
      web/client/src/sections/projectGroup/containers/bigscreen.jsx

3
api/app/lib/controllers/project/group.js
View File

@ -126,6 +126,7 @@ async function delGroup (ctx) {
} }
async function groupStatistic (ctx) { async function groupStatistic (ctx) {
console.log('ssssssaqqq',ctx.app.camunda)
try { try {
const { models } = ctx.fs.dc; const { models } = ctx.fs.dc;
const { userId } = ctx.fs.api const { userId } = ctx.fs.api
@ -240,7 +241,7 @@ async function groupStatistic (ctx) {
strucCount += strucIdArr_.length strucCount += strucIdArr_.length
//所有结构物的告警 //所有结构物的告警
const ss = alarmRes.filter(p => strucIdArr_.some(q => q.strucId == p.StructureId)) 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 return p + c.alarmCount
}, 0) }, 0)
// //

4
web/client/src/layout/components/header/index.jsx
View File

@ -23,7 +23,6 @@ const Header = (props) => {
const [customProjGroupModalVis, setCustomProjGroupModalVis] = useState(false) const [customProjGroupModalVis, setCustomProjGroupModalVis] = useState(false)
const [customProjGroupDelPopVis, setCustomProjGroupDelPopVis] = useState(false) const [customProjGroupDelPopVis, setCustomProjGroupDelPopVis] = useState(false)
const [customProjGroupEditData, setCustomProjGroupEditData] = useState(null) const [customProjGroupEditData, setCustomProjGroupEditData] = useState(null)
let userRole = user?.pomsUserInfo?.role let userRole = user?.pomsUserInfo?.role
let modalRole = [] let modalRole = []
if (userRole) { if (userRole) {
@ -282,12 +281,13 @@ const Header = (props) => {
footer={ footer={
<> <>
{modalRole.length > 0 ? modalRole.map((item, index) => { {modalRole.length > 0 ? modalRole.map((item, index) => {
console.log('item1',item)
if (item.hasOwnProperty('items')) { if (item.hasOwnProperty('items')) {
return ( return (
<Nav.Sub <Nav.Sub
key={index + 'a'} key={index + 'a'}
itemKey={item.itemKey} itemKey={item.itemKey}
text={item.text} text={item.text==='工单'?`${item.text}（${111}）`:item.text}
dropdownStyle={{ color: '#F2F3F5' }} dropdownStyle={{ color: '#F2F3F5' }}
> >
{item.hasOwnProperty('items') && item.items.map((ite, idx) => ( {item.hasOwnProperty('items') && item.items.map((ite, idx) => (

33
web/client/src/sections/projectGroup/containers/bigscreen.jsx
View File

@ -198,7 +198,6 @@ const Bigscreen = (props) => {
clearInterval(timer); clearInterval(timer);
}; };
}, [proportion]); }, [proportion]);
return ( return (
<div className='project-group'> <div className='project-group'>
<Header match={match} history={history} {...props} groupDetail={groupDetail} /> <Header match={match} history={history} {...props} groupDetail={groupDetail} />
@ -387,31 +386,31 @@ const Bigscreen = (props) => {
{alarmData && alarmData.length > 0 ? (<div style={{ height: '100%' }}> {alarmData && alarmData.length > 0 ? (<div style={{ height: '100%' }}>
<div style={{ display: "flex", justifyContent: 'flex-end' }}> <div style={{ display: "flex", justifyContent: 'flex-end' }}>
<div style={{ display: "flex", alignItems: 'center' }}> <div style={{ display: "flex", alignItems: 'center' }}>
<div class='alarmDiv'></div><div class='alarm'>超阈值个数</div> <div className='alarmDiv'></div><div className='alarm'>超阈值个数</div>
</div> </div>
<div style={{ display: "flex", alignItems: 'center' }}> <div style={{ display: "flex", alignItems: 'center' }}>
<div class='dealAlarmCountDiv'></div><div class='alarmCount'>手动恢复个数</div> <div className='dealAlarmCountDiv'></div><div className='alarmCount'>手动恢复个数</div>
</div> </div>
</div> </div>
<div id='alarmRank' style={{ height: clientHeight * 0.55 - 150, position: 'relative' }}> <div id='alarmRank' style={{ height: clientHeight * 0.55 - 150, position: 'relative' }}>
<AutoRollComponent content={<>{alarmData?.map((item, index) => { <AutoRollComponent content={<>{alarmData?.map((item, index) => {
return (<div style={{ display: 'flex', marginTop: 15, alignItems: 'center' }}> return (<div style={{ display: 'flex', marginTop: 15, alignItems: 'center' }}>
<div class='rankDiv'> <div className='rankDiv'>
{index === 0 ? <img src='/assets/images/projectGroup/first.png'></img> : {index === 0 ? <img src='/assets/images/projectGroup/first.png'></img> :
index === 1 ? <img src='/assets/images/projectGroup/second.png'></img> : index === 1 ? <img src='/assets/images/projectGroup/second.png'></img> :
index === 2 ? <img src='/assets/images/projectGroup/third.png'></img> : index === 2 ? <img src='/assets/images/projectGroup/third.png'></img> :
index > 2 ? <span>{index + 1}</span> : '' index > 2 ? <span>{index + 1}</span> : ''
} }
</div> </div>
<div class='structDiv'>{item.name?.length > 5 ? <Tooltip content={item.name}>{item.name.substring(0, 5) + '...'}</Tooltip> : item.name}</div> <div className='structDiv'>{item.name?.length > 5 ? <Tooltip content={item.name}>{item.name.substring(0, 5) + '...'}</Tooltip> : item.name}</div>
<div class='barChartDiv'> <div className='barChartDiv'>
<div style={{ width: '50%', display: 'flex', justifyContent: 'flex-end', position: 'relative' }}> <div style={{ width: '50%', display: 'flex', justifyContent: 'flex-end', position: 'relative' }}>
<span style={{ position: 'absolute', left: 0, zIndex: 2 }}> {item.dealAlarmCount}</span> <span style={{ position: 'absolute', left: 0, zIndex: 2 }}> {item.dealAlarmCount}</span>
<div class='alarms' style={{ width: (biggest > 0 ? ((item.dealAlarmCount / biggest) * 100 + '%') : 0), height: '100%', zIndex: 2 }}> </div> <div className='alarms' style={{ width: (biggest > 0 ? ((item.dealAlarmCount / biggest) * 100 + '%') : 0), height: '100%', zIndex: 2 }}> </div>
</div> </div>
<div style={{ width: '50%', display: 'flex', position: 'relative' }}> <div style={{ width: '50%', display: 'flex', position: 'relative' }}>
<span style={{ position: 'absolute', right: 0, zIndex: 2 }}> {item.alarmCount}</span> <span style={{ position: 'absolute', right: 0, zIndex: 2 }}> {item.alarmCount}</span>
<div class='dealAlarms' style={{ width: (biggest > 0 ? ((item.alarmCount / biggest) * 100 + '%') : 0), height: '100%', zIndex: 2 }}> </div> <div className='dealAlarms' style={{ width: (biggest > 0 ? ((item.alarmCount / biggest) * 100 + '%') : 0), height: '100%', zIndex: 2 }}> </div>
</div> </div>
</div> </div>
</div>) </div>)
@ -419,7 +418,7 @@ const Bigscreen = (props) => {
divHeight={"100%"} divId={"chart"} /> divHeight={"100%"} divId={"chart"} />
</div> </div>
<div class="scale"> <div className="scale">
{xData?.map(item => { {xData?.map(item => {
return <div >{item}</div> return <div >{item}</div>
})} })}
@ -454,13 +453,15 @@ const Bigscreen = (props) => {
} }
} }
} }
return <div style={{ display: "flex", background: index % 2 == 1 ? "#F6F9FF" : '', height: 40, alignItems: 'center' }}>
<div style={{ textAlign: 'center', width: '33%', fontFamily: 'SourceHanSansCN-Regular', color: '#2C66F3', fontWeight: 400 }}>{c.name}</div>
<div style={{ textAlign: 'center', width: '33%' }}>{title}</div> return <div style={{ display: "flex", background: index % 2 == 1 ? "#F6F9FF" : '', height: 40, alignItems: 'center' }}>
<div style={{ textAlign: 'center', width: '33%', fontFamily: 'SourceHanSansCN-Regular', color: '#F33B3B', fontWeight: 400 }}>{c.offnum + '/' + c.totnum}</div> <div style={{ textAlign: 'center', width: '33%', fontFamily: 'SourceHanSansCN-Regular', color: '#2C66F3', fontWeight: 400 }}>{c.name}</div>
</div> <div style={{ textAlign: 'center', width: '33%' }}>{title}</div>
})}</>} containerStyle={{ position: "relative", height: "85%", }} <div style={{ textAlign: 'center', width: '33%', fontFamily: 'SourceHanSansCN-Regular', color: '#F33B3B', fontWeight: 400 }}>{c.offnum + '/' + c.totnum}</div>
divHeight={"100%"} divId={"chart"} /> </div>
})}</> } containerStyle={{ position: "relative", height: "85%", }}
divHeight={"100%"} divId={"interruptchart"}/>
</div> </div>
</div> </div>
</Card> </Card>

Write Preview
Loading…
Cancel
Save