bug:20079、20073

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";
 

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 = [

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 = [

src/pages/Container/Map/components/Content/branchOffice/ZhongDian/ProjectProgressPanel/index.js

@@ -48,7 +48,7 @@ function ProjectProgressPanel(props) {
                     <div>{item.corpinfoName}</div>
                     <div>{item.inspectCount}</div>
                     <div>{item.hiddenCount}</div>
-                    <div>{item.penaltyAmount}</div>
+                    <div>{`${item.penaltyAmount}元`}</div>
                   </div>
                 ))}
               </SeamlessScroll>

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 ? (<AliPlayer source={playUrl} height="300px" isLive />) : (<div>暂无视频</div>) },
       ]}
     />
   );
 };
 
-export default Connect([NS_BI_MARK_INFO], true)(DoorCamera);
+export default Connect([NS_BI_MARK_INFO, NS_BI_STATISTICS], true)(DoorCamera);

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";
 
 // 标题切换时先让旧标题离开，再让新标题进入，上下滑动和淡入淡出效果。

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";
 

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";
 

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);
 };