diff --git a/src/components/CooglMap b/src/components/CooglMap index d7b2cae0729c3d0b0548404a6b1a560543f5fca1..f4f758d95d29b8d8d8e0d7c9e3b796fca9ee7f2d 160000 --- a/src/components/CooglMap +++ b/src/components/CooglMap @@ -1 +1 @@ -Subproject commit d7b2cae0729c3d0b0548404a6b1a560543f5fca1 +Subproject commit f4f758d95d29b8d8d8e0d7c9e3b796fca9ee7f2d diff --git a/src/layouts/Header/index.less b/src/layouts/Header/index.less index 8b3c9a01391aec89b334b749f425e67bd44fd32c..ac2ef7c22815ee60ec8439021fa022dcb83e50e5 100644 --- a/src/layouts/Header/index.less +++ b/src/layouts/Header/index.less @@ -115,7 +115,7 @@ .divider { width: 2px; height: 28px; - background-color: rgb(72, 168, 221); + background-color: rgba(72, 168, 221, 0.47); } .time { diff --git a/src/pages/GlobalModalServices/modals/InfluenceSign/index.tsx b/src/pages/GlobalModalServices/modals/InfluenceSign/index.tsx index cfb54ee6d7f0e2d2658fad03f82313cb2c185ca0..b63b50f1bb569496a31cda3626538e74f58a25df 100644 --- a/src/pages/GlobalModalServices/modals/InfluenceSign/index.tsx +++ b/src/pages/GlobalModalServices/modals/InfluenceSign/index.tsx @@ -41,9 +41,9 @@ const InfluenceSign = (props: { }); const getListData = async () => { - console.log('getListData', params) + console.log('getListData', params); const res = await services.Physicalsign.getPhysicalsignindexPageCaseInfoVO( - params, + fetchParams, ); if (res.code === 200) { let items = res.data.items.map((item: any) => ({ @@ -75,7 +75,9 @@ const InfluenceSign = (props: {
-
{data?.conditionName}
+
+ {data?.conditionName} +
{data?.fullName}
diff --git a/src/pages/GlobalModalServices/modals/InfluenceSignNew/index.tsx b/src/pages/GlobalModalServices/modals/InfluenceSignNew/index.tsx index 1283d589f2937538f375665b7cc1630f81a637d2..b427d4f36ab8ed85e750b816e05858a76fb91f6a 100644 --- a/src/pages/GlobalModalServices/modals/InfluenceSignNew/index.tsx +++ b/src/pages/GlobalModalServices/modals/InfluenceSignNew/index.tsx @@ -1,7 +1,7 @@ import EventPicList from '@/pages/Common/components/EventPicList'; import services from '@/services'; import { useModel } from '@umijs/max'; -import { Divider, Flex, Space, Spin } from 'antd'; +import { Flex, Spin } from 'antd'; import { useEffect, useRef, useState } from 'react'; import { ChildrenModalMethods } from '../../type'; import styles from './index.less'; @@ -42,9 +42,8 @@ const InfluenceSignNew = (props: { }); const getListData = async () => { - const res = await services.Physicalsign.getPhysicalsignindexPageCaseInfoVO( - params, + fetchParams, ); if (res.code === 200) { let items = res.data.items.map((item: any) => ({ @@ -64,7 +63,7 @@ const InfluenceSignNew = (props: { : [...listData.items, ...items], }; setListData(result); - setLoading(false) + setLoading(false); } }; @@ -134,34 +133,38 @@ const InfluenceSignNew = (props: {
*/} {loading && ( - + )} - { - listData?.items?.length ? ( - { - fetchParams.current.page = page; - getListData(); - }} - handleDetail={(details) => { - modalDispatch.push( - 'EventDetail', - { - w: 'fit-content', - props: { - eventId: details.eventId, - }, + {listData?.items?.length ? ( + { + fetchParams.current.page = page; + getListData(); + }} + handleDetail={(details) => { + modalDispatch.push( + 'EventDetail', + { + w: 'fit-content', + props: { + eventId: details.eventId, }, - 1, - ); - }} - /> - ) : <> - } + }, + 1, + ); + }} + /> + ) : ( + <> + )} ); }; diff --git a/src/pages/GlobalModalServices/modals/PipeGalleryDetail/components/AssessmentInfo/index.tsx b/src/pages/GlobalModalServices/modals/PipeGalleryDetail/components/AssessmentInfo/index.tsx index 3913549dacd519f4e8fc5994d61ced9308dbd626..7f5d4e0cdc7599335abfca9522530694df5ce248 100644 --- a/src/pages/GlobalModalServices/modals/PipeGalleryDetail/components/AssessmentInfo/index.tsx +++ b/src/pages/GlobalModalServices/modals/PipeGalleryDetail/components/AssessmentInfo/index.tsx @@ -92,14 +92,16 @@ const AssessmentInfo: React.FC<{ unitStyle={{ ...commonUnitStyle, fontFamily: 'D-DIN Exp' }} labelStyle={commonLabelStyle} onClick={() => { - if (true) { - // 管廊检测评估弹窗-本体 - dispatch.push('PipelineAssessment', { + // 管廊检测评估弹窗-本体 + dispatch.push( + 'PipelineAssessment', + { props: { facilityType: 'main', }, - }); - } + }, + 2, + ); }} /> { - if (true) { - // 管廊检测评估弹窗-附属设施检测评估基础信息 - dispatch.push('PipelineAssessment', { + // 管廊检测评估弹窗-附属设施检测评估基础信息 + dispatch.push( + 'PipelineAssessment', + { props: { facilityType: 'auxiliary', }, - }); - } + }, + 2, + ); }} /> diff --git a/src/pages/GlobalModalServices/modals/PipeGalleryDetail/components/MapSection/index.less b/src/pages/GlobalModalServices/modals/PipeGalleryDetail/components/MapSection/index.less index 9d1fb26eee349e9242094f8ff954769807263f9e..d5d329be3a9cfd97b6d1e9acee3f3c5015ddfbef 100644 --- a/src/pages/GlobalModalServices/modals/PipeGalleryDetail/components/MapSection/index.less +++ b/src/pages/GlobalModalServices/modals/PipeGalleryDetail/components/MapSection/index.less @@ -88,7 +88,6 @@ width: 24px; height: 24px; border-radius: 50%; - // transform: translate(50%); display: flex; align-items: center; justify-content: center; diff --git a/src/pages/GlobalModalServices/modals/PipelineInspection/index.tsx b/src/pages/GlobalModalServices/modals/PipelineInspection/index.tsx index d47774635da7b2b5d6bfc0712a8bec86e4496e44..ad6c659928dd4b210eef2cbf0f0a5bcd627ff867 100644 --- a/src/pages/GlobalModalServices/modals/PipelineInspection/index.tsx +++ b/src/pages/GlobalModalServices/modals/PipelineInspection/index.tsx @@ -1,7 +1,7 @@ import BlueTable from '@/components/BlueTable'; import { useGlobalModalServices } from '@/pages/GlobalModalServices/provider'; import services from '@/services'; -import { DatePicker, Flex } from 'antd'; +import { DatePicker, Flex, Popover } from 'antd'; import type { ColumnsType } from 'antd/es/table'; import dayjs from 'dayjs'; import React, { useEffect, useRef, useState } from 'react'; @@ -31,11 +31,12 @@ const PipelineInspection: React.FC<{ metaData: any }> = ({ metaData }) => { const getData = (page: number) => { services.DataBase.getSjdzInfoData({ - typeCode: 'hyzm-gl-rcxclb', + typeCode: 'hyzm-gl-rcxjjhtj', + params: { startTime: dateRange[0].format('YYYY-MM-DD'), endTime: dateRange[1].format('YYYY-MM-DD'), - // glId: metaData?.id, + glId: metaData?.id, pageSize: 10, pageNo: page, }, @@ -46,11 +47,10 @@ const PipelineInspection: React.FC<{ metaData: any }> = ({ metaData }) => { const newList = list.map((v: any) => { return { planName: v.xjjhmc, - startDate: dayjs(v.bhfxrq).format('YYYY-MM-DD'), - endDate: dayjs(v.rksj).format('YYYY-MM-DD'), + startDate: v.ksrq, + endDate: v.jsrq, pipelineName: v.glmc, - inspectionResult: v.bhms, - + inspectionResult: v.xjjg, ...v, }; }); @@ -74,6 +74,14 @@ const PipelineInspection: React.FC<{ metaData: any }> = ({ metaData }) => { dataIndex: 'planName', key: 'planName', + render: (text) => { + return ( + + {text} + + ); + }, + className: styles.tableCell, }, { @@ -109,11 +117,19 @@ const PipelineInspection: React.FC<{ metaData: any }> = ({ metaData }) => { dataIndex: 'operation', key: 'operation', - render: () => ( + render: (_: any, record: any) => ( { - dispatch.push('PipelineInspectionDetail', {}, 3); + dispatch.push( + 'PipelineInspectionDetail', + { + props: { + metaData: record, + }, + }, + 3, + ); }} > 详情 diff --git a/src/pages/GlobalModalServices/modals/PipelineInspectionDetail/index.tsx b/src/pages/GlobalModalServices/modals/PipelineInspectionDetail/index.tsx index 444cffdee0c61ea9f114d4962c21be0889064acc..5eb3dcf0f6f7fe1a926ca1306d0a1f3dbf6528d6 100644 --- a/src/pages/GlobalModalServices/modals/PipelineInspectionDetail/index.tsx +++ b/src/pages/GlobalModalServices/modals/PipelineInspectionDetail/index.tsx @@ -1,4 +1,4 @@ -import React from 'react'; +import React, { useMemo } from 'react'; import styles from './index.less'; interface InfoItemProps { @@ -14,36 +14,26 @@ const InfoItem: React.FC = ({ label, value, style }) => ( ); -const PipelineInspectionDetail: React.FC = () => { - const leftInfoItems = [ - { label: '巡检计划名称', value: 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' }, - { label: '开始日期', value: '2024-12-24' }, - { label: '结束日期', value: '2024-12-24' }, - { label: '联系电话', value: 'XXXXXXXXXXXXXXX' }, - { label: '联系人', value: 'XXXXXXXXXXXXXXX' }, - { label: '管廊名称', value: 'XXXXXXXXXXXXXXXXXXXXXXX' }, - { label: '巡检周期', value: 'XXXXXXXXXXXXXXX' }, - { label: '巡检范围', value: 'XXXXXXXXXXXXXXXXXXXXXXX' }, - { label: '巡检结果', value: 'XXXXXXXXXXXXXXX' }, - { label: '备注', value: 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX\ - XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX\ - XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX\ - XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX\ - XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX\ - XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX\ - XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX\ - XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX\ - XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' }, - ]; - - // const rightInfoItems = [ - // { label: '结束日期', value: '2024-12-24' }, - // { label: '联系人', value: 'XXXXXXXXXXXXXXX' }, - // { label: '相对地面位置', value: '2024-12-24' }, - // { label: '层数', value: 'XXXXXXXXXXXXXXX' }, - // { label: '建筑面积(平方米)', value: 'XXXXXXXXXXXXXXX' }, - // { label: '管廊名称', value: 'XXXXXXXXXXXXXXXXXXXXXXX' }, - // ]; +const PipelineInspectionDetail: React.FC<{ metaData: any }> = (props) => { + const { metaData } = props; + const leftInfoItems = useMemo( + () => [ + { label: '巡检计划名称', value: metaData?.planName }, + { label: '开始日期', value: metaData?.startDate }, + { label: '结束日期', value: metaData?.endDate }, + { label: '联系电话', value: metaData?.lxdh }, + { label: '联系人', value: metaData?.lxr }, + { label: '管廊名称', value: metaData?.glmc }, + { label: '巡检周期', value: metaData?.xjzq }, + { label: '巡检范围', value: metaData?.xjfw }, + { label: '巡检结果', value: metaData?.xjjg }, + { + label: '备注', + value: metaData?.bz, + }, + ], + [metaData], + ); return (
@@ -54,15 +44,10 @@ const PipelineInspectionDetail: React.FC = () => { ))}
- {/*
- {rightInfoItems.map((item, index) => ( - - ))} -
*/} ); }; -export default PipelineInspectionDetail; \ No newline at end of file +export default PipelineInspectionDetail;