Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/Sinopec-Anxin

src/app/pages/home-page/home-page.component.html

@@ -45,7 +45,7 @@
                     <img class="bucket" src="../../../assets/images/bucket.png" alt="">
                     <img class="circle" src="../../../assets/images/circle.png" alt="">
                 </div>
-                <div class="leftitem" *ngIf="!userdata.organization.parentId">
+                <!-- <div class="leftitem" *ngIf="!userdata.organization.parentId">
                     <span class="itemname">公司排名</span>
                     <div class="box areabox">
                         <div class="areaboxitem" *ngFor="let item of HomeAggregatioData.compayAgg;let key = index">
@@ -76,7 +76,7 @@
                     <div class="angle-border right-top-border"></div>
                     <div class="angle-border left-bottom-border"></div>
                     <div class="angle-border right-bottom-border"></div>
-                </div>
+                </div> -->
                 <div class="leftitem">
                     <span class="itemname">事件排名</span>
                     <div class="box eventbox">
@@ -124,7 +124,7 @@
                                         {{key + 1}}
                                     </ng-template>
                                 </div>
-                                {{item.name}} {{item.companyName}}
+                                {{item.companyName}}  {{item.name}} 
                             </div>
                             <div class="progressbox">
                                 <div class="progress">
@@ -250,14 +250,14 @@
 
                             {{HomeAggregatioData.ouViolationType.ouTotalCount}}
                         </div>
-                        <div class="oilNumItem">
+                        <!-- <div class="oilNumItem">
                             <div class="pointbox">
                                 <div class="point"></div>
                                 <span>累计卸油正常车次</span>
                             </div>
 
                             {{HomeAggregatioData.ouViolationType.ouCorrectCount}}
-                        </div>
+                        </div> -->
                         <div class="oilNumItem">
                             <div class="pointbox">
                                 <div class="point"></div>

src/app/pages/home-page/home-page.component.scss

@@ -572,8 +572,8 @@
 
         .oilNum {
           position: absolute;
-          left: 6%;
+          left: 4%;
-          bottom: 15px;
+          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 {
               display: flex;
               align-items: center;
             }
+
             .point {
               width: 6px;
               height: 6px;

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'