diff --git a/src/assets/images/evtIc2.png b/src/assets/images/evtIc2.png
index 9e2a73c625fa4b18ba94164def00bf20991f62ee..d6f71afaf135b747c6c94ba106733543eb6a4f9b 100644
Binary files a/src/assets/images/evtIc2.png and b/src/assets/images/evtIc2.png differ
diff --git a/src/pages/GlobalModalServices/modals/AdministPunish/NumTop5/index.tsx b/src/pages/GlobalModalServices/modals/AdministPunish/NumTop5/index.tsx
index 514b71b95add5d5174dd5eaaf70aaf0d9ccfb9a3..514b44f210b2e86a332732f341a8c10761e0c81e 100644
--- a/src/pages/GlobalModalServices/modals/AdministPunish/NumTop5/index.tsx
+++ b/src/pages/GlobalModalServices/modals/AdministPunish/NumTop5/index.tsx
@@ -40,8 +40,9 @@ export const jqxc = [
 const Top5: React.FC<{
   modalDispatch: ChildrenModalMethods;
   searchTime: any;
+  total:number
 }> = memo((props) => {
-  const { modalDispatch, searchTime } = props;
+  const { modalDispatch, searchTime ,total} = props;
   const [areaKey, setAreaKey] = useState('all');
 
   //办案数量top5
@@ -83,11 +84,11 @@ const Top5: React.FC<{
       num: item?.num,
       percent: (
         (item?.num /
-          list?.reduce((acc: any, it: any) => acc + (it?.num || 0), 0)) *
+          total) *
         100
       ).toFixed(2),
     }));
-  }, [qysl, areaKey]);
+  }, [qysl, areaKey,total]);
 
   return (
     <BaseCard w={457} h={430} title="办案数量TOP5">
diff --git a/src/pages/GlobalModalServices/modals/AdministPunish/Top5/index.tsx b/src/pages/GlobalModalServices/modals/AdministPunish/Top5/index.tsx
index d8fd77c12d58ba9c8fddca32dd2fd878baa12673..0049ad7afcded2b9ca831b2966e81958b35a7a0e 100644
--- a/src/pages/GlobalModalServices/modals/AdministPunish/Top5/index.tsx
+++ b/src/pages/GlobalModalServices/modals/AdministPunish/Top5/index.tsx
@@ -10,8 +10,9 @@ import styles from './index.less';
 const Top5: React.FC<{
   modalDispatch: ChildrenModalMethods;
   searchTime: any;
+  total:number
 }> = memo((props) => {
-  const { modalDispatch, searchTime } = props;
+  const { modalDispatch, searchTime ,total} = props;
 
   const { data: wfxwsl } = useRequest(
     () =>
@@ -34,11 +35,11 @@ const Top5: React.FC<{
       num: item?.num,
       percent: (
         (item?.num /
-          list?.reduce((acc: any, it: any) => acc + (it?.num || 0), 0)) *
+          total) *
         100
       ).toFixed(2),
     }));
-  }, [wfxwsl]);
+  }, [wfxwsl,total]);
 
   return (
     <BaseCard w={457} h={430} title="违法行为类型TOP5">
diff --git a/src/pages/GlobalModalServices/modals/AdministPunish/index.tsx b/src/pages/GlobalModalServices/modals/AdministPunish/index.tsx
index 13e0ee8b2903197ffad5be526f7c1028c97b68c2..1ed2d9107e8fab234eed8983ad6313395284ca4e 100644
--- a/src/pages/GlobalModalServices/modals/AdministPunish/index.tsx
+++ b/src/pages/GlobalModalServices/modals/AdministPunish/index.tsx
@@ -1,24 +1,18 @@
-import { Flex, Progress, Space, Statistic, Tabs } from 'antd';
+import { Flex } from 'antd';
 import dayjs from 'dayjs';
 import { memo, useEffect, useMemo, useState } from 'react';
 
-import EmptySpace from '@/components/EmptySpace';
 import TopSarch from '../../components/TopSarch';
-import { ChildrenModalMethods } from '../../type';
 
-import BaseCard from '../../components/BaseCard';
-import styles from './index.less';
 import PieChart from '@/components/PieChart';
-import { useRequest } from 'ahooks';
 import services from '@/services';
-import { convertUnits, formatNumber } from '@/utils/ui';
-import LineCharts from '../../components/IndLineCharts';
+import { useRequest } from 'ahooks';
+import BaseCard from '../../components/BaseCard';
+import styles from './index.less';
 import Info from './Info';
 import Trend from './Trend';
 
 import NumTop5 from './NumTop5';
-import { useGlobalModalServices } from '../../provider';
-import CountUp from 'react-countup';
 import Top5 from './Top5';
 /**中心城区 */
 export const zxcq = [
@@ -51,7 +45,7 @@ export const jqxc = [
 
 /**行政处罚modal */
 const AdministPunish = (props: any) => {
-  const {modalDispatch}=props
+  const { modalDispatch } = props;
 
   const [searchTime, setSearchTime] = useState({
     key: 'month',
@@ -59,7 +53,6 @@ const AdministPunish = (props: any) => {
     endTime: dayjs().endOf('month').format('YYYY-MM-DD'),
   });
 
-
   //总体统计
   const { data: fkjezs } = useRequest(
     () =>
@@ -88,11 +81,25 @@ const AdministPunish = (props: any) => {
     ];
   }, [fkjezs]);
 
+  //总体统计
+  const { data } = useRequest(
+    () =>
+      services.DataBase.getSjdzInfoData({
+        typeCode: 'zzcc-xzcf-fkjezs',
+        params: {
+          ...searchTime,
+        },
+      }).then((res) => {
+        if (res.code === 200) {
+          return res.data.data.records[0];
+        }
+        throw new Error('获取数据失败');
+      }),
+    {
+      refreshDeps: [searchTime],
+    },
+  );
 
-
-
-
- 
   useEffect(() => {
     modalDispatch.setOptions({
       headerLeft: () => {
@@ -118,20 +125,23 @@ const AdministPunish = (props: any) => {
   }, []);
   return (
     <div className={styles.container}>
-     
-
       <Flex gap={25}>
         <Info modalDispatch={modalDispatch} searchTime={searchTime}></Info>
         <Trend searchTime={searchTime}></Trend>
       </Flex>
       <Flex gap={25} style={{ marginTop: 20 }}>
-        <Top5 modalDispatch={modalDispatch} searchTime={searchTime}></Top5>
+        <Top5
+          modalDispatch={modalDispatch}
+          searchTime={searchTime}
+          total={data?.cfsl ?? 0}
+        ></Top5>
         <NumTop5
           modalDispatch={modalDispatch}
           searchTime={searchTime}
+          total={data?.cfsl ?? 0}
         ></NumTop5>
         <BaseCard w={457} h={430} title="程序类型">
-        <PieChart
+          <PieChart
             style={{ width: '100%', flexDirection: 'column' }}
             chartStyle={{ width: 180, height: 180 }}
             labelClassName={styles.labelClassName}
@@ -140,7 +150,6 @@ const AdministPunish = (props: any) => {
             labelStyle={{ maxWidth: 100 }}
             color={['#ff9b5d', '#ffe335']}
           />
-         
         </BaseCard>
       </Flex>
     </div>
diff --git a/src/pages/NewHome/NewLeftSidebar/OperatingSituation/index.less b/src/pages/NewHome/NewLeftSidebar/OperatingSituation/index.less
index 7414dee1932617d7024ecbe2a85ed54bcc76b1cf..44e063629ec9d12bd541cdea33d8d1f174e058ba 100644
--- a/src/pages/NewHome/NewLeftSidebar/OperatingSituation/index.less
+++ b/src/pages/NewHome/NewLeftSidebar/OperatingSituation/index.less
@@ -33,6 +33,7 @@
                 .ant-picker-outlined {
                     // background: transparent !important;
                 }
+
                 .ant-picker-cell-inner {
                     background: #326FA7 !important;
                 }
@@ -51,7 +52,7 @@
             height: 58px;
             transform: rotate(90deg);
             margin-left: 20px;
-          }
+        }
 
         .platform {
             // width: 488px;
@@ -236,6 +237,24 @@
                     }
                 }
             }
+
+            .cityIssue {
+                margin-top: 40px;
+                padding-left: 21px;
+                background-color: rgba(71, 101, 165, 0.307);
+                height: 72px;
+                border-radius: 10px;
+                display: flex;
+                align-items: center;
+                .label{
+width: 55%;
+font-size: 20px;
+                }
+                .numWarp{
+                    display: flex;
+                    align-items: center;
+                }
+            }
         }
     }
 
diff --git a/src/pages/NewHome/NewLeftSidebar/OperatingSituation/index.tsx b/src/pages/NewHome/NewLeftSidebar/OperatingSituation/index.tsx
index c4a161373209739abf8d467a9f0b85f3d36fd6e5..1b4c8cd40bcf3f84feb933ead76646eb44217566 100644
--- a/src/pages/NewHome/NewLeftSidebar/OperatingSituation/index.tsx
+++ b/src/pages/NewHome/NewLeftSidebar/OperatingSituation/index.tsx
@@ -1,15 +1,15 @@
+import upIcon from '@/assets/images/urbanSituation/up.png';
 import { useGlobalModalServices } from '@/pages/GlobalModalServices/provider';
 import services from '@/services';
 import { convertUnits, formatNumber } from '@/utils/ui';
 import { useRequest } from 'ahooks';
-import { Flex, Progress, Statistic, StatisticProps } from 'antd';
+import { Flex, Statistic, StatisticProps } from 'antd';
 import dayjs from 'dayjs';
 import { useEffect, useMemo, useState } from 'react';
 import CountUp from 'react-countup';
 import DateSelect from './DateSelect';
 import styles from './index.less';
 import LineCharts from './LineCharts';
-import upIcon from '@/assets/images/urbanSituation/up.png';
 const formatter: StatisticProps['formatter'] = (value: any) => {
   return (
     <CountUp
@@ -65,15 +65,15 @@ const OperatingSituation = () => {
   }, []);
 
   const getSearchTime = (searchParams: any) => {
-    const { type, time } = searchParams
+    const { type, time } = searchParams;
     if (type === '3') {
-      return dayjs(time).format('YYYY-MM-DD')
+      return dayjs(time).format('YYYY-MM-DD');
     } else if (type === '2') {
-      return dayjs(time).format('YYYY-MM')
+      return dayjs(time).format('YYYY-MM');
     } else if (type === '1') {
-      return dayjs(time).format('YYYY')
+      return dayjs(time).format('YYYY');
     }
-  }
+  };
 
   const platformList = useMemo(() => {
     //市运行平台
@@ -139,7 +139,7 @@ const OperatingSituation = () => {
           name: item.time,
         })),
         onClick: () => {
-          console.log(getSearchTime(searchParams))
+          console.log(getSearchTime(searchParams));
           dispatch?.push('UrbanOperation' as any, {
             title: '12345市民投诉',
 
@@ -296,10 +296,10 @@ const OperatingSituation = () => {
         </div>
       </div>
       <div className={styles.content}>
-        <Flex className={styles.platform} vertical justify='space-between'>
+        <Flex className={styles.platform} vertical justify="space-between">
           {platformList?.map((item) => {
             return (
-              <Flex key={item?.key} align='center'>
+              <Flex key={item?.key} align="center">
                 <div
                   className={styles.platItem}
                   onClick={() => {
@@ -333,7 +333,7 @@ const OperatingSituation = () => {
         /> */}
         <div className={styles.rigth}>
           <div className={styles.topWarp}>
-            <div className={styles.title}>城市管理综合问题总数</div>
+            <div className={styles.title}>城市管理类问题总数</div>
             <div
               className={styles.countWarp}
               style={{ cursor: 'pointer' }}
@@ -378,7 +378,7 @@ const OperatingSituation = () => {
                 }),
               ) || []
             }
-            style={{ width: '100%', height: 64 }}
+            style={{ width: '100%', height: 104 }}
           />
           <div className={styles.eventWarp}>
             <div className={styles.eventItem}>
@@ -409,7 +409,7 @@ const OperatingSituation = () => {
               }}
             >
               <img
-                src={require('@/assets/images/evtIc4.png')}
+                src={require('@/assets/images/evtIc2.png')}
                 alt=""
                 className={styles.icon}
               />
@@ -419,10 +419,10 @@ const OperatingSituation = () => {
                     convertUnits(data?.data?.disposing?.value)?.num,
                   )}
                   <span className={styles.unit}>
-                    {convertUnits(data?.data?.disposing?.value)?.unit}
+                    {convertUnits(data?.data?.need?.value)?.unit}
                   </span>
                 </div>
-                <div className={styles.label}>处置中</div>
+                <div className={styles.label}>应处置</div>
               </div>
             </div>
             <div className={styles.eventItem}>
@@ -438,12 +438,12 @@ const OperatingSituation = () => {
                     {convertUnits(data?.data?.close?.value)?.unit}
                   </span>
                 </div>
-                <div className={styles.label}>已结案</div>
+                <div className={styles.label}>已处置</div>
               </div>
             </div>
             <div className={styles.eventItem}>
               <img
-                src={require('@/assets/images/evtIc2.png')}
+                src={require('@/assets/images/evtIc4.png')}
                 alt=""
                 className={styles.icon}
               />
@@ -452,16 +452,16 @@ const OperatingSituation = () => {
                   <span></span>
                   <Statistic
                     valueStyle={{ fontSize: 30, lineHeight: 1 }}
-                    value={data?.data?.closeRate?.value}
+                    value={data?.data?.disposalRate?.value}
                   />
                   <span className={styles.unit}>%</span>
                 </div>
-                <div className={styles.label}>结案率</div>
+                <div className={styles.label}>处置率</div>
               </div>
             </div>
           </div>
 
-          <div className={styles.issueWarp}>
+          {/* <div className={styles.issueWarp}>
             <div className={styles.topWarp}>
               <div className={styles.title}>疑难问题</div>
               <div
@@ -524,6 +524,18 @@ const OperatingSituation = () => {
                 </span>
               </div>
             </div>
+          </div> */}
+          <div className={styles.cityIssue}>
+            <div className={styles.label}>城市管理类疑难问题</div>
+            <div className={styles.numWarp}>
+              {commonStatistic(
+                convertUnits(DEDataSource?.cityManageEventTotal)?.num,
+                30,
+              )}
+              <span className={styles.unit} style={{marginLeft:5}}>
+                {convertUnits(DEDataSource?.cityManageEventTotal)?.unit}
+              </span>
+            </div>
           </div>
         </div>
       </div>