解决冲突

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

@@ -4,46 +4,68 @@
  * @Author       : Shiming
  * @Date         : 2022-04-06 10:57:56
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-07 01:26:56
+ * @LastEditTime : 2022-04-07 14:59:07
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\datascreen\\datascreen.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
 <!-- 页头 -->
 <!-- <page-header-wrapper [title]="'运营报表'"></page-header-wrapper> -->
+<div style="display: flex; justify-content: center; align-items: center">
+  <h1>运多星网络货运平台实时交易监控</h1>
+</div>
 <div nz-row [nzGutter]="24">
   <div nz-col class="gutter-row" [nzSpan]="8">
-    <nz-card nzTitle="">
+    <nz-card nzTitle="2022全年交易情况">
       <nz-row [nzGutter]="16">
         <nz-col [nzSpan]="12">
-          <nz-statistic [nzValue]="(1949101 | number)!" [nzTitle]="'成交额'"></nz-statistic>
+          <nz-statistic [nzValue]="(allDeal?.dealAmount | currency)!" [nzTitle]="'成交额'"></nz-statistic>
         </nz-col>
         <nz-col [nzSpan]="12">
-          <nz-statistic [nzValue]="(2019.111 | number: '1.0-2')!" [nzTitle]="'结算额'"></nz-statistic>
+          <nz-statistic [nzValue]="(allDeal?.settlementAmount | currency)!" [nzTitle]="'结算额'"></nz-statistic>
         </nz-col>
       </nz-row>
       <nz-row [nzGutter]="16">
         <nz-col [nzSpan]="12">
-          <nz-statistic [nzValue]="(1949101 | number)!" [nzTitle]="'订单数'"></nz-statistic>
+          <nz-statistic [nzValue]="(allDeal?.billQuantity | number)!" [nzTitle]="'订单数'"></nz-statistic>
         </nz-col>
         <nz-col [nzSpan]="12">
-          <nz-statistic [nzValue]="(2019.111 | number: '1.0-2')!" [nzTitle]="'货物吞吐(吨)'"></nz-statistic>
+          <nz-statistic [nzValue]="(allDeal?.weight | number: '1.0-2')!" [nzTitle]="'货物吞吐(吨)'"></nz-statistic>
         </nz-col>
       </nz-row>
     </nz-card>
     <nz-card nzTitle="本月交易趋势">
       <g2-timeline
-      [data]="chartData"
-      [titleMap]="{ y1: '客流量', y2: '支付笔数' }"
-      [height]="200"
-      mask="MM月DD日"
-      [slider]="false"
-    ></g2-timeline>
+        [data]="monthData"
+        [titleMap]="{ y1: '订单数', y2: '运单数' }"
+        [height]="200"
+        mask="MM月DD日"
+        [slider]="false"
+      ></g2-timeline>
     </nz-card>
     <nz-card nzTitle="实时货源">
-      <st #st multiSort bordered [columns]="columns" [ps]="5" [data]="service.$api_listShipperReportPage"
+      <st
+        [scroll]="{ y: '300px' }"
+        #st
+        multiSort
+        bordered
+        [columns]="columns"
+        [data]="service.$api_getRealTimeSupply"
         [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
-        [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
-        [page]="{ show: false, showSize: false, pageSizes: [5, 50, 100] }" [loading]="service.http.loading">
+        [res]="{ reName: { list: 'data' } }"
+        [page]="{ show: false, showSize: false, pageSizes: [5, 50, 100] }"
+        [loading]="service.http.loading"
+      >
+        <ng-template st-row="index" let-item let-index="index">
+          {{ index }}
+        </ng-template>
+        <ng-template st-row="weight" let-item let-index="index">
+          {{ item.weight ? item.weight + '吨' : '' }}
+          {{ item.volume ? item.volume + '方' : '' }}
+        </ng-template>
+        <ng-template st-row="weight" let-item let-index="index">
+          {{ item.weight ? item.weight + '吨' : '' }}
+          {{ item.volume ? item.volume + '方' : '' }}
+        </ng-template>
       </st>
     </nz-card>
   </div>
@@ -51,20 +73,20 @@
     <nz-card>
       <nz-row [nzGutter]="24">
         <nz-col [nzSpan]="8">
-          <nz-statistic [nzValue]="(2019.111 | number: '1.0-2')!" [nzTitle]="'今日交易额'"></nz-statistic> 
+          <nz-statistic [nzValue]="(headDeal?.todayAmount | currency)!" [nzTitle]="'今日交易额'"></nz-statistic>
         </nz-col>
         <nz-col [nzSpan]="8">
-          <nz-statistic [nzValue]="(1949101 | number)!" [nzTitle]="'本月交易额'"></nz-statistic>
+          <nz-statistic [nzValue]="(headDeal?.monthAmount | currency)!" [nzTitle]="'本月交易额'"></nz-statistic>
         </nz-col>
         <nz-col [nzSpan]="8">
-          <nz-statistic [nzValue]="(2019.111 | number: '1.0-2')!" [nzTitle]="'累计交易额'"></nz-statistic>
+          <nz-statistic [nzValue]="(headDeal?.cumulativeAmount | currency)!" [nzTitle]="'累计交易额'"></nz-statistic>
         </nz-col>
       </nz-row>
     </nz-card>
-    <app-datatable-customindex-map style="max-height: 600px;" #map [chartData]="chartData"></app-datatable-customindex-map>
+    <app-datatable-customindex-map style="max-height: 600px" #map [chartData]="chartData"></app-datatable-customindex-map>
     <nz-card>
       <nz-row [nzGutter]="24">
-        <g2-bar height="200" [title]="'销售额趋势'" [data]="salesData" (clickItem)="handleClick($event)"></g2-bar>
+        <g2-bar height="200" [title]="'本月发货量排名'" [data]="salesData2"  (ready)='genData()'></g2-bar>
       </nz-row>
     </nz-card>
   </div>
@@ -72,59 +94,75 @@
     <nz-card>
       <nz-row [nzGutter]="24">
         <nz-col [nzSpan]="6">
-          <nz-statistic [nzValue]="(1949101 | number)!" [nzTitle]="'货主'"></nz-statistic>
+          <nz-statistic [nzValue]="(classifyDeal?.enterpriseTotal | number)!" [nzTitle]="'货主'"></nz-statistic>
         </nz-col>
         <nz-col [nzSpan]="6">
-          <nz-statistic [nzValue]="(2019.111 | number: '1.0-2')!" [nzTitle]="'合伙人'"></nz-statistic>
+          <nz-statistic [nzValue]="(classifyDeal?.partnerTotal | number: '1.0-2')!" [nzTitle]="'合伙人'"></nz-statistic>
         </nz-col>
         <nz-col [nzSpan]="6">
-          <nz-statistic [nzValue]="(1949101 | number)!" [nzTitle]="'司机'"></nz-statistic>
+          <nz-statistic [nzValue]="(classifyDeal?.driverTotal | number)!" [nzTitle]="'司机'"></nz-statistic>
         </nz-col>
         <nz-col [nzSpan]="6">
-          <nz-statistic [nzValue]="(2019.111 | number: '1.0-2')!" [nzTitle]="'车辆'"></nz-statistic>
+          <nz-statistic [nzValue]="(classifyDeal?.carTotal | number: '1.0-2')!" [nzTitle]="'车辆'"></nz-statistic>
         </nz-col>
       </nz-row>
     </nz-card>
     <nz-card nzTitle="今日交易情况">
       <nz-row [nzGutter]="16">
         <nz-col [nzSpan]="12">
-          <nz-statistic [nzValue]="(1949101 | number)!" [nzTitle]="'订单数'"></nz-statistic>
+          <nz-statistic [nzValue]="(todaysDeal?.billQuantity | number)!" [nzTitle]="'订单数'"></nz-statistic>
         </nz-col>
         <nz-col [nzSpan]="12">
-          <nz-statistic [nzValue]="(2019.111 | number: '1.0-2')!" [nzTitle]="'有效订单'"></nz-statistic>
+          <nz-statistic [nzValue]="(todaysDeal?.billEffectiveQuantity | number: '1.0-2')!" [nzTitle]="'有效订单'"></nz-statistic>
         </nz-col>
       </nz-row>
       <nz-row [nzGutter]="16">
         <nz-col [nzSpan]="12">
-          <nz-statistic [nzValue]="(1949101 | number)!" [nzTitle]="'运输金额(元)'"></nz-statistic>
+          <nz-statistic [nzValue]="(todaysDeal?.amount | currency)!" [nzTitle]="'运输金额(元)'"></nz-statistic>
         </nz-col>
         <nz-col [nzSpan]="12">
-          <nz-statistic [nzValue]="(2019.111 | number: '1.0-2')!" [nzTitle]="'货物吞吐(吨)'"></nz-statistic>
+          <nz-statistic [nzValue]="(todaysDeal?.weight | number: '1.0-2')!" [nzTitle]="'货物吞吐(吨)'"></nz-statistic>
         </nz-col>
       </nz-row>
     </nz-card>
     <nz-card nzTitle="本月运营质量监测">
-       <nz-row [nzGutter]="24">
-        <nz-col [nzSpan]="6">
-          <g2-pie percent="28" subTitle="中式快餐" total="28%" height="130"></g2-pie>
+      <nz-row [nzGutter]="24">
+        <nz-col [nzSpan]="12">
+          <div style="width: 200px; display: inline-block">
+            <g2-pie percent="28" subTitle="准点率" total="28%" height="100"></g2-pie>
+          </div>
         </nz-col>
-        <nz-col [nzSpan]="6">
-          <g2-pie percent="28" subTitle="中式快餐" total="28%" height="130"></g2-pie>
+        <nz-col [nzSpan]="12">
+          <div style="width: 200px; display: inline-block">
+            <g2-pie percent="22" subTitle="货损率" total="22%" height="100"></g2-pie>
+          </div>
         </nz-col>
-        <nz-col [nzSpan]="6">
-          <g2-pie percent="28" subTitle="中式快餐" total="28%" height="130"></g2-pie>
+        <nz-col [nzSpan]="12">
+          <div style="width: 200px; display: inline-block">
+            <g2-pie percent="22" subTitle="空车率" total="22%" height="100"></g2-pie>
+          </div>
         </nz-col>
-        <nz-col [nzSpan]="6">
-          <g2-pie percent="28" subTitle="中式快餐" total="28%" height="130"></g2-pie>
+        <nz-col [nzSpan]="12">
+          <div style="width: 200px; display: inline-block">
+            <g2-pie percent="22" subTitle="结算率" total="22%" height="100" width="200"></g2-pie>
+          </div>
         </nz-col>
       </nz-row>
     </nz-card>
     <nz-card nzTitle="实时运单风控">
-      <st #st multiSort bordered [columns]="orderColumns" [ps]="5" [data]="service.$api_listShipperReportPage"
-      [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqOrderParams }"
-      [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
-      [page]="{ show: false, showSize: false, pageSizes: [5, 50, 100] }" [loading]="service.http.loading">
-    </st>
+      <st
+        #st
+        multiSort
+        bordered
+       [scroll]="{y: '300px'}"
+        [columns]="orderColumns"
+        [data]="service.$api_getRealTimeWaybillRiskControl"
+        [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqOrderParams }"
+        [res]="{ reName: { list: 'data' } }"
+        [page]="{ show: false, showSize: false, pageSizes: [5, 50, 100] }"
+        [loading]="service.http.loading"
+      >
+      </st>
     </nz-card>
   </div>
-</div>
+</div>