feat:巡检1.8

api/app/lib/controllers/bigScreen/leader.js

@@ -3,10 +3,24 @@
 const moment = require("moment");
 
 
+function getPlanCount(startTime,endTime,frequencyUnit){
+        switch(frequencyUnit){
+            case '天':
+                return Math.ceil(moment(startTime).diff(endTime, 'days'))
+            case '周':
+                return Math.ceil(moment(startTime).diff(endTime, 'weeks'))
+            case '月':
+                return Math.ceil(moment(startTime).diff(endTime, 'months'))
+            default:
+                break
+        }
+
+}
+
 async function findPatrolRecords(ctx, next) {
     const sequelize = ctx.fs.dc.orm;
     try {
-        let rslt = { planCount: 0, done: 0 }
+        let rslt = { planCount: 0, done: 0,count:0,bCount:0 }
         const models = ctx.fs.dc.models
         const { projectId, startTime, endTime } = ctx.query
 
@@ -34,7 +48,8 @@ async function findPatrolRecords(ctx, next) {
         })
         if (plan && plan.length) {
             for (let { dataValues: c } of plan) {
-                let frequency = Number(c.frequency.split('次')[0]) || 0
+                let frequencyNum = Number(c.frequency.split('次')[0]) || 0
+                let frequencyUnit = c.frequency.split('/')[1]
                 let points = c.points.length || 0
                 let done = 0
                 //
@@ -74,8 +89,27 @@ async function findPatrolRecords(ctx, next) {
                         patrolPlanId: c.id
                     }
                 })
-                rslt.planCount += frequency * points - done
+                const result = await sequelize.query(`
+                  select p.name,
+                    count(case when prih.state!=6 then 1 end) as count,
+                      count(case when prih.state=6 then 1 end) as bCount
+                  from project p
+                  left join patrol_record pr
+                      on p.id = pr.project_id
+                  left join patrol_record_issue_handle prih
+                      on pr.id = prih.patrol_record_id
+                      and prih.create_time 
+                      between '${startTime}'
+                      and '${endTime}'
+                  where p.id in (${projectId})
+                  group by  p.name
+    
+        `)
+                const planCount=getPlanCount(c.startTime,c.endTime,frequencyUnit)
+                rslt.planCount += frequencyNum * points * planCount- done
                 rslt.done += dones
+                rslt.bCount+=result[0][0].bCount
+                rslt.count=result[0][0].count
             }
 
         }

api/app/lib/controllers/bigScreen/run.js

@@ -0,0 +1,162 @@
+async function findPatrolRecords(ctx) {
+    const models = ctx.fs.dc.models;
+    const sequelize = ctx.fs.dc.orm;
+    try {
+        const { projectId } = ctx.query
+        let generalInclude = [
+            { model: models.PatrolRecordIssueHandle },
+        ]
+        const rslt = await models.PatrolRecord.findAll({
+            where: { projectId: { $in: projectId.split(',') }, alarm: true },
+            include: generalInclude,
+        })
+        const res = rslt.reduce((acc, record) => {
+            const pointId = record.pointId
+            const inspectionTime = record.inspectionTime
+            const obj = acc.find(r => r.pointId === pointId);
+            if (!obj) {
+                acc.push(record)
+            } else if (obj && inspectionTime > record.inspectionTime) {
+                record.findIndex(r => r.pointId === pointId)
+                acc.splice(index, 1)
+                acc.push(record)
+            }
+            return acc;
+        }, []);
+        ctx.body = res
+        ctx.status = 200
+    } catch (error) {
+        ctx.fs.logger.error(`path: ${ctx.path}, error: ${error}`);
+        ctx.status = 400;
+        ctx.body = { message: '运行监控的列表' }
+    }
+}
+
+async function getProjectPoints(ctx) {
+    let rslt = null
+    try {
+        const { projectId } = ctx.query
+        const models = ctx.fs.dc.models;
+        rslt = await models.Point.findAll({
+            attributes: ['id', 'name', 'equipmentNo', 'equipmentModel'],
+            where: { projectId: { $in: projectId.split(',') } }
+        })
+        ctx.status = 200;
+        ctx.body = rslt;
+    } catch (err) {
+        ctx.fs.logger.error(`path: ${ctx.path}, error: ${err}`);
+        ctx.status = 400;
+        ctx.body = {
+            name: 'FindError',
+            message: '获取结构物点位列表失败'
+        }
+    }
+}
+
+
+async function getDeployPoints(ctx) {
+    let rslt = null;
+    try {
+        const { pictureId } = ctx.query;
+        const models = ctx.fs.dc.models;
+        const heatmap = await models.ProjectGraph.findOne({ where: { id: { $in: pictureId.split(',') } } })
+        if (heatmap) {
+            rslt = await models.ProjectPointsDeploy.findAll({
+                where: { graphId: { $in: pictureId.split(',') } }
+            })
+            ctx.status = 200;
+            ctx.body = rslt;
+        } else {
+            throw new Error('pictureId not found');
+        }
+    } catch (err) {
+        ctx.fs.logger.error(`path: ${ctx.path}, error: ${err}`);
+        ctx.status = 400;
+        ctx.body = {
+            name: 'FindError',
+            message: '获取结构物平面图测点布设失败'
+        }
+    }
+}
+
+async function findSingleGraph(ctx, next) {
+    const models = ctx.fs.dc.models;
+    let error = { name: 'FindSingleError', message: '查询单一数据失败' };
+    let rslt = null;
+    const { projectId,subType } = ctx.query;
+    try {
+        rslt = await ctx.fs.dc.models.Project.findAll({
+            where: { id: { $in: projectId.split(',') },subType}, attributes: ['id', 'sub_type',],
+            include: [{
+                model: models.ProjectGraph
+            }
+            ]
+        });
+
+        error = null;
+    } catch (err) {
+        ctx.fs.logger.error(`path: ${ctx.path}, error: ${err}`);
+    }
+    if (error) {
+        ctx.status = 400;
+        ctx.body = error;
+    } else {
+        ctx.status = 200;
+        ctx.body = rslt;
+    }
+}
+
+
+async function findProjects(ctx, next) {
+    let rslt = {}
+    const { projectId } = ctx.query;
+    try {
+        rslt = await ctx.fs.dc.models.Project.findAll({
+            where: { id: { $in: projectId.split(',') } }
+        })
+        ctx.status = 200;
+        ctx.body = rslt;
+
+    } catch (error) {
+        ctx.fs.logger.error(`path: ${ctx.path}, error: ${error}`);
+        ctx.status = 400;
+        ctx.body = { message: '运行监控的列表' }
+    }
+
+}
+
+async function findNewestRecord(ctx, next) {
+    const models = ctx.fs.dc.models;
+    const { pointId } = ctx.query;
+    const sequelize = ctx.fs.dc.orm;
+    try{
+        const rs=await sequelize.query(`
+        SELECT p.*  
+        FROM (  
+            SELECT id,point_id,alarm,points,inspection_time, ROW_NUMBER() OVER (PARTITION BY point_id ORDER BY inspection_time DESC) AS row_num  
+            FROM patrol_record 
+            WHERE point_id in (${pointId})
+        ) AS p  
+        WHERE p.row_num = 1;
+        `)
+
+        ctx.status = 200
+        ctx.body = rs[0];
+    }catch(error){
+        ctx.fs.logger.error(`path: ${ctx.path}, error: ${error}`);
+        ctx.status = 400;
+        ctx.body = { message: '查询巡检最新记录失败' }
+    }
+}
+
+
+
+
+module.exports = {
+    findPatrolRecords,
+    getProjectPoints,
+    getDeployPoints,
+    findSingleGraph,
+    findProjects,
+    findNewestRecord
+}

api/app/lib/controllers/patrolManage/patrolRecord.js

@@ -448,13 +448,22 @@ function getSubSystemPatrolAbout(opts) {
     return async function (ctx, next) {
         try {
             let rslt = []
+            let generalInclude=[]
             const models = ctx.fs.dc.models;
-            const { STime, ETime, keywords } = ctx.query
+            const { STime, ETime, keywords,IsbigScreen,projectId } = ctx.query
-            let generalInclude = [{ model: models.PatrolRecordIssueHandle }, { model: models.Project, where: { subType: { $like: `%${keywords}%` } } }]
+            if(IsbigScreen==='true'){
+                generalInclude=[{ model: models.PatrolRecordIssueHandle }, { model: models.Project, where: { id: { $in: projectId.split(',') } } }]
+            }else{
+                generalInclude= [{ model: models.PatrolRecordIssueHandle }, { model: models.Project, where: { subType: { $like: `%${keywords}%` } } }]
+            }
             rslt = await models.PatrolRecord.findAll({
                 where: { inspectionTime: { $between: [STime, ETime] } },
                 include: generalInclude
             })
+            if(IsbigScreen==='true'){
+                ctx.status = 200;
+                ctx.body = rslt
+            }else{
                 let userInfo = ctx.fs.api.userInfo;
                 rslt = rslt.filter(f => f)
                 if (userInfo.username != 'SuperAdmin') {
@@ -466,6 +475,7 @@ function getSubSystemPatrolAbout(opts) {
                 }
                 ctx.status = 200;
                 ctx.body = rslt
+            }
         } catch (error) {
             ctx.fs.logger.error(`path: ${ctx.path}, error: ${error}`);
             ctx.status = 400;

api/app/lib/index.js

@@ -53,7 +53,7 @@ module.exports.models = function (dc) { // dc = { orm: Sequelize对象, ORM: Seq
         require(`./models/${filename}`)(dc)
     });
 
-    const { Department, User, UserResource, Resource, Project, Point,
+    const { Department, User, UserResource, Resource, Project,ProjectGraph, Point,
         PatrolPlan, PatrolRecord, ReportInfo, PatrolPlanUser,
         CheckItems, CheckItemsGroup,
         PatrolTemplate, PatrolTemplateCheckItems, PatrolRecordIssueHandle,
@@ -117,4 +117,7 @@ module.exports.models = function (dc) { // dc = { orm: Sequelize对象, ORM: Seq
 
     Network.belongsTo(Project,{ foreignKey: 'projectId', otherKey: 'id' })
     Project.hasMany(Network,{ foreignKey: 'projectId', sourceKey: 'id' })
+
+    ProjectGraph.belongsTo(Project,{ foreignKey: 'projectId', otherKey: 'id' })
+    Project.hasMany(ProjectGraph,{ foreignKey: 'projectId', sourceKey: 'id' })
 };

api/app/lib/routes/bigScreen/run.js

@@ -0,0 +1,26 @@
+'use strict';
+const run = require('../../controllers/bigScreen/run');
+
+module.exports = function (app, router, opts) {
+
+
+    app.fs.api.logAttr['GET/bigScreen/patrol/record'] = { content: '', visible: false };
+    router.get('/bigScreen/patrol/record',run.findPatrolRecords)
+
+
+    app.fs.api.logAttr['GET/bigScreen/picture/deploy/points'] = { content: '获取点位布设信息', visible: false };
+    router.get('bigScreen//picture/deploy/points', run.getDeployPoints);
+
+    app.fs.api.logAttr['GET/bigScreen/project/all/points'] = { content: '获取结构物点位列表', visible: false };
+    router.get('/bigScreen/project/all/points', run.getProjectPoints);
+
+    app.fs.api.logAttr['GET/bigScreen/project/planarGraph'] = { content: '获取结构物平面图数据', visible: false };
+    router.get('/bigScreen/project/planarGraph', run.findSingleGraph);
+
+    app.fs.api.logAttr['GET/bigScreen/projects'] = { content: '获取结构物', visible: false };
+    router.get('/bigScreen/projects', run.findProjects)
+
+    app.fs.api.logAttr['GET/bigScreen/newestRecord'] = { content: '获取最新巡检记录', visible: false };
+    router.get('/bigScreen/newestRecord', run.findNewestRecord)
+
+}

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

@@ -28,9 +28,8 @@ const Header = props => {
     const [patrolManageVisible, setPatrolManageVisible] = useState(false)
     const [deviceManageTabsVisible, setDeviceManageTabsVisible] = useState(false)
     const [currentSubMenuTab, setCurrentSubMenuTab] = useState('')
-    const [tab, setTab] = useState('error')
+    const [tab, setTab] = useState('run')
     const [weather, setWeather] = useState([])
-    console.log('globalTab', globalTab)
     let headerTitleStyle = {
         position: 'absolute',
         left: '3.125rem',

web-screen/client/src/layout/reducers/tab.js

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

web-screen/client/src/sections/bigScreen/actions/index.js

@@ -1,6 +1,7 @@
 'use strict';
 import leader  from './leader'
+import run from './run'
 export default {
-    ...leader,
+    ...leader,...run
    
 }

web-screen/client/src/sections/bigScreen/actions/run.js

@@ -0,0 +1,103 @@
+'use strict';
+import { basicAction } from '@peace/utils'
+import { ApiTable } from '$utils'
+
+export function getSubSystemPatrolAbout(query) {
+    return dispatch => basicAction({
+        type: 'get',
+        query,
+        dispatch: dispatch,
+        actionType: 'GET_SUB_STYSTEM_PATROL_ABOUT',
+        url: `${ApiTable.getSubSystemPatrolAbout}`,
+        msg: { error: '获取巡检记录数' },
+        reducer: { name: 'subSystemPatrols'}
+    });
+}
+
+export function records(query) {
+    return (dispatch) => basicAction({
+        type: 'get',
+        dispatch,
+        query,
+        actionType: 'GET_PATROL_RECORD_LIST',
+        url: `${ApiTable.getRecord}`,
+        msg: { error: '获取巡检记录失败', },
+        reducer: { name: 'record' }
+    });
+}
+export function getProjectGraph(query) {
+    return (dispatch) => basicAction({
+        type: 'get',
+        dispatch,
+        query,
+        actionType: 'GET_PROJECT_PLANAR_GRAPH',
+        url: ApiTable.getProjectGraph,
+        msg: { option: '获取结构物平面图' },
+        reducer: { name: 'projectGraph' }
+    });
+}
+
+
+export function getProjectPoints(query) {
+    return (dispatch) => basicAction({
+        type: 'get',
+        dispatch,
+        query,
+        actionType: 'GET_PROJECT_ALL_POINTS',
+        url: ApiTable.getProjectPoints,
+        msg: { option: '获取结构物所有点位' },
+        reducer: { name: 'projectAllPoints' }
+    });
+}
+
+export function getDeployPoints(query) {
+    return (dispatch) => basicAction({
+        type: 'get',
+        dispatch,
+        query,
+        actionType: 'GET_PROJECT_DEPLOY_POINTS',
+        url: ApiTable.getDeployPoints,
+        msg: { option: '获取结构物平面图测点分布' },
+        reducer: { name: 'projectDeployPoints' }
+    });
+}
+
+
+
+export function getProjects(query) {
+    return (dispatch) => basicAction({
+        type: 'get',
+        dispatch,
+        query,
+        actionType: 'GET_PROJECTS',
+        url: ApiTable.getProjects,
+        msg: { option: '获取结构物' },
+        reducer: { name: 'projects' }
+    });
+}
+
+export function findNewestRecord(query) {
+    return (dispatch) => basicAction({
+        type: 'get',
+        dispatch,
+        query,
+        actionType: 'FIND_NEWEST_RECORD',
+        url: ApiTable.findNewestRecord,
+        msg: { option: '获取点位最新巡检记录' },
+        reducer: { name: 'newestRecords' }
+    });
+}
+
+
+
+export default{
+    getSubSystemPatrolAbout,
+    getDeployPoints,
+    getProjectPoints,
+    getProjects,
+    records,
+    getProjectGraph,
+    getDeployPoints,
+    findNewestRecord
+
+}

web-screen/client/src/sections/bigScreen/components/leader/index.js

@@ -13,10 +13,19 @@ const Leader = (props) => {
     const {actions,dispatch, globalTab, } = props
     const {bigScreen}=actions
     const [centerData,setCenterData]=useState({})
-    const fontStyle={
+    const centerFontStyle={
         fontSize:'1.2rem',
+        fontStyle:'italic', 
+        color:'#E5F1FF',
+        fontFamily: '思源黑体',
 
     }
+    const centerNumFontStyle={
+    fontSize:'2rem',
+    // color:'#6eece9',
+    fontStyle:'italic',
+    paddingLeft:'0.5rem'
+}
     useEffect(()=>{
         const structArr = JSON.parse(sessionStorage.getItem('user')).monitorObject
         dispatch(bigScreen.getCenterData({projectId:structArr.toString()})).then(res=>{
@@ -34,11 +43,11 @@ const Leader = (props) => {
         <div style={{position:'absolute',top:'-10rem',left:'27rem',}}>
                 <img src='/assets/bigScreen/center.webp' style={{display:'inline-block' ,width: '64.47rem', height: '62.3125rem'}}></img>
         </div>
-        <div style={{position:'absolute',top:'15.6rem',left:'38rem',}}><span>设备总数</span><span>{centerData.deviceCount}</span></div>
+        <div style={{position:'absolute',top:'14.6rem',left:'37rem',}}><span style={{...centerFontStyle}}>设备总数</span><span style={{...centerNumFontStyle,color:'#6eece9',}}>{centerData.deviceCount}</span></div>
-        <div style={{position:'absolute',top:'12rem',left:'45rem',}}><span>发现问题</span><span>{centerData.questions}</span></div>
+        <div style={{position:'absolute',top:'10.5rem',left:'45rem',}}><span style={{...centerFontStyle}}>发现问题</span><span style={{...centerNumFontStyle,color:'rgb(204 193 84)',}}>{centerData.questions}</span></div>
-        <div style={{position:'absolute',top:'15rem',left:'57.5rem',}}><div>{centerData.handleCount}</div> <span>累计巡检数</span></div>
+        <div style={{position:'absolute',top:'12.5rem',left:'56.5rem',}}><div style={{...centerNumFontStyle,height:'2.5rem',color:'#6eece9',textAlign:'center'}}>{centerData.handleCount}</div> <span style={{...centerFontStyle}}>累计巡检数</span></div>
-        <div style={{position:'absolute',top:'12rem',left:'68rem',}}><span>出具报告数</span><span>{centerData.records}</span></div>
+        <div style={{position:'absolute',top:'10.5rem',left:'67.5rem',}}><span style={{...centerFontStyle}}>出具报告数</span><span style={{...centerNumFontStyle,color:'#6eece9',}}>{centerData.records}</span></div>
-        <div style={{position:'absolute',top:'15.6rem',left:'75rem',}}><span>处理故障数</span><span>{centerData.reportCount}</span></div>
+        <div style={{position:'absolute',top:'14.6rem',left:'75rem',}}><span style={{...centerFontStyle}}>处理故障数</span><span style={{...centerNumFontStyle,color:'rgb(47 229 9)',}}>{centerData.reportCount}</span></div>
 
     </>
 

web-screen/client/src/sections/bigScreen/components/run/left.js

@@ -1,93 +1,268 @@
 import React, { useEffect, useState } from 'react'
-import { Spin, Popconfirm, message, Button, Input, Calendar, Col, Radio, Row, Select, Typography } from 'antd'
+import { Spin, Popconfirm, message, Button, Input, Calendar, Col, Radio, Row, Select, Typography, Badge, Tag } from 'antd'
 
 import { connect } from 'react-redux'
 import ProTable from '@ant-design/pro-table'
 import moment from 'moment'
 import ReactEcharts from 'echarts-for-react'
-import PerfectScrollbar from 'perfect-scrollbar';
+import PerfectScrollbar from 'perfect-scrollbar'
 import './style.less'
 import AutoRollComponent from '../AutoRollComponent'
 
-
+let scrollbarCalendar
-let scrollbar
 
 const Left = props => {
-    const { clientHeight, clientWidth,isFullScreen} = props
+    const { dispatch, actions, clientHeight, clientWidth, isFullScreen } = props
-    const questFontColor = { color: '#8f7a49' }//有问题的颜色
+    const questFontColor = { color: '#8f7a49' } //有问题的颜色
-    const normalFontColor = { color: 'rgba(33, 106, 167)' }//正常的颜色
+    const normalFontColor = { color: 'rgba(33, 106, 167)' } //正常的颜色
+    const { bigScreen } = actions
+    const [dataList, setDataList] = useState([])
+    const [data, setData] = useState([])
+    const [weekData, setWeekData] = useState({})
+    const [month, setMonth] = useState(moment().format('YYYY-MM-DD HH:mm:ss'))
+    const [pieData, setPieData] = useState()
+    
+    useEffect(() => {
+        scrollbarCalendar = new PerfectScrollbar('#calendar', { suppressScrollX: true })
+        const dom = document.getElementById('calendar')
+        if (dom) {
+            scrollbarCalendar.update()
+            dom.scrollTop = 0
+        }
+        queryData()
+    }, [])
+    useEffect(() => {
+        getData(moment(month).startOf('month').format('YYYY-MM-DD HH:mm:ss'),
+            moment(month).endOf('month').format('YYYY-MM-DD HH:mm:ss'))
+    }, [month])
+    const queryData = () => {
+        const startTime = moment().startOf('week').format('YYYY-MM-DD HH:mm:ss')
+        const endTime = moment().endOf('week').format('YYYY-MM-DD HH:mm:ss')
+        const structArr = JSON.parse(sessionStorage.getItem('user')).monitorObject
+        dispatch(bigScreen.findPatrolRecords({ projectId: structArr.toString(), startTime, endTime })).then(res => {
+            if (res.success) {
+                const data = res.payload.data
+                setWeekData(data)
+            }
+        })
+        dispatch(bigScreen.getSubSystemPatrolAbout({
+            projectId: structArr.toString(), IsbigScreen: 'true',
+            STime: moment('1970-01-01').format('YYYY-MM-DD') + ' 00:00:00',
+            ETime: moment('2099-12-31').format('YYYY-MM-DD') + ' 23:59:59',
+        })
+        ).then(res => {
+            if (res.success) {
+                const data = res.payload.data
+                const maxInspectionTimeByPointId = {};
+                data.forEach((item) => {
+                    const { pointId, inspectionTime } = item;
+                    if (pointId in maxInspectionTimeByPointId) {
+                        if (inspectionTime > maxInspectionTimeByPointId[pointId]) {
+                            maxInspectionTimeByPointId[pointId] = inspectionTime;
+                        }
+                    } else {
+                        maxInspectionTimeByPointId[pointId] = inspectionTime;
+                    }
+                })
+                const filteredData = data.filter((item) => {
+                    const { pointId, inspectionTime } = item;
+                    return inspectionTime === maxInspectionTimeByPointId[pointId];
+                })
+                const deviceLevelStatistics = {};
+                const levelValues = { 轻微: 0, 中度: 1, 严重: 2 };
+                filteredData.forEach((record) => {
+                    const points = record.points;
+                    if (points && points.inspectContent && Array.isArray(points.inspectContent)) {
+                        points.inspectContent.forEach((content) => {
+                            const device = content.deviceId;
+                            content.checkItems.forEach(checkItem => {
+                                const level = checkItem.level;
+                                if (!checkItem.isNormal) {
+                                    if (!deviceLevelStatistics[device]) {
+                                        // 如果设备不存在于统计对象中，初始化
+                                        deviceLevelStatistics[device] = {
+                                            deviceName: content.deviceName, // 可能需要设备名称
+                                            level: level
+                                        };
+                                    } else {
+                                        // 如果设备已存在于统计对象中，比较level并更新为最低的level
+                                        deviceLevelStatistics[device].level = levelValues[level] > levelValues[deviceLevelStatistics[device].level] ? level : deviceLevelStatistics[device].level;
+                                    }
+                                }
+                            })
+                        })
+                    }
+                })
+                const levelCounts = { 轻微: 0, 中度: 0, 严重: 0 };
+                for (const deviceId in deviceLevelStatistics) {
+                    if (deviceLevelStatistics.hasOwnProperty(deviceId)) {
+                        const deviceInfo = deviceLevelStatistics[deviceId];
+                        const level = deviceInfo.level;
+                        // 增加相应等级的设备数量
+                        levelCounts[level]++;
+                    }
+                }
+                const data1 = Object.entries(levelCounts).map(([name, value]) => ({ name, value }))
+                setPieData(data1)
+            }
+        })
+        // const format = 'YYYY-MM-DD HH:mm:ss'
+        // const times = [moment().subtract(70, 'years').format(format), moment().format(format)]
+        // dispatch(bigScreen.records(`patrolRecord/all/${times[0]}/${times[1]}/null/null`,{ projectId: structArr.toString(), IsbigScreen: 'true'})).then(res=>{
+        //     if(res.success){
+        //         console.log(res.payload.data)
+        //     }
+        // })
+           
+        
 
+    }
+    const getData = (startOfMonth, endOfMonth) => {
+        const structArr = JSON.parse(sessionStorage.getItem('user')).monitorObject
+        dispatch(
+            bigScreen.getSubSystemPatrolAbout({
+                projectId: structArr.toString(),
+                IsbigScreen: 'true',
+                STime: startOfMonth,
+                ETime: endOfMonth,
+            })
+        ).then(res => {
+            if (res.success) {
+                const data = res.payload.data
+                setData(data)
+            }
+        })
 
-    // useEffect(()=>{
+
+    }
+    // const getListData = (value) => {
+    //     let listData = []
+    //     const days = value.daysInMonth()
+    //     for (let i = 0; i < days; i++) {
+    //         listData.push({ type: 'default', content: i + 1 })
+    //     }
+    //     data.forEach(item => {
+    //         const day = moment(item.inspectionTime).date()
+    //         if(value.date()===day){
+    //             if (item.patrolRecordIssueHandles.length) {
+    //                 listData[day - 1] = { type: 'warning', content: day }
+    //             } else {
+    //                 listData[day - 1] = { type: 'success', content: day }
+    //             }
+    //         }
 
     //     })
+    //     return listData || []
+    // }
+
+    const getListData = (value) => {
+        let listData = []
+        const record = data.find(item => moment(item.inspectionTime).date() === value.date())
+        if (record) {
+            if (record.patrolRecordIssueHandles.length) {
+                listData.push({ color: '#f50', content: value.date() })
+            } else {
+                listData.push({ color: '#87d068', content: value.date() })
+            }
+        } else {
+
+            listData.push({ color: 'transparent', content: value.date() })
+
+        }
+        return listData || []
+    }
+
     const onPanelChange = (value, mode) => {
-        console.log('value1', value);
+        setMonth(moment(value).format('YYYY-MM-DD HH:mm:ss'))
-    };
+    }
-    const defaultDate = moment({ year: moment().year(), month: moment().month() });
+
+    const dateFullCellRender = value => {
+        const dataList = getListData(value)
+        return (
+            <ul className='events'>
+                {dataList.map((item, index) => (
+                    <li key={item.index}>
+                        {/* <span>{item.content}</span> */}
+                        {/* <Badge status={item.type} count={item.content} color='transparent'/> */}
+                        <Tag color={item.color}>{item.content}</Tag>
+
+                    </li>
+                ))}
+            </ul>
+        )
+    }
+
 
     return (
         <>
-            <div >
+            <div>
                 {/* 左一 */}
-                <div className='left1Container'>
+                <div id='calendar' className='left1Container' style={{ height: '21rem' }}>
                     <Calendar
-                        validRange={[moment(moment()).startOf('month'), moment(moment()).endOf('month')]}
+                        dateFullCellRender={dateFullCellRender}
                         fullscreen={false}
                         headerRender={({ value, type, onChange, onTypeChange }) => {
-                            const start = 0;
+                            const start = 0
-                            const end = 12;
+                            const end = 12
-                            const monthOptions = [];
+                            const monthOptions = []
-                            const current = value.clone();
+                            let current = value.clone()
-                            const localeData = value.localeData();
+                            const localeData = value.localeData()
-                            const months = [];
+                            const months = []
                             for (let i = 0; i < 12; i++) {
-                                current.month(i);
+                                current = current.month(i)
-                                months.push(localeData.monthsShort(current));
+                                months.push(localeData.monthsShort(current))
                             }
                             for (let i = start; i < end; i++) {
                                 monthOptions.push(
-                                    <Select.Option key={i} value={i} className="month-item">
+                                    <Select.Option key={i} value={i} className='month-item'>
                                         {months[i]}
-                                    </Select.Option>,
+                                    </Select.Option>
-                                );
+                                )
                             }
-                            const year = value.year();
+                            const year = value.year()
-                            const month = value.month();
+                            const month = value.month()
-                            const options = [];
+                            const options = []
                             for (let i = year - 10; i < year + 10; i += 1) {
-                                // for (let j = 0; j < 12; j++) {
                                 options.push(
-                                    <Select.Option key={i} value={i} className="year-item">
+                                    <Select.Option key={i} value={i} className='year-item'>
-                                        {`${i}年`}
+                                        {i}
-                                    </Select.Option>)
+                                    </Select.Option>
-                                // }
+                                )
                             }
                             return (
                                 <div className='calendarHeader'>
                                     <div className='cardHeader'>
-                                        <div className='title' >巡检数据统计</div>
+                                        <div className='title'>巡检数据统计</div>
                                     </div>
-                                    {/* <Typography.Title level={4}>巡检数据统计</Typography.Title> */}
                                     <Row gutter={8}>
                                         <Col>
                                             <Select
-                                                size="small"
+                                                size='small'
                                                 dropdownMatchSelectWidth={false}
-                                                className="my-year-select"
+                                                className='my-year-select'
-                                                value={moment().format('yyy-MM')}
+                                                value={year}
-                                                onChange={(newYear) => {
+                                                onChange={newYear => {
-                                                    console.log('x11112', newYear)
+                                                    const now = value.clone().year(newYear)
-                                                    const now = value.clone().year(newYear);
+                                                    onChange(now)
-                                                    onChange(now);
+                                                }}>
-                                                }}
-                                            >
                                                 {options}
                                             </Select>
                                         </Col>
+                                        <Col>
+                                            <Select
+                                                size='small'
+                                                dropdownMatchSelectWidth={false}
+                                                value={month}
+                                                onChange={newMonth => {
+                                                    const now = value.clone().month(newMonth)
+                                                    onChange(now)
+                                                }}>
+                                                {monthOptions}
+                                            </Select>
+                                        </Col>
                                     </Row>
                                 </div>
-                            );
+                            )
                         }}
                         onPanelChange={onPanelChange}
                     />
@@ -95,65 +270,71 @@ const Left = props => {
                 {/* 左二 */}
                 <div className='left1Container'>
                     <div className='cardHeader'>
-                        <div className='title' >本周巡检统计</div>
+                        <div className='title'>本周巡检统计</div>
                     </div>
                     <div className='row'>
-                        <div >
+                        <div>
                             <div className='smallP'>
-                                <div style={{background:'url(/assets/bigScreen/ying.png)  0% 0% / 100% 100% no-repeat'}}></div>
+                                <div style={{ background: 'url(/assets/bigScreen/ying.png)  0% 0% / 100% 100% no-repeat' }}></div>
                                 <div className='describe1'>本周应检</div>
                             </div>
-                            <span className='numbers'>100</span><span>个</span>
+                            <span className='numbers'>{weekData.done + weekData.planCount}</span>
+                            <span>个</span>
                         </div>
                         <div>
                             <div className='smallP'>
-                                <div style={{background:'url(/assets/bigScreen/yij.png) 0% 0% / 100% 100% no-repeat',}}></div>
+                                <div style={{ background: 'url(/assets/bigScreen/yij.png) 0% 0% / 100% 100% no-repeat' }}></div>
                                 <div className='describe1'>本周已检</div>
                             </div>
-                            <span className='numbers'>100</span><span>个</span>
+                            <span className='numbers'>{weekData.done}</span>
+                            <span>个</span>
                         </div>
                     </div>
                     <div className='row'>
-                        <div >
+                        <div>
                             <div className='smallP'>
-                                <div style={{background:'url(/assets/bigScreen/daij.png) 0% 0% / 100% 100% no-repeat',}}></div>
+                                <div style={{ background: 'url(/assets/bigScreen/daij.png) 0% 0% / 100% 100% no-repeat' }}></div>
                                 <div className='describe1'>本周待验</div>
                             </div>
-                            <span className='numbers'>100</span><span>个</span>
+                            <span className='numbers'>{weekData.planCount}</span>
+                            <span>个</span>
                         </div>
                         <div>
                             <div className='smallP'>
-                                <div style={{background:'url(/assets/bigScreen/daic.png) 0% 0% / 100% 100% no-repeat',}}></div>
+                                <div style={{ background: 'url(/assets/bigScreen/daic.png) 0% 0% / 100% 100% no-repeat' }}></div>
                                 <div className='describe1'>待处理问题</div>
                             </div>
-                            <span className='numbers'>100</span><span>个</span>
+                            <span className='numbers'>{weekData.count}</span>
+                            <span>个</span>
                         </div>
                     </div>
                     <div className='row'>
-                        <div >
+                        <div>
                             <div className='smallP'>
-                                <div style={{background:'url(/assets/bigScreen/yic.png) 0% 0% / 100% 100% no-repeat',}}></div>
+                                <div style={{ background: 'url(/assets/bigScreen/yic.png) 0% 0% / 100% 100% no-repeat' }}></div>
                                 <div className='describe1'>已处理问题</div>
                             </div>
-                            <span className='numbers'>100</span><span>个</span>
+                            <span className='numbers'>{weekData.bCount}</span>
+                            <span>个</span>
                         </div>
                         <div className='last'>
                             <div className='smallP'>
                                 <div></div>
-                                <div className='describe1'>待处理问题</div>
+                                <div className='describe1'></div>
                             </div>
-                            <span className='numbers'>100</span><span>个</span>
+                            <span className='numbers'>100</span>
+                            <span>个</span>
                         </div>
                     </div>
                 </div>
                 {/* 左三 */}
                 <div className='left1Container'>
                     <div className='cardHeader'>
-                        <div className='title' >已处理问题</div>
+                        <div className='title'>已处理问题</div>
                     </div>
                     <div className={'pieChartfs'}>
                         <ReactEcharts
-                        style={{ height: !isFullScreen?'13.4375rem':'18.4375rem', width: '25.2662rem' }}
+                            style={{ height: !isFullScreen ? '13.4375rem' : '18.4375rem', width: '25.2662rem' }}
                             option={{
                                 tooltip: {
                                     trigger: 'axis',
@@ -161,10 +342,14 @@ const Left = props => {
                                         type: 'shadow',
                                     },
                                 },
-                            // legend: {
+                                tooltip: {
-                            //     right: 0,
+                                    trigger: 'item',
-                            //     textStyle: { color: '#CCE6FF' }
+                                    // formatter: '{a} <br/>{b} : {c} ({d}%)'
-                            // },
+                                },
+                                legend: {
+                                    right: 0,
+                                    textStyle: { color: '#CCE6FF' }
+                                },
                                 grid: {
                                     left: '3%',
                                     right: '4%',
@@ -172,32 +357,25 @@ const Left = props => {
                                     containLabel: true,
                                 },
 
-
                                 series: [
                                     {
-                                    name: 'Access From',
                                         type: 'pie',
                                         radius: '50%',
-                                    data: [
+                                        data: pieData,
-                                        { value: 1048, name: '严重' },
-                                        { value: 735, name: '中等' },
-                                        { value: 580, name: '轻微' },
-                                    ],
                                         emphasis: {
                                             itemStyle: {
                                                 shadowBlur: 10,
                                                 shadowOffsetX: 0,
-                                            shadowColor: 'rgba(0, 0, 0, 0.5)'
+                                                shadowColor: 'rgba(0, 0, 0, 0.5)',
-                                        }
+                                            },
-                                    }
+                                        },
-                                }
+                                    },
                                 ],
                             }}></ReactEcharts>
                     </div>
                 </div>
             </div>
         </>
-
     )
 }
 

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

@@ -1,33 +1,51 @@
 import React, { useEffect, useState } from 'react'
-import { Spin, Popconfirm, message, Button, Input, Progress } from 'antd';
+import { Spin, Popconfirm, message, Button, Popover, Carousel } from 'antd';
 import { connect } from 'react-redux';
-import ProTable from '@ant-design/pro-table';
 import moment from 'moment';
 import PerfectScrollbar from 'perfect-scrollbar';
-import ReactEcharts from 'echarts-for-react'
 import '../style.less'
 
 
-let scrollbar
+let scrollbarRecord
-
+let recordProblem
 const Right = (props) => {
-    const { clientHeight, clientWidth,isFullScreen } = props
+    const { dispatch, actions, clientHeight, clientWidth, isFullScreen } = props
+    const { bigScreen } = actions
     const [beginHeight, setBeginHeight] = useState(window.innerHeight); //
     // const [isFullScreen, setIsFullScreen] = useState(false); //是否全屏
-    const [index,setIndex]=useState('1')//默认第一个tab
+    const [index, setIndex] = useState('1')//默认第一个tab
+    const [recordList, setRecordList] = useState([])
+    const [points, setPoints] = useState([])
+    const [graph, setGraph] = useState([])
+    const [deployPoints, setDeployPoints] = useState([])
+    const [subType, setSubType] = useState('指挥中心')
+    const [numObj, setNumObj] = useState({
+        commandCenter: 0, pipeGalleryBody: 0,
+        elevatorSystem: 0, powerSupplyAndDistributionSystem: 0,
+        lightningProtectionAndGroundingSystem: 0,
+        GasSilo: 0, waterSupplyWarehouse: 0,
+        securitySystem: 0, highVoltagePowerWarehouse: 0
+    })
+    const STATE_TEXT = { 1: '待制定计划', 2: '待审核', 3: '计划驳回', 4: '待维修', 5: '待验收', 6: '验收通过', 7: '验收不通过', }
+    let h = clientHeight / 1.3;
+    let w = clientWidth / 1.4;
 
-    useEffect(() => {
+    const renderOptionText = (currentState) => {
+        let text = '待制定计划'
+        return STATE_TEXT[currentState] || text
+    }
 
+    useEffect(() => {
+        getData()
     }, [])
-    useEffect(()=>{
+    useEffect(() => {
-        scrollbar = new PerfectScrollbar('#redcordContent', { suppressScrollX: true });
+        scrollbarRecord = new PerfectScrollbar('#redcordContent', { suppressScrollX: true });
         const dom = document.getElementById('redcordContent');
-        console.log('dom', dom)
         if (dom) {
-            scrollbar.update();
+            scrollbarRecord.update();
             dom.scrollTop = 0;
         }
-    },[window.innerHeight])
+    }, [window.innerHeight])
 
 
     let header = [
@@ -60,20 +78,199 @@ const Right = (props) => {
         },
     ]
     //巡检记录表头
-    let recordHeader=[
+    let recordHeader = [
-        {name:'结构物名称'},
+        { name: '结构物名称' },
-        {name:'上报人'},
+        { name: '上报人' },
-        {name:'上报时间'},
+        { name: '上报时间' },
-        {name:'点位名称'},
+        { name: '点位名称' },
-        {name:'问题来源'},
+        { name: '问题来源' },
-        {name:'严重等级'},
+        { name: '严重等级' },
-        {name:'当前状态'},
+        { name: '当前状态' },
 
     ]
 
-    const ck=(index)=>{
+    const ck = (index) => {
+        switch (index) {
+            case '1':
+                setSubType('指挥中心')
+                break;
+            case '2':
+                setSubType('管廊本体')
+                break;
+            case '3':
+                setSubType('电梯系统')
+                break;
+            case '4':
+                setSubType('供配电系统')
+                break;
+            case '5':
+                setSubType('防雷与接地系统')
+                break;
+            case '6':
+                setSubType('燃气仓')
+                break;
+            case '7':
+                setSubType('给水仓')
+                break;
+            case '8':
+                setSubType('安防系统')
+                break;
+            case '9':
+                setSubType('高压电力仓')
+                break;
+            default:
+                break
+        }
         setIndex(index)
     }
+    useEffect(() => {
+        const points = deployPoints.map(item => item.pointId).toString()
+        if (points) {
+            dispatch(bigScreen.findNewestRecord({ pointId: points })).then(res => { if (res.success) { setPoints(res.payload.data) } })
+        }
+    }, [deployPoints])
+    useEffect(() => {
+        const structArr = JSON.parse(sessionStorage.getItem('user')).monitorObject
+        dispatch(bigScreen.getProjectGraph({ projectId: structArr.toString(), subType })).then(_ => {
+            if (_.success) {
+                let graph = _.payload.data
+                setGraph(graph)
+                setDeployPoints([])
+                if (graph.length) {//有图片
+                    dispatch(bigScreen.getDeployPoints({ pictureId: graph?.map(item => item.id).toString() || '-11' })).then(res => {
+                        if (res.success) {
+                            setDeployPoints(res.payload.data)
+
+                        }
+                    })
+                }
+
+            }
+        });
+    }, [subType])
+
+    const getData = () => {
+        const structArr = JSON.parse(sessionStorage.getItem('user')).monitorObject
+        dispatch(bigScreen.records({ projectId: structArr.toString() })).then(res => {
+            if (res.success) {
+                const data = res.payload.data
+                const data1 = data.map(item => {
+                    const LEVELS_ = ['严重', '中度', '轻微'];
+                    const recordLevels = []
+                    item?.points?.inspectContent ? Object.keys(item?.points?.inspectContent).map(key => {
+                        recordLevels.push(item?.points?.inspectContent[key]?.level)
+                    }) : ''
+                    if (Array.isArray(item?.points?.inspectContent)) {
+                        item?.points?.inspectContent?.map(x => {
+                            x.checkItems?.map(v => {
+                                recordLevels.push(v?.level)
+                            })
+                        })
+                    }
+                    const level = LEVELS_.find(s => recordLevels.find(x => x == s))
+                    return {
+                        projectName: item?.points?.project?.name,
+                        reporUsertName: item?.points?.user?.name,
+                        reportTime: item?.patrolRecordIssueHandles && item?.patrolRecordIssueHandles.length && item?.patrolRecordIssueHandles[0]?.createTime ?
+                            moment(item?.patrolRecordIssueHandles[0]?.createTime).format('YYYY-MM-DD HH:mm:ss') : '--',
+                        pointName: item?.points?.itemData?.name,
+                        questionFrom: item?.patrolPlanId === -1 ? '主动上报' : '巡检上报',
+                        level: level,
+                        status: !item?.patrolRecordIssueHandles || item?.patrolRecordIssueHandles?.length == 0 ? '待制定计划' :
+                            renderOptionText(item?.patrolRecordIssueHandles[0]?.state),
+                    }
+                }
+
+                )
+                setRecordList(data1)
+                if (data.length > 4) {
+                    let problemstop = 0
+                    let problemsId = document.getElementById('redcordContent');
+                    if (recordProblem) clearInterval(recordProblem)
+                    if (problemsId) {
+                        function problemstart() {
+                            recordProblem = setInterval(() => {
+                                problemstop += 5
+                                problemsId.scrollTop = problemstop
+                                if (problemsId.scrollTop >= problemsId.scrollHeight / 2) problemstop = 0, problemsId.scrollTop = problemstop
+                            }, 500);
+                            problemsId.onmouseover = () => clearInterval(recordProblem)
+                        }
+                        problemsId.onmouseout = () => problemstart()
+                        setTimeout(problemstart(), 1000);
+                    }
+                }
+            }
+        })
+        dispatch(bigScreen.getProjects({ projectId: structArr.toString() })).then(res => {
+            if (res.success) {
+                let obj = {
+                    commandCenter: 0, pipeGalleryBody: 0,
+                    elevatorSystem: 0, powerSupplyAndDistributionSystem: 0,
+                    lightningProtectionAndGroundingSystem: 0,
+                    GasSilo: 0, waterSupplyWarehouse: 0,
+                    securitySystem: 0, highVoltagePowerWarehouse: 0
+                }
+                res.payload.data.map(item => {
+                    switch (item.subType) {
+                        case '指挥中心':
+                            obj.commandCenter += 1
+                            break;
+                        case '管廊本体':
+                            obj.pipeGalleryBody += 1
+                            break;
+                        case '电梯系统':
+                            obj.elevatorSystem += 1
+                            break;
+                        case '供配电系统':
+                            obj.powerSupplyAndDistributionSystem += 1
+                            break;
+                        case '防雷与接地系统':
+                            obj.lightningProtectionAndGroundingSystem += 1
+                            break;
+                        case '燃气仓':
+                            obj.GasSilo += 1
+                            break;
+                        case '给水仓':
+                            obj.waterSupplyWarehouse += 1
+                            break;
+                        case '安防系统':
+                            obj.securitySystem += 1
+                            break;
+                        case '高压电力仓':
+                            obj.highVoltagePower += 1
+                            break;
+                        default:
+                            return
+
+                    }
+                })
+                setNumObj(obj)
+            }
+        })
+        // dispatch(getProjectPoints({projectId: structArr.toString()})).then(res=>{
+        //     if(res.success){
+        //         setPoints(res.payload.data)
+        //     }
+        // })
+
+
+    }
+
+    // let targetStyle = {
+    //     position: 'relative',
+    //     width: width,
+    //     // overflow:'hidden',
+    //     height: height,
+    //     background: `url("/_file-server/${image}") no-repeat`,
+    //     backgroundSize: '100% 100%',
+    // };
+
+
+
+
+
+
     return <>
         <div>
             {/* 右边的抬头 */}
@@ -82,49 +279,118 @@ const Right = (props) => {
                     switch (item.name) {
                         case '指挥中心':
                             return <div className={index === '1' ? 'bgSelectedStyle' : 'bgUnselectedStyle'}
-                        onClick={()=>{ck('1')}}>{item.name+`(${1})`}</div>
+                                onClick={() => { ck('1') }}>{item.name + `(${numObj.commandCenter})`}</div>
                         case '管廊本体':
                             return <div className={index === '2' ? 'bgSelectedStyle' : 'bgUnselectedStyle'}
-                        onClick={()=>{ck('2')}}>{item.name+`(${1})`}</div>
+                                onClick={() => { ck('2') }}>{item.name + `(${numObj.pipeGalleryBody})`}</div>
                         case '电梯系统':
                             return <div className={index === '3' ? 'bgSelectedStyle' : 'bgUnselectedStyle'}
-                        onClick={()=>{ck('3')}}>{item.name+`(${1})`}</div>
+                                onClick={() => { ck('3') }}>{item.name + `(${numObj.elevatorSystem})`}</div>
                         case '供配电系统':
                             return <div className={index === '4' ? 'bgSelectedStyle' : 'bgUnselectedStyle'}
-                        onClick={()=>{ck('4')}}>{item.name+`(${1})`}</div>
+                                onClick={() => { ck('4') }}>{item.name + `(${numObj.powerSupplyAndDistributionSystem})`}</div>
                         case '防雷与接地系统':
                             return <div className={index === '5' ? 'bgSelectedStyle' : 'bgUnselectedStyle'}
-                        onClick={()=>{ck('5')}}>{item.name+`(${1})`}</div>
+                                onClick={() => { ck('5') }}>{item.name + `(${numObj.lightningProtectionAndGroundingSystem})`}</div>
                         case '燃气仓':
                             return <div className={index === '6' ? 'bgSelectedStyle' : 'bgUnselectedStyle'}
-                        onClick={()=>{ck('6')}}>{item.name+`(${1})`}</div>
+                                onClick={() => { ck('6') }}>{item.name + `(${numObj.GasSilo})`}</div>
                         case '给水仓':
                             return <div className={index === '7' ? 'bgSelectedStyle' : 'bgUnselectedStyle'}
-                        onClick={()=>{ck('7')}}>{item.name+`(${1})`}</div>
+                                onClick={() => { ck('7') }}>{item.name + `(${numObj.waterSupplyWarehouse})`}</div>
                         case '安防系统':
                             return <div className={index === '8' ? 'bgSelectedStyle' : 'bgUnselectedStyle'}
-                        onClick={()=>{ck('8')}}>{item.name+`(${1})`}</div>
+                                onClick={() => { ck('8') }}>{item.name + `(${numObj.securitySystem})`}</div>
-                    case '管廊本体':
-                        return <div className={index === '9' ? 'bgSelectedStyle' : 'bgUnselectedStyle'}
-                        onClick={()=>{ck('9')}}>{item.name+`(${1})`}</div>
                         case '高压电力仓':
                             return <div className={index === '10' ? 'bgSelectedStyle' : 'bgUnselectedStyle'}
-                        onClick={()=>{ck('10')}}>{item.name+`(${1})`}</div>
+                                onClick={() => { ck('9') }}>{item.name + `(${numObj.highVoltagePowerWarehouse})`}</div>
                         default:
                             break;
                     }
                 })}
             </div>
             {/* 中间的图片 */}
-        <div className='bigiImg'>
+            <div className='bigiImg' >
-            <img src='/assets/bigScreen/bigImg.png' className='bigiImg'></img>
+                {/* <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 => (
+                                    <Popover content={
+                                        (
+                                            <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> */}
+                                                {points.find(i => i.point_id === item.pointId)?.points?.inspectContent?.map(q => (
+                                                    <div>{q.deviceName}:{'是否异常:' + q.alarm}</div>
+                                                ))}
+                                            </div>
+                                        )
+
+                                    }> <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>
+                         : '暂无数据')) : '暂无数据'
+                        }
+                {/* </Carousel> */}
+            </div>
+
+
+            {/* {graph?.length?graph.map(item=>(item?.projectGraphs.length?<img style={{width:'100%',height:'100%',objectFit:'cover'}} src={`https://inspection.anxinyun.cn/_file-server/${item?.projectGraphs[0]?.graph}`}/>:'暂无数据')):'暂无数据'} */}
+            {/* <img src='/assets/bigScreen/bigImg.png' className='bigiImg'></img> */}
+
             {/* 巡检记录 */}
-        <div className='recordHeader'>
+            <div className='recordHeader' >
-            {recordHeader.map(item=>(<div className='recordTitle'>{item.name}</div>))}
+                {recordHeader.map(item => (<div className='recordTitle'>{item.name}</div>))}
             </div>
-        <div id='redcordContent' className={isFullScreen?'fullStyle':'noFullStyle'} style={{ width: '88.6875rem', position: 'relative' }}>
+            <div id='redcordContent' className={isFullScreen ? 'fullStyle' : 'noFullStyle'} style={{ width: '88.6875rem', position: 'relative' }}>
+                {recordList.length ? recordList.map(item => (
                     <div className='redcordContent'>
+                        <div>{item.projectName}</div>
+                        <div>{item.reporUsertName}</div>
+                        <div>{item.reportTime}</div>
+                        <div>{item.pointName}</div>
+                        <div>{item.questionFrom}</div>
+                        <div>{item.level}</div>
+                        <div>{item.status}</div>
+                    </div>
+                )) : <div style={{ marginLeft: '10rem' }}>暂无数据</div>}
+
+
+
+
+                {/* <div className='redcordContent'>
             <div>指挥中心</div>
             <div>李一一</div>
             <div>2023-11-02 09:23:35</div>
@@ -217,7 +483,7 @@ const Right = (props) => {
             <div>巡检上报</div>
             <div>轻微</div>
             <div>待制定计划</div>
-        </div>
+        </div> */}
             </div>
         </div>
     </>

web-screen/client/src/sections/bigScreen/components/run/style.less

@@ -2,6 +2,7 @@
   width: 26.3125rem;
   height: 17.8125rem;
   margin-top: 1.5rem;
+  position: relative;
   .pieChartfs{
     text-align: center;
     height: 17.8125rem;
@@ -34,6 +35,22 @@
   background-repeat: no-repeat;
   display: flex;
   justify-content: space-between;
+    .ant-row{
+      .ant-col{
+        .ant-select{
+          .ant-select-selector{
+            background: transparent;
+            color: #ffffff;
+            border-color: transparent;
+          }
+          .ant-select-arrow{
+            color: #ffffff;
+
+          }
+        }
+      }
+    }
+  
 }
 
 .ant-row {
@@ -167,6 +184,7 @@
   height: 33.5rem;
   // padding-top: 0.5rem;
   margin-left: 2rem;
+  position: relative;
   // color: red;
   // background: url(/assets/bigScreen/bigImg.png) no-repeat;
   // background-size: 100% 100%;
@@ -230,3 +248,22 @@
 .noFullStyle{
   height: 11rem;
 }
+.events {
+  margin: 0;
+  padding: 0;
+  list-style: none;
+}
+.events .ant-badge-status {
+  width: 100%;
+  overflow: hidden;
+  font-size: .75rem;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+.notes-month {
+  font-size: 1.75rem;
+  text-align: center;
+}
+.notes-month section {
+  font-size: 1.75rem;
+}

web-screen/client/src/utils/webapi.js

@@ -133,12 +133,12 @@ export const ApiTable = {
    //项目状态配置
    editProjectStatus: 'project/status',
    //工地平面图
-   getProjectGraph: 'project/{projectId}/planarGraph',
+   getProjectGraph: 'bigScreen/project/planarGraph',
    createGraph: 'planarGraph/add',
    updateGraph: 'planarGraph/{id}/modify',
    deleteGraph: 'project/graph/{id}',
-   getProjectPoints: 'project/{projectId}/all/points',
+   getProjectPoints: 'project/all/points',
-   getDeployPoints: 'picture/{pictureId}/deploy/points',
+   getDeployPoints: 'bigScreen/picture/deploy/points',
    setDeployPoints: 'set/picture/{pictureId}/deploy/points',
 
    //设备管理
@@ -170,14 +170,19 @@ export const ApiTable = {
    addOrUpdateNetwork:'network',
    delNetwork:'network/{id}',
 
-
+   //领导仓
    findPatrolRecords:'bigScreen/patrolRecord',
-   findPatrolRate:'bigScreen/patrolRate',
+   findPatrolRate:'bigScreen/getDeployPoints',
    countByProject:'bigScreen/patrolCount',
    getDevices:'bigScreen/devices/guarantee',
    getHistoricalFaults:'bigScreen/historicalFaults',
    getFaultsRank:'bigScreen/faultsRank',
    getCenterData:'bigScreen/centerData',
+   //运行管理
+   getSubSystemPatrolAbout:'patrolRecord/subSystemPatrolAbout',
+   getRecord:'bigScreen/patrol/record',
+   getProjects:'bigScreen/projects',
+   findNewestRecord:'bigScreen/newestRecord',
 };
 //