From bfbcb144aea74f9faa7f28dfc265e758f2593f83 Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Thu, 14 Apr 2022 15:49:24 +0800
Subject: [PATCH] fix bug

---
 .../datascreen/datascreen.component.html      | 53 ++++++++++---------
 1 file changed, 28 insertions(+), 25 deletions(-)

diff --git a/src/app/routes/datatable/components/datascreen/datascreen.component.html b/src/app/routes/datatable/components/datascreen/datascreen.component.html
index 2bad58ef..625f4869 100644
--- a/src/app/routes/datatable/components/datascreen/datascreen.component.html
+++ b/src/app/routes/datatable/components/datascreen/datascreen.component.html
@@ -4,25 +4,28 @@
  * @Author       : Shiming
  * @Date         : 2022-04-06 10:57:56
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-14 14:25:03
+ * @LastEditTime : 2022-04-14 15:48:32
  * @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 >
-  <div style="position: relative;">
-    <h1 style="display: flex; justify-content: center; align-items: center;margin: 0; padding: 0; font-size: 25px;font-weight: 700;">运多星网络货运平台</h1>
-    <div style="position: absolute; right: 0; display: flex;">
-  <img src="../../../../../assets/images/oclock.svg" alt="">&nbsp;
-   <span style="font-size: 16px; margin-top: 5px;">{{todayTime}}</span>
+<div>
+  <div style="position: relative">
+    <h1 style="display: flex; justify-content: center; align-items: center; margin: 0; padding: 0; font-size: 20px; font-weight: 700"
+      >运多星网络货运平台</h1
+    >
+    <div style="position: absolute; right: 0; display: flex">
+      <img src="../../../../../assets/images/oclock.svg" alt="" />&nbsp;
+      <span style="font-size: 16px; margin-top: 5px">{{ todayTime }}</span>
     </div>
   </div>
- 
-  <h1 style="display: flex; justify-content: center; align-items: center;margin: 0; padding: 0;font-size: 25px;font-weight: 700;">实时交易监控</h1>
 
+  <h1 style="display: flex; justify-content: center; align-items: center; margin: 0; padding: 0; font-size: 20px; font-weight: 700"
+    >实时交易监控</h1
+  >
 </div>
-<div nz-row [nzGutter]="24" >
+<div nz-row [nzGutter]="24">
   <div nz-col class="gutter-row" nzXs="12" nzSm="12" nzMd="12" nzLg="12" nzXl="8" nzXXl="8">
     <nz-card nzTitle="2022全年交易情况">
       <nz-row [nzGutter]="16">
@@ -42,15 +45,15 @@
         </nz-col>
       </nz-row>
     </nz-card>
-    <nz-card nzTitle="本月交易趋势" >
-      <app-financetable-curve-min  #curve [chartData]='chartData2'></app-financetable-curve-min>
+    <nz-card nzTitle="本月交易趋势">
+      <app-financetable-curve-min #curve [chartData]="chartData2"></app-financetable-curve-min>
     </nz-card>
-    <nz-card nzTitle="实时货源" style="height: 400px;">
+    <nz-card nzTitle="实时货源" style="height: 400px">
       <st
         #st
         multiSort
         [columns]="columns"
-        [scroll]="{ y: '350px' }"
+        [scroll]="{ y: '280px' }"
         [data]="service.$api_getRealTimeSupply"
         [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
         [res]="{ reName: { list: 'data' } }"
@@ -84,13 +87,13 @@
           <nz-statistic [nzValue]="(headDeal?.cumulativeAmount | currency)!" [nzTitle]="'累计交易额'"></nz-statistic>
         </nz-col>
       </nz-row>
-    </nz-card >
-   <div style="min-height: 550px;">
-    <app-datatable-customindex-map style="max-height: 680px" #map [chartData]="chartData"></app-datatable-customindex-map>
-   </div>
-    <nz-card >
+    </nz-card>
+    <div style="min-height: 550px">
+      <app-datatable-customindex-map style="max-height: 680px" #map [chartData]="chartData"></app-datatable-customindex-map>
+    </div>
+    <nz-card>
       <nz-row [nzGutter]="24">
-        <g2-bar #bar height="350" [delay]='200' repaint='true' [title]="'本月发货量排名'" [data]="salesData2"  (ready)='genData()'></g2-bar>
+        <g2-bar #bar height="350" [delay]="200" repaint="true" [title]="'本月发货量排名'" [data]="salesData2" (ready)="genData()"></g2-bar>
       </nz-row>
     </nz-card>
   </div>
@@ -153,11 +156,11 @@
         </nz-col>
       </nz-row>
     </nz-card>
-    <nz-card nzTitle="实时运单风控" style="height: 400px;">
+    <nz-card nzTitle="实时运单风控" style="height: 400px">
       <st
         #st
         multiSort
-       [scroll]="{y: '400px'}"
+        [scroll]="{ y: '280px' }"
         [columns]="orderColumns"
         [data]="service.$api_getRealTimeWaybillRiskControl"
         [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqOrderParams }"
@@ -165,9 +168,9 @@
         [page]="{ show: false, showSize: false, pageSizes: [5, 50, 100] }"
         [loading]="service.http.loading"
       >
-      <ng-template st-row="carNo" let-item let-index="index">
-        {{ item?.driverName }}{{ item?.carNo ? '/' + item?.carNo : '' }}
-      </ng-template>
+        <ng-template st-row="carNo" let-item let-index="index">
+          {{ item?.driverName }}{{ item?.carNo ? '/' + item?.carNo : '' }}
+        </ng-template>
       </st>
     </nz-card>
   </div>