From 6e233810555b15e04a45fb3fb0c82f19c04a0ab9 Mon Sep 17 00:00:00 2001 From: LiuJiaNan <15703339975@163.com> Date: Thu, 6 Aug 2026 11:45:09 +0800 Subject: [PATCH] bug:19956 --- src/api/biStatistics/index.js | 14 ++++---- .../ZhongDian/ContractProjectPanel/index.js | 10 +++--- .../ZhongDian/MobileMonitoringPanel/index.js | 34 +++++++++---------- .../ZhongDian/ProjectStatsPanel/index.js | 8 ++--- 4 files changed, 32 insertions(+), 34 deletions(-) diff --git a/src/api/biStatistics/index.js b/src/api/biStatistics/index.js index 1bac333..f330680 100644 --- a/src/api/biStatistics/index.js +++ b/src/api/biStatistics/index.js @@ -96,10 +96,6 @@ export const getEightWorkInfoScreenDepartmentStatistics = declareRequest( "getEightWorkInfoScreenDepartmentStatisticsLoading", "Post > @/eightwork/eightworkInfo/screenDepartmentStatistics", ); -export const getProjectVisualProjectStatistics = declareRequest( - "getProjectVisualProjectStatisticsLoading", - "Get > /xgfManager/project/visualProjectStatistics", -); export const getKeyProjectLargeScreenProjectProgress = declareRequest( "getKeyProjectLargeScreenProjectProgressLoading", "Post > @/keyProject/keyProject/largeScreenProjectProgress", @@ -108,9 +104,13 @@ export const getFixedCameraVideoInfoPage = declareRequest( "getFixedCameraVideoInfoPageLoading", "Post > @/videopatrol/fixedCamera/getVideoInfoPage", ); -export const getProjectContractProjectStatistics = declareRequest( - "getProjectContractProjectStatisticsLoading", - "Post > @/xgfManager/project/contractProjectStatistics", +export const getKeyProjectLargeScreenContractorStatistics = declareRequest( + "getKeyProjectLargeScreenContractorStatisticsLoading", + "Post > @/keyProject/keyProject/largeScreenContractorStatistics", +); +export const getKeyProjectLargeScreenMobileMonitoring = declareRequest( + "getKeyProjectLargeScreenMobileMonitoringLoading", + "Post > @/keyProject/keyProject/largeScreenMobileMonitoring", ); export const getSensorDeviceFireSituation = declareRequest( "getSensorDeviceFireSituationLoading", diff --git a/src/pages/Container/Map/components/Content/branchOffice/ZhongDian/ContractProjectPanel/index.js b/src/pages/Container/Map/components/Content/branchOffice/ZhongDian/ContractProjectPanel/index.js index b97dea4..ea3be54 100644 --- a/src/pages/Container/Map/components/Content/branchOffice/ZhongDian/ContractProjectPanel/index.js +++ b/src/pages/Container/Map/components/Content/branchOffice/ZhongDian/ContractProjectPanel/index.js @@ -18,12 +18,12 @@ function ContractProjectPanel(props) { chartInstance.current = echarts.init(chartRef.current); const waitStartData = data.map(item => - Number.parseInt(item.pendingProjectCount), + Number.parseInt(item.waitStartCount), ); const inProgressData = data.map(item => - Number.parseInt(item.executingProjectCount), + Number.parseInt(item.doingCount), ); - const names = data.map(item => item.corpinfoName); + const names = data.map(item => item.contractorName); const option = { tooltip: { @@ -159,7 +159,7 @@ function ContractProjectPanel(props) { useMount(() => { const loadData = async () => { - const { data } = await props.getProjectContractProjectStatistics({ + const { data } = await props.getKeyProjectLargeScreenContractorStatistics({ portArea, corpinfoId: currentBranchOffice, pageIndex: 1, @@ -179,7 +179,7 @@ function ContractProjectPanel(props) { return ( - +
{ - const loadPlayUrl = async (cameraNumber) => { - const { data, success } = await props.getFixedCameraPlayUrl({ - indexCode: cameraNumber, - }); - if (success && data) { - setPlayUrl(data?.url || ""); - } - }; const loadCamera = async () => { - const { data } = await props.getFixedCameraVideoInfoPage({ + const { data } = await props.getKeyProjectLargeScreenMobileMonitoring({ portArea, corpinfoId: currentBranchOffice, pageIndex: 1, pageSize: 99, + cameraType: 2, }); - if (data?.length) { - loadPlayUrl(data[Math.floor(randoms(0, data.length - 1))].cameraNumber); - } + const cameras = (data || []).filter(item => item.videoAddress?.includes(".html")); + const camera = cameras.length ? cameras[Math.floor(randoms(0, cameras.length - 1))] : null; + setPlayUrl(camera ? `${camera.videoAddress}&aspect=fullscreen&stretch=yes` : ""); }; loadCamera(); }, []); @@ -42,15 +35,20 @@ function MobileMonitoringPanel(props) { className={styles.branchOfficeKeyProject__monitoring} >
{playUrl ? ( - +