From 52fbe91d091b86c0dcaebeed446336c4b72a83c5 Mon Sep 17 00:00:00 2001
From: tangshaojian <63377964@qq.com>
Date: Mon, 19 May 2025 17:07:20 +0800
Subject: [PATCH] =?UTF-8?q?tsj:=20=E6=89=A7=E6=B3=95=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E8=A1=8C=E6=94=BF=E5=A4=84=E7=BD=9A=EF=BC=8C=E5=90=88=E5=85=A5?=
 =?UTF-8?q?=E5=88=98=E6=B6=B5=E7=9A=84=E5=AE=9E=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/LeftContent/index.less         | 13 -------
 .../components/LeftContent/index.tsx          | 29 --------------
 .../SubPages/LawEnforcement/index.tsx         | 38 -------------------
 .../components/LeftContent/index.less         | 24 ------------
 .../components/LeftContent/index.tsx          | 23 -----------
 .../LawEnforcementCoordination/index.tsx      |  4 +-
 .../components/LeftContent/index.less         | 24 ------------
 .../components/LeftContent/index.tsx          | 23 -----------
 .../SubPages/LawEnforcementPatrol/index.tsx   |  4 +-
 .../components/LeftContent/index.less         | 24 ------------
 .../components/LeftContent/index.tsx          | 23 -----------
 .../MiddleContent/LineCharts/index.less       |  0
 .../MiddleContent/LineCharts/index.tsx        |  0
 .../RightContent}/MiddleContent/index.less    |  0
 .../RightContent}/MiddleContent/index.tsx     |  2 +-
 .../RightContent}/OverallSituation/index.less |  0
 .../RightContent}/OverallSituation/index.tsx  |  8 ++--
 .../RightContent}/WorkStar/index.less         |  0
 .../RightContent}/WorkStar/index.tsx          |  2 +-
 .../components/RightContent}/index.less       |  0
 .../components/RightContent}/index.tsx        |  7 ++--
 .../LawEnforcementPunishment/index.tsx        | 18 +++------
 .../SubPages/RestaurantOil/index.tsx          |  4 +-
 23 files changed, 21 insertions(+), 249 deletions(-)
 delete mode 100644 src/pages/Home_v_2504/components/SubPages/LawEnforcement/components/LeftContent/index.less
 delete mode 100644 src/pages/Home_v_2504/components/SubPages/LawEnforcement/components/LeftContent/index.tsx
 delete mode 100644 src/pages/Home_v_2504/components/SubPages/LawEnforcement/index.tsx
 delete mode 100644 src/pages/Home_v_2504/components/SubPages/LawEnforcementCoordination/components/LeftContent/index.less
 delete mode 100644 src/pages/Home_v_2504/components/SubPages/LawEnforcementCoordination/components/LeftContent/index.tsx
 delete mode 100644 src/pages/Home_v_2504/components/SubPages/LawEnforcementPatrol/components/LeftContent/index.less
 delete mode 100644 src/pages/Home_v_2504/components/SubPages/LawEnforcementPatrol/components/LeftContent/index.tsx
 delete mode 100644 src/pages/Home_v_2504/components/SubPages/LawEnforcementPunishment/components/LeftContent/index.less
 delete mode 100644 src/pages/Home_v_2504/components/SubPages/LawEnforcementPunishment/components/LeftContent/index.tsx
 rename src/pages/Home_v_2504/components/SubPages/{AdministrativePunishment => LawEnforcementPunishment/components/RightContent}/MiddleContent/LineCharts/index.less (100%)
 rename src/pages/Home_v_2504/components/SubPages/{AdministrativePunishment => LawEnforcementPunishment/components/RightContent}/MiddleContent/LineCharts/index.tsx (100%)
 rename src/pages/Home_v_2504/components/SubPages/{AdministrativePunishment => LawEnforcementPunishment/components/RightContent}/MiddleContent/index.less (100%)
 rename src/pages/Home_v_2504/components/SubPages/{AdministrativePunishment => LawEnforcementPunishment/components/RightContent}/MiddleContent/index.tsx (98%)
 rename src/pages/Home_v_2504/components/SubPages/{AdministrativePunishment => LawEnforcementPunishment/components/RightContent}/OverallSituation/index.less (100%)
 rename src/pages/Home_v_2504/components/SubPages/{AdministrativePunishment => LawEnforcementPunishment/components/RightContent}/OverallSituation/index.tsx (93%)
 rename src/pages/Home_v_2504/components/SubPages/{AdministrativePunishment => LawEnforcementPunishment/components/RightContent}/WorkStar/index.less (100%)
 rename src/pages/Home_v_2504/components/SubPages/{AdministrativePunishment => LawEnforcementPunishment/components/RightContent}/WorkStar/index.tsx (97%)
 rename src/pages/Home_v_2504/components/SubPages/{AdministrativePunishment => LawEnforcementPunishment/components/RightContent}/index.less (100%)
 rename src/pages/Home_v_2504/components/SubPages/{AdministrativePunishment => LawEnforcementPunishment/components/RightContent}/index.tsx (90%)

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 a5b3d5c8..00000000
--- 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 ad678d18..00000000
--- 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 (
-    
-    <div className={styles.container}>
-      {/* 标题 */}
-      <div className={styles.header}>
-        <PanelTitle title="执法管理监管" />
-        {/* <DateSelector
-          onChange={handleDateChange}
-          defaultType="day"
-          panelType="left"
-        /> */}
-      </div>
-      
-      <div className={styles.content}>
-        <p>此处为执法管理监管左侧内容区域</p>
-      </div>
-    </div>
-  );
-};
-
-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 fd695bec..00000000
--- 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<LawEnforcementProps> = ({ visible }) => {
-  return (
-    <SubPageTemplate
-      visible={visible}
-      pageId={INDUSTRY_PAGE_IDS.LAW_ENFORCEMENT}
-      leftComponent={LeftContent}
-      rightComponent={(props) => (
-        <RightContent
-          {...props}
-          dataTypeKey="执法管理事件"
-          title="执法管理事件"
-          useHighFrequencyType={true}
-          isThinLayout={true}
-        />
-      )}
-      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 68da75f4..00000000
--- 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 82ca3d11..00000000
--- 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 (
-    <div className={styles.container}>
-      {/* 标题 */}
-      <div className={styles.header}>
-        <PanelTitle title="整体概况" />
-      </div>
-      
-      <div className={styles.content}>
-        <p>此处为市区协同监管左侧内容区域</p>
-      </div>
-    </div>
-  );
-};
-
-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 edac3455..486a1935 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 68da75f4..00000000
--- 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 2b012be3..00000000
--- 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 (
-    <div className={styles.container}>
-      {/* 标题 */}
-      <div className={styles.header}>
-        <PanelTitle title="整体概况" />
-      </div>
-      
-      <div className={styles.content}>
-        <p>此处为日常巡查监管左侧内容区域</p>
-      </div>
-    </div>
-  );
-};
-
-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 3658ca11..9e2cafc2 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 68da75f4..00000000
--- 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 aa8b38a9..00000000
--- 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 (
-    <div className={styles.container}>
-      {/* 标题 */}
-      <div className={styles.header}>
-        <PanelTitle title="整体概况" />
-      </div>
-      
-      <div className={styles.content}>
-        <p>此处为行政处罚监管左侧内容区域</p>
-      </div>
-    </div>
-  );
-};
-
-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 e1d5be0b..9ea20165 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 e1875b67..2913792b 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 c16ad576..6dbca94e 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 730d0078..b8bb7fba 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 64e09fb1..0da47454 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<LawEnforcementPunishmentProps> = ({ vis
       visible={visible}
       pageId="lawEnforcementPunishment"
       leftComponent={LeftContent}
-      rightComponent={(props) => (
-        <RightContent
-          {...props}
-          dataTypeKey="行政处罚"
-          title="行政处罚"
-          useHighFrequencyType={true}
-          isThinLayout={true}
-        />
-      )}
+      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 e20d165f..69a03d94 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<RestaurantOilProps> = ({ visible }) => {
       visible={visible}
       pageId={INDUSTRY_PAGE_IDS.RESTAURANT_OIL}
       leftComponent={LeftContent}
-      // rightComponent={RightContent}
-      rightComponent={AdministrativePunishment}
+      rightComponent={RightContent}
+      // rightComponent={AdministrativePunishment}
       title="餐饮油烟监管"
     />
   );
-- 
GitLab