Rainie/bbq
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

解决冲突

Browse Source
This commit is contained in:
wangshiming
2022-04-07 15:03:32 +08:00
parent ff978b77d4
commit d2e8926ca6
5 changed files with 157 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/routes/datatable/components/datascreen/curve/map.component.ts
View File

@ -49,7 +49,7 @@ export class DatatableCustomindexMapComponent implements OnInit, OnChanges {
this.chart = new Chart({
container: el,
autoFit: true,
height: 540,
height: 700,
padding: [0, 0]
});
this.chart.tooltip({
@ -88,9 +88,9 @@ export class DatatableCustomindexMapComponent implements OnInit, OnChanges {
// 可视化用户数据
this.userData = [
{ name: '山东', value: '21',trend:'#F51D27' },
{ name: '山东', value: 21 },
{ name: '山东', value: 22},
{ name: '广东', value: 20,trend:'#0A61D7' },
{ name: '广东', value: 20, },
{ name: '广东', value: 20 },
{ name: '四川', value: 120 },
{ name: '湖南', value: 200 },

124
src/app/routes/datatable/components/datascreen/datascreen.component.html
View File

@ -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>

3
src/app/routes/datatable/components/datascreen/datascreen.component.less
View File

@ -4,5 +4,8 @@
color: #399ffd;
font-weight: bold;
}
.nz-statistic-number,.ant-statistic-content-value {
font-size: 20px;
}
}
}

102
src/app/routes/datatable/components/datascreen/datascreen.component.ts
View File

@ -5,7 +5,7 @@ import { map } from 'rxjs/operators';
* @Author : Shiming
* @Date : 2022-04-06 10:57:56
* @LastEditors : Shiming
* @LastEditTime : 2022-04-07 09:30:20
* @LastEditTime : 2022-04-07 14:59:12
* @FilePath : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\datascreen\\datascreen.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
@ -32,7 +32,14 @@ export class DatatableDatascreenComponent implements OnInit {
columns: STColumn[] = [];
chartData: G2TimelineData[] = [];
orderColumns: STColumn[] = [];
salesData = this.genData();
allDeal: any;
headDeal: any;
classifyDeal: any;
todaysDeal: any;
monthData: G2TimelineData[] = [];
salesData :any;
salesData2 :any = this.genData();
constructor(public service: DataService) {
}
@ -49,8 +56,6 @@ export class DatatableDatascreenComponent implements OnInit {
get reqParams() {
const params = {
}
return { ...params };
}
ngOnInit(): void {
@ -61,55 +66,74 @@ export class DatatableDatascreenComponent implements OnInit {
}
initData(){
this.service.request(this.service.$api_getAnnualTransactions).subscribe((res: any) => {
console.log(res);
this.allDeal = res
})
}
this.service.request(this.service.$api_getTransactionAmount).subscribe((res: any) => {
this.headDeal = res
})
this.service.request(this.service.$api_getCustomerStatistics).subscribe((res: any) => {
this.classifyDeal = res
})
this.service.request(this.service.$api_getTradingToday).subscribe((res: any) => {
this.todaysDeal = res
})
}
initLineData(){
for (let i = 0; i < 20; i += 1) {
this.chartData.push({
time: new Date().getTime() + 1000 * 60 * 60 * 24 * i,
y1: Math.floor(Math.random() * 100) + 1000,
y2: Math.floor(Math.random() * 100) + 10,
});
}
this.service.request(this.service.$api_getTradingTrend).subscribe((res: any) => {
this.monthData = res
// for (let i = 0; i < 20; i += 1) {
// this.monthData.push({
// time: new Date().getTime() + 1000 * 60 * 60 * 24 * i,
// y1: Math.floor(Math.random() * 100) + 1000,
// y2: Math.floor(Math.random() * 100) + 10,
// });
// }
})
let value: any = []
this.service.request(this.service.$api_getShipmentRanking).subscribe((res: any) => {
console.log(res);
res.forEach((element: any) => {
value.push({
x: element.city,
y: element.weight,
});
});
this.salesData = value
console.log(this.salesData);
})
}
private genData(): G2MiniAreaData[] {
const beginDay = new Date().getTime();
const res: G2MiniAreaData[] = [];
for (let i = 0; i < 20; i += 1) {
res.push({
x: format(new Date(beginDay + 1000 * 60 * 60 * 24 * i), 'yyyy-MM-dd'),
y: Math.floor(Math.random() * 100) + 10,
public genData(): G2MiniAreaData[] {
let value: any = []
this.service.request(this.service.$api_getShipmentRanking).subscribe((res: any) => {
console.log(res);
res.forEach((element: any) => {
value.push({
x: element.city,
y: element.weight,
});
});
})
console.log(value);
return value;
}
return res;
}
/**
* 初始化数据列表
*/
initST() {
this.columns = [
{ title: '序号', index: 'carNo', className: 'text-center' },
{ title: '发货地', index: 'carNoColorLabel', className: 'text-center' },
{ title: '卸货地', index: 'carModelLabel', className: 'text-center' },
{ title: '货物', index: 'carStatus', className: 'text-center'},
{ title: '数量', index: 'approvalStatus', className: 'text-center' },
{ title: '序号', render: 'index', className: 'text-center',width: '70px' },
{ title: '发货地', index: 'loadAddress', className: 'text-center',width: '90px' },
{ title: '卸货地', index: 'dischargeAddress', className: 'text-center' ,width: '90px'},
{ title: '货物', index: 'goodsName', className: 'text-center',width: '90px'},
{ title: '数量', render: 'weight', className: 'text-center',width: '120px' },
];
console.log(this.map);
setTimeout(() => {
if(this.map) {
this.map.reRender()
}
}, 500);
}
initOrderST() {
this.orderColumns = [
{ title: '运单号', index: 'carNo', className: 'text-center' },
{ title: '货主', index: 'carNoColorLabel', className: 'text-center' },
{ title: '时间', index: 'carModelLabel', className: 'text-center' },
{ title: '风险等级', index: 'carStatus', className: 'text-center'}
{ title: '运单号', index: 'wayCode', className: 'text-center',width: '120px' },
{ title: '货主', index: 'shipperName', className: 'text-center',width: '70px' },
{ title: '时间', index: 'createTime', className: 'text-center',width: '200px' },
{ title: '风险等级', index: 'warningType', className: 'text-center',width: '90px'}
];
}

14
src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html
View File

@ -1,7 +1,7 @@
<!--
* @Author: your name
* @Date: 2021-12-03 15:31:52
* @LastEditTime : 2022-04-06 15:37:59
* @LastEditTime : 2022-04-07 15:02:55
* @LastEditors : Shiming
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath : \\tms-obc-web\\src\\app\\routes\\waybill-management\\components\\bulk-detail\\bulk-detail.component.html
@ -30,6 +30,7 @@
<sv label="所属项目">{{i?.enterpriseProjectName}}</sv>
<sv label="服务类型">{{i?.serviceTypeLabel}}</sv>
<sv label="调度员">{{i?.dispatchName}} /{{i?.dispatchPhone}}</sv>
<sv label="外部订单号">{{ i?.externalBillCode }}</sv>
<sv label="货源编号">{{ i?.resourceCode }} </sv>
<sv label="承诺付款天数">{{ i?.paymentDays }}</sv>
</div>
@ -92,13 +93,12 @@
<sv label="接单数量">
{{ i?.acceptWeight }}吨,{{ i?.acceptVolume }}方
</sv>
<sv label="装货数量">
<sv *ngIf="i?.billStatus =='3' || i?.billStatus =='4' || i?.billStatus =='5'" label="装货数量">
{{ i?.loadWeight }}吨，{{ i?.loadVolume }}方
</sv>
<sv label="卸货数量">
<sv *ngIf="i?.billStatus =='4' || i?.billStatus =='5'" label="卸货数量">
{{ i?.settlementWeight }}吨,{{ i?.settlementVolume }}方
</sv>
</sv-container>
<div class="mt-md">
<h4 class="text-md">装货卸货信息
@ -154,10 +154,10 @@
totalObj?.price - attObj?.price | currency
}}，附加运费{{ attObj?.price | currency}}，附加费率{{ (attObj?.price / totalObj?.price) * 100 | number: '0.2-2' }}%）
</div>
<div>车队长：{{ i?.payee?.name }}/{{ i?.payee?.phone }}/{{ i?.payee?.idNo }}</div>
<div>收款人：{{ i?.payee?.name }}/{{ i?.payee?.phone }}/{{ i?.payee?.idNo }}</div>
</nz-card> -->
<nz-card [nzTitle]="'运费信息' +'（到货后'+i?.paymentDays+'天内支付运费）'" #distannce3>
<h2>{{i?.goodsInfos?.[0]?.freightPrice}}{{i?.goodsInfos?.[0]?.freightTypeLabel}}（{{ i?.goodsInfos?.[0]?.settlementBasisLabel ? i?.goodsInfos?.[0]?.settlementBasisLabel + '，' :' ' }}{{i?.goodsInfos?.[0]?.ruleLabel}}）</h2>
<h2>{{i?.freightPrice}}{{i?.goodsInfos?.[0]?.freightTypeLabel}}（{{ i?.goodsInfos?.[0]?.settlementBasisLabel ? i?.goodsInfos?.[0]?.settlementBasisLabel + '，' :' ' }}{{i?.goodsInfos?.[0]?.ruleLabel}}）</h2>
<st #st [data]="billExpenses" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
<ng-template st-row="PriceType" let-item let-index="index"> 到付 </ng-template>
<ng-template st-row="price" let-item let-index="index">
@ -176,7 +176,7 @@
附加费{{ i?.totalSurcharge | currency }}，附加费率{{ (i?.totalRate * 100).toFixed(2)}}%）
</div>
</div>
<div *ngIf ="i?.payee?.phone && i?.payee?.phone !== i?.driverVo.phone">车队长：{{ i?.payee?.name }}/{{ i?.payee?.phone }}/{{ i?.payee?.idNo }}</div>
<div>收款人：{{ i?.payee?.name }}/{{ i?.payee?.phone }}/{{ i?.payee?.idNo }}</div>
</nz-card>
<nz-card nzTitle="附件信息" #distannce4>