diff --git a/src/assets/images/SecurityServiceOverview/right/blueBg.png b/src/assets/images/SecurityServiceOverview/right/blueBg.png index 28e0f4e7e4f222e0beb50ef9ed06bbc9ba5b3415..c2b20a661358df69fbf51b241aa0f1f3ca7674e5 100644 Binary files a/src/assets/images/SecurityServiceOverview/right/blueBg.png and b/src/assets/images/SecurityServiceOverview/right/blueBg.png differ diff --git a/src/assets/images/SecurityServiceOverview/right/blueIcon.png b/src/assets/images/SecurityServiceOverview/right/blueIcon.png index 6e78b96b8792a87495c5ff7c088da9071a7b9495..8dc69fd07dd5da01620de1ac0bec8021a63adaa3 100644 Binary files a/src/assets/images/SecurityServiceOverview/right/blueIcon.png and b/src/assets/images/SecurityServiceOverview/right/blueIcon.png differ diff --git a/src/assets/images/SecurityServiceOverview/right/orangeBg.png b/src/assets/images/SecurityServiceOverview/right/orangeBg.png index 71bbfdb10ecfb64e1fdbef715a0aaa3725c44a58..c6a8b9ce30a8d18a265caf9dd758b92ccce83570 100644 Binary files a/src/assets/images/SecurityServiceOverview/right/orangeBg.png and b/src/assets/images/SecurityServiceOverview/right/orangeBg.png differ diff --git a/src/assets/images/SecurityServiceOverview/right/orangeIcon.png b/src/assets/images/SecurityServiceOverview/right/orangeIcon.png index 4c4da3d673317fd110d8b0538470be055feb7c9b..dc94e3a97dce53c396054529644c2f52092fe7ad 100644 Binary files a/src/assets/images/SecurityServiceOverview/right/orangeIcon.png and b/src/assets/images/SecurityServiceOverview/right/orangeIcon.png differ diff --git a/src/assets/images/SecurityServiceOverview/right/redBg.png b/src/assets/images/SecurityServiceOverview/right/redBg.png index 1a2b88d25f12039400177cbad9df58ee776a2b0b..2d53b1459159a4581943486f06aee9c5ee738ac6 100644 Binary files a/src/assets/images/SecurityServiceOverview/right/redBg.png and b/src/assets/images/SecurityServiceOverview/right/redBg.png differ diff --git a/src/assets/images/SecurityServiceOverview/right/redIcon.png b/src/assets/images/SecurityServiceOverview/right/redIcon.png index 41062d72b9015e8fd20f77a99b8b9a9e841ffb4f..d44639b8302c00b549194b770116973cb4120ffa 100644 Binary files a/src/assets/images/SecurityServiceOverview/right/redIcon.png and b/src/assets/images/SecurityServiceOverview/right/redIcon.png differ diff --git a/src/assets/images/SecurityServiceOverview/right/yellowBg.png b/src/assets/images/SecurityServiceOverview/right/yellowBg.png index 7d0a8d69ed7a0b88b4e67d36d89dfe04c95ba73f..2f8404021f45f983b6276f038c5f4a686da58402 100644 Binary files a/src/assets/images/SecurityServiceOverview/right/yellowBg.png and b/src/assets/images/SecurityServiceOverview/right/yellowBg.png differ diff --git a/src/assets/images/SecurityServiceOverview/right/yellowIcon.png b/src/assets/images/SecurityServiceOverview/right/yellowIcon.png index 6ac81f3f89c464be92779929fdf614b8092c6e4c..3a381a3712e3aa1bb07b6b085c9a069e2e24555a 100644 Binary files a/src/assets/images/SecurityServiceOverview/right/yellowIcon.png and b/src/assets/images/SecurityServiceOverview/right/yellowIcon.png differ diff --git a/src/pages/SecurityServiceOverview/SecurityState/IndustryWarn/index.tsx b/src/pages/SecurityServiceOverview/SecurityState/IndustryWarn/index.tsx index 564f720059ea0ad7c4c6509a74ed9bb551950acd..343ac2e99511902a9a8063bf1944da497432b7eb 100644 --- a/src/pages/SecurityServiceOverview/SecurityState/IndustryWarn/index.tsx +++ b/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={} > @@ -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={} > diff --git a/src/pages/SecurityServiceOverview/SecurityState/MeetSafeguard/index.less b/src/pages/SecurityServiceOverview/SecurityState/MeetSafeguard/index.less index 4ce6f156b3fdf8d75238d9771c43e58f719af9ad..120d55a097674e2a2c783b307fb4e06edea6b17a 100644 --- a/src/pages/SecurityServiceOverview/SecurityState/MeetSafeguard/index.less +++ b/src/pages/SecurityServiceOverview/SecurityState/MeetSafeguard/index.less @@ -1,6 +1,6 @@ .container { height: 310px; - width: 750px; + width: 782px; border-radius: 20px; background-image: url('../../../../assets/images/SecurityServiceOverview/cardBg2.png'); background-size: 100% 100%; diff --git a/src/pages/SecurityServiceOverview/SecurityState/RightLayout/RiskNotice/index.less b/src/pages/SecurityServiceOverview/SecurityState/RightLayout/RiskNotice/index.less index a14604f7f2edb631ad87fc1ff95b9b519c40d378..548ecc9dc2d943f17c439b20ba1ec0caaf9b5da0 100644 --- a/src/pages/SecurityServiceOverview/SecurityState/RightLayout/RiskNotice/index.less +++ b/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 { diff --git a/src/pages/SecurityServiceOverview/SecurityState/RightLayout/RiskNotice/index.tsx b/src/pages/SecurityServiceOverview/SecurityState/RightLayout/RiskNotice/index.tsx index b1be2fed19254b96c8201b8bf29f1e9e5375bfb9..f1135fe4d54805ffd9e0ba466571c93e9a6e8bcd 100644 --- a/src/pages/SecurityServiceOverview/SecurityState/RightLayout/RiskNotice/index.tsx +++ b/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'), diff --git a/src/pages/SecurityServiceOverview/SecurityState/SafetyAccident/AccidentItem/index.tsx b/src/pages/SecurityServiceOverview/SecurityState/SafetyAccident/AccidentItem/index.tsx index cc0661df2ee6a27698683045d7c89368c848a85c..2fbf180cf9144e012acf966542951f3c530f08a6 100644 --- a/src/pages/SecurityServiceOverview/SecurityState/SafetyAccident/AccidentItem/index.tsx +++ b/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} diff --git a/src/pages/SecurityServiceOverview/SecurityState/SafetyAccident/index.less b/src/pages/SecurityServiceOverview/SecurityState/SafetyAccident/index.less index f320f6a5905066d4f87b673c9e6a4527ac46d6bf..c68bedbd0b0b7c706ceeed6508d9fd97c5eed741 100644 --- a/src/pages/SecurityServiceOverview/SecurityState/SafetyAccident/index.less +++ b/src/pages/SecurityServiceOverview/SecurityState/SafetyAccident/index.less @@ -1,6 +1,6 @@ .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'); diff --git a/src/pages/SecurityServiceOverview/SecurityState/SafetyAccident/index.tsx b/src/pages/SecurityServiceOverview/SecurityState/SafetyAccident/index.tsx index b5ed85843df60227c4764cb7e18a6476b629a2db..f90fea3b7ede8201cf378d680896121339a25a28 100644 --- a/src/pages/SecurityServiceOverview/SecurityState/SafetyAccident/index.tsx +++ b/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 = () => { diff --git a/src/pages/SecurityServiceOverview/SecurityState/SafetyTips/SafetyTipItem/index.tsx b/src/pages/SecurityServiceOverview/SecurityState/SafetyTips/SafetyTipItem/index.tsx index fd0cccc44516fc92510e51a9bef69862cd15dad7..6b7be344c7d4c3910e67cfccf9a0304c9b599c0a 100644 --- a/src/pages/SecurityServiceOverview/SecurityState/SafetyTips/SafetyTipItem/index.tsx +++ b/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} diff --git a/src/pages/SecurityServiceOverview/SecurityState/SafetyTips/index.less b/src/pages/SecurityServiceOverview/SecurityState/SafetyTips/index.less index d1a577674cfaea266fd9a8368eeb61856fff483a..c4093c838c3c0a88dfd4e5a9d03bc951e4d8a371 100644 --- a/src/pages/SecurityServiceOverview/SecurityState/SafetyTips/index.less +++ b/src/pages/SecurityServiceOverview/SecurityState/SafetyTips/index.less @@ -1,11 +1,11 @@ .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; } diff --git a/src/pages/SecurityServiceOverview/SecurityState/SafetyTips/index.tsx b/src/pages/SecurityServiceOverview/SecurityState/SafetyTips/index.tsx index 076ec0017c4acaec3a629352abca28032141d6c1..f699e1ff491fa47e4521db396495559d679227ba 100644 --- a/src/pages/SecurityServiceOverview/SecurityState/SafetyTips/index.tsx +++ b/src/pages/SecurityServiceOverview/SecurityState/SafetyTips/index.tsx @@ -51,7 +51,7 @@ const SafetyTips = () => {
安全工作
- + {BigImgData?.data?.records?.map((item: any,index:number) => { return (
{ const [fetchParams, setFetchParams] = useState({ 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); {
setModalOpt({ - open: true, - type: item.type, - title: '安全风险', - })} + // onClick={() => setModalOpt({ + // open: true, + // type: item.type, + // title: '安全风险', + // })} >
- {item.value} - 个 + + {/* {item.value} */} + -- + + {/* 个 */}
{item.label}