diff --git a/src/api/biMark/index.js b/src/api/biMark/index.js new file mode 100644 index 0000000..0da703d --- /dev/null +++ b/src/api/biMark/index.js @@ -0,0 +1,6 @@ +import { declareRequest } from "@cqsjjb/jjb-dva-runtime"; + +export const getCorpInfoListAll = declareRequest( + "biFullLoading", + "Post > @/basicInfo/corpInfo/corpListAll", +); diff --git a/src/api/bi/index.js b/src/api/biStatistics/index.js similarity index 95% rename from src/api/bi/index.js rename to src/api/biStatistics/index.js index 690143c..1666d0e 100644 --- a/src/api/bi/index.js +++ b/src/api/biStatistics/index.js @@ -56,10 +56,6 @@ export const getCorpInfoCorpUserStatisticPage = declareRequest( "portIndexBasicInfoStatisticPageLoading", "Post > @/basicInfo/corpInfo/corpUserStatisticPage", ); -export const getCorpInfoListAll = declareRequest( - "biFullLoading", - "Post > @/basicInfo/corpInfo/corpListAll", -); export const getFirePointDeviceList = declareRequest( "xiaoFangFirePointDeviceListLoading", "Post > @/fireCheck/firePoint/deviceList", diff --git a/src/enumerate/namespace/index.js b/src/enumerate/namespace/index.js index fba902d..f305d6e 100644 --- a/src/enumerate/namespace/index.js +++ b/src/enumerate/namespace/index.js @@ -6,4 +6,5 @@ import { defineNamespace } from "@cqsjjb/jjb-dva-runtime"; export const NS_GLOBAL = defineNamespace("global"); -export const NS_BI = defineNamespace("bi"); +export const NS_BI_STATISTICS = defineNamespace("biStatistics"); +export const NS_BI_MARK = defineNamespace("biMark"); diff --git a/src/pages/Container/Map/components/Content/IndexInfo/Bottom/RecordStatsPanel/index.js b/src/pages/Container/Map/components/Content/IndexInfo/Bottom/RecordStatsPanel/index.js index f565472..4be326c 100644 --- a/src/pages/Container/Map/components/Content/IndexInfo/Bottom/RecordStatsPanel/index.js +++ b/src/pages/Container/Map/components/Content/IndexInfo/Bottom/RecordStatsPanel/index.js @@ -3,7 +3,7 @@ import { Spin } from "antd"; import { useEffect, useState } from "react"; import SeamlessScroll from "zy-react-library/components/SeamlessScroll"; import background from "~/assets/images/public/bigScreen/bg13.png"; -import { NS_BI } from "~/enumerate/namespace"; +import { NS_BI_STATISTICS } from "~/enumerate/namespace"; import Panel from "../../Panel"; import "./index.less"; @@ -23,7 +23,7 @@ function RecordStatsPanel(props) { title="相关方单位备案与项目执行统计" className="index-info-bottom__record-stats" > - +
- +
{list.map(item => (
{playUrl @@ -84,4 +84,4 @@ function VideoPatrolPanel(props) { ); } -export default Connect([NS_BI], true)(VideoPatrolPanel); +export default Connect([NS_BI_STATISTICS], true)(VideoPatrolPanel); diff --git a/src/pages/Container/Map/components/Content/IndexInfo/LeftPanel/RectificationPanel/index.js b/src/pages/Container/Map/components/Content/IndexInfo/LeftPanel/RectificationPanel/index.js index 73e6abc..fe19c39 100644 --- a/src/pages/Container/Map/components/Content/IndexInfo/LeftPanel/RectificationPanel/index.js +++ b/src/pages/Container/Map/components/Content/IndexInfo/LeftPanel/RectificationPanel/index.js @@ -4,7 +4,7 @@ import { useEffect, useState } from "react"; import SeamlessScroll from "zy-react-library/components/SeamlessScroll"; import tableHeaderBackground from "~/assets/images/public/bigScreen/tablebg1.png"; import tableRowBackground from "~/assets/images/public/bigScreen/tablebg2.png"; -import { NS_BI } from "~/enumerate/namespace"; +import { NS_BI_STATISTICS } from "~/enumerate/namespace"; import Panel from "../../Panel"; import "./index.less"; @@ -27,7 +27,7 @@ function RectificationPanel(props) { title="当前各公司隐患整改情况" className="index-info-left-panel__rectification" > - +
- +
@@ -58,7 +58,7 @@ function WeatherPanel(props) { {weather.alertTitle || "天气数据加载失败"}
- +
- +
); } -export default Connect([NS_BI], true)(WorkStatusPanel); +export default Connect([NS_BI_STATISTICS], true)(WorkStatusPanel); diff --git a/src/pages/Container/Map/components/Content/IndexInfo/RightPanel/AlarmPanel/index.js b/src/pages/Container/Map/components/Content/IndexInfo/RightPanel/AlarmPanel/index.js index 7a5f8b3..8171910 100644 --- a/src/pages/Container/Map/components/Content/IndexInfo/RightPanel/AlarmPanel/index.js +++ b/src/pages/Container/Map/components/Content/IndexInfo/RightPanel/AlarmPanel/index.js @@ -4,7 +4,7 @@ import { useEffect, useState } from "react"; import SeamlessScroll from "zy-react-library/components/SeamlessScroll"; import tableHeaderBackground from "~/assets/images/public/bigScreen/tablebg1.png"; import tableRowBackground from "~/assets/images/public/bigScreen/tablebg2.png"; -import { NS_BI } from "~/enumerate/namespace"; +import { NS_BI_STATISTICS } from "~/enumerate/namespace"; import Panel from "../../Panel"; import "./index.less"; @@ -21,7 +21,7 @@ function AlarmPanel(props) { }, []); return ( - +
- +
- +
{list.map(item => (
@@ -76,4 +76,4 @@ function WorkPanel(props) { ); } -export default Connect([NS_BI], true)(WorkPanel); +export default Connect([NS_BI_STATISTICS], true)(WorkPanel); diff --git a/src/pages/Container/Map/components/Content/port/Index/BasicInfoPanel/index.js b/src/pages/Container/Map/components/Content/port/Index/BasicInfoPanel/index.js index 7ec0c6d..007d349 100644 --- a/src/pages/Container/Map/components/Content/port/Index/BasicInfoPanel/index.js +++ b/src/pages/Container/Map/components/Content/port/Index/BasicInfoPanel/index.js @@ -6,7 +6,7 @@ import branchIcon from "~/assets/images/map_bi/content/img3.png"; import relatedIcon from "~/assets/images/map_bi/content/img4.png"; import userIcon from "~/assets/images/map_bi/content/img5.png"; import oval from "~/assets/images/map_bi/content/oval.png"; -import { NS_BI } from "~/enumerate/namespace"; +import { NS_BI_STATISTICS } from "~/enumerate/namespace"; import Panel from "~/pages/Container/Map/components/Content/port/Panel"; import { Context } from "~/pages/Container/Map/js/context"; import "./index.less"; @@ -44,7 +44,7 @@ function BasicInfoPanel(props) { return ( - +
{statistics.map(item => (
@@ -66,4 +66,4 @@ function BasicInfoPanel(props) { ); } -export default Connect([NS_BI], true)(BasicInfoPanel); +export default Connect([NS_BI_STATISTICS], true)(BasicInfoPanel); diff --git a/src/pages/Container/Map/components/Content/port/Index/PersonnelStatsPanel/index.js b/src/pages/Container/Map/components/Content/port/Index/PersonnelStatsPanel/index.js index 6d09f94..83f366b 100644 --- a/src/pages/Container/Map/components/Content/port/Index/PersonnelStatsPanel/index.js +++ b/src/pages/Container/Map/components/Content/port/Index/PersonnelStatsPanel/index.js @@ -4,7 +4,7 @@ import { useContext, useEffect, useState } from "react"; import SeamlessScroll from "zy-react-library/components/SeamlessScroll"; import activeTabBackground from "~/assets/images/map_bi/content/title.png"; import tabBackground from "~/assets/images/map_bi/content/title_on.png"; -import { NS_BI } from "~/enumerate/namespace"; +import { NS_BI_STATISTICS } from "~/enumerate/namespace"; import Panel from "~/pages/Container/Map/components/Content/port/Panel"; import { Context } from "~/pages/Container/Map/js/context"; import "./index.less"; @@ -64,7 +64,7 @@ function PersonnelStatsPanel(props) {
人员数
- + {isVisible && ( {statistics.map((item, index) => ( @@ -90,4 +90,4 @@ function PersonnelStatsPanel(props) { ); } -export default Connect([NS_BI], true)(PersonnelStatsPanel); +export default Connect([NS_BI_STATISTICS], true)(PersonnelStatsPanel); diff --git a/src/pages/Container/Map/components/Content/port/Index/RiskStatsPanel/index.js b/src/pages/Container/Map/components/Content/port/Index/RiskStatsPanel/index.js index 8a152df..af016a9 100644 --- a/src/pages/Container/Map/components/Content/port/Index/RiskStatsPanel/index.js +++ b/src/pages/Container/Map/components/Content/port/Index/RiskStatsPanel/index.js @@ -8,7 +8,7 @@ import majorIcon from "~/assets/images/map_bi/content/img2ico1.png"; import highIcon from "~/assets/images/map_bi/content/img2ico2.png"; import normalIcon from "~/assets/images/map_bi/content/img2ico3.png"; import lowIcon from "~/assets/images/map_bi/content/img2ico4.png"; -import { NS_BI } from "~/enumerate/namespace"; +import { NS_BI_STATISTICS } from "~/enumerate/namespace"; import Panel from "~/pages/Container/Map/components/Content/port/Panel"; import { Context } from "~/pages/Container/Map/js/context"; import "./index.less"; @@ -69,7 +69,7 @@ function RiskStatsPanel(props) { return ( - +
{statistics.map(item => (
@@ -99,4 +99,4 @@ function RiskStatsPanel(props) { ); } -export default Connect([NS_BI], true)(RiskStatsPanel); +export default Connect([NS_BI_STATISTICS], true)(RiskStatsPanel); diff --git a/src/pages/Container/Map/components/Content/port/XiaoFang/FireDeviceListPanel/index.js b/src/pages/Container/Map/components/Content/port/XiaoFang/FireDeviceListPanel/index.js index f80f27b..311defa 100644 --- a/src/pages/Container/Map/components/Content/port/XiaoFang/FireDeviceListPanel/index.js +++ b/src/pages/Container/Map/components/Content/port/XiaoFang/FireDeviceListPanel/index.js @@ -2,7 +2,7 @@ import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Spin } from "antd"; import { useContext, useEffect, useState } from "react"; import SeamlessScroll from "zy-react-library/components/SeamlessScroll"; -import { NS_BI } from "~/enumerate/namespace"; +import { NS_BI_STATISTICS } from "~/enumerate/namespace"; import Panel from "~/pages/Container/Map/components/Content/port/Panel"; import { Context } from "~/pages/Container/Map/js/context"; import "./index.less"; @@ -38,7 +38,7 @@ function FireDeviceListPanel(props) {
数量
- + {isVisible && ( {deviceList.map((item, index) => ( @@ -64,4 +64,4 @@ function FireDeviceListPanel(props) { ); } -export default Connect([NS_BI], true)(FireDeviceListPanel); +export default Connect([NS_BI_STATISTICS], true)(FireDeviceListPanel); diff --git a/src/pages/Container/Map/index.js b/src/pages/Container/Map/index.js index 61cdac6..92db372 100644 --- a/src/pages/Container/Map/index.js +++ b/src/pages/Container/Map/index.js @@ -4,7 +4,7 @@ import { message, Spin } from "antd"; import autoFit from "autofit.js"; import { useEffect, useMemo, useReducer, useRef, useState } from "react"; import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery"; -import { NS_BI } from "~/enumerate/namespace"; +import { NS_BI_MARK } from "~/enumerate/namespace"; import BottomUtils from "./components/BottomUtils"; import CenterUtils from "./components/CenterUtils"; import Content from "./components/Content"; @@ -118,7 +118,7 @@ function Map(props) {
{isRenderContent && ( - +
@@ -138,4 +138,4 @@ function Map(props) { ); } -export default Connect([NS_BI], true)(Map); +export default Connect([NS_BI_MARK], true)(Map);