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..7b8d5e92682501f5c69f036317ce5f42a8eeb76f 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,27 +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 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],
+ );
// const rightInfoItems = [
// { label: '结束日期', value: '2024-12-24' },
@@ -65,4 +64,4 @@ const PipelineInspectionDetail: React.FC = () => {
);
};
-export default PipelineInspectionDetail;
\ No newline at end of file
+export default PipelineInspectionDetail;