From 3da5d5682b329c46d871330402d51bc45bf614fb Mon Sep 17 00:00:00 2001
From: lijingqi <1437862981@qq.com>
Date: Wed, 11 Dec 2024 19:50:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=B7=B2=E6=8E=A5=E5=85=A5?=
 =?UTF-8?q?=E8=A1=8C=E4=B8=9A=E7=B3=BB=E7=BB=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CommonTable/index.less         |   6 +-
 src/components/CooglMap                       |   2 +-
 .../Common/Sign/IndustrySystem/index.less     |   1 +
 .../Common/Sign/IndustrySystem/index.tsx      | 123 ++++++++++++----
 src/pages/IndustryOperation/index.tsx         |   4 +-
 .../SafetyMap/index.less                      |   4 +-
 .../SecurityState/MeetSafeguard/index.tsx     | 135 ++++++++++++------
 .../components/BaseInfo/index.tsx             |  10 +-
 .../components/IndustrySign/index.tsx         | 112 +++++++++------
 9 files changed, 262 insertions(+), 135 deletions(-)

diff --git a/src/components/CommonTable/index.less b/src/components/CommonTable/index.less
index 2b1ae0ec..6e452efd 100644
--- a/src/components/CommonTable/index.less
+++ b/src/components/CommonTable/index.less
@@ -47,7 +47,9 @@
         .ant-table-wrapper .ant-table-thead>tr>th:not(:last-child):not(.ant-table-selection-column):not(.ant-table-row-expand-icon-cell):not([colspan])::before {
             width: 0px !important;
         }
-
+        .css-dev-only-do-not-override-z0m7uc.ant-table-wrapper .ant-table-tbody .ant-table-row >.ant-table-cell-row-hover{
+            background: rgba(57, 122, 183, 0.402) !important;
+        }
         .ant-table-wrapper .ant-table-tbody>tr>td {
 
 
@@ -123,7 +125,7 @@
         background-color: rgba(57, 122, 183, 0.241);
         background-size: 100% 100%;
     
-        border-radius: 16px;
+        border-radius: 16px !important;
         overflow: hidden !important;
     }
 
diff --git a/src/components/CooglMap b/src/components/CooglMap
index 4057818b..82abe5ed 160000
--- a/src/components/CooglMap
+++ b/src/components/CooglMap
@@ -1 +1 @@
-Subproject commit 4057818b1c207bb180fe13a7f8e80c85536d0aa1
+Subproject commit 82abe5ed63d0d89205c743fe61c378c1311e865f
diff --git a/src/pages/Common/Sign/IndustrySystem/index.less b/src/pages/Common/Sign/IndustrySystem/index.less
index 026f95fa..6312cc17 100644
--- a/src/pages/Common/Sign/IndustrySystem/index.less
+++ b/src/pages/Common/Sign/IndustrySystem/index.less
@@ -25,6 +25,7 @@
       }
       .subName {
         padding: 10px 0;
+        cursor: pointer;
       }
     }
   }
diff --git a/src/pages/Common/Sign/IndustrySystem/index.tsx b/src/pages/Common/Sign/IndustrySystem/index.tsx
index 278fbdce..5b975fc3 100644
--- a/src/pages/Common/Sign/IndustrySystem/index.tsx
+++ b/src/pages/Common/Sign/IndustrySystem/index.tsx
@@ -1,37 +1,94 @@
-
-import { Flex } from 'antd'
-import styles from './index.less'
+import { Flex } from 'antd';
+import styles from './index.less';
 
 /**
  * @description 已接入行业系统
  */
 
 const IndustrySystem = () => {
-
   const list = [
+    // {
+    //   name: '审批监督处',
+    //   sub: [
+    //     {
+    //       name: '成都市城管委信用信息报送系统'
+    //     }
+    //   ]
+    // },
     {
-      name: '审批监督处',
+      name: '城管执法',
       sub: [
         {
-          name: '成都市城管委信用信息报送系统'
-        }
-      ]
+          name: '违法建设治理系统',
+          url: 'https://wjzl.cdcgzfzd.cn:1234',
+        },
+        {
+          name: '综合新政执法智慧服务平台',
+          url: 'https://zhzf.tfryb.com',
+        },
+        
+      ],
     },
     {
-      name: '执法总队',
+      name: '数字城管',
       sub: [
         {
-          name: '违法建设治理系统'
+          name: '成都市数字化城市管理信息系统',
+          url: 'http://171.221.172.80:6888/eUrbanMTS/main.htm',
         },
+      
+        
+      ],
+    },
+    {
+      name: '道桥监管',
+      sub: [
         {
-          name: '综合执法'
+          name: '桥梁水位监测系统',
+          url: 'https://swjc.cddqgl.com:105',
         },
         {
-          name: '车载监控平台'
-        }
-      ]
-    }
-  ]
+          name: '桥梁健康监测系统',
+          url: 'https://jk.cddqgl.com/#/login',
+        },
+        {
+          name: '成都市城市道路桥梁监控中心综合应用平台',
+          url: 'https://yj.cddqgl.com:8080/DQCenter',
+        },
+        {
+          name: '成都市占用（挖掘）城市道路信息管理平台',
+          url: 'https://gl.cdzdwj.com',
+        },
+        {
+          name: '成都市道路桥梁信息管理系统',
+          url: 'https://www.cddqgl.com',
+        },
+      ],
+    },
+    {
+      name: '照明监管',
+      sub: [
+        {
+          name: '成都市城市照明综合监管平台',
+          url: 'https://service.cdzmjg.cn:8443',
+        },
+        {
+          name: '照明运维系统',
+          url: 'http://182.151.63.251:9000/login',
+        },
+      ],
+    },
+    {
+      name: '扬尘治理',
+      sub: [
+      
+        {
+          name: '成都市工地扬尘监控及建筑垃圾运输处置信息和监管平台',
+          url: 'http://221.237.182.174:8011',
+        },
+      ],
+    },
+  ];
 
   return (
     <Flex vertical className={styles.wrap}>
@@ -40,21 +97,25 @@ const IndustrySystem = () => {
         <div>政务信息化系统</div>
       </Flex>
       <div className={styles.list}>
-        {
-          list.map((item) => (
-            <Flex className={styles.listItem} align='center' key={item.name}>
-              <div className={styles.name}>{`${item.name}(${item.sub.length})`}</div>
-              <div>
-                {item.sub.map((subItem) => (
-                  <div key={subItem.name} className={styles.subName}>{subItem.name}</div>
-                ))}
-              </div>
-            </Flex>
-          ))
-        }
+        {list.map((item) => (
+          <Flex className={styles.listItem} align="center" key={item.name}>
+            <div
+              className={styles.name}
+            >{`${item.name}(${item.sub.length})`}</div>
+            <div>
+              {item.sub.map((subItem) => (
+                <div key={subItem.name} className={styles.subName} onClick={()=>{
+                  window.open(subItem?.url)
+                }}>
+                  {subItem.name}
+                </div>
+              ))}
+            </div>
+          </Flex>
+        ))}
       </div>
     </Flex>
-  )
-}
+  );
+};
 
-export default IndustrySystem
\ No newline at end of file
+export default IndustrySystem;
diff --git a/src/pages/IndustryOperation/index.tsx b/src/pages/IndustryOperation/index.tsx
index def2b717..3844efc9 100644
--- a/src/pages/IndustryOperation/index.tsx
+++ b/src/pages/IndustryOperation/index.tsx
@@ -147,10 +147,10 @@ const IndustryOperation: React.FC = () => {
               <div
                 className={styles.header_right_text}
                 onClick={() =>
-                  setModalOpt({ open: true, title: ' 目前已接入16个行业系统' })
+                  setModalOpt({ open: true, title: ' 目前已接入11个行业系统' })
                 }
               >
-                目前已接入<span>16</span>个行业系统
+                目前已接入<span>11</span>个行业系统
               </div>
               <DoubleRightOutlined className={styles.header_right_icon} />
             </Space>
diff --git a/src/pages/SecurityServiceOverview/SafetyMap/index.less b/src/pages/SecurityServiceOverview/SafetyMap/index.less
index 8080d6c9..e2b62903 100644
--- a/src/pages/SecurityServiceOverview/SafetyMap/index.less
+++ b/src/pages/SecurityServiceOverview/SafetyMap/index.less
@@ -107,8 +107,8 @@
     margin-bottom: 20px;
 
     .img {
-      width: 120px;
-      height: 80px;
+      width: 150px;
+      height: 100px;
       margin-right: 20px;
     }
 
diff --git a/src/pages/SecurityServiceOverview/SecurityState/MeetSafeguard/index.tsx b/src/pages/SecurityServiceOverview/SecurityState/MeetSafeguard/index.tsx
index 13d6e035..dbd81df3 100644
--- a/src/pages/SecurityServiceOverview/SecurityState/MeetSafeguard/index.tsx
+++ b/src/pages/SecurityServiceOverview/SecurityState/MeetSafeguard/index.tsx
@@ -94,69 +94,114 @@ const MeetSafeguard = () => {
   const dataSource = [
     {
       key: '1',
-      name: '胡彦斌',
-      age: 32,
-      address: '西湖区湖底公园1号',
+      name: 'GPS测量笔',
+      unit: 'xxx',
+      total: '15',
+      yt: '测量',
+      address: '成都市成华区双林路256号',
+      person: '陈杨',
+      phone:'15287278987'
     },
     {
       key: '2',
-      name: '胡彦祖',
-      age: 42,
-      address: '西湖区湖底公园1号',
+      name: 'GPS测量笔',
+      unit: 'xxx',
+      total: '15',
+      yt: '测量',
+      address: '成都市成华区双林路256号',
+      person: '陈杨',
+      phone:'15287278987'
     },
     {
       key: '3',
-      name: '胡彦斌',
-      age: 32,
-      address: '西湖区湖底公园1号',
+      name: 'GPS测量笔',
+      unit: 'xxx',
+      total: '15',
+      yt: '测量',
+      address: '成都市成华区双林路256号',
+      person: '陈杨',
+      phone:'15287278987'
     },
     {
       key: '4',
-      name: '胡彦祖',
-      age: 42,
-      address: '西湖区湖底公园1号',
+      name: 'GPS测量笔',
+      unit: 'xxx',
+      total: '15',
+      yt: '测量',
+      address: '成都市成华区双林路256号',
+      person: '陈杨',
+      phone:'15287278987'
     },
     {
       key: '5',
-      name: '胡彦斌',
-      age: 32,
-      address: '西湖区湖底公园1号',
+      name: 'GPS测量笔',
+      unit: 'xxx',
+      total: '15',
+      yt: '测量',
+      address: '成都市成华区双林路256号',
+      person: '陈杨',
+      phone:'15287278987'
     },
     {
       key: '6',
-      name: '胡彦祖',
-      age: 42,
-      address: '西湖区湖底公园1号',
+      name: 'GPS测量笔',
+      unit: 'xxx',
+      total: '15',
+      yt: '测量',
+      address: '成都市成华区双林路256号',
+      person: '陈杨',
+      phone:'15287278987'
+    
     },
     {
       key: '7',
-      name: '胡彦斌',
-      age: 32,
-      address: '西湖区湖底公园1号',
+      name: 'GPS测量笔',
+      unit: 'xxx',
+      total: '15',
+      yt: '测量',
+      address: '成都市成华区双林路256号',
+      person: '陈杨',
+      phone:'15287278987'
     },
     {
       key: '8',
-      name: '胡彦祖',
-      age: 42,
-      address: '西湖区湖底公园1号',
+      name: 'GPS测量笔',
+      unit: 'xxx',
+      total: '15',
+      yt: '测量',
+      address: '成都市成华区双林路256号',
+      person: '陈杨',
+      phone:'15287278987'
     },
     {
       key: '9',
-      name: '胡彦斌',
-      age: 32,
-      address: '西湖区湖底公园1号',
+      name: 'GPS测量笔',
+      unit: 'xxx',
+      total: '15',
+      yt: '测量',
+      address: '成都市成华区双林路256号',
+      person: '陈杨',
+      phone:'15287278987'
     },
     {
       key: '10',
-      name: '胡彦祖',
-      age: 42,
-      address: '西湖区湖底公园1号',
+      name: 'GPS测量笔',
+      unit: 'xxx',
+      total: '15',
+      yt: '测量',
+      address: '成都市成华区双林路256号',
+      person: '陈杨',
+      phone:'15287278987'
     },
     {
       key: '11',
-      name: '胡彦祖',
-      age: 42,
-      address: '西湖区湖底公园1号',
+      name: 'GPS测量笔',
+      unit: 'xxx',
+      total: '15',
+      yt: '测量',
+      address: '成都市成华区双林路256号',
+      person: '陈杨',
+      phone:'15287278987'
     },
   ];
 
@@ -183,41 +228,41 @@ const MeetSafeguard = () => {
       width: 150,
       ellipsis: true,
       title: '型号/规格',
-      dataIndex: 'age',
-      key: 'age',
+      dataIndex: 'unit',
+      key: 'unit',
     },
     {
       title: '数量',
-      dataIndex: 'age',
-      key: 'address',
+      dataIndex: 'total',
+      key: 'total',
       width: 150,
       ellipsis: true,
     },
     {
       title: '用途',
-      dataIndex: 'age',
-      key: 'age',
+      dataIndex: 'yt',
+      key: 'yt',
       width: 150,
       ellipsis: true,
     },
     {
       title: '存放地点',
-      dataIndex: 'age',
-      key: 'age',
+      dataIndex: 'address',
+      key: 'address',
       width: 300,
       ellipsis: true,
     },
     {
       title: '联络人',
-      dataIndex: 'age',
-      key: 'age',
+      dataIndex: 'person',
+      key: 'person',
       width: 120,
       ellipsis: true,
     },
     {
       title: '联系方式',
-      dataIndex: 'age',
-      key: 'age',
+      dataIndex: 'phone',
+      key: 'phone',
       width: 150,
       ellipsis: true,
     },
diff --git a/src/pages/SecurityServiceOverview/components/BaseInfo/index.tsx b/src/pages/SecurityServiceOverview/components/BaseInfo/index.tsx
index 561ed125..21956d5b 100644
--- a/src/pages/SecurityServiceOverview/components/BaseInfo/index.tsx
+++ b/src/pages/SecurityServiceOverview/components/BaseInfo/index.tsx
@@ -4,10 +4,10 @@ import services from '@/services';
 import { imageOptions } from '@/utils/comm';
 import { useRequest } from '@umijs/max';
 import { Carousel, Image } from 'antd';
+import LineCharts from '../../SecurityState/SecurityCqi/LineCharts';
 import Casecirculation from './Casecirculation';
 import DetMap from './DetMap';
 import styles from './index.less';
-import LineCharts from '../../SecurityState/SecurityCqi/LineCharts';
 const BaseInfo: React.FC<{
   eventId: string;
   detail: any;
@@ -60,10 +60,8 @@ const BaseInfo: React.FC<{
       </div>
       <div className={styles.left}>
         <div className={styles.lineWarp}>
-<div className={styles.titleWarp}>
-感知源上报-东侧位移监测设备
-</div>
-<LineCharts></LineCharts>
+          <div className={styles.titleWarp}>感知源上报-东侧位移监测设备</div>
+          <LineCharts></LineCharts>
         </div>
         <div className={styles.info}>
           <LabelImgText
@@ -84,7 +82,7 @@ const BaseInfo: React.FC<{
             valueStyle={valueStyle}
             labelStyle={labelStyle}
           />
-           <LabelImgText
+          <LabelImgText
             label={'研判分析'}
             value={data?.warning_context}
             valueStyle={valueStyle}
diff --git a/src/pages/SecurityServiceOverview/components/IndustrySign/index.tsx b/src/pages/SecurityServiceOverview/components/IndustrySign/index.tsx
index aa11887e..876d789b 100644
--- a/src/pages/SecurityServiceOverview/components/IndustrySign/index.tsx
+++ b/src/pages/SecurityServiceOverview/components/IndustrySign/index.tsx
@@ -11,7 +11,6 @@ import { useState } from 'react';
 import { colorConfig } from '../../SecurityState/RightLayout/RiskNotice';
 import BaseInfo from '../BaseInfo';
 import styles from './index.less';
-import { log } from 'echarts/types/src/util/log.js';
 /**
  *
  * @description 行业体征部分
@@ -111,69 +110,91 @@ const IndustrySign = ({ param }: { param: any }) => {
   const dataSource = [
     {
       key: '1',
-      name: '胡彦斌',
-      age: 32,
-      address: '西湖区湖底公园1号',
+      name: '金丰高架桥1号',
+      type: '高架桥',
+      status: '正常',
+      unit: '道桥监管中心',
+      address: '成都市成华区双林路256号',
     },
     {
       key: '2',
-      name: '胡彦祖',
-      age: 42,
-      address: '西湖区湖底公园1号',
+      name: '金丰高架桥2号',
+      type: '高架桥',
+      status: '正常',
+      unit: '道桥监管中心',
+      address: '成都市成华区双林路2156号',
     },
     {
       key: '3',
-      name: '胡彦斌',
-      age: 32,
-      address: '西湖区湖底公园1号',
+      name: '金丰高架桥3号',
+      type: '高架桥',
+      status: '正常',
+      unit: '道桥监管中心',
+      address: '成都市成华区双林路2156号',
     },
     {
       key: '4',
-      name: '胡彦祖',
-      age: 42,
-      address: '西湖区湖底公园1号',
+      name: '金丰高架桥4号',
+      type: '高架桥',
+      status: '正常',
+      unit: '道桥监管中心',
+      address: '成都市成华区双林路2156号',
     },
     {
       key: '5',
-      name: '胡彦斌',
-      age: 32,
-      address: '西湖区湖底公园1号',
+      name: '金丰高架桥5号',
+      type: '高架桥',
+      status: '正常',
+      unit: '道桥监管中心',
+      address: '成都市成华区双林路2156号',
     },
     {
       key: '6',
-      name: '胡彦祖',
-      age: 42,
-      address: '西湖区湖底公园1号',
+      name: '金丰高架桥6号',
+      type: '高架桥',
+      status: '正常',
+      unit: '道桥监管中心',
+      address: '成都市成华区双林路2156号',
     },
     {
       key: '7',
-      name: '胡彦斌',
-      age: 32,
-      address: '西湖区湖底公园1号',
+      name: '金丰高架桥7号',
+      type: '高架桥',
+      status: '预警',
+      unit: '道桥监管中心',
+      address: '成都市成华区双林路2156号',
     },
     {
       key: '8',
-      name: '胡彦祖',
-      age: 42,
-      address: '西湖区湖底公园1号',
+      name: '金丰高架桥8号',
+      type: '高架桥',
+      status: '正常',
+      unit: '道桥监管中心',
+      address: '成都市成华区双林路2156号',
     },
     {
       key: '9',
-      name: '胡彦斌',
-      age: 32,
-      address: '西湖区湖底公园1号',
+      name: '金丰高架桥9号',
+      type: '高架桥',
+      status: '正常',
+      unit: '道桥监管中心',
+      address: '成都市成华区双林路2156号',
     },
     {
       key: '10',
-      name: '胡彦祖',
-      age: 42,
-      address: '西湖区湖底公园1号',
+      name: '金丰高架桥10号',
+      type: '高架桥',
+      status: '正常',
+      unit: '道桥监管中心',
+      address: '成都市成华区双林路2156号',
     },
     {
       key: '11',
-      name: '胡彦祖',
-      age: 42,
-      address: '西湖区湖底公园1号',
+      name: '金丰高架桥11号',
+      type: '高架桥',
+      status: '预警',
+      unit: '道桥监管中心',
+      address: '成都市成华区双林路2156号',
     },
   ];
 
@@ -200,37 +221,36 @@ const IndustrySign = ({ param }: { param: any }) => {
       width: 150,
       ellipsis: true,
       title: '桥梁类型',
-      dataIndex: 'age',
+      dataIndex: 'type',
       key: 'age',
     },
     {
       title: '状态',
-      dataIndex: 'address',
-      key: 'address',
+      dataIndex: 'status',
+      key: 'status',
       width: 80,
-      render: () => {
-        return;
+      render: (val:string) => {
+        return <span style={{color:val=='预警'?'#e66a6e':'#27f77e'}}>{val}</span>
       },
     },
     {
       title: '管理单位',
-      dataIndex: 'age',
-      key: 'age',
+      dataIndex: 'unit',
+      key: 'unit',
       width: 200,
       ellipsis: true,
     },
     {
       title: '位置',
-      dataIndex: 'age',
-      key: 'age',
+      dataIndex: 'address',
+      key: 'address',
       width: 300,
       ellipsis: true,
     },
   ];
-  const { run:InputChange } = useDebounceFn(
+  const { run: InputChange } = useDebounceFn(
     (e) => {
-     console.log(e.target.value);
-     
+      console.log(e.target.value);
     },
     {
       wait: 500,
-- 
GitLab