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

src/app/pages/plan-admin/plan-admin.component.html

@@ -5,9 +5,9 @@
       <app-title [name]="'组织机构'"></app-title>
     </div>
     <div class="or">
-            <nz-tree [nzExpandedKeys]="nzExpandedKeys" [nzShowExpand]="false" #nzTreeComponent
-                [nzExpandAll]="nzExpandAll" nzBlockNode [nzData]="nodes" (nzClick)="activeNode($event)"
-                [nzTreeTemplate]="nzTreeTemplate" [nzMultiple]="false"></nz-tree>
+      <nz-tree [nzExpandedKeys]="nzExpandedKeys" [nzShowExpand]="false" #nzTreeComponent [nzExpandAll]="nzExpandAll"
+        nzBlockNode [nzData]="nodes" (nzClick)="activeNode($event)" [nzTreeTemplate]="nzTreeTemplate"
+        [nzMultiple]="false"></nz-tree>
       <ng-template #nzTreeTemplate let-node let-origin="origin">
         <ng-container *ngIf="node.origin.parentId == null; else elseTemplate">
           <img style="vertical-align: bottom;" src="../../../assets/images/flower.png" alt="">
@@ -55,7 +55,7 @@
       <nz-table #basicTable [nzData]="list" [nzShowPagination]="false">
         <thead>
           <tr>
-                        <th>加油站名称</th>
+            <th style="text-align: center;">加油站名称</th>
             <th>区域</th>
             <th>所属公司</th>
             <th>联系人</th>
@@ -70,7 +70,7 @@
         </thead>
         <tbody>
           <tr *ngFor="let data of basicTable.data">
-                        <th>加油站名称</th>
+            <th style="text-align: center;">加油站名称</th>
             <th>区域</th>
             <th>所属公司</th>
             <th>联系人</th>
@@ -80,7 +80,7 @@
             <th>油机数量</th>
             <th>车道数量</th>
             <th>油罐容积</th>
-                        <th (click)="look()">查看</th>
+            <th class="look" (click)="look()" style="cursor:pointer;color: #36A2FF">查看</th>
           </tr>
         </tbody>
       </nz-table>

src/app/pages/plan-admin/plan-admin.component.scss

@@ -29,7 +29,7 @@
 
     nz-tree {
       background: none;
-      color: #C4E2FC;
+      color: #c4e2fc;
     }
   }
 }
@@ -57,7 +57,7 @@
 
       input {
         background: none;
-        border: 1px solid #91CCFF;
+        border: 1px solid #91ccff;
         color: #fff;
       }
 
@@ -70,8 +70,6 @@
         margin-left: 16px;
       }
     }
-
-
   }
 
   .tablebox {
@@ -80,9 +78,6 @@
     flex-direction: column;
     align-items: center;
     overflow: hidden;
-
-   
-
     .pagination {
       margin-top: 26px;
       display: flex;
@@ -93,6 +88,5 @@
     ::-webkit-scrollbar {
       width: 0px;
     }
-
   }
 }

src/theme.less

@@ -298,54 +298,56 @@
       margin-left: 0px;
     }
   }
+
   .ant-table table {
     border-collapse: collapse;
   }
+
+
   nz-table {
     flex: 1;
     width: 96%;
-    display: flex;
-    flex-direction: column;
-    overflow: hidden;
-    background: none;
+  }
 
   .ant-table {
     background: none;
   }
 
-    thead {
-      tr {
+  .ant-table-thead>tr {
     height: 40px;
     line-height: 40px;
     background: rgba(35, 153, 255, 0.2);
     border: 1px solid rgba(35, 217, 255, 0.4);
     box-shadow: 0 0 3px 0 rgba(35, 217, 255, 0.4) inset;
-        th {
-          text-align: left;
-          padding: 0;
-          background: none;
+  }
 
+  .ant-table-thead>tr>th {
+    background: none;
+    border-bottom: none;
+    padding: 0;
     color: #23D9FF;
   }
-      }
-    }
 
-    tbody {
-      flex: 1;
-      overflow-y: auto;
-      tr {
+  .ant-table-tbody>tr {
     height: 40px;
     line-height: 40px;
     border-bottom: 1px solid #0d3761;
+  }
+
+  .ant-table-tbody>tr>th {
+    font-weight: 400;
+    font-family: synormal;
+    background: none;
+    border-bottom: none;
+    padding: 0;
     color: #91CCFF;
+  }
+
   .look {
     color: #36A2FF;
     cursor: pointer;
   }
 }
-    }
-  }
-}
 
 
 .ant-modal-close-x {