diff --git a/config/proxy.ts b/config/proxy.ts index 756983c4e2885bf3763819fb62ef2b33904b9f73..434f0d36920e9bdf30f83d0d5dbca03979db43b6 100644 --- a/config/proxy.ts +++ b/config/proxy.ts @@ -1,7 +1,7 @@ export default { '/apis': { - target: 'http://171.217.92.33:21601', - // target: 'http://125.70.11.26:4303', + target: 'http://171.217.92.33:21601', + // target: 'http://125.70.11.26:4303', changeOrigin: true, pathRewrite: { '^/apis': '' }, logLevel: 'debug', diff --git a/src/app.ts b/src/app.ts index 56fa1553474109122aa5c875b7ccde551828fdc6..10b06fd6abac1c4bb94795accac76a9ec3e8fac2 100644 --- a/src/app.ts +++ b/src/app.ts @@ -5,9 +5,8 @@ import { } from '@/utils/request'; import type { RequestConfig } from '@umijs/max'; import { Base64 } from 'js-base64'; -import { getUrlQuery } from './utils/comm'; +import { getUrlQuery } from './utils/comm'; import { setCookie } from './utils/cookie'; -import { setSession } from './utils/session'; import { checkBeforeLogin } from './utils/loginUtil/SSO'; //request 配置 @@ -27,5 +26,5 @@ if (token) { export function render(oldRender: () => void) { checkBeforeLogin(() => { oldRender(); - }) -} \ No newline at end of file + }); +} diff --git a/src/pages/SecurityServiceOverview/SafetyMap/index.less b/src/pages/SecurityServiceOverview/SafetyMap/index.less index 17979ddd9e53fa991badeb5ebf883925479b9b55..39c5f32743498db8cd8635d89cb71ae69e8ec9e6 100644 --- a/src/pages/SecurityServiceOverview/SafetyMap/index.less +++ b/src/pages/SecurityServiceOverview/SafetyMap/index.less @@ -55,7 +55,7 @@ background-image: url('../../../assets/images/SecurityServiceOverview/warn_animation.png'); background-size: 100% 100%; animation-name: example; - animation-duration: 2s; + animation-duration: 1s; animation-iteration-count: infinite; animation-timing-function: linear; } diff --git a/src/pages/SecurityServiceOverview/SafetyMap/index.tsx b/src/pages/SecurityServiceOverview/SafetyMap/index.tsx index 61ba10953534d6e4e2935fd8fa9f603e81bd8e4c..c06a1f8992c497b82af63c9edcbdc1f9fba7bb8b 100644 --- a/src/pages/SecurityServiceOverview/SafetyMap/index.tsx +++ b/src/pages/SecurityServiceOverview/SafetyMap/index.tsx @@ -8,6 +8,7 @@ import CooglMap from '@/components/CooglMap'; import Modal from '@/components/HncyModal'; import services from '@/services'; import { useRequest } from '@umijs/max'; +import { useInterval } from 'ahooks'; import { Descriptions, Flex } from 'antd'; import BaseInfo from '../components/BaseInfo'; import CheckboxGroup, { items } from './CheckboxGroup'; @@ -48,6 +49,11 @@ const SafetyMap = () => { }; const [isBmap, setIsBmap] = useState(false); const MapRef = useRef(); + const [count, setCount] = useState(0); + + useInterval(() => { + setCount(count + 1); + }, 1000); const [searchParams, setSearchParams] = useState({ parentTypeCode: 'dlql', lat: 30.680193, diff --git a/src/pages/SecurityServiceOverview/SecurityState/FacilityWarn/index.tsx b/src/pages/SecurityServiceOverview/SecurityState/FacilityWarn/index.tsx index 03461c6a2caefc54b0d1a4dac2913b5eb383a18a..15ee0ae81b5c1550c14bca2fa8eb9c0175e16efa 100644 --- a/src/pages/SecurityServiceOverview/SecurityState/FacilityWarn/index.tsx +++ b/src/pages/SecurityServiceOverview/SecurityState/FacilityWarn/index.tsx @@ -40,19 +40,19 @@ const FacilityWarn = ({ data }: { data: any }) => { typeCode: 'zm', typeName: '照明', parentCode: null, - total: zmm?.data?.data?.records?.[0]?.fxys, + total: zmm?.data?.data?.records?.[0]?.fxys??'--', children: [ { typeCode: 'dl', typeName: '路灯设施', parentCode: 'dlql', - total: zmm?.data?.data?.records?.[0]?.ldss, + total: zmm?.data?.data?.records?.[0]?.ldss??'--', }, { typeCode: 'dl', typeName: '检修作业', parentCode: 'dlql', - total: zmm?.data?.data?.records?.[0]?.jxzy, + total: zmm?.data?.data?.records?.[0]?.jxzy??'--', }, ], }; @@ -64,13 +64,13 @@ const FacilityWarn = ({ data }: { data: any }) => { typeCode: 'ggzp', typeName: '广告招牌 ', parentCode: null, - total: gg?.data?.data?.records?.[0]?.fxys, + total: gg?.data?.data?.records?.[0]?.fxys??'--', children: [ { typeCode: 'dl', typeName: '广告招牌设备', parentCode: 'dlql', - total: gg?.data?.data?.records?.[0]?.ggzpss, + total: gg?.data?.data?.records?.[0]?.ggzpss??'--', }, ], }; @@ -178,7 +178,7 @@ const FacilityWarn = ({ data }: { data: any }) => { backgroundColor: 'rgba(63, 149, 229, 0.1)', }} extra={ -
风险源数 {zm?.total}
+
风险源数 {zm?.total}
} >
@@ -198,12 +198,17 @@ const FacilityWarn = ({ data }: { data: any }) => { })}
- +
{ })}
- +
@@ -296,7 +306,7 @@ const FacilityWarn = ({ data }: { data: any }) => { - {data?.monthEventTotal !== '0' && data?.monthEventTotal ? ( + {yj!= '0' && yj ? ( <>
@@ -49,7 +49,7 @@ const WarnWiget = ({ className={styles.warnCountv} style={{ color: 'rgb(227, 80, 80)' }} > - {data?.monthEventTotal} + {yj}
预警数
@@ -58,7 +58,7 @@ const WarnWiget = ({ className={styles.warnCountv} style={{ color: 'rgb(35, 194, 255)' }} > - {data?.yxcEventTotal} + {cy}
已处置
@@ -66,12 +66,12 @@ const WarnWiget = ({ ) : ( <>
- 预警数 {data?.monthEventTotal} + 预警数 {yj}
已处置 - {data?.yxcEventTotal} + {cy}
@@ -80,8 +80,8 @@ const WarnWiget = ({ ) : ( diff --git a/src/pages/SecurityServiceOverview/SecurityState/IndustryWarn/index.tsx b/src/pages/SecurityServiceOverview/SecurityState/IndustryWarn/index.tsx index 804e02657b8c162f6718fe98b399ffcb9392b36c..999373f21b59f92f253d9588285a62455235c64e 100644 --- a/src/pages/SecurityServiceOverview/SecurityState/IndustryWarn/index.tsx +++ b/src/pages/SecurityServiceOverview/SecurityState/IndustryWarn/index.tsx @@ -17,7 +17,6 @@ const IndustryWarn = ({ data }: { data: any }) => { ], }); - //道路桥梁 const dlql = useMemo(() => { // return data?.find((item: any) => item?.typeCode === 'dlql'); @@ -102,37 +101,35 @@ const IndustryWarn = ({ data }: { data: any }) => { typeCode: 'hw', typeName: '环卫', parentCode: null, - total: hwgf?.data?.records?.[0]?.fxys, + total: hwgf?.data?.records?.[0]?.fxys??'--', children: [ - { typeCode: 'dl', typeName: '环卫设施', parentCode: 'dlql', - total: hwgf?.data?.records?.[0]?.hwss, + total: hwgf?.data?.records?.[0]?.hwss??'--', }, { typeCode: 'dl', typeName: '环卫公厕', parentCode: 'dlql', - total: hwgf?.data?.records?.[0]?.hwgc, + total: hwgf?.data?.records?.[0]?.hwgc??'--', }, { typeCode: 'dl', typeName: '环卫车辆', parentCode: 'dlql', - total: hwgf?.data?.records?.[0]?.hwcl, + total: hwgf?.data?.records?.[0]?.hwcl??'--', }, { typeCode: 'dl', typeName: '环卫车辆', parentCode: 'dlql', - total: hwgf?.data?.records?.[0]?.hwzl, + total: hwgf?.data?.records?.[0]?.hwzl??'--', }, - ], }; - }, [data,hwgf]); + }, [data, hwgf]); //固废 const gf = useMemo(() => { // return data?.find((item: any) => item?.typeCode === 'gf'); @@ -243,7 +240,7 @@ const IndustryWarn = ({ data }: { data: any }) => { typeCode: dlql?.typeCode, parentData: dlql, }} - style={{ width: 100 }} + style={{ width: 170 }} /> ); })} @@ -283,7 +280,11 @@ const IndustryWarn = ({ data }: { data: any }) => { })}
- +
diff --git a/src/pages/SecurityServiceOverview/SecurityState/RightLayout/RiskNotice/index.less b/src/pages/SecurityServiceOverview/SecurityState/RightLayout/RiskNotice/index.less index 13fe1b5805993b9373fd12401c658beecfc97160..50026cb36faa9860053a96d53009107f4638dd07 100644 --- a/src/pages/SecurityServiceOverview/SecurityState/RightLayout/RiskNotice/index.less +++ b/src/pages/SecurityServiceOverview/SecurityState/RightLayout/RiskNotice/index.less @@ -92,4 +92,34 @@ } } +} +.modalTitle { + .title { + background: linear-gradient(180deg, rgb(255, 255, 255), rgb(181, 229, 255)); + -webkit-background-clip: text; + -webkit-text-fill-color: transparent; + background-clip: text; + font-family: DingTalk JinBuTi; + font-size: 30px; + margin-left: -10px; + } + + .tag { + display: inline-block; + width: 83px; + height: 24px; + border-radius: 12px; + background: linear-gradient(180.00deg, rgba(26, 66, 110, 0), rgb(122, 94, 111) 100%); + color: #FF7A7A; + text-align: center; + font-size: 16px; + line-height: 23px; + margin: 0 10px 0 20px; + background-size: 100% 100%; + } + + .type { + font-size: 16px; + color: #BCCEE9; + } } \ No newline at end of file diff --git a/src/pages/SecurityServiceOverview/SecurityState/SafetyTips/SafetyModal/index.tsx b/src/pages/SecurityServiceOverview/SecurityState/SafetyTips/SafetyModal/index.tsx index dc54570e646411d42e4f81308b268495d6259915..2bc867635977ed8df1ecbf1c1d192dd9cafd2b4a 100644 --- a/src/pages/SecurityServiceOverview/SecurityState/SafetyTips/SafetyModal/index.tsx +++ b/src/pages/SecurityServiceOverview/SecurityState/SafetyTips/SafetyModal/index.tsx @@ -48,9 +48,9 @@ const SafetyModal = ({ data, open, onCancel }: SafetyModalProps) => { {(articleDetail?.data?.cover || data?.cover) && (
{/* */} - {data?.coverList?.map((cover: string, index: number) => ( + {/* {data?.coverList?.map((cover: string, index: number) => ( {`Cover - ))} + ))} */}
)} diff --git a/src/pages/SecurityServiceOverview/components/BaseInfo/Casecirculation/index.tsx b/src/pages/SecurityServiceOverview/components/BaseInfo/Casecirculation/index.tsx index 9dc51d3d8180607d3715c5e836fe8b5ab81f6ec3..0da8741b1a571698ed060ce441965bf4f2045a93 100644 --- a/src/pages/SecurityServiceOverview/components/BaseInfo/Casecirculation/index.tsx +++ b/src/pages/SecurityServiceOverview/components/BaseInfo/Casecirculation/index.tsx @@ -235,7 +235,7 @@ const CulationComponent = forwardRef( {/* 上报不显示附件 */} {item?.eventAttachmentInfos && - item.operationType !== '上报' && ( + item?.operationType !== '上报' && (
办理附件: {item?.eventAttachmentInfos?.map( @@ -246,10 +246,10 @@ const CulationComponent = forwardRef( width={20} height={24} src={ - attachment.attachmentPath?.includes( + attachment?.attachmentPath?.includes( 'http', ) - ? attachment.attachmentPath + ? attachment?.attachmentPath : IMG_URL + attachment.attachmentPath } {...imageOptions} diff --git a/src/pages/SecurityServiceOverview/components/IndustrySign/index.tsx b/src/pages/SecurityServiceOverview/components/IndustrySign/index.tsx index ea98f055415b3e27b5c63ec2b2665d8d285bb0b0..3ad35c03d1081d152c9f6abe0ad94690c16e9e07 100644 --- a/src/pages/SecurityServiceOverview/components/IndustrySign/index.tsx +++ b/src/pages/SecurityServiceOverview/components/IndustrySign/index.tsx @@ -106,7 +106,8 @@ const IndustrySign = ({ param }: { param: any }) => { = { @@ -63,7 +60,7 @@ export const responseInterceptors: RequestConfig['responseInterceptors'] = [ (error: any) => { if (error?.response?.status === 424) { //退出登录 - handleLogout(); + handleLogout(); } message.error( error?.response?.data?.msg || codeMessage[error?.response?.status],