diff --git a/src/components/CommonTable/index.less b/src/components/CommonTable/index.less
index 2b1ae0ecce66f85d2f3197db2f31e9aff0039181..6e452efd44c006b4e293122b5b8268cfbf5f9477 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 4057818b1c207bb180fe13a7f8e80c85536d0aa1..82abe5ed63d0d89205c743fe61c378c1311e865f 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 026f95fa3732ce5943bddda6f718bd00109090fe..6312cc17a80e2029f8414719bcb498c3914b275d 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 278fbdcee1c8cc61ba8265e986f0e43cd18f6a3c..5b975fc30b1529558425b2e32f43f5607dd30870 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 (
@@ -40,21 +97,25 @@ const IndustrySystem = () => {
政务信息化系统
- {
- list.map((item) => (
-
- {`${item.name}(${item.sub.length})`}
-
- {item.sub.map((subItem) => (
-
{subItem.name}
- ))}
-
-
- ))
- }
+ {list.map((item) => (
+
+ {`${item.name}(${item.sub.length})`}
+
+ {item.sub.map((subItem) => (
+
{
+ window.open(subItem?.url)
+ }}>
+ {subItem.name}
+
+ ))}
+
+
+ ))}
- )
-}
+ );
+};
-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 def2b7178bfd4e966a9d09efd0c86530e00aa7e8..3844efc930399c20e95c6a96cc28fab78080a957 100644
--- a/src/pages/IndustryOperation/index.tsx
+++ b/src/pages/IndustryOperation/index.tsx
@@ -147,10 +147,10 @@ const IndustryOperation: React.FC = () => {
- setModalOpt({ open: true, title: ' 目前已接入16个行业系统' })
+ setModalOpt({ open: true, title: ' 目前已接入11个行业系统' })
}
>
- 目前已接入16个行业系统
+ 目前已接入11个行业系统
diff --git a/src/pages/SecurityServiceOverview/SafetyMap/index.less b/src/pages/SecurityServiceOverview/SafetyMap/index.less
index 8080d6c9cc14844ced98da63fc2dd95ad16c754d..e2b629033c219996c7b3c47d882572d69a76d4b1 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 13d6e03503ff739bf7c1002a5de32f0735d9574b..dbd81df3708f8dcd48b9895c61d406598df4d628 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 561ed1250e9128a4f877905e0c8b7da217933ba6..21956d5b04d399e1a5607b550273cfa7f68790a0 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<{
-
-感知源上报-东侧位移监测设备
-
-
+
感知源上报-东侧位移监测设备
+
- {
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 {val}
},
},
{
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,