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

feat:进入大屏默认领导仓

master
zhaobing 1 year ago
parent
c04b816702
commit
5a96c577e3
4 changed files with 44 additions and 42 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      web-screen/client/src/layout/components/header/index.js
  2. 2
      web-screen/client/src/layout/reducers/tab.js
  3. 70
      web-screen/client/src/sections/bigScreen/components/run/right.js
  4. 2
      web-screen/client/src/utils/webapi.js

12
web-screen/client/src/layout/components/header/index.js
View File

@ -28,7 +28,7 @@ const Header = props => {
const [patrolManageVisible, setPatrolManageVisible] = useState(false)
const [deviceManageTabsVisible, setDeviceManageTabsVisible] = useState(false)
const [currentSubMenuTab, setCurrentSubMenuTab] = useState('')
const [tab, setTab] = useState('run')
const [tab, setTab] = useState('leader')
const [weather, setWeather] = useState([])
let headerTitleStyle = {
position: 'absolute',
@ -61,11 +61,11 @@ const Header = props => {
}, [])
const queryWeather = () => {
// RouteRequest.get(`/query/weather/3d?location=101240101`).then(res => {
// if (res?.daily?.length === 3) {
// setWeather(res.daily)
// }
// })
RouteRequest.get(`/query/weather/3d?location=101240101`).then(res => {
if (res?.daily?.length === 3) {
setWeather(res.daily)
}
})
}
const iconSrc = useMemo(() => {

2
web-screen/client/src/layout/reducers/tab.js
View File

@ -3,7 +3,7 @@
import Immutable from 'immutable';
const initState = {
tab: 'run',
tab: 'leader',
showCG: true
};

70
web-screen/client/src/sections/bigScreen/components/run/right.js
View File

@ -131,7 +131,7 @@ const Right = (props) => {
}, [deployPoints])
useEffect(() => {
const structArr = JSON.parse(sessionStorage.getItem('user')).monitorObject
dispatch(bigScreen.getProjectGraph({ projectId: structArr.toString(), subType })).then(_ => {
dispatch(bigScreen.getProjectGraph({ projectId: [...structArr].toString(), subType })).then(_ => {
if (_.success) {
let graph = _.payload.data
setGraph(graph)
@ -312,17 +312,20 @@ const Right = (props) => {
{/* 中间的图片 */}
<div className='bigiImg' >
{/* <Carousel autoplay> */}
{graph?.length ? graph.map(item => (item?.projectGraphs.length ?
<div style={{
width: '88.6594rem', height: '33.5rem', objectFit: 'cover', position: 'relative',
background: `url('/_file-server/${item?.projectGraphs[0]?.graph}') no-repeat`,
backgroundSize: '100% 100%'
}} >
{
deployPoints.length ? deployPoints.map(item => (
{graph?.length ? graph.map(item => (item?.projectGraphs.length ?
<div style={{
width: '88.6594rem', height: '33.5rem', objectFit: 'cover', position: 'relative',
background: `url('https://inspection.anxinyun.cn/_file-server/${item?.projectGraphs[0]?.graph}') no-repeat`,
backgroundSize: '100% 100%'
}} >
{
deployPoints.length ? deployPoints.map(item => (
<div style={{ position: 'absolute', top: JSON.parse(item.position).relativeY * 33.5 + 'rem',
// 33.5*JSON.parse(item.position).relativeY+'rem',
left: JSON.parse(item.position).relativeX * 88.6594 + 'rem',}}>
<Popover content={
(
<div>
<div >
<div>{moment(points.find(i => i.point_id === item.pointId)?.inspectTime).format('YYYY-MM-DD HH:mm:ss') + '巡检发现异常'}</div>
<div>进度:{renderOptionText(points.find(i => i.point_id === item.pointId)?.state)}</div>
{/* <div>{}</div> */}
@ -335,34 +338,33 @@ const Right = (props) => {
}> <div style={{
width: '.875rem', height: '.875rem', borderRadius: '100%',
boxShadow: 'rgb(16, 142, 233) 0px 0px 10px',
position: 'absolute', top: (clientHeight / 1.3) * JSON.parse(item.position).relativeY / JSON.parse(item.position).screenHeight + 'rem',
// 33.5*JSON.parse(item.position).relativeY+'rem',
left: (clientWidth / 1.3) * JSON.parse(item.position).relativeX / JSON.parse(item.position).screenWidth + 'rem',
zIndex: 999999,
backgroundColor: points.find(i => i.point_id === item.pointId)?.alarm ? 'rgb(233 16 16)' : 'rgb(16, 142, 233)',
}}></div></Popover>
)) : ""
}
{deployPoints.length ?
<div>
<div style={{ position: 'absolute', display: 'flex', left: '4rem', bottom: '2rem' }}>
<div style={{
width: '.875rem', height: '.875rem', borderRadius: '100%',
position: 'absolute',
boxShadow: 'rgb(16, 142, 233) 0px 0px 10px', backgroundColor: 'rgb(233 16 16)'
}}></div><div style={{ marginLeft: '2rem', color: 'red' }}>{`异常(${points.filter(item => item.alarm).length})`}</div>
</div>
<div style={{ position: 'absolute', display: 'flex', left: '4rem', bottom: '0.5rem' }}>
<div style={{
width: '.875rem', height: '.875rem', borderRadius: '100%', position: 'absolute',
boxShadow: 'rgb(16, 142, 233) 0px 0px 10px', backgroundColor: 'rgb(16, 142, 233)'
}}></div><div style={{ marginLeft: '2rem', color: 'blue' }}>{`正常(${points.filter(item => !item.alarm).length})`}</div>
</div>
</div> : ''
}
</div>
: '暂无数据')) : '暂无数据'
</div>
)) : ""
}
{deployPoints.length ?
<div>
<div style={{ position: 'absolute', display: 'flex', left: '4rem', bottom: '2rem' }}>
<div style={{
width: '.875rem', height: '.875rem', borderRadius: '100%',
position: 'absolute',
boxShadow: 'rgb(16, 142, 233) 0px 0px 10px', backgroundColor: 'rgb(233 16 16)'
}}></div><div style={{ marginLeft: '2rem', color: 'red' }}>{`异常(${points.filter(item => item.alarm).length})`}</div>
</div>
<div style={{ position: 'absolute', display: 'flex', left: '4rem', bottom: '0.5rem' }}>
<div style={{
width: '.875rem', height: '.875rem', borderRadius: '100%', position: 'absolute',
boxShadow: 'rgb(16, 142, 233) 0px 0px 10px', backgroundColor: 'rgb(16, 142, 233)'
}}></div><div style={{ marginLeft: '2rem', color: 'blue' }}>{`正常(${points.filter(item => !item.alarm).length})`}</div>
</div>
</div> : ''
}
</div>
: '暂无数据')) : '暂无数据'
}
{/* </Carousel> */}
</div>

2
web-screen/client/src/utils/webapi.js
View File

@ -172,7 +172,7 @@ export const ApiTable = {
//领导仓
findPatrolRecords:'bigScreen/patrolRecord',
findPatrolRate:'bigScreen/getDeployPoints',
findPatrolRate:'bigScreen/patrolRate',
countByProject:'bigScreen/patrolCount',
getDevices:'bigScreen/devices/guarantee',
getHistoricalFaults:'bigScreen/historicalFaults',

Write Preview
Loading…
Cancel
Save