From 037b846e7f4b1df4b7c94d015cb586a8f9183ad3 Mon Sep 17 00:00:00 2001 From: fandaiyang <1147379969@qq.com> Date: Wed, 15 Jan 2025 17:37:44 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Common/components/EventPicList/index.less | 15 + .../modals/DifficultEvents/index.tsx | 4 +- .../EventDetail/Casecirculation/index.less | 5 +- .../EventDetail/Casecirculation/index.tsx | 2 +- src/pages/GlobalModalServices/registry.tsx | 2 +- src/pages/IndustryOperation/index.tsx | 4 +- .../OperatingSituation/index.less | 510 +++++++++--------- .../OperatingSituation/index.tsx | 340 ++++++------ .../IndustryOperationNew/index.tsx | 2 +- .../IndustryOperationV4/index.less | 2 +- .../IndustryOperationV4/index.tsx | 2 +- 11 files changed, 466 insertions(+), 422 deletions(-) diff --git a/src/pages/Common/components/EventPicList/index.less b/src/pages/Common/components/EventPicList/index.less index 3ab9096f..a9edc0cb 100644 --- a/src/pages/Common/components/EventPicList/index.less +++ b/src/pages/Common/components/EventPicList/index.less @@ -75,3 +75,18 @@ white-space: nowrap; overflow: hidden; } + +.spin { + width: 100%; + height: 100%; + + :global { + .ant-spin-container { + width: 100%; + height: 100%; + &::after { + background: transparent !important; + } + } + } +} diff --git a/src/pages/GlobalModalServices/modals/DifficultEvents/index.tsx b/src/pages/GlobalModalServices/modals/DifficultEvents/index.tsx index 0edec33a..763bb035 100644 --- a/src/pages/GlobalModalServices/modals/DifficultEvents/index.tsx +++ b/src/pages/GlobalModalServices/modals/DifficultEvents/index.tsx @@ -63,14 +63,14 @@ const DifficultEvents = (props: { modalDispatch: ChildrenModalMethods }) => { marginLeft: 24, }} > - { setActiveKey(type as any); }} defaultValue={'all'} itemkey={'key'} items={tabs} - /> + /> */} ); }, diff --git a/src/pages/GlobalModalServices/modals/EventDetail/Casecirculation/index.less b/src/pages/GlobalModalServices/modals/EventDetail/Casecirculation/index.less index 1105222f..5d58ee56 100644 --- a/src/pages/GlobalModalServices/modals/EventDetail/Casecirculation/index.less +++ b/src/pages/GlobalModalServices/modals/EventDetail/Casecirculation/index.less @@ -152,12 +152,15 @@ font-size: 20px; font-weight: 700; + p { + margin-bottom: 0; + } } .time { font-size: 16px; color: rgb(255, 255, 255); - + margin-bottom: 0; padding: 4px 0; } diff --git a/src/pages/GlobalModalServices/modals/EventDetail/Casecirculation/index.tsx b/src/pages/GlobalModalServices/modals/EventDetail/Casecirculation/index.tsx index ee16e640..46ae1a03 100644 --- a/src/pages/GlobalModalServices/modals/EventDetail/Casecirculation/index.tsx +++ b/src/pages/GlobalModalServices/modals/EventDetail/Casecirculation/index.tsx @@ -225,7 +225,7 @@ const CulationComponent = forwardRef(

{item.circulationPersonName}

)} -

{item?.recordTime}

+

{item?.createTime}

{/* 备注 */} diff --git a/src/pages/GlobalModalServices/registry.tsx b/src/pages/GlobalModalServices/registry.tsx index b1c42cd2..4af90e65 100644 --- a/src/pages/GlobalModalServices/registry.tsx +++ b/src/pages/GlobalModalServices/registry.tsx @@ -238,7 +238,7 @@ export default class Registry { defaultConfig: { w: 1104, h: 875, - title: '行业系统接入清单', + title: '行业系统', }, defaultProps: {}, modal: IndustrySystem, diff --git a/src/pages/IndustryOperation/index.tsx b/src/pages/IndustryOperation/index.tsx index e1af2c7b..ca479c3f 100644 --- a/src/pages/IndustryOperation/index.tsx +++ b/src/pages/IndustryOperation/index.tsx @@ -246,10 +246,10 @@ const IndustryOperation: React.FC = () => {
- setModalOpt({ open: true, title: ' 行业系统接入清单' }) + setModalOpt({ open: true, title: ' 行业系统' }) } > - 目前已接入10个行业系统 + 行业系统
diff --git a/src/pages/NewHome/NewLeftSidebar/OperatingSituation/index.less b/src/pages/NewHome/NewLeftSidebar/OperatingSituation/index.less index 44e06362..aa529186 100644 --- a/src/pages/NewHome/NewLeftSidebar/OperatingSituation/index.less +++ b/src/pages/NewHome/NewLeftSidebar/OperatingSituation/index.less @@ -1,282 +1,298 @@ .container { + display: flex; + flex-direction: column; + height: 684px; + width: 100%; + // background: rgba(68, 120, 195, 0.2); + background: url('@/assets/images/bg.png'); + border-radius: 20px; + + .titleWarp { display: flex; - flex-direction: column; - height: 684px; - width: 100%; - // background: rgba(68, 120, 195, 0.2); - background: url('@/assets/images/bg.png'); - border-radius: 20px; - - .titleWarp { + justify-content: space-between; + padding-right: 20px; + + .title { + font-family: DingTalk JinBuTi; + background-color: rgba(62, 146, 199, 0.347); + width: 170px; + height: 52px; + display: flex; + justify-content: center; + align-items: center; + border-radius: 20px 0 25px 0; + color: rgb(255, 255, 255); + font-size: 30px; + } + + .select { + padding: 10px; + + :global { + .ant-picker-outlined { + // background: transparent !important; + } + + .ant-picker-cell-inner { + background: #326fa7 !important; + } + } + } + } + + .content { + display: flex; + // justify-content: space-between; + padding: 0 20px; + margin-top: 32px; + + .upIcon { + width: 24px; + height: 58px; + transform: rotate(90deg); + margin-left: 20px; + } + + .platform { + // width: 488px; + flex: 1; + + .platItem { + width: calc(100% - 64px); + height: 84px; + background: rgba(67, 112, 180, 0.313); + border-radius: 10px; display: flex; + align-items: center; justify-content: space-between; - padding-right: 20px; + // margin-bottom: 13px; + padding: 0 25px; .title { - font-family: DingTalk JinBuTi; - background-color: rgba(62, 146, 199, 0.347); - width: 170px; - height: 52px; - display: flex; - justify-content: center; - align-items: center; - border-radius: 20px 0 25px 0; - color: rgb(255, 255, 255); - font-size: 30px; + color: rgb(188, 206, 233); + font-size: 20px; + width: 134px; } - .select { - padding: 10px; + .countWarp { + width: 130px; + display: flex; + align-items: center; + cursor: pointer; + text-align: right; + justify-content: flex-end; + + .unit { + font-size: 14px; + color: rgb(188, 206, 233); + margin-left: 8px; + } + } + } + } - :global { + .rigth { + width: 534px; + height: 569px; + background: rgba(77, 107, 178, 0.238); + border-radius: 15px; + padding: 33px 20px 20px 20px; - .ant-picker-outlined { - // background: transparent !important; - } + .topWarp { + display: flex; + justify-content: space-between; + align-items: center; - .ant-picker-cell-inner { - background: #326FA7 !important; - } - } + .title { + color: rgb(189, 206, 233); + font-size: 20px; } - } - .content { - display: flex; - // justify-content: space-between; - padding: 0 20px; - margin-top: 32px; - - .upIcon { - width: 24px; - height: 58px; - transform: rotate(90deg); - margin-left: 20px; + .countWarp { + display: flex; + align-items: center; + + .unit { + color: rgb(188, 206, 233); + font-size: 14px; + margin-left: 8px; + line-height: 1; + } + } + } + + .roat { + margin-top: 10px; + text-align: right; + color: rgb(188, 206, 233); + margin-bottom: 10px; + + .count { + font-size: 18px; + color: rgb(29, 187, 138); + font-weight: 700; } + } + + .eventWarp { + display: grid; + grid-template-columns: 1fr 1fr; + margin-top: 30px; + padding: 0 30px; + grid-row-gap: 27px; + + .eventItem { + display: flex; + + .icon { + width: 60px; + height: 60px; + } - .platform { - // width: 488px; - flex: 1; - - .platItem { - width: calc(100% - 64px); - height: 84px; - background: rgba(67, 112, 180, 0.313); - border-radius: 10px; - display: flex; - align-items: center; - justify-content: space-between; - // margin-bottom: 13px; - padding: 0 25px; - - .title { - color: rgb(188, 206, 233); - font-size: 20px; - width: 134px; - } - - .countWarp { - width: 130px; - display: flex; - align-items: center; - cursor: pointer; - text-align: right; - justify-content: flex-end; - - .unit { - font-size: 14px; - color: rgb(188, 206, 233); - margin-left: 8px; - } - } + .rw { + margin-left: 16px; + + .countWarp { + display: flex; + align-items: center; + + .unit { + margin-left: 5px; + color: rgb(188, 206, 233); + } } + + .label { + color: rgb(188, 206, 233); + font-size: 20px; + } + } } + } + + .issueWarp { + height: 139px; + border-radius: 10px; + background-color: rgba(71, 101, 165, 0.269); + margin-top: 15px; + padding: 17px 20px; + + .topWarp { + display: flex; + justify-content: space-between; + width: 100%; - .rigth { - width: 534px; - height: 569px; - background: rgba(77, 107, 178, 0.238); - border-radius: 15px; - padding: 33px 20px 20px 20px; - - .topWarp { - display: flex; - justify-content: space-between; - align-items: center; - - .title { - color: rgb(189, 206, 233); - font-size: 20px; - } - - .countWarp { - display: flex; - align-items: center; - - .unit { - color: rgb(188, 206, 233); - font-size: 14px; - margin-left: 8px; - line-height: 1; - } - } + .title { + } + + .countWarp { + display: flex; + align-items: center; + + .unit { + margin-left: 5px; + color: rgb(188, 206, 233); } + } + } - .roat { - margin-top: 10px; - text-align: right; - color: rgb(188, 206, 233); - margin-bottom: 10px; + .progressWarp { + margin-top: 17px; - .count { - font-size: 18px; - color: rgb(29, 187, 138); - font-weight: 700; - } + :global { + .ant-progress .ant-progress-success-bg { + background-color: rgb(255, 198, 20); } + } + } + + .botWarp { + display: flex; + justify-content: space-between; + color: rgb(188, 206, 233); + padding-left: 20px; + margin-top: 8px; + padding-right: 20px; - .eventWarp { - display: grid; - grid-template-columns: 1fr 1fr; - margin-top: 30px; - padding: 0 30px; - grid-row-gap: 27px; - - .eventItem { - display: flex; - - .icon { - width: 60px; - height: 60px; - } - - .rw { - margin-left: 16px; - - .countWarp { - display: flex; - align-items: center; - - .unit { - margin-left: 5px; - color: rgb(188, 206, 233); - } - } - - .label { - color: rgb(188, 206, 233); - font-size: 20px; - } - } - } + .item { + display: flex; + align-items: center; + + .dot { + width: 12px; + height: 12px; } - .issueWarp { - height: 139px; - border-radius: 10px; - background-color: rgba(71, 101, 165, 0.269); - margin-top: 15px; - padding: 17px 20px; - - .topWarp { - display: flex; - justify-content: space-between; - width: 100%; - - .title {} - - .countWarp { - display: flex; - align-items: center; - - .unit { - margin-left: 5px; - color: rgb(188, 206, 233); - } - } - } - - .progressWarp { - margin-top: 17px; - - :global { - .ant-progress .ant-progress-success-bg { - background-color: rgb(255, 198, 20); - } - } - } - - .botWarp { - display: flex; - justify-content: space-between; - color: rgb(188, 206, 233); - padding-left: 20px; - margin-top: 8px; - padding-right: 20px; - - .item { - display: flex; - align-items: center; - - .dot { - width: 12px; - height: 12px; - - } - - .name { - color: rgb(188, 206, 233); - margin-left: 3px; - margin-right: 6px; - } - - .unit { - font-size: rgb(188, 206, 233); - margin-left: 5px; - } - } - } + .name { + color: rgb(188, 206, 233); + margin-left: 3px; + margin-right: 6px; } - .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; - } + .unit { + font-size: rgb(188, 206, 233); + margin-left: 5px; } + } + } + } + + .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; + cursor: pointer; + } + } + } + } + + :global { + .ant-statistic-content-value { + background: linear-gradient( + 180deg, + rgb(170, 255, 246), + rgb(37, 187, 255) + ); + -webkit-background-clip: text; + -webkit-text-fill-color: transparent; + background-clip: text; + font-family: D-DIN; + // font-size: 26px; + // font-size: clamp(20px, 2.5vh, 30px); + font-weight: 700; } + } +} - :global { - .ant-statistic-content-value { - background: linear-gradient(180deg, - rgb(170, 255, 246), - rgb(37, 187, 255)); - -webkit-background-clip: text; - -webkit-text-fill-color: transparent; - background-clip: text; - font-family: D-DIN; - // font-size: 26px; - // font-size: clamp(20px, 2.5vh, 30px); - font-weight: 700; - } +.spin { + flex: 1; + height: 100%; + + :global { + .ant-spin-container { + width: 100%; + height: 100%; + &::after { + background: transparent !important; + } } + } } .countBlue { - background: linear-gradient(180deg, #aafff6, #25bbff); - background-clip: 'text'; - -webkit-text-fill-color: transparent; - -} \ No newline at end of file + background: linear-gradient(180deg, #aafff6, #25bbff); + background-clip: 'text'; + -webkit-text-fill-color: transparent; +} diff --git a/src/pages/NewHome/NewLeftSidebar/OperatingSituation/index.tsx b/src/pages/NewHome/NewLeftSidebar/OperatingSituation/index.tsx index b544f32c..10b6086b 100644 --- a/src/pages/NewHome/NewLeftSidebar/OperatingSituation/index.tsx +++ b/src/pages/NewHome/NewLeftSidebar/OperatingSituation/index.tsx @@ -3,7 +3,7 @@ import { useGlobalModalServices } from '@/pages/GlobalModalServices/provider'; import services from '@/services'; import { convertUnits, formatNumber } from '@/utils/ui'; import { useRequest } from 'ahooks'; -import { Flex, Statistic, StatisticProps } from 'antd'; +import { Flex, Spin, Statistic, StatisticProps } from 'antd'; import dayjs from 'dayjs'; import { useEffect, useMemo, useState } from 'react'; import CountUp from 'react-countup'; @@ -45,7 +45,7 @@ const OperatingSituation = () => { const { dispatch } = useGlobalModalServices(); /** 疑难问题基础数据 */ const [DEDataSource, setDEDataSource] = useState(); - const { data } = useRequest( + const { data, loading: platformLoading } = useRequest( () => services.CityProblemApi.getContentStatisticsV3(searchParams), { refreshDeps: [searchParams], @@ -295,174 +295,179 @@ const OperatingSituation = () => { /> -
- - {platformList?.map((item) => { - return ( - -
{ - item?.onClick?.(); - }} - > -
{item?.name}
- + +
+ + {platformList?.map((item) => { + return ( + +
{ + item?.onClick?.(); + }} + > +
{item?.name}
+ -
- - {commonStatistic(convertUnits(item.value)?.num, 30)} - - - {convertUnits(item.value)?.unit} - +
+ + {commonStatistic(convertUnits(item.value)?.num, 30)} + + + {convertUnits(item.value)?.unit} + +
-
- - - ); - })} - - {/* */} -
-
-
城市管理类问题总数
-
{ - // dispatch.push('GeneralSituation', { - // title: '事件总体情况', - // }); - dispatch.push('UrbanOperation', { - title: '总体情况', - props: { - // sourceSystemCode: data?.data?.items?.find( - // (item: any) => item.code === 'wnywxt', - // )?.code, - datetType: searchParams?.type, - lineData: data?.data?.timeItems[ - '城市管理综合问题总数' - ]?.map((item: any) => ({ + + + ); + })} + + +
+
+
城市管理类问题总数
+
{ + // dispatch.push('GeneralSituation', { + // title: '事件总体情况', + // }); + dispatch.push('UrbanOperation', { + title: '总体情况', + props: { + // sourceSystemCode: data?.data?.items?.find( + // (item: any) => item.code === 'wnywxt', + // )?.code, + datetType: searchParams?.type, + lineData: data?.data?.timeItems[ + '城市管理综合问题总数' + ]?.map((item: any) => ({ + ...item, + name: item.time, + })), + time: dayjs(searchParams?.time).format('YYYY-MM'), + showSourceSelect: true, + sourceType: 'all', + }, + }); + }} + > + {commonStatistic(convertUnits(data?.data?.total?.value)?.num, 38)} + + {convertUnits(data?.data?.total?.value)?.unit} + +
+
+
+ +
+ ({ ...item, name: item.time, - })), - time: dayjs(searchParams?.time).format('YYYY-MM'), - showSourceSelect: true, - sourceType: 'all', - }, - }); - }} - > - {commonStatistic(convertUnits(data?.data?.total?.value)?.num, 38)} - - {convertUnits(data?.data?.total?.value)?.unit} - + }), + ) || [] + } + style={{ width: '100%', height: 104 }} + />
-
-
- ({ - ...item, - name: item.time, - }), - ) || [] - } - style={{ width: '100%', height: 104 }} - /> -
-
- -
-
- {commonStatistic( - convertUnits(data?.data?.accept?.value)?.num, - )} - - {convertUnits(data?.data?.accept?.value)?.unit} - + +
+
+ +
+
+ {commonStatistic( + convertUnits(data?.data?.accept?.value)?.num, + )} + + {convertUnits(data?.data?.accept?.value)?.unit} + +
+
立案
-
立案
-
-
{ - // dispatch.push('ToDisposed', { - // title: '待处置事件', - // }); - }} - > - -
-
- {commonStatistic( - convertUnits(data?.data?.need?.value)?.num, - )} - - {convertUnits(data?.data?.need?.value)?.unit} - +
{ + // dispatch.push('ToDisposed', { + // title: '待处置事件', + // }); + }} + > + +
+
+ {commonStatistic( + convertUnits(data?.data?.need?.value)?.num, + )} + + {convertUnits(data?.data?.need?.value)?.unit} + +
+
应处置
-
应处置
-
-
- -
-
- {commonStatistic(convertUnits(data?.data?.close?.value)?.num)} - - {convertUnits(data?.data?.close?.value)?.unit} - +
+ +
+
+ {commonStatistic(convertUnits(data?.data?.close?.value)?.num)} + + {convertUnits(data?.data?.close?.value)?.unit} + +
+
已处置
-
已处置
-
-
- -
-
- - - % +
+ +
+
+ + + % +
+
处置率
-
处置率
-
- {/*
+ {/*
疑难问题
{
*/} -
-
城市管理类疑难问题
-
- {commonStatistic( - convertUnits(DEDataSource?.cityManageEventTotal)?.num, - 30, - )} - - {convertUnits(DEDataSource?.cityManageEventTotal)?.unit} - +
+
城市管理类疑难问题
+
{ + dispatch.push('DifficultEvents', { + title: '疑难问题', + }); + }}> + {commonStatistic( + convertUnits(DEDataSource?.cityManageEventTotal)?.num, + 30, + )} + + {convertUnits(DEDataSource?.cityManageEventTotal)?.unit} + +
-
+
); }; diff --git a/src/pages/NewHome/NewRightContent/IndustryOperationNew/index.tsx b/src/pages/NewHome/NewRightContent/IndustryOperationNew/index.tsx index 8c90d471..27f4ff7e 100644 --- a/src/pages/NewHome/NewRightContent/IndustryOperationNew/index.tsx +++ b/src/pages/NewHome/NewRightContent/IndustryOperationNew/index.tsx @@ -103,7 +103,7 @@ const IndustryOperationNew: React.FC = () => { }} >
- 目前已接入10个行业系统 + 行业系统
diff --git a/src/pages/NewHome/NewRightContent/IndustryOperationV4/index.less b/src/pages/NewHome/NewRightContent/IndustryOperationV4/index.less index 1b7e29b8..95572426 100644 --- a/src/pages/NewHome/NewRightContent/IndustryOperationV4/index.less +++ b/src/pages/NewHome/NewRightContent/IndustryOperationV4/index.less @@ -43,7 +43,7 @@ .header_right_icon { font-size: 20px; color: rgb(179, 214, 247); - transform: translateY(5px); + // transform: translateY(5px); } } } diff --git a/src/pages/NewHome/NewRightContent/IndustryOperationV4/index.tsx b/src/pages/NewHome/NewRightContent/IndustryOperationV4/index.tsx index 303d5a18..0c92114c 100644 --- a/src/pages/NewHome/NewRightContent/IndustryOperationV4/index.tsx +++ b/src/pages/NewHome/NewRightContent/IndustryOperationV4/index.tsx @@ -100,7 +100,7 @@ const IndustryOperationV4: React.FC = () => { }} >
- 目前已接入10个行业系统 + 行业系统
-- GitLab