From 7698db993050f44a1fad82c9707aee5cc8861fe5 Mon Sep 17 00:00:00 2001
From: SHAOJIAHAO <55341701@qq.com>
Date: Thu, 30 Dec 2021 16:48:04 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E5=AE=8C=E5=96=84=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/home-page/home-page.component.ts    |  6 ++--
 .../oil-unloading-process-list.component.html | 34 +++++++++----------
 .../oil-unloading-process-list.component.scss | 14 ++++++--
 3 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/src/app/pages/home-page/home-page.component.ts b/src/app/pages/home-page/home-page.component.ts
index 6e33cc9..fb2c93b 100644
--- a/src/app/pages/home-page/home-page.component.ts
+++ b/src/app/pages/home-page/home-page.component.ts
@@ -61,7 +61,8 @@ export class HomePageComponent implements OnInit {
             color: '#fff',
             fontSize: 12
           },
-          formatter: "{b} : {c} ({d}%)"
+          formatter: "{b} : {c} ({d}%)",
+          extraCssText: 'z-index:2'
         },
         label: {
           normal: {
@@ -257,7 +258,8 @@ export class HomePageComponent implements OnInit {
             color: '#fff',
             fontSize: 12
           },
-          formatter: "{b} : {c} ({d}%)"
+          formatter: "{b} : {c} ({d}%)",
+          extraCssText: 'z-index:2'
         }
       }
     ]
diff --git a/src/app/pages/oil-unloading-process-list/oil-unloading-process-list.component.html b/src/app/pages/oil-unloading-process-list/oil-unloading-process-list.component.html
index 8c02802..13ac9d0 100644
--- a/src/app/pages/oil-unloading-process-list/oil-unloading-process-list.component.html
+++ b/src/app/pages/oil-unloading-process-list/oil-unloading-process-list.component.html
@@ -107,10 +107,10 @@
         <div class="tablebox">
             <div class="table">
                 <div nz-row class="th">
-                    <div nz-col nzSpan="1">
-                    </div>
-                    <div nz-col nzSpan="2">
-                        油站名称
+                    <!-- <div nz-col nzSpan="1">
+                    </div> -->
+                    <div nz-col nzSpan="3">
+                        <span style="margin-left: 26px;">油站名称</span>
                     </div>
                     <div nz-col nzSpan="2">
                         公司名称
@@ -118,10 +118,10 @@
                     <div nz-col nzSpan="2">
                         区域
                     </div>
-                    <div nz-col nzSpan="2">
+                    <div nz-col nzSpan="3">
                         卸油开始时间
                     </div>
-                    <div nz-col nzSpan="2">
+                    <div nz-col nzSpan="3">
                         卸油结束时间
                     </div>
                     <div nz-col nzSpan="3">
@@ -133,30 +133,30 @@
                     <div nz-col nzSpan="3">
                         全流程准备预警节点数量
                     </div>
-                    <div nz-col nzSpan="2">
+                    <div nz-col nzSpan="1">
                         状态
                     </div>
-                    <div nz-col nzSpan="2">
+                    <div nz-col nzSpan="1">
                         操作
                     </div>
                 </div>
                 <div class="tbody" id="tbody">
                     <div nz-row class="tr" *ngFor="let item of list">
-                        <div nz-col nzSpan="1">
-                        </div>
-                        <div nz-col nzSpan="2">
-                            {{item.gasStation.stationName}}
+                        <!-- <div nz-col nzSpan="1">
+                        </div> -->
+                        <div nz-col nzSpan="3" [title]="item.gasStation.stationName">
+                            <span style="margin-left: 26px;">{{item.gasStation.stationName}}</span>
                         </div>
-                        <div nz-col nzSpan="2">
+                        <div nz-col nzSpan="2" [title]="item.gasStation.companyName">
                             {{item.gasStation.companyName}}
                         </div>
                         <div nz-col nzSpan="2">
                             {{item.gasStation.locationName}}
                         </div>
-                        <div nz-col nzSpan="2">
+                        <div nz-col nzSpan="3">
                             {{item.startTime ? (item.startTime | date:"yyyy-MM-dd HH:mm:ss") : '/'}}
                         </div>
-                        <div nz-col nzSpan="2">
+                        <div nz-col nzSpan="3">
                             {{item.endTime ? (item.endTime | date:"yyyy-MM-dd HH:mm:ss") : '/'}}
                         </div>
                         <div nz-col nzSpan="3">
@@ -168,7 +168,7 @@
                         <div nz-col nzSpan="3">
                             {{item.allProccessCount}}
                         </div>
-                        <div nz-col nzSpan="2">
+                        <div nz-col nzSpan="1">
                             <ng-container
                                 *ngIf="item.proccessBeforeCount == 0 && item.proccessingCount == 0 && item.allProccessCount == 0; else elseTemplate">
                                 <span style="color: #4BFFD4;">合规</span>
@@ -177,7 +177,7 @@
                                 <span style="color: #FF4B65;">预警</span>
                             </ng-template>
                         </div>
-                        <div nz-col nzSpan="2">
+                        <div nz-col nzSpan="1">
                             <span style="color: #36A2FF;cursor: pointer;" (click)="look(item)">查看</span>
                         </div>
                     </div>
diff --git a/src/app/pages/oil-unloading-process-list/oil-unloading-process-list.component.scss b/src/app/pages/oil-unloading-process-list/oil-unloading-process-list.component.scss
index 15de318..833bcf1 100644
--- a/src/app/pages/oil-unloading-process-list/oil-unloading-process-list.component.scss
+++ b/src/app/pages/oil-unloading-process-list/oil-unloading-process-list.component.scss
@@ -26,14 +26,17 @@
     .searchParams {
       // flex: 10;
       width: 150px;
-      
+
     }
-    .searchParamsLong{
+
+    .searchParamsLong {
       width: 250px;
     }
-    .searchParams2{
+
+    .searchParams2 {
       width: 220px;
     }
+
     .btn {
       // flex: 1;
     }
@@ -41,6 +44,7 @@
     nz-select {
       color: rgba(145, 204, 255, 0.95);
     }
+
     nz-tree-select {
       color: rgba(145, 204, 255, 0.95);
     }
@@ -275,7 +279,11 @@
           border-bottom: 1px solid #0d3761;
 
           div {
+
             color: #91CCFF;
+            white-space: nowrap;
+            overflow: hidden;
+            text-overflow: ellipsis;
 
             .look {
               color: #36A2FF;