diff --git a/src/layouts/LeftSidebarMenu/index.tsx b/src/layouts/LeftSidebarMenu/index.tsx
index ea0e8b24f70506a8f30747150c763f8f6a91fd81..f90d7d47256bebc244763f40d21c21fc1ca3a283 100644
--- a/src/layouts/LeftSidebarMenu/index.tsx
+++ b/src/layouts/LeftSidebarMenu/index.tsx
@@ -46,12 +46,9 @@ const menu: MenuItemProps[] = [
title: '城市感知',
unActiveIcon: require('@/assets/images/routeMenu/bg4.png'),
activeIcon: require('@/assets/images/routeMenu/bg4_a.png'),
- path: '/home/developmentSignsIndex',
+ path: '/home/iot-platform-screen',
renderCard: () => {
- return
{
- const url = 'https://10.1.174.34:13200/iot-platform-screen'
- window.open(url, '_blank');
- }}>城市感知
;
+ return 城市感知
;
},
},
{
@@ -60,7 +57,7 @@ const menu: MenuItemProps[] = [
activeIcon: require('@/assets/images/routeMenu/bg8_a.png'),
path: '/home/developmentSignsIndex',
renderCard: () => {
- return 道路实况(建设中)
;
+ return 道路实况
;
},
},
];
@@ -87,6 +84,12 @@ export default function LeftSidebarMenu() {
message.warning('系统正在抓紧建设中');
return;
}
+ // 跳转城市感知
+ if (item.path === '/home/iot-platform-screen') {
+ const url = 'https://10.1.174.34:13200/iot-platform-screen'
+ window.open(url, '_blank');
+ return
+ }
setActive(index);
navigation(item.path);
};
@@ -99,9 +102,8 @@ export default function LeftSidebarMenu() {
style={{
gridColumn: item.columns?.join('/'),
gridRow: item.rows?.join('/'),
- backgroundImage: `url(${
- i === active ? item.activeIcon : item.unActiveIcon
- })`,
+ backgroundImage: `url(${i === active ? item.activeIcon : item.unActiveIcon
+ })`,
}}
>
{item.renderCard?.()}
diff --git a/src/pages/TheOperationOfTheDistrictCityAndCounty/components/Map/index.tsx b/src/pages/TheOperationOfTheDistrictCityAndCounty/components/Map/index.tsx
index 50aac2b5b1d37ab247899d1b6cfa516e605404a6..f534438a88e2d7b448d71d9cfdc5e5bd51671569 100644
--- a/src/pages/TheOperationOfTheDistrictCityAndCounty/components/Map/index.tsx
+++ b/src/pages/TheOperationOfTheDistrictCityAndCounty/components/Map/index.tsx
@@ -53,7 +53,7 @@ const DistrictMap: React.FC = () => {
};
console.log(data, selectedData);
useEffect(() => {
- const temp = data.find((v) => v?.objectId === selectDistrict?.objectId);
+ const temp = data?.find((v) => v?.objectId === selectDistrict?.objectId);
setSelectedData(temp);
}, [data, selectDistrict]);
@@ -67,7 +67,7 @@ const DistrictMap: React.FC = () => {
>
{!selectDistrict ? (
- {data.map((item, index) => {
+ {data?.map((item, index) => {
console.log(item);
return (
{
>
);
})}
- {data.map((item, index) => {
+ {data?.map((item, index) => {
const point = [Number(item.centerX), Number(item.centerY)];
return (
diff --git a/src/pages/UrbanSituation/Focus/index.tsx b/src/pages/UrbanSituation/Focus/index.tsx
index 91885a2b277d6496f5ad625bd9940de734ff0fe4..aa5f1534ea3456dcf63b70770513216445b49a48 100644
--- a/src/pages/UrbanSituation/Focus/index.tsx
+++ b/src/pages/UrbanSituation/Focus/index.tsx
@@ -55,17 +55,17 @@ const Focus = () => {
// },
{
name: '保障点位',
- value: 12,
+ value: 5,
unit: '个',
},
{
name: '保障资源',
- value: 12,
+ value: 10,
unit: '个',
},
{
name: '当前问题',
- value: 12,
+ value: 3,
unit: '个',
},
];
@@ -148,7 +148,10 @@ const Focus = () => {
style={{ marginTop: 30 }}
>
重大活动保障
- 更多
+ {
+ const url = 'https://10.1.174.34:13000'
+ window.open(url, '_blank');
+ }}>更多