diff --git a/src/pages/Home_v_2504/components/SubPages/LawEnforcement/components/LeftContent/index.less b/src/pages/Home_v_2504/components/SubPages/LawEnforcement/components/LeftContent/index.less
deleted file mode 100644
index a5b3d5c85f639fc3b7f122e50fd68ea2f952c009..0000000000000000000000000000000000000000
--- a/src/pages/Home_v_2504/components/SubPages/LawEnforcement/components/LeftContent/index.less
+++ /dev/null
@@ -1,13 +0,0 @@
-.container {
- width: 100%;
- height: 100%;
- padding: 20px;
- color: #fff;
- background: rgba(7, 28, 67, 0.5);
- border-radius: 12px;
- border: 1px solid rgba(24, 144, 255, 0.3);
- display: flex;
- flex-direction: column;
- align-items: center;
- justify-content: center;
-}
\ No newline at end of file
diff --git a/src/pages/Home_v_2504/components/SubPages/LawEnforcement/components/LeftContent/index.tsx b/src/pages/Home_v_2504/components/SubPages/LawEnforcement/components/LeftContent/index.tsx
deleted file mode 100644
index ad678d18f820ed87e610e40105d2190fd2c634a4..0000000000000000000000000000000000000000
--- a/src/pages/Home_v_2504/components/SubPages/LawEnforcement/components/LeftContent/index.tsx
+++ /dev/null
@@ -1,29 +0,0 @@
-import React from 'react';
-import styles from './index.less';
-import PanelTitle from '@/pages/Home_v_2504/components/common/PanelTitle';
-
-/**
- * 执法管理左侧内容组件
- */
-const LeftContent: React.FC = () => {
- return (
-
-
- );
-};
-
-export default LeftContent;
\ No newline at end of file
diff --git a/src/pages/Home_v_2504/components/SubPages/LawEnforcement/index.tsx b/src/pages/Home_v_2504/components/SubPages/LawEnforcement/index.tsx
deleted file mode 100644
index fd695bec5420d6011e902ac2a9a127197263b8cc..0000000000000000000000000000000000000000
--- a/src/pages/Home_v_2504/components/SubPages/LawEnforcement/index.tsx
+++ /dev/null
@@ -1,38 +0,0 @@
-import React from 'react';
-import SubPageTemplate from '../SubPageTemplate';
-import { INDUSTRY_PAGE_IDS } from '@/constants/dataTypes';
-
-// 引入左侧组件
-import LeftContent from './components/LeftContent';
-// 复用餐饮油烟的右侧组件
-import RightContent from '../RestaurantOil/components/RightContent';
-
-interface LawEnforcementProps {
- visible: boolean;
-}
-
-/**
- * 执法管理子页面
- * 使用通用子页面模板实现
- */
-const LawEnforcement: React.FC = ({ visible }) => {
- return (
- (
-
- )}
- title="执法管理监管"
- />
- );
-};
-
-export default LawEnforcement;
\ No newline at end of file
diff --git a/src/pages/Home_v_2504/components/SubPages/LawEnforcementCoordination/components/LeftContent/index.less b/src/pages/Home_v_2504/components/SubPages/LawEnforcementCoordination/components/LeftContent/index.less
deleted file mode 100644
index 68da75f466c4d86921560dd15d4ead8943d9d0d3..0000000000000000000000000000000000000000
--- a/src/pages/Home_v_2504/components/SubPages/LawEnforcementCoordination/components/LeftContent/index.less
+++ /dev/null
@@ -1,24 +0,0 @@
-.container {
- width: 100%;
- height: 100%;
- display: flex;
- flex-direction: column;
- background-image: url('~@/assets/images/V-2504/subpage-bg-left.png');
- background-size: cover;
- background-position: center;
- border-radius: 20px;
-}
-
-.header {
- display: flex;
- justify-content: space-between;
- align-items: center;
-}
-
-.content {
- border-radius: 12px;
- padding: 15px;
- display: flex;
- flex-wrap: wrap;
- gap: 15px;
-}
\ No newline at end of file
diff --git a/src/pages/Home_v_2504/components/SubPages/LawEnforcementCoordination/components/LeftContent/index.tsx b/src/pages/Home_v_2504/components/SubPages/LawEnforcementCoordination/components/LeftContent/index.tsx
deleted file mode 100644
index 82ca3d1155e008e6cd4b2ff2829b2d63fa136885..0000000000000000000000000000000000000000
--- a/src/pages/Home_v_2504/components/SubPages/LawEnforcementCoordination/components/LeftContent/index.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import React from 'react';
-import styles from './index.less';
-import PanelTitle from '@/pages/Home_v_2504/components/common/PanelTitle';
-
-/**
- * 市区协同左侧内容组件
- */
-const LeftContent: React.FC = () => {
- return (
-
- );
-};
-
-export default LeftContent;
\ No newline at end of file
diff --git a/src/pages/Home_v_2504/components/SubPages/LawEnforcementCoordination/index.tsx b/src/pages/Home_v_2504/components/SubPages/LawEnforcementCoordination/index.tsx
index edac3455c6990b5c2599bc31ee4ebebb149eda10..486a19352c66879cfb5578c78cf50de3c448bfa1 100644
--- a/src/pages/Home_v_2504/components/SubPages/LawEnforcementCoordination/index.tsx
+++ b/src/pages/Home_v_2504/components/SubPages/LawEnforcementCoordination/index.tsx
@@ -2,8 +2,8 @@ import React from 'react';
import SubPageTemplate from '../SubPageTemplate';
import { INDUSTRY_PAGE_IDS } from '@/constants/dataTypes';
-// 引入左侧组件
-import LeftContent from './components/LeftContent';
+// 复用首页的左侧组件
+import LeftContent from '@/pages/Home_v_2504/components/LeftSidebar';
// 复用餐饮油烟的右侧组件
import RightContent from '../RestaurantOil/components/RightContent';
diff --git a/src/pages/Home_v_2504/components/SubPages/LawEnforcementPatrol/components/LeftContent/index.less b/src/pages/Home_v_2504/components/SubPages/LawEnforcementPatrol/components/LeftContent/index.less
deleted file mode 100644
index 68da75f466c4d86921560dd15d4ead8943d9d0d3..0000000000000000000000000000000000000000
--- a/src/pages/Home_v_2504/components/SubPages/LawEnforcementPatrol/components/LeftContent/index.less
+++ /dev/null
@@ -1,24 +0,0 @@
-.container {
- width: 100%;
- height: 100%;
- display: flex;
- flex-direction: column;
- background-image: url('~@/assets/images/V-2504/subpage-bg-left.png');
- background-size: cover;
- background-position: center;
- border-radius: 20px;
-}
-
-.header {
- display: flex;
- justify-content: space-between;
- align-items: center;
-}
-
-.content {
- border-radius: 12px;
- padding: 15px;
- display: flex;
- flex-wrap: wrap;
- gap: 15px;
-}
\ No newline at end of file
diff --git a/src/pages/Home_v_2504/components/SubPages/LawEnforcementPatrol/components/LeftContent/index.tsx b/src/pages/Home_v_2504/components/SubPages/LawEnforcementPatrol/components/LeftContent/index.tsx
deleted file mode 100644
index 2b012be31e929789b6958826678202cacf073b82..0000000000000000000000000000000000000000
--- a/src/pages/Home_v_2504/components/SubPages/LawEnforcementPatrol/components/LeftContent/index.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import React from 'react';
-import styles from './index.less';
-import PanelTitle from '@/pages/Home_v_2504/components/common/PanelTitle';
-
-/**
- * 日常巡查左侧内容组件
- */
-const LeftContent: React.FC = () => {
- return (
-
- );
-};
-
-export default LeftContent;
\ No newline at end of file
diff --git a/src/pages/Home_v_2504/components/SubPages/LawEnforcementPatrol/index.tsx b/src/pages/Home_v_2504/components/SubPages/LawEnforcementPatrol/index.tsx
index 3658ca11592609824f9bdba540040d1a9c703cef..9e2cafc2a7c67e2d44104fe244646c325d0ab848 100644
--- a/src/pages/Home_v_2504/components/SubPages/LawEnforcementPatrol/index.tsx
+++ b/src/pages/Home_v_2504/components/SubPages/LawEnforcementPatrol/index.tsx
@@ -2,8 +2,8 @@ import React from 'react';
import SubPageTemplate from '../SubPageTemplate';
import { INDUSTRY_PAGE_IDS } from '@/constants/dataTypes';
-// 引入左侧组件
-import LeftContent from './components/LeftContent';
+// 复用首页的左侧组件
+import LeftContent from '@/pages/Home_v_2504/components/LeftSidebar';
// 复用餐饮油烟的右侧组件
import RightContent from '../RestaurantOil/components/RightContent';
diff --git a/src/pages/Home_v_2504/components/SubPages/LawEnforcementPunishment/components/LeftContent/index.less b/src/pages/Home_v_2504/components/SubPages/LawEnforcementPunishment/components/LeftContent/index.less
deleted file mode 100644
index 68da75f466c4d86921560dd15d4ead8943d9d0d3..0000000000000000000000000000000000000000
--- a/src/pages/Home_v_2504/components/SubPages/LawEnforcementPunishment/components/LeftContent/index.less
+++ /dev/null
@@ -1,24 +0,0 @@
-.container {
- width: 100%;
- height: 100%;
- display: flex;
- flex-direction: column;
- background-image: url('~@/assets/images/V-2504/subpage-bg-left.png');
- background-size: cover;
- background-position: center;
- border-radius: 20px;
-}
-
-.header {
- display: flex;
- justify-content: space-between;
- align-items: center;
-}
-
-.content {
- border-radius: 12px;
- padding: 15px;
- display: flex;
- flex-wrap: wrap;
- gap: 15px;
-}
\ No newline at end of file
diff --git a/src/pages/Home_v_2504/components/SubPages/LawEnforcementPunishment/components/LeftContent/index.tsx b/src/pages/Home_v_2504/components/SubPages/LawEnforcementPunishment/components/LeftContent/index.tsx
deleted file mode 100644
index aa8b38a90b7ff4a513c9f509ee1466acb5d40176..0000000000000000000000000000000000000000
--- a/src/pages/Home_v_2504/components/SubPages/LawEnforcementPunishment/components/LeftContent/index.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import React from 'react';
-import styles from './index.less';
-import PanelTitle from '@/pages/Home_v_2504/components/common/PanelTitle';
-
-/**
- * 行政处罚左侧内容组件
- */
-const LeftContent: React.FC = () => {
- return (
-
- );
-};
-
-export default LeftContent;
\ No newline at end of file
diff --git a/src/pages/Home_v_2504/components/SubPages/AdministrativePunishment/MiddleContent/LineCharts/index.less b/src/pages/Home_v_2504/components/SubPages/LawEnforcementPunishment/components/RightContent/MiddleContent/LineCharts/index.less
similarity index 100%
rename from src/pages/Home_v_2504/components/SubPages/AdministrativePunishment/MiddleContent/LineCharts/index.less
rename to src/pages/Home_v_2504/components/SubPages/LawEnforcementPunishment/components/RightContent/MiddleContent/LineCharts/index.less
diff --git a/src/pages/Home_v_2504/components/SubPages/AdministrativePunishment/MiddleContent/LineCharts/index.tsx b/src/pages/Home_v_2504/components/SubPages/LawEnforcementPunishment/components/RightContent/MiddleContent/LineCharts/index.tsx
similarity index 100%
rename from src/pages/Home_v_2504/components/SubPages/AdministrativePunishment/MiddleContent/LineCharts/index.tsx
rename to src/pages/Home_v_2504/components/SubPages/LawEnforcementPunishment/components/RightContent/MiddleContent/LineCharts/index.tsx
diff --git a/src/pages/Home_v_2504/components/SubPages/AdministrativePunishment/MiddleContent/index.less b/src/pages/Home_v_2504/components/SubPages/LawEnforcementPunishment/components/RightContent/MiddleContent/index.less
similarity index 100%
rename from src/pages/Home_v_2504/components/SubPages/AdministrativePunishment/MiddleContent/index.less
rename to src/pages/Home_v_2504/components/SubPages/LawEnforcementPunishment/components/RightContent/MiddleContent/index.less
diff --git a/src/pages/Home_v_2504/components/SubPages/AdministrativePunishment/MiddleContent/index.tsx b/src/pages/Home_v_2504/components/SubPages/LawEnforcementPunishment/components/RightContent/MiddleContent/index.tsx
similarity index 98%
rename from src/pages/Home_v_2504/components/SubPages/AdministrativePunishment/MiddleContent/index.tsx
rename to src/pages/Home_v_2504/components/SubPages/LawEnforcementPunishment/components/RightContent/MiddleContent/index.tsx
index e1d5be0b25eba6ab7b61f704e41a683b55addbeb..9ea2016522813ef1127af5fd36bac163af1cd774 100644
--- a/src/pages/Home_v_2504/components/SubPages/AdministrativePunishment/MiddleContent/index.tsx
+++ b/src/pages/Home_v_2504/components/SubPages/LawEnforcementPunishment/components/RightContent/MiddleContent/index.tsx
@@ -2,7 +2,7 @@ import classNames from 'classnames'
import React, { CSSProperties, useEffect, useMemo } from 'react'
import LineCharts from './LineCharts';
-import HncyCard from '../../../common/Card'
+import HncyCard from '@/pages/Home_v_2504/components/common/Card'
import DescriptionItem from '@/components/DescriptionItem'
import bgIcon1 from '@/assets/images/bgIcon1.png'
import bgIcon2 from '@/assets/images/bgIcon2.png'
diff --git a/src/pages/Home_v_2504/components/SubPages/AdministrativePunishment/OverallSituation/index.less b/src/pages/Home_v_2504/components/SubPages/LawEnforcementPunishment/components/RightContent/OverallSituation/index.less
similarity index 100%
rename from src/pages/Home_v_2504/components/SubPages/AdministrativePunishment/OverallSituation/index.less
rename to src/pages/Home_v_2504/components/SubPages/LawEnforcementPunishment/components/RightContent/OverallSituation/index.less
diff --git a/src/pages/Home_v_2504/components/SubPages/AdministrativePunishment/OverallSituation/index.tsx b/src/pages/Home_v_2504/components/SubPages/LawEnforcementPunishment/components/RightContent/OverallSituation/index.tsx
similarity index 93%
rename from src/pages/Home_v_2504/components/SubPages/AdministrativePunishment/OverallSituation/index.tsx
rename to src/pages/Home_v_2504/components/SubPages/LawEnforcementPunishment/components/RightContent/OverallSituation/index.tsx
index e1875b679f772b6217e729b078c068ff3c010476..2913792b54b67682e17ad030955569bd0d9ea818 100644
--- a/src/pages/Home_v_2504/components/SubPages/AdministrativePunishment/OverallSituation/index.tsx
+++ b/src/pages/Home_v_2504/components/SubPages/LawEnforcementPunishment/components/RightContent/OverallSituation/index.tsx
@@ -1,6 +1,6 @@
import React, { CSSProperties, useMemo } from 'react'
-import HncyCard from '../../../common/Card'
+import HncyCard from '@/pages/Home_v_2504/components/common/Card'
import icon1 from '@/assets/images/icon1.png'
import icon2 from '@/assets/images/icon2.png'
@@ -60,13 +60,13 @@ export default function OverallSituation() {
const valueStyle: CSSProperties = {
background: 'linear-gradient(180.00deg, rgb(170, 255, 246),rgb(37, 187, 255))',
- webkitBackgroundClip: 'text',
- webkitTextFillColor: 'transparent',
+ WebkitBackgroundClip: 'text',
+ WebkitTextFillColor: 'transparent',
backgroundClip: 'text',
textFillColor: 'transparent',
fontFamily: 'D-DIN',
fontSize: 28,
- fonteight: 700,
+ fontWeight: 700,
}
const unitStyle: CSSProperties = {
diff --git a/src/pages/Home_v_2504/components/SubPages/AdministrativePunishment/WorkStar/index.less b/src/pages/Home_v_2504/components/SubPages/LawEnforcementPunishment/components/RightContent/WorkStar/index.less
similarity index 100%
rename from src/pages/Home_v_2504/components/SubPages/AdministrativePunishment/WorkStar/index.less
rename to src/pages/Home_v_2504/components/SubPages/LawEnforcementPunishment/components/RightContent/WorkStar/index.less
diff --git a/src/pages/Home_v_2504/components/SubPages/AdministrativePunishment/WorkStar/index.tsx b/src/pages/Home_v_2504/components/SubPages/LawEnforcementPunishment/components/RightContent/WorkStar/index.tsx
similarity index 97%
rename from src/pages/Home_v_2504/components/SubPages/AdministrativePunishment/WorkStar/index.tsx
rename to src/pages/Home_v_2504/components/SubPages/LawEnforcementPunishment/components/RightContent/WorkStar/index.tsx
index c16ad5765a9c1bbba39aed0aedad5f3ee63003b0..6dbca94e49aff4e4067c554bebde796543144a25 100644
--- a/src/pages/Home_v_2504/components/SubPages/AdministrativePunishment/WorkStar/index.tsx
+++ b/src/pages/Home_v_2504/components/SubPages/LawEnforcementPunishment/components/RightContent/WorkStar/index.tsx
@@ -1,6 +1,6 @@
import React, { CSSProperties, useState } from 'react'
-import HncyCard from '../../../common/Card'
+import HncyCard from '@/pages/Home_v_2504/components/common/Card'
import no1 from '@/assets/images/no1.png'
import no2 from '@/assets/images/no2.png'
import no3 from '@/assets/images/no3.png'
diff --git a/src/pages/Home_v_2504/components/SubPages/AdministrativePunishment/index.less b/src/pages/Home_v_2504/components/SubPages/LawEnforcementPunishment/components/RightContent/index.less
similarity index 100%
rename from src/pages/Home_v_2504/components/SubPages/AdministrativePunishment/index.less
rename to src/pages/Home_v_2504/components/SubPages/LawEnforcementPunishment/components/RightContent/index.less
diff --git a/src/pages/Home_v_2504/components/SubPages/AdministrativePunishment/index.tsx b/src/pages/Home_v_2504/components/SubPages/LawEnforcementPunishment/components/RightContent/index.tsx
similarity index 90%
rename from src/pages/Home_v_2504/components/SubPages/AdministrativePunishment/index.tsx
rename to src/pages/Home_v_2504/components/SubPages/LawEnforcementPunishment/components/RightContent/index.tsx
index 730d007857edc3271199155b3e0ff8b70e1ca175..b8bb7fba766bcd661a2e627893ffb1d35a838480 100644
--- a/src/pages/Home_v_2504/components/SubPages/AdministrativePunishment/index.tsx
+++ b/src/pages/Home_v_2504/components/SubPages/LawEnforcementPunishment/components/RightContent/index.tsx
@@ -1,5 +1,5 @@
import React, { useCallback } from 'react'
-import PanelTitle from '../../common/PanelTitle'
+import PanelTitle from '@/pages/Home_v_2504/components/common/PanelTitle';
import OverallSituation from './OverallSituation';
@@ -22,7 +22,7 @@ interface Props {
isThinLayout?: boolean;
}
-export default function AdministrativePunishment({
+export default function RightContent({
dataTypeKey = '行政处罚',
title = '行政处罚',
useHighFrequencyType = false,
@@ -32,8 +32,7 @@ export default function AdministrativePunishment({
// 处理日期变化
const handleDateChange = useCallback((params: { type: string; startTime: string; endTime: string }) => {
- console.log('Date changed: RightContent!!', params);
-
+ console.log('Date changed: RightContent!!', params);
}, []);
diff --git a/src/pages/Home_v_2504/components/SubPages/LawEnforcementPunishment/index.tsx b/src/pages/Home_v_2504/components/SubPages/LawEnforcementPunishment/index.tsx
index 64e09fb1159651cb71721f80a617d9d7890ce5a6..0da4745424d4cbdaa3203753952f694af568f633 100644
--- a/src/pages/Home_v_2504/components/SubPages/LawEnforcementPunishment/index.tsx
+++ b/src/pages/Home_v_2504/components/SubPages/LawEnforcementPunishment/index.tsx
@@ -2,10 +2,12 @@ import React from 'react';
import SubPageTemplate from '../SubPageTemplate';
import { INDUSTRY_PAGE_IDS } from '@/constants/dataTypes';
-// 引入左侧组件
-import LeftContent from './components/LeftContent';
+// 复用首页的左侧组件
+import LeftContent from '@/pages/Home_v_2504/components/LeftSidebar';
+// import LeftContent from './components/LeftContent';
// 复用餐饮油烟的右侧组件
-import RightContent from '../RestaurantOil/components/RightContent';
+import RightContent from './components/RightContent';
+// import RightContent from '../RestaurantOil/components/RightContent';
interface LawEnforcementPunishmentProps {
visible: boolean;
@@ -21,15 +23,7 @@ const LawEnforcementPunishment: React.FC = ({ vis
visible={visible}
pageId="lawEnforcementPunishment"
leftComponent={LeftContent}
- rightComponent={(props) => (
-
- )}
+ rightComponent={RightContent}
title="行政处罚监管"
/>
);
diff --git a/src/pages/Home_v_2504/components/SubPages/RestaurantOil/index.tsx b/src/pages/Home_v_2504/components/SubPages/RestaurantOil/index.tsx
index e20d165ff4bd28393cf17eed04c04f939d6d48de..69a03d941d83bf0eb4bfa2e37cbe0b8bb5e13741 100644
--- a/src/pages/Home_v_2504/components/SubPages/RestaurantOil/index.tsx
+++ b/src/pages/Home_v_2504/components/SubPages/RestaurantOil/index.tsx
@@ -19,8 +19,8 @@ const RestaurantOil: React.FC = ({ visible }) => {
visible={visible}
pageId={INDUSTRY_PAGE_IDS.RESTAURANT_OIL}
leftComponent={LeftContent}
- // rightComponent={RightContent}
- rightComponent={AdministrativePunishment}
+ rightComponent={RightContent}
+ // rightComponent={AdministrativePunishment}
title="餐饮油烟监管"
/>
);