Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

src/app/routes/datatable/components/customtable/customindex/customindex.component.html

@@ -12,88 +12,70 @@
 <page-header-wrapper [title]="'客户报表'"></page-header-wrapper>
 <div nz-row [nzGutter]="16">
   <div nz-col class="gutter-row" [nzSpan]="6">
-    <g2-card [title]="'货主'" [bordered]="true" [total]="hzData?.total || '0'" [footer]="'已认证' + ' ' + hzData?.auditPassTotal" contentHeight="46">
+    <g2-card [title]="'货主'" [bordered]="true" [total]="hzData?.total || '0'"
+      [footer]="'已认证' + ' ' + hzData?.auditPassTotal" contentHeight="46">
     </g2-card>
   </div>
   <div nz-col class="gutter-row" [nzSpan]="6">
-    <g2-card [title]="'合伙人'" [bordered]="true" [total]="hhrData?.total || '0'" [footer]="'已认证' + ' ' + hhrData?.auditPassTotal" contentHeight="46">
+    <g2-card [title]="'合伙人'" [bordered]="true" [total]="hhrData?.total || '0'"
+      [footer]="'已认证' + ' ' + hhrData?.auditPassTotal" contentHeight="46">
     </g2-card>
   </div>
   <div nz-col class="gutter-row" [nzSpan]="6">
-    <g2-card [title]="'司机'" [bordered]="true" [total]="sjData?.total || '0'" [footer]="'已认证' + ' ' + sjData?.auditPassTotal" contentHeight="46">
+    <g2-card [title]="'司机'" [bordered]="true" [total]="sjData?.total || '0'"
+      [footer]="'已认证' + ' ' + sjData?.auditPassTotal" contentHeight="46">
     </g2-card>
   </div>
   <div nz-col class="gutter-row" [nzSpan]="6">
-    <g2-card [title]="'车辆'" [bordered]="true" [total]="clData?.total || '0'" [footer]="'已认证'  + ' '+ clData?.auditPassTotal" contentHeight="46">
+    <g2-card [title]="'车辆'" [bordered]="true" [total]="clData?.total || '0'"
+      [footer]="'已认证'  + ' '+ clData?.auditPassTotal" contentHeight="46">
     </g2-card>
   </div>
 </div>
-<nz-card nzTitle="客户报表" [nzExtra]="extraTemplate">
+<nz-card nzTitle="客户报表" [nzExtra]="extraTemplate" acl [acl-ability]="['customindex-client']">
   <ng-template #extraTemplate>
     <div class="chooseBox">
       <div class="timeBox">
-        <nz-radio-group [(ngModel)]="mode" nzButtonStyle="solid" (ngModelChange)="changeData()"  acl  [acl-ability]="['customindex-client']">
+        <nz-radio-group [(ngModel)]="mode" nzButtonStyle="solid" (ngModelChange)="changeData()">
           <label nz-radio-button nzValue="year">年</label>
           <label nz-radio-button nzValue="month">月</label>
           <label nz-radio-button nzValue="date">日</label>
           <label nz-radio-button nzValue="define">自定义</label>
         </nz-radio-group>
         <div class="dateBox">
-          <nz-date-picker
-            [(ngModel)]="date"
-            [nzMode]="mode"
-            [nzFormat]="dateFormat"
-            *ngIf="mode !== 'define'"
-            [nzDisabledDate]="disabledDate"
-            (ngModelChange)="onChange($event)"
-          ></nz-date-picker>
-          <nz-range-picker
-            [(ngModel)]="defineDate"
-            [nzFormat]="dateFormat"
-            *ngIf="mode === 'define'"
-            [nzDisabledDate]="disabledDate"
-            (ngModelChange)="onChange($event)"
-          ></nz-range-picker>
+          <nz-date-picker [(ngModel)]="date" [nzMode]="mode" [nzFormat]="dateFormat" *ngIf="mode !== 'define'"
+            [nzDisabledDate]="disabledDate" (ngModelChange)="onChange($event)"></nz-date-picker>
+          <nz-range-picker [(ngModel)]="defineDate" [nzFormat]="dateFormat" *ngIf="mode === 'define'"
+            [nzDisabledDate]="disabledDate" (ngModelChange)="onChange($event)"></nz-range-picker>
         </div>
       </div>
     </div>
   </ng-template>
-  <st
-    #st
-    multiSort
-    [columns]="columns"
-    [ps]="20"
-    [data]="reportData"
-    [scroll]="{ x: '1200px' }"
+  <st #st multiSort [columns]="columns" [ps]="20" [data]="reportData" [scroll]="{ x: '1200px' }"
     [res]="{ reName: { list: 'data', total: 'data.total' } }"
-    [page]="{ show: false, showSize: false, pageSizes: [20, 50, 100] }"
-  >
-  <ng-template  st-row="type"  let-item>
+    [page]="{ show: false, showSize: false, pageSizes: [20, 50, 100] }">
+    <ng-template st-row="type" let-item>
       <div *ngIf="item.type == '1'">货主</div>
       <div *ngIf="item.type == '2'">合伙人</div>
       <div *ngIf="item.type == '3'">司机</div>
       <div *ngIf="item.type == '4'">车辆</div>
-  </ng-template>
-</st>
+    </ng-template>
+  </st>
 </nz-card>
-<nz-card nzTitle="用户新增报表" [nzExtra]="extraTemplate01">
+<nz-card nzTitle="用户新增报表" [nzExtra]="extraTemplate01" acl [acl-ability]="['customindex-totalAdd']">
   <ng-template #extraTemplate01>
     <div class="chooseBox">
       <div class="timeBox">
-        <nz-radio-group [(ngModel)]="modeNext" nzButtonStyle="solid" (ngModelChange)="changeDataNext2()" acl  [acl-ability]="['customindex-totalAdd']">
+        <nz-radio-group [(ngModel)]="modeNext" nzButtonStyle="solid" (ngModelChange)="changeDataNext2()">
           <label nz-radio-button nzValue="year">年</label>
           <label nz-radio-button nzValue="month">月</label>
         </nz-radio-group>
         <div class="dateBox">
-          <nz-date-picker
-            [nzDisabledDate]="disabledDate"
-            [(ngModel)]="dateNext"
-            [nzMode]="modeNext"
-            (ngModelChange)="onChangeNext($event)"
-          ></nz-date-picker>
+          <nz-date-picker [nzDisabledDate]="disabledDate" [(ngModel)]="dateNext" [nzMode]="modeNext"
+            (ngModelChange)="onChangeNext($event)"></nz-date-picker>
         </div>
       </div>
     </div>
   </ng-template>
   <app-datatable-customindex-curve #curve [chartData]="chartData"></app-datatable-customindex-curve>
-</nz-card>
+</nz-card>

src/app/routes/datatable/components/operationtable/operationtable.component.html

@@ -1,19 +1,21 @@
 <!-- 页头 -->
 <page-header-wrapper [title]="'运营报表'"></page-header-wrapper>
-<nz-card nzTitle="运营报表" [nzExtra]="extraTemplate">
+<nz-card nzTitle="运营报表" [nzExtra]="extraTemplate" acl [acl-ability]="['operationtable-table']">
   <ng-template #extraTemplate>
     <div class="chooseBox">
-      <button nz-button nzType="primary" (click)="exportFun()" acl  [acl-ability]="['operationtable-export']">导出</button>
+      <button nz-button nzType="primary" (click)="exportFun()" acl [acl-ability]="['operationtable-export']">导出</button>
       <div class="timeBox">
-        <nz-radio-group [(ngModel)]="mode" nzButtonStyle="solid" (ngModelChange)="changeData()" acl  [acl-ability]="['operationtable-table']">
+        <nz-radio-group [(ngModel)]="mode" nzButtonStyle="solid" (ngModelChange)="changeData()">
           <label nz-radio-button nzValue="year">年</label>
           <label nz-radio-button nzValue="month">月</label>
           <label nz-radio-button nzValue="date">日</label>
           <label nz-radio-button nzValue="define">自定义</label>
         </nz-radio-group>
         <div class="dateBox">
-          <nz-date-picker [(ngModel)]="date" [nzMode]="mode" [nzFormat]="dateFormat" *ngIf="mode !== 'define'" [nzDisabledDate]="disabledDate" (ngModelChange)="onChange($event)"></nz-date-picker>
-          <nz-range-picker [(ngModel)]="defineDate" [nzFormat]="dateFormat" *ngIf="mode === 'define'" [nzDisabledDate]="disabledDate" (ngModelChange)="onChange($event)"></nz-range-picker>
+          <nz-date-picker [(ngModel)]="date" [nzMode]="mode" [nzFormat]="dateFormat" *ngIf="mode !== 'define'"
+            [nzDisabledDate]="disabledDate" (ngModelChange)="onChange($event)"></nz-date-picker>
+          <nz-range-picker [(ngModel)]="defineDate" [nzFormat]="dateFormat" *ngIf="mode === 'define'"
+            [nzDisabledDate]="disabledDate" (ngModelChange)="onChange($event)"></nz-range-picker>
         </div>
 
       </div>
@@ -25,10 +27,10 @@
     [scroll]="{ x: '1200px' }" [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
     [page]="{ show: true, showSize: true, pageSizes: [20, 50, 100] }" [loading]="service.http.loading"></st>
 </nz-card>
-<nz-card nzTitle="运营报表" [nzExtra]="extraTemplate01">
+<nz-card nzTitle="运营报表" [nzExtra]="extraTemplate01" acl [acl-ability]="['operationtable-operationalReport']">
   <ng-template #extraTemplate01>
     <div class="chooseBox">
-      <nz-select [(ngModel)]="enterpriseInfoId" style="width: 200px" (ngModelChange)="initPillarData(true)" acl  [acl-ability]="['operationtable-operationalReport']">
+      <nz-select [(ngModel)]="enterpriseInfoId" style="width: 200px" (ngModelChange)="initPillarData(true)">
         <nz-option [nzValue]="item.value" [nzLabel]="item.label" *ngFor="let item of interManlist"></nz-option>
       </nz-select>
       <div class="timeBox">
@@ -37,19 +39,20 @@
           <label nz-radio-button nzValue="month">月</label>
         </nz-radio-group>
         <div class="dateBox">
-          <nz-date-picker [nzDisabledDate]="disabledDate" [(ngModel)]="dateNext" [nzMode]="modeNext" (ngModelChange)="onChangeNext($event)"></nz-date-picker>
+          <nz-date-picker [nzDisabledDate]="disabledDate" [(ngModel)]="dateNext" [nzMode]="modeNext"
+            (ngModelChange)="onChangeNext($event)"></nz-date-picker>
         </div>
       </div>
     </div>
   </ng-template>
-  <div nz-row [nzGutter]="64">
+  <!-- <div nz-row [nzGutter]="64">
     <div nz-col class="gutter-row" [nzSpan]="12">
-     <app-operation-curve #curve [chartData]="chartData.lineChart"></app-operation-curve>
+      <app-operation-curve #curve [chartData]="chartData.lineChart"></app-operation-curve>
     </div>
     <div nz-col class="gutter-row" [nzSpan]="12">
       <app-operation-pillar #pillar [chartData]="chartData.histogram"></app-operation-pillar>
     </div>
-  </div>
+  </div> -->
 </nz-card>
 
-<app-opeationtable-pie #pie></app-opeationtable-pie>
+<app-opeationtable-pie #pie></app-opeationtable-pie>

src/app/routes/waybill-management/waybill-management-routing.module.ts

@@ -15,14 +15,30 @@ import { WaybillManagementVehicleDetailComponent } from './components/vehicle-de
 import { WaybillManagementVehicleComponent } from './components/vehicle/vehicle.component';
 
 const routes: Routes = [
-  { path: 'vehicle', component: WaybillManagementVehicleComponent },
-  { path: 'vehicle/vehicle-detail/:id', component: WaybillManagementVehicleDetailComponent },
-  { path: 'bulk', component: WaybillManagementBulkComponent },
-  { path: 'bulk/bulk-detail/:id', component: WaybillManagementBulkeDetailComponent },
-  { path: 'abnormal-appear', component: WaybillManagementAbnormalAppearComponent },
-]
+  {
+    path: 'vehicle',
+    component: WaybillManagementVehicleComponent,
+    data: { guard: { ability: ['WAYBILL-VEHICLE-search'] } }
+  },
+  {
+    path: 'vehicle/vehicle-detail/:id',
+    component: WaybillManagementVehicleDetailComponent,
+    data: { guard: { ability: ['WAYBILL-VEHICLE-DETAIL-wholeUnloadCarInfo'] } }
+  },
+  { path: 'bulk', component: WaybillManagementBulkComponent, data: { guard: { ability: ['WAYBILL-BULK-search'] } } },
+  {
+    path: 'bulk/bulk-detail/:id',
+    component: WaybillManagementBulkeDetailComponent,
+    data: { guard: { ability: ['WAYBILL-BULK-DETAIL-insertBulkStartCarInfo'] } }
+  },
+  {
+    path: 'abnormal-appear',
+    component: WaybillManagementAbnormalAppearComponent,
+    data: { guard: { ability: ['WAYBILL-ABNORMAL-search'] } }
+  }
+];
 @NgModule({
   imports: [RouterModule.forChild(routes)],
   exports: [RouterModule]
 })
-export class WaybillManagementRoutingModule { }
+export class WaybillManagementRoutingModule {}