样式修改

src/pages/SecurityServiceOverview/SecurityState/IndustryWarn/index.tsx

@@ -132,8 +132,15 @@ const IndustryWarn = ({
           parentCode: 'dlql',
           listTypeCode: 'zzcc-aq-hwgf-fylb',
           total: gfcz?.data?.records?.[0]?.tmc ?? '--',
-          factorytypecode:'TMC',
-          pageNo:0,//数据底座分页接口，有的重0开始有的从1开始
+          factorytypecode: 'TMC',
+          pageNo: 0, //数据底座分页接口，有的重0开始有的从1开始
+          columnsFields: {
+            name: 'name',
+            type: 'jishuguanlifenlei',
+            descgldw: 'guanlidanwei',
+            address: 'address',
+            status: 'objstate',
+          },
         },
         {
           typeCode: 'dl',
@@ -141,7 +148,15 @@ const IndustryWarn = ({
           parentCode: 'dlql',
           listTypeCode: 'zzcc-aq-hwgf-fylb',
           total: gfcz?.data?.records?.[0]?.fsfdc ?? '--',
-           factorytypecode:'FSC'
+          factorytypecode: 'FSC',
+          pageNo: 0, //数据底座分页接口，有的重0开始有的从1开始
+          columnsFields: {
+            name: 'name',
+            type: 'jishuguanlifenlei',
+            descgldw: 'guanlidanwei',
+            address: 'address',
+            status: 'objstate',
+          },
         },
         {
           listTypeCode: 'zzcc-aq-hwgf-fylb',
@@ -149,7 +164,15 @@ const IndustryWarn = ({
           typeName: '餐厨厂',
           parentCode: 'dlql',
           total: gfcz?.data?.records?.[0]?.canchu ?? '--',
-            factorytypecode:'CCC'
+          factorytypecode: 'CCC',
+          pageNo: 0, //数据底座分页接口，有的重0开始有的从1开始
+          columnsFields: {
+            name: 'name',
+            type: 'jishuguanlifenlei',
+            descgldw: 'guanlidanwei',
+            address: 'address',
+            status: 'objstate',
+          },
         },
       ],
     };
@@ -164,7 +187,7 @@ const IndustryWarn = ({
         style={{
           paddingTop: 16,
           paddingRight: 18,
-          backdropFilter: 'blur(2px)', 
+          backdropFilter: 'blur(2px)',
           backgroundImage: `url(${cardBg})`,
           backgroundSize: '100% 100%',
         }}
@@ -207,9 +230,9 @@ const IndustryWarn = ({
         style={{
           paddingTop: 16,
           paddingRight: 18,
-          backdropFilter: 'blur(2px)', 
-          backgroundImage:`url(${cardBg})`,
-          backgroundSize:'100% 100%'
+          backdropFilter: 'blur(2px)',
+          backgroundImage: `url(${cardBg})`,
+          backgroundSize: '100% 100%',
         }}
         extra={<StatusWiget industryCode="0401" />}
       >
@@ -242,9 +265,9 @@ const IndustryWarn = ({
         style={{
           paddingTop: 16,
           paddingRight: 18,
-          backdropFilter: 'blur(2px)', 
-          backgroundImage:`url(${cardBg})`,
-          backgroundSize:'100% 100%'
+          backdropFilter: 'blur(2px)',
+          backgroundImage: `url(${cardBg})`,
+          backgroundSize: '100% 100%',
         }}
         extra={<StatusWiget industryCode="0401" />}
       >

src/pages/SecurityServiceOverview/SecurityState/MeetSafeguard/index.less

 .container {
     height: 310px;
-    width: 750px;
+    width: 782px;
     border-radius: 20px;
     background-image: url('../../../../assets/images/SecurityServiceOverview/cardBg2.png');
     background-size: 100% 100%;

src/pages/SecurityServiceOverview/SecurityState/RightLayout/RiskNotice/index.less

@@ -55,7 +55,7 @@
           height: 14px;
           border-radius: 14px;
           background: var(--bg);
-          margin-right: 14px;
+          margin-right: 5px;
         }
       }
 
@@ -67,6 +67,8 @@
         white-space: nowrap;
         overflow: hidden;
         text-overflow: ellipsis;
+        padding-left: 19px;
+        margin-top: 2px;
       }
     }
   }
@@ -92,6 +94,7 @@
     .title {
       font-size: 18px;
       font-family: DingTalk JinBuTi;
+      margin-bottom: 2px;
     }
 
     .address {

src/pages/SecurityServiceOverview/SecurityState/RightLayout/RiskNotice/index.tsx

@@ -31,28 +31,28 @@ export const colorConfig: Record<
 > = {
   红色预警: {
     //红色风险
-    color: '#FFBCBC',
+    color: 'rgb(255, 227, 227)',
     bg: redBg,
     icon: 'redIcon',
     tag: require('@/assets/images/SecurityServiceOverview/dtyjtag1.png'),
   },
   橙色预警: {
     //橙色风险
-    color: '#FDDFCE',
+    color: 'rgb(255, 249, 246)',
     bg: orangeBg,
     icon: 'orangeIcon',
     tag: require('@/assets/images/SecurityServiceOverview/dtyjtag2.png'),
   },
   黄色预警: {
     //黄色风险
-    color: '#FFE892',
+    color: 'rgb(255, 250, 233)',
     bg: yellowBg,
     icon: 'yellowIcon',
     tag: require('@/assets/images/SecurityServiceOverview/dtyjtag3.png'),
   },
   一般预警: {
     //一般风险
-    color: '#BFE4FF',
+    color: 'rgb(220, 241, 255)',
     bg: blueBg,
     icon: 'blueIcon',
     tag: require('@/assets/images/SecurityServiceOverview/dtyjtag4.png'),

src/pages/SecurityServiceOverview/SecurityState/SafetyAccident/AccidentItem/index.tsx

@@ -38,7 +38,7 @@ const AccidentItem = ({ data, onClick }: AccidentItemProps) => {
               suffix: dayjs(data?.publishTime).format('YYYY-MM-DD'),
             }}
             title={data?.title}
-            style={{color:'rgb(140, 170, 212)'}}
+            style={{color:'rgb(140, 170, 212)',fontSize:16}}
           >
             {data?.title}
           </Paragraph>

src/pages/SecurityServiceOverview/SecurityState/SafetyAccident/index.less

 .container {
     height: 232px;
-    width: 750px;
+    width: 782px;
     border-radius: 20px;
     // background: linear-gradient(to right, rgba(19, 84, 255, 0.1), rgba(23, 255, 149, 0));
     background-image: url('../../../../assets/images/SecurityServiceOverview/cardBg2.png');

src/pages/SecurityServiceOverview/SecurityState/SafetyAccident/index.tsx

@@ -4,7 +4,7 @@ import services from '@/services';
 import SafetyModal from '../SafetyTips/SafetyModal';
 import AccidentItem from './AccidentItem';
 import styles from './index.less';
-import { divide } from 'lodash';
+
 import EmptySpace from '@/components/EmptySpace';
 
 const SafetyAccident = () => {

src/pages/SecurityServiceOverview/SecurityState/SafetyTips/SafetyTipItem/index.tsx

@@ -30,7 +30,7 @@ const SafetyTipItem = ({ data }: { data: any }) => {
                 suffix: ' ' + dayjs(data?.publishTime).format('YYYY-MM-DD'),
               }}
               title={data?.title}
-              style={{ color: 'rgb(202, 223, 252)', fontWeight: 500 }}
+              style={{ color: 'rgb(202, 223, 252)', fontWeight: 500,fontSize:16}}
             >
               {data?.title}
             </Paragraph>

src/pages/SecurityServiceOverview/SecurityState/SafetyTips/index.less

 .container {
-    height: 340px;
-    width: 750px;
+    height: 350px;
+    width: 782px;
     border-radius: 20px;
     // background: linear-gradient(to right, rgba(19, 84, 255, 0.1), rgba(23, 255, 149, 0));
     background-image: url('../../../../assets/images/SecurityServiceOverview/cardBg2.png');
     background-size: 100% 100%;
-    margin-top: 30px;
+    margin-top: 19px;
     -webkit-backdrop-filter: blur(5px);
     /* Safari浏览器兼容 */
     backdrop-filter: blur(5px);
@@ -27,7 +27,7 @@
     .content {
         padding: 0 20px;
         margin-top: 22px;
-        height: 247px;
+        height: 280px;
         display: flex;
         border-radius: 10px;
         overflow: hidden;
@@ -35,12 +35,12 @@
         .carouselItem {
             position: relative;
             width: 280px;
-            height: 244px;
+            height: 254px;
             border-radius: 10px;
 
             .img {
                 width: 100%;
-                height: 244px;
+                height: 254px;
                 border-radius: 10px;
             }
 

src/pages/SecurityServiceOverview/SecurityState/SafetyTips/index.tsx

@@ -51,7 +51,7 @@ const SafetyTips = () => {
     <div className={styles.container}>
       <div className={styles.tag}>安全工作</div>
       <div className={styles.content}>
-        <Carousel autoplay style={{ width: 274,borderRadius:10 }}>
+        <Carousel autoplay style={{ width: 270,borderRadius:10 }}>
           {BigImgData?.data?.records?.map((item: any,index:number) => {
             return (
               <div

src/pages/SecurityServiceOverview/SecurityState/index.less

@@ -2,7 +2,7 @@
   width: 100%;
 
   .leftWrap {
-    width: 1100px;
+    width: 1110px;
   }
 
   .mapCenter {
@@ -15,7 +15,7 @@
   }
 
   .rightWrap {
-    width: 1100px;
+    width: 1110px;
     display: flex;
     .rDiv{
       margin-left: 16px;

src/pages/SecurityServiceOverview/components/IndustrySign/index.tsx

@@ -44,13 +44,13 @@ const IndustrySign = ({ param }: { param: any }) => {
   const [fetchParams, setFetchParams] = useState<any>({
     typeCode: param?.listTypeCode,
     data: {
-      pageNo: param?.pageNo ?? 1,
+      pageNo:0,
       pageSize: 10,
       regionCode: selectAreaId,
       factorytypecode: param?.factorytypecode,
     },
   });
-console.log( param?.pageNo);
+  console.log(param?.pageNo);
 
   const { data: tableData } = useRequest(
     () => services.DataBase.getSjdzInfoData(fetchParams),
@@ -138,11 +138,8 @@ console.log( param?.pageNo);
         ellipsis: true,
         render: (text, record, index) => {
           // 当前页码减1，乘以每页数量，再加上当前行的索引加1
-
-          return `${
-            (fetchParams?.data?.pageNo - 1) * fetchParams?.data?.pageSize +
-            (index + 1)
-          }`;
+          const num = fetchParams?.data?.pageNo || 1;
+          return `${(num - 1) * fetchParams?.data?.pageSize + (index + 1)}`;
         },
       },
       {
@@ -344,7 +341,7 @@ console.log( param?.pageNo);
         <CommonTable
           dataSource={tableData?.data?.data?.records}
           columns={columns}
-          scroll={{ x: 700, y: 550 }}
+          scroll={{ x: 700, y: 540 }}
           pagination={{
             total: tableData?.data?.data?.page?.total,
             pageSize: fetchParams?.data?.count,
@@ -354,7 +351,7 @@ console.log( param?.pageNo);
               setFetchParams({
                 ...fetchParams,
                 data: {
-                  pageNo: page,
+                  pageNo: page-1,
                   pageSize: pageSize,
                 },
               });