diff --git a/src/components/CooglMap b/src/components/CooglMap index b919d42b0b8425a489f3ef3d3d1b9f5d04bd6393..d4217e13f6d52b81916474ec0a2feafeca470a2b 160000 --- a/src/components/CooglMap +++ b/src/components/CooglMap @@ -1 +1 @@ -Subproject commit b919d42b0b8425a489f3ef3d3d1b9f5d04bd6393 +Subproject commit d4217e13f6d52b81916474ec0a2feafeca470a2b diff --git a/src/pages/Common/Sign/SignModel/SignStatus/index.tsx b/src/pages/Common/Sign/SignModel/SignStatus/index.tsx index 17db8c0c60ac1c0f45825f69cbf94d2693291fa4..76b1f6e51d51b35df3c043cf518909388be3de3c 100644 --- a/src/pages/Common/Sign/SignModel/SignStatus/index.tsx +++ b/src/pages/Common/Sign/SignModel/SignStatus/index.tsx @@ -30,7 +30,7 @@ const SignStatus = () => {
{list?.map((item) => { return ( -
+
diff --git a/src/pages/NewHome/NewLeftSidebar/UrbanManagementIssues/PeopleComplaint/TypeDistribution/LineBarCharts/index.tsx b/src/pages/NewHome/NewLeftSidebar/UrbanManagementIssues/PeopleComplaint/TypeDistribution/LineBarCharts/index.tsx index 6992d6c1ad2818a5726b7f699f36b6e87c908b25..0b469916b887e04c0fbd9d75ce8673e6312dbe57 100644 --- a/src/pages/NewHome/NewLeftSidebar/UrbanManagementIssues/PeopleComplaint/TypeDistribution/LineBarCharts/index.tsx +++ b/src/pages/NewHome/NewLeftSidebar/UrbanManagementIssues/PeopleComplaint/TypeDistribution/LineBarCharts/index.tsx @@ -7,26 +7,20 @@ const LineBarCharts = ({ dataSource }: { dataSource: any[] }) => { const realData = dataSource?.map(item => item.num); return { - color: ['#FFEB6E', '#36BD3B'], + color: ['#5F8BFF'], tooltip: { trigger: 'axis', borderWidth: '0', backgroundColor: 'rgba(73,81,92,.95)', textStyle: { color: '#fff', - }, - axisPointer: { - type: 'cross', - crossStyle: { - color: '#999', - }, - }, + } }, grid: { left: '0', right: '0', bottom: '2%', - top: '25%', + top: '15%', containLabel: true, }, legend: { @@ -69,10 +63,11 @@ const LineBarCharts = ({ dataSource }: { dataSource: any[] }) => { // max: 'dataMax', interval: 10, axisLabel: { - textStyle: { - color: '#CBEDFF', - fontSize: 16 - }, + show: false, + // textStyle: { + // color: '#CBEDFF', + // fontSize: 16 + // }, }, nameTextStyle: { align: 'left', @@ -98,6 +93,14 @@ const LineBarCharts = ({ dataSource }: { dataSource: any[] }) => { itemStyle: { barBorderRadius: [12, 12, 12, 12], }, + label: { + show: true, + position: 'top', + valueAnimation: true, + color: '#fff', + fontWeight: 700, + fontSize: 20 + } }] }; }, [dataSource]); @@ -105,7 +108,7 @@ const LineBarCharts = ({ dataSource }: { dataSource: any[] }) => { return ( ); }; diff --git a/src/pages/NewHome/NewLeftSidebar/UrbanManagementIssues/PeopleComplaint/index.less b/src/pages/NewHome/NewLeftSidebar/UrbanManagementIssues/PeopleComplaint/index.less index ed6fdf52867bfa2860a0fbe26b9dd2b3d58d8023..3eb1021e4914c1d879d29056ba279d976c401b58 100644 --- a/src/pages/NewHome/NewLeftSidebar/UrbanManagementIssues/PeopleComplaint/index.less +++ b/src/pages/NewHome/NewLeftSidebar/UrbanManagementIssues/PeopleComplaint/index.less @@ -1,6 +1,7 @@ .container { width: 100%; height: 100%; + margin-top: 10px; // padding: 20px; .statisticsRow { @@ -34,7 +35,7 @@ background: linear-gradient(180deg, #AAFFF6 0%, #25BBFF 100%); -webkit-background-clip: text; -webkit-text-fill-color: transparent; - font-family: 'D-DIN Exp'; + font-family: 'D-DIN'; font-size: 26px; font-weight: 700; } diff --git a/src/pages/NewHome/NewLeftSidebar/UrbanManagementIssues/index.less b/src/pages/NewHome/NewLeftSidebar/UrbanManagementIssues/index.less index 6b036125ea816d0a78b49d5698c4421847c2f002..42d5ee92951f540d224e35b4b28ea2246619dfc8 100644 --- a/src/pages/NewHome/NewLeftSidebar/UrbanManagementIssues/index.less +++ b/src/pages/NewHome/NewLeftSidebar/UrbanManagementIssues/index.less @@ -12,7 +12,6 @@ display: flex; justify-content: space-between; align-items: center; - margin-bottom: 34px; .tabItem { color: rgb(76, 134, 189); @@ -50,6 +49,7 @@ grid-template-columns: 557px 1fr; grid-template-rows: 1fr 1fr; gap: 35px; + margin-top: 34px; > div:nth-child(1) { grid-row: 1 / span 2; diff --git a/src/pages/NewHome/NewLeftSidebar/UrbanManagementIssues/index.tsx b/src/pages/NewHome/NewLeftSidebar/UrbanManagementIssues/index.tsx index b6d5b1a65e53909ad7bb4f84e1b46c37e67d7acc..e528ba7745dc2b0e9b025ab3d4947501e9a61681 100644 --- a/src/pages/NewHome/NewLeftSidebar/UrbanManagementIssues/index.tsx +++ b/src/pages/NewHome/NewLeftSidebar/UrbanManagementIssues/index.tsx @@ -13,12 +13,6 @@ const UrbanManagementIssues: React.FC = () => { const [categoryStatistics, setCategoryStatistics] = useState([]); const [areaStatistics, setAreaStatistics] = useState([]); - useEffect(() => { - getCategoryAnalysis(); - getAreaAnalysis(); - }, []); - - // 获取高发类型和区域统计数据 const getCategoryAnalysis = (category = 'mainClass') => { const params = { @@ -47,6 +41,11 @@ const UrbanManagementIssues: React.FC = () => { const onChangeCategory = (value: string) => { getCategoryAnalysis(value) } + + useEffect(() => { + getCategoryAnalysis(); + getAreaAnalysis(); + }, []); const tabItems = [ {