Merge branch 'oldLogin' of...

Merge branch 'oldLogin' of http://171.217.92.33:9990/gitlab/cityLevel/cd-comprehensive-web into oldLogin

CooglMap @ f4f758d9

-Subproject commit d7b2cae0729c3d0b0548404a6b1a560543f5fca1
+Subproject commit f4f758d95d29b8d8d8e0d7c9e3b796fca9ee7f2d

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 {

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: {
       <div className={styles.itemContainer}>
         <div className={styles.left}>
           <div className={styles.titleContent}>
-            <div className={styles.title} title={data?.conditionName}>{data?.conditionName}</div>
+            <div className={styles.title} title={data?.conditionName}>
+              {data?.conditionName}
+            </div>
             <div className={styles.address}>{data?.fullName}</div>
           </div>
         </div>

src/pages/GlobalModalServices/modals/InfluenceSignNew/index.tsx

 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: {
         </div>
       </div> */}
       {loading && (
-        <Flex align="center" justify="center" style={{ height: '100%', paddingTop: 50 }}>
+        <Flex
+          align="center"
+          justify="center"
+          style={{ height: '100%', paddingTop: 50 }}
+        >
           <Spin></Spin>
         </Flex>
       )}
-      {
-        listData?.items?.length ? (
-          <EventPicList
-            listData={listData}
-            listHeight={700}
-            setParams={(page) => {
-              fetchParams.current.page = page;
-              getListData();
-            }}
-            handleDetail={(details) => {
-              modalDispatch.push(
-                'EventDetail',
-                {
-                  w: 'fit-content',
-                  props: {
-                    eventId: details.eventId,
-                  },
+      {listData?.items?.length ? (
+        <EventPicList
+          listData={listData}
+          listHeight={700}
+          setParams={(page) => {
+            fetchParams.current.page = page;
+            getListData();
+          }}
+          handleDetail={(details) => {
+            modalDispatch.push(
+              'EventDetail',
+              {
+                w: 'fit-content',
+                props: {
+                  eventId: details.eventId,
                 },
-                1,
-              );
-            }}
-          />
-        ) : <></>
-      }
+              },
+              1,
+            );
+          }}
+        />
+      ) : (
+        <></>
+      )}
     </div>
   );
 };

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,
+              );
             }}
           />
           <DescriptionItem
@@ -111,14 +113,16 @@ const AssessmentInfo: React.FC<{
             unitStyle={commonUnitStyle}
             labelStyle={commonLabelStyle}
             onClick={() => {
-              if (true) {
-                // 管廊检测评估弹窗-附属设施检测评估基础信息
-                dispatch.push('PipelineAssessment', {
+              // 管廊检测评估弹窗-附属设施检测评估基础信息
+              dispatch.push(
+                'PipelineAssessment',
+                {
                   props: {
                     facilityType: 'auxiliary',
                   },
-                });
-              }
+                },
+                2,
+              );
             }}
           />
         </div>

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;

src/pages/GlobalModalServices/modals/PipelineInspection/index.tsx

 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 (
+          <Popover className={styles.planName} content={text}>
+            {text}
+          </Popover>
+        );
+      },
+
       className: styles.tableCell,
     },
     {
@@ -109,11 +117,19 @@ const PipelineInspection: React.FC<{ metaData: any }> = ({ metaData }) => {
       dataIndex: 'operation',
       key: 'operation',
 
-      render: () => (
+      render: (_: any, record: any) => (
         <span
           className={styles.operation}
           onClick={() => {
-            dispatch.push('PipelineInspectionDetail', {}, 3);
+            dispatch.push(
+              'PipelineInspectionDetail',
+              {
+                props: {
+                  metaData: record,
+                },
+              },
+              3,
+            );
           }}
         >
           详情

src/pages/GlobalModalServices/modals/PipelineInspectionDetail/index.tsx

-import React from 'react';
+import React, { useMemo } from 'react';
 import styles from './index.less';
 
 interface InfoItemProps {
@@ -14,36 +14,26 @@ const InfoItem: React.FC<InfoItemProps> = ({ label, value, style }) => (
   </div>
 );
 
-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 (
     <div className={styles.container}>
@@ -54,15 +44,10 @@ const PipelineInspectionDetail: React.FC = () => {
               <InfoItem key={index} {...item} />
             ))}
           </div>
-          {/* <div className={styles.rightInfo}>
-            {rightInfoItems.map((item, index) => (
-              <InfoItem key={index} {...item} />
-            ))}
-          </div> */}
         </div>
       </div>
     </div>
   );
 };
 
-export default PipelineInspectionDetail; 
\ No newline at end of file
+export default PipelineInspectionDetail;