diff --git a/src/app/pages/home-page/home-page.component.html b/src/app/pages/home-page/home-page.component.html index 3542ff6..2bc5ff4 100644 --- a/src/app/pages/home-page/home-page.component.html +++ b/src/app/pages/home-page/home-page.component.html @@ -45,7 +45,7 @@ -
+
事件排名
@@ -124,7 +124,7 @@ {{key + 1}}
- {{item.name}} {{item.companyName}} + {{item.companyName}} {{item.name}}
@@ -250,14 +250,14 @@ {{HomeAggregatioData.ouViolationType.ouTotalCount}}
-
+
diff --git a/src/app/pages/home-page/home-page.component.scss b/src/app/pages/home-page/home-page.component.scss index 5b85e5f..0a93e86 100644 --- a/src/app/pages/home-page/home-page.component.scss +++ b/src/app/pages/home-page/home-page.component.scss @@ -572,8 +572,8 @@ .oilNum { position: absolute; - left: 6%; - bottom: 15px; + left: 4%; + bottom: 22px; display: flex; flex-direction: column; @@ -582,15 +582,17 @@ align-items: center; justify-content: space-between; color: white; - font-size: 12px; + font-size: 13px; span { margin: 0 4px; } - .pointbox{ + + .pointbox { display: flex; align-items: center; } + .point { width: 6px; height: 6px; diff --git a/src/app/pages/home-page/home-page.component.ts b/src/app/pages/home-page/home-page.component.ts index 2494f58..4f5a998 100644 --- a/src/app/pages/home-page/home-page.component.ts +++ b/src/app/pages/home-page/home-page.component.ts @@ -132,7 +132,7 @@ export class HomePageComponent implements OnInit { }, series: [ { - data: [], + data: [4000, 3000, 4000, 4000, 4000, 4000, 3000, 4000, 4000, 4000, 4000, 3000, 4000, 4000, 4000, 4000, 3000, 4000, 4000, 4000, 4000, 3000, 4000, 4000, 4000, 4000, 3000, 4000, 4000, 4000,], type: 'bar', itemStyle: { color: { @@ -152,12 +152,26 @@ export class HomePageComponent implements OnInit { barWidth: '35%' }, { - data: [], + data: [4000, 3000, 4000, 4000, 4000, 4000, 3000, 4000, 4000, 4000, 4000, 3000, 4000, 4000, 4000, 4000, 3000, 4000, 4000, 4000, 4000, 3000, 4000, 4000, 4000, 4000, 3000, 4000, 4000, 4000,], type: 'line', symbol: 'circle', symbolSize: 5, label: { - show: true + normal: { + show: true, + // formatter: function (dataObj) { + // const { dataIndex, value } = dataObj; + // let labelText = value; + + // labelText = ''; + // if (dataIndex % 2 === 0) { // 每隔三个x坐标显示一个 + // labelText = value; + // } + + // return `${labelText}` + // } + } + }, itemStyle: { color: '#fff', @@ -171,7 +185,7 @@ export class HomePageComponent implements OnInit { } ], grid: { - left: '18px', + left: '40px', right: '30px', bottom: '38px', top: '30px' @@ -341,7 +355,7 @@ export class HomePageComponent implements OnInit { // itemHeight: 8, // }, grid: { - left: '36px', + left: '40px', right: '30px', bottom: '38px', top: '66px'