Skip to content
Snippets Groups Projects
Commit 23b766b7 authored by 1147379969's avatar 1147379969
Browse files

fix: 调整

parent 37022fac
Branches
Tags
No related merge requests found
...@@ -46,12 +46,9 @@ const menu: MenuItemProps[] = [ ...@@ -46,12 +46,9 @@ const menu: MenuItemProps[] = [
title: '城市感知', title: '城市感知',
unActiveIcon: require('@/assets/images/routeMenu/bg4.png'), unActiveIcon: require('@/assets/images/routeMenu/bg4.png'),
activeIcon: require('@/assets/images/routeMenu/bg4_a.png'), activeIcon: require('@/assets/images/routeMenu/bg4_a.png'),
path: '/home/developmentSignsIndex', path: '/home/iot-platform-screen',
renderCard: () => { renderCard: () => {
return <div className={styles.DS_text} onClick={()=>{ return <div className={styles.DS_text}>城市感知</div>;
const url = 'https://10.1.174.34:13200/iot-platform-screen'
window.open(url, '_blank');
}}>城市感知</div>;
}, },
}, },
{ {
...@@ -60,7 +57,7 @@ const menu: MenuItemProps[] = [ ...@@ -60,7 +57,7 @@ const menu: MenuItemProps[] = [
activeIcon: require('@/assets/images/routeMenu/bg8_a.png'), activeIcon: require('@/assets/images/routeMenu/bg8_a.png'),
path: '/home/developmentSignsIndex', path: '/home/developmentSignsIndex',
renderCard: () => { renderCard: () => {
return <div className={styles.DS_text}>道路实况(建设中)</div>; return <div className={styles.DS_text}>道路实况</div>;
}, },
}, },
]; ];
...@@ -87,6 +84,12 @@ export default function LeftSidebarMenu() { ...@@ -87,6 +84,12 @@ export default function LeftSidebarMenu() {
message.warning('系统正在抓紧建设中'); message.warning('系统正在抓紧建设中');
return; 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); setActive(index);
navigation(item.path); navigation(item.path);
}; };
...@@ -99,9 +102,8 @@ export default function LeftSidebarMenu() { ...@@ -99,9 +102,8 @@ export default function LeftSidebarMenu() {
style={{ style={{
gridColumn: item.columns?.join('/'), gridColumn: item.columns?.join('/'),
gridRow: item.rows?.join('/'), gridRow: item.rows?.join('/'),
backgroundImage: `url(${ backgroundImage: `url(${i === active ? item.activeIcon : item.unActiveIcon
i === active ? item.activeIcon : item.unActiveIcon })`,
})`,
}} }}
> >
{item.renderCard?.()} {item.renderCard?.()}
......
...@@ -53,7 +53,7 @@ const DistrictMap: React.FC = () => { ...@@ -53,7 +53,7 @@ const DistrictMap: React.FC = () => {
}; };
console.log(data, selectedData); console.log(data, selectedData);
useEffect(() => { useEffect(() => {
const temp = data.find((v) => v?.objectId === selectDistrict?.objectId); const temp = data?.find((v) => v?.objectId === selectDistrict?.objectId);
setSelectedData(temp); setSelectedData(temp);
}, [data, selectDistrict]); }, [data, selectDistrict]);
...@@ -67,7 +67,7 @@ const DistrictMap: React.FC = () => { ...@@ -67,7 +67,7 @@ const DistrictMap: React.FC = () => {
> >
{!selectDistrict ? ( {!selectDistrict ? (
<Fragment> <Fragment>
{data.map((item, index) => { {data?.map((item, index) => {
console.log(item); console.log(item);
return ( return (
<CooglMap.Polygon <CooglMap.Polygon
...@@ -80,7 +80,7 @@ const DistrictMap: React.FC = () => { ...@@ -80,7 +80,7 @@ const DistrictMap: React.FC = () => {
></CooglMap.Polygon> ></CooglMap.Polygon>
); );
})} })}
{data.map((item, index) => { {data?.map((item, index) => {
const point = [Number(item.centerX), Number(item.centerY)]; const point = [Number(item.centerX), Number(item.centerY)];
return ( return (
......
...@@ -55,17 +55,17 @@ const Focus = () => { ...@@ -55,17 +55,17 @@ const Focus = () => {
// }, // },
{ {
name: '保障点位', name: '保障点位',
value: 12, value: 5,
unit: '', unit: '',
}, },
{ {
name: '保障资源', name: '保障资源',
value: 12, value: 10,
unit: '', unit: '',
}, },
{ {
name: '当前问题', name: '当前问题',
value: 12, value: 3,
unit: '', unit: '',
}, },
]; ];
...@@ -148,7 +148,10 @@ const Focus = () => { ...@@ -148,7 +148,10 @@ const Focus = () => {
style={{ marginTop: 30 }} style={{ marginTop: 30 }}
> >
<span>重大活动保障</span> <span>重大活动保障</span>
<span>更多</span> <span onClick={() => {
const url = 'https://10.1.174.34:13000'
window.open(url, '_blank');
}}>更多</span>
</Flex> </Flex>
<div className={styles.activityWrap}> <div className={styles.activityWrap}>
<Flex justify="space-between"> <Flex justify="space-between">
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment