From 6f250019d5bdc2b9e1f442e87b11347bf215a0d3 Mon Sep 17 00:00:00 2001 From: LiuJiaNan <15703339975@163.com> Date: Fri, 7 Aug 2026 17:46:03 +0800 Subject: [PATCH] =?UTF-8?q?bug:20079=E3=80=8120073?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IndexInfo/LeftPanel/WeatherPanel/index.js | 2 +- .../IndexLeft/WeatherPreventionPanel/index.js | 2 +- .../QiXiang/WeatherPreventionPanel/index.js | 2 +- .../ZhongDian/ProjectProgressPanel/index.js | 2 +- .../components/Content/modal/DoorCamera/index.js | 16 ++++++++++++++-- .../Container/Map/components/Header/index.js | 2 +- .../Container/Map/components/RightUtils/index.js | 2 +- .../BranchOffice/components/CenterPanel/index.js | 2 +- src/utils/{weather.js => index.js} | 3 ++- 9 files changed, 23 insertions(+), 10 deletions(-) rename src/utils/{weather.js => index.js} (94%) diff --git a/src/pages/Container/Map/components/Content/IndexInfo/LeftPanel/WeatherPanel/index.js b/src/pages/Container/Map/components/Content/IndexInfo/LeftPanel/WeatherPanel/index.js index af2205a..b690c82 100644 --- a/src/pages/Container/Map/components/Content/IndexInfo/LeftPanel/WeatherPanel/index.js +++ b/src/pages/Container/Map/components/Content/IndexInfo/LeftPanel/WeatherPanel/index.js @@ -7,7 +7,7 @@ import tableRowBackground from "~/assets/images/public/bigScreen/tablebg2.png"; import temperatureIcon from "~/assets/images/public/bigScreen/w_ico1.png"; import windIcon from "~/assets/images/public/bigScreen/w_ico2.png"; import { NS_BI_STATISTICS } from "~/enumerate/namespace"; -import { getWeatherIcon } from "~/utils/weather"; +import { getWeatherIcon } from "~/utils"; import Panel from "../../Panel"; import styles from "./index.module.less"; diff --git a/src/pages/Container/Map/components/Content/branchOffice/IndexLeft/WeatherPreventionPanel/index.js b/src/pages/Container/Map/components/Content/branchOffice/IndexLeft/WeatherPreventionPanel/index.js index bdf9c20..1c76d4a 100644 --- a/src/pages/Container/Map/components/Content/branchOffice/IndexLeft/WeatherPreventionPanel/index.js +++ b/src/pages/Container/Map/components/Content/branchOffice/IndexLeft/WeatherPreventionPanel/index.js @@ -7,7 +7,7 @@ import windIcon from "~/assets/images/public/bigScreen/img11.png"; import { NS_BI_STATISTICS } from "~/enumerate/namespace"; import Panel from "~/pages/Container/Map/components/Content/branchOffice/Panel"; import { Context } from "~/pages/Container/Map/js/context"; -import { getAlertColor, getWeatherIcon } from "~/utils/weather"; +import { getAlertColor, getWeatherIcon } from "~/utils"; import styles from "./index.module.less"; const statistics = [ diff --git a/src/pages/Container/Map/components/Content/branchOffice/QiXiang/WeatherPreventionPanel/index.js b/src/pages/Container/Map/components/Content/branchOffice/QiXiang/WeatherPreventionPanel/index.js index e50b7dc..42b5e4d 100644 --- a/src/pages/Container/Map/components/Content/branchOffice/QiXiang/WeatherPreventionPanel/index.js +++ b/src/pages/Container/Map/components/Content/branchOffice/QiXiang/WeatherPreventionPanel/index.js @@ -7,7 +7,7 @@ import temperatureIcon from "~/assets/images/public/bigScreen/img10.png"; import windIcon from "~/assets/images/public/bigScreen/img11.png"; import { NS_BI_STATISTICS } from "~/enumerate/namespace"; import Panel from "~/pages/Container/Map/components/Content/branchOffice/Panel"; -import { getAlertColor, getWeatherIcon } from "~/utils/weather"; +import { getAlertColor, getWeatherIcon } from "~/utils"; import styles from "./index.module.less"; const records = [ diff --git a/src/pages/Container/Map/components/Content/branchOffice/ZhongDian/ProjectProgressPanel/index.js b/src/pages/Container/Map/components/Content/branchOffice/ZhongDian/ProjectProgressPanel/index.js index 244d557..29a8072 100644 --- a/src/pages/Container/Map/components/Content/branchOffice/ZhongDian/ProjectProgressPanel/index.js +++ b/src/pages/Container/Map/components/Content/branchOffice/ZhongDian/ProjectProgressPanel/index.js @@ -48,7 +48,7 @@ function ProjectProgressPanel(props) {
{item.corpinfoName}
{item.inspectCount}
{item.hiddenCount}
-
{item.penaltyAmount}
+
{`${item.penaltyAmount}元`}
))} diff --git a/src/pages/Container/Map/components/Content/modal/DoorCamera/index.js b/src/pages/Container/Map/components/Content/modal/DoorCamera/index.js index 5afdee0..d138a72 100644 --- a/src/pages/Container/Map/components/Content/modal/DoorCamera/index.js +++ b/src/pages/Container/Map/components/Content/modal/DoorCamera/index.js @@ -1,14 +1,25 @@ import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Descriptions } from "antd"; import { useEffect, useState } from "react"; -import { NS_BI_MARK_INFO } from "~/enumerate/namespace"; +import AliPlayer from "zy-react-library/components/Video/AliPlayer"; +import { NS_BI_MARK_INFO, NS_BI_STATISTICS } from "~/enumerate/namespace"; const DoorCamera = (props) => { const [info, setInfo] = useState({}); + const [playUrl, setPlayUrl] = useState(""); + + const loadPlayUrl = async (cameraNumber) => { + const { data, success } = await props.getFixedCameraPlayUrl({ + indexCode: cameraNumber, + }); + if (success && data) + setPlayUrl(data?.url || ""); + }; const getData = async () => { const { data } = await props.firstLevelDoorInfoCameraInfo({ id: props.id }); setInfo(data); + loadPlayUrl(data.videoResourceCode); }; useEffect(() => { @@ -22,9 +33,10 @@ const DoorCamera = (props) => { items={[ { label: "视频名称", children: info.videoResourceName }, { label: "摄像头编号", children: info.videoResourceCode }, + { label: "视频", children: playUrl ? () : (
暂无视频
) }, ]} /> ); }; -export default Connect([NS_BI_MARK_INFO], true)(DoorCamera); +export default Connect([NS_BI_MARK_INFO, NS_BI_STATISTICS], true)(DoorCamera); diff --git a/src/pages/Container/Map/components/Header/index.js b/src/pages/Container/Map/components/Header/index.js index 3f697e6..f6f52d8 100644 --- a/src/pages/Container/Map/components/Header/index.js +++ b/src/pages/Container/Map/components/Header/index.js @@ -6,7 +6,7 @@ import guangImg from "~/assets/images/map_bi/guang.png"; import topImg1 from "~/assets/images/map_bi/top1.png"; import topImg2 from "~/assets/images/map_bi/top2.png"; import { Context } from "~/pages/Container/Map/js/context"; -import { closeWindow } from "~/utils/weather"; +import { closeWindow } from "~/utils"; import styles from "./index.module.less"; // 标题切换时先让旧标题离开，再让新标题进入，上下滑动和淡入淡出效果。 diff --git a/src/pages/Container/Map/components/RightUtils/index.js b/src/pages/Container/Map/components/RightUtils/index.js index 82200c7..492cffe 100644 --- a/src/pages/Container/Map/components/RightUtils/index.js +++ b/src/pages/Container/Map/components/RightUtils/index.js @@ -6,7 +6,7 @@ import tooltipImg2 from "~/assets/images/map_bi/right_utils/branch_office/bg11.p import buttonBg from "~/assets/images/map_bi/right_utils/branch_office/button.png"; import tooltipImg1 from "~/assets/images/map_bi/right_utils/port/tooltip.png"; import { Context } from "~/pages/Container/Map/js/context"; -import { closeWindow } from "~/utils/weather"; +import { closeWindow } from "~/utils"; import styles from "./index.module.less"; import { utilsList } from "./utilsList"; diff --git a/src/pages/Container/White/BranchOffice/components/CenterPanel/index.js b/src/pages/Container/White/BranchOffice/components/CenterPanel/index.js index 7a4733c..d1bb9c6 100644 --- a/src/pages/Container/White/BranchOffice/components/CenterPanel/index.js +++ b/src/pages/Container/White/BranchOffice/components/CenterPanel/index.js @@ -4,7 +4,7 @@ import { useEffect, useRef, useState } from "react"; import SeamlessScroll from "zy-react-library/components/SeamlessScroll"; import { NS_BI_STATISTICS } from "~/enumerate/namespace"; import Title from "~/pages/Container/White/BranchOffice/components/Title"; -import { getAlertColor, getWeatherIcon } from "~/utils/weather"; +import { getAlertColor, getWeatherIcon } from "~/utils"; import { initEcharts1, initEcharts2, initEcharts3, initEcharts4, initEcharts5 } from "./echarts"; import "./index.less"; diff --git a/src/utils/weather.js b/src/utils/index.js similarity index 94% rename from src/utils/weather.js rename to src/utils/index.js index 400a734..8b3c818 100644 --- a/src/utils/weather.js +++ b/src/utils/index.js @@ -55,7 +55,8 @@ export const closeWindow = () => { window.close(); setTimeout(() => { if (!window.closed && !window.opener) { - window.location.href = "https://gbs-gateway.qhdsafety.com/"; + // window.location.href = "https://gbs-gateway.qhdsafety.com/"; + window.location.href = "http://192.168.198.8:30140/"; } }, 500); };