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

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

Browse Source
This commit is contained in:
xiaoxing.liu
2022-04-13 19:07:10 +08:00
parent 023bfdf71d a8fa9fd1af
commit 9fe45a2a96
69 changed files with 1273 additions and 1038 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2022-04-07 17:57:23
* @LastEditors : Shiming
* @LastEditTime : 2022-04-07 19:28:24
* @LastEditTime : 2022-04-13 10:22:35
* @FilePath : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\datascreen\\curve\\curve.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
@ -75,7 +75,7 @@ export class DatatableCustomindexCurveMinComponent implements OnInit,OnChanges {
this.chart = new Chart({
container: el,
autoFit: true,
height: 200,
height: 320,
});
let value: any = []
this.service.request(this.service.$api_getTradingTrend).subscribe((res: any) => {

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

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2022-04-06 10:57:56
* @LastEditors : Shiming
* @LastEditTime : 2022-04-07 19:51:32
* @LastEditTime : 2022-04-13 15:20:32
* @FilePath : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\datascreen\\datascreen.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
@ -23,7 +23,7 @@
</div>
<div nz-row [nzGutter]="24">
<div nz-col class="gutter-row" [nzSpan]="8">
<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">
<nz-col [nzSpan]="12">
@ -47,11 +47,11 @@
</nz-card>
<nz-card nzTitle="实时货源">
<st
[scroll]="{ y: '300px' }"
#st
multiSort
bordered
[columns]="columns"
[scroll]="{ y: '320px' }"
[data]="service.$api_getRealTimeSupply"
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
[res]="{ reName: { list: 'data' } }"
@ -59,7 +59,7 @@
[loading]="service.http.loading"
>
<ng-template st-row="index" let-item let-index="index">
{{ index }}
{{ index + 1 }}
</ng-template>
<ng-template st-row="weight" let-item let-index="index">
{{ item.weight ? item.weight + '吨' : '' }}
@ -72,7 +72,7 @@
</st>
</nz-card>
</div>
<div nz-col class="gutter-row" [nzSpan]="8">
<div nz-col class="gutter-row" nzXs="12" nzSm="12" nzMd="12" nzLg="12" nzXl="8" nzXXl="8">
<nz-card>
<nz-row [nzGutter]="24">
<nz-col [nzSpan]="8">
@ -86,14 +86,14 @@
</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: 680px" #map [chartData]="chartData"></app-datatable-customindex-map>
<nz-card>
<nz-row [nzGutter]="24">
<g2-bar #bar height="200" [delay]='500' repaint='true' [title]="'本月发货量排名'" [data]="salesData2" (ready)='genData()'></g2-bar>
<g2-bar #bar height="310" [delay]='500' repaint='true' [title]="'本月发货量排名'" [data]="salesData2" (ready)='genData()'></g2-bar>
</nz-row>
</nz-card>
</div>
<div nz-col class="gutter-row" [nzSpan]="8">
<div nz-col class="gutter-row" nzXs="12" nzSm="12" nzMd="12" nzLg="12" nzXl="8" nzXXl="8">
<nz-card>
<nz-row [nzGutter]="24">
<nz-col [nzSpan]="6">
@ -157,7 +157,7 @@
#st
multiSort
bordered
[scroll]="{y: '300px'}"
[scroll]="{y: '290px'}"
[columns]="orderColumns"
[data]="service.$api_getRealTimeWaybillRiskControl"
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqOrderParams }"

6
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 19:48:19
* @LastEditTime : 2022-04-13 10:25:50
* @FilePath : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\datascreen\\datascreen.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
@ -127,7 +127,7 @@ export class DatatableDatascreenComponent implements OnInit {
*/
initST() {
this.columns = [
{ title: '序号', render: 'index', className: 'text-center', width: '70px' },
{ 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' },
@ -138,7 +138,7 @@ export class DatatableDatascreenComponent implements OnInit {
this.orderColumns = [
{ title: '运单号', index: 'wayCode', className: 'text-center', width: '150px' },
{ title: '司机/车辆', index: 'carNo', className: 'text-center', width: '120px' },
{ title: '货主', index: 'shipperName', className: 'text-center', width: '70px' },
{ title: '货主', index: 'shipperName', className: 'text-center', width: '200px' },
{ title: '时间', index: 'createTime', className: 'text-center', width: '200px' },
{ title: '异常预警', index: 'warningTypeLabel', className: 'text-center', width: '120px' }
];

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

@ -4,8 +4,9 @@
* @Author : Shiming
* @Date : 2022-04-06 17:57:07
* @LastEditors : Shiming
* @LastEditTime : 2022-04-07 19:44:32
* @LastEditTime : 2022-04-13 15:20:33
* @FilePath : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\datascreen\\map\\map.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<g2-custom delay="200" (render)="render($event)" ></g2-custom>
<g2-custom #map div style="height: 680px; " delay="200" (render)="render($event)" ></g2-custom>
<!-- <nz-col nzXs="0" nzSm="0" nzMd="0" nzLg="14" nzXl="14" nzXXl="14" style="z-index: 9999;"></nz-col> -->

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

@ -1,4 +1,4 @@
import { Component, ElementRef, Input, NgZone, OnChanges, OnInit, SimpleChanges, ViewChild } from '@angular/core';
import { Component, ElementRef, Input, NgZone, OnChanges, OnInit, SimpleChanges, ViewChild, AfterViewInit } from '@angular/core';
import { Chart } from '@antv/g2';
import DataSet from '@antv/data-set';
import { DataService } from 'src/app/routes/datatable/services/data.service';
@ -7,9 +7,11 @@ import { DataService } from 'src/app/routes/datatable/services/data.service';
templateUrl: './map.component.html',
styleUrls: ['./map.component.less']
})
export class DatatableCustomindexMapComponent implements OnInit, OnChanges {
export class DatatableCustomindexMapComponent implements OnInit, OnChanges, AfterViewInit {
el: any;
@Input() chartData: any;
@ViewChild('auditModal', { static: false }) auditModal!: any;
@ViewChild('map',{static: false}) map!: any;
chart: any;
mapData: any;
ds!: DataSet ;
@ -18,6 +20,10 @@ export class DatatableCustomindexMapComponent implements OnInit, OnChanges {
userDv: any;
userData: any = [];
constructor(private service: DataService, private ngZone: NgZone) {}
ngAfterViewInit(): void {
this.map.el.nativeElement.style.height = this.map.el.nativeElement.clientWidth + 'px'
this.chart.render();
}
ngOnChanges(changes: SimpleChanges): void {
if (this.chartData) {
@ -26,7 +32,7 @@ export class DatatableCustomindexMapComponent implements OnInit, OnChanges {
// }, 1000)
}
}
ngOnInit(): void {}
reRender() {
console.log('5454545');
@ -49,7 +55,6 @@ export class DatatableCustomindexMapComponent implements OnInit, OnChanges {
this.chart = new Chart({
container: el,
autoFit: true,
height: 680,
padding: [0, 0]
});
this.chart.tooltip({
@ -85,18 +90,6 @@ export class DatatableCustomindexMapComponent implements OnInit, OnChanges {
stroke: '#ccc',
lineWidth: 1
});
// 可视化用户数据
// this.userData = [
// { name: '山东', value: 21 },
// { name: '山东', value: 22},
// { name: '广东', value: 20, },
// { name: '广东', value: 20 },
// { name: '四川', value: 120 },
// { name: '湖南', value: 200 },
// { name: '河北', value: 30 },
// ];
let value: any = []
this.service.request(this.service.$api_getTransactionDistribution).subscribe((res: any) => {
if(res) {
@ -108,6 +101,10 @@ export class DatatableCustomindexMapComponent implements OnInit, OnChanges {
});
console.log(value);
this.userData = value
if (!(this.userData instanceof Array) || this.userData.length === 0) {
return;
}
this.userDv = this.ds.createView().source(this.userData).transform({
geoDataView: this.worldMap,
field: 'name',

6
src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.html
View File

@ -34,13 +34,13 @@
</ng-template>
<ng-template st-row="verifyStatus" let-item>
<a (click)="viewResult(item)" *ngIf="item?.verifyStatus === '2'">{{item?.verifyStatusLabel}}</a>
<span *ngIf="item?.verifyStatus === '1'">{{item?.verifyStatusLabel}}</span>
<span *ngIf="item?.verifyStatus !== '2'">{{item?.verifyStatusLabel}}</span>
</ng-template>
<ng-template st-row="orderCode" let-item>
<span class="text-blue-dark">{{item?.orderCode}}</span>
<a (click)="routeToOrder(item)">{{item?.orderCode}}</a>
</ng-template>
<ng-template st-row="wayBillCode" let-item>
<span class="text-blue-dark">{{item?.wayBillCode}}</span>
<a (click)="routeTowaybill(item)">{{item?.wayBillCode}}</a>
</ng-template>
<ng-template st-row="tolalAmount" let-item let-index="index">
<div class="text-right">{{item?.tolalAmount | currency }}</div>

23
src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.ts
View File

@ -163,9 +163,9 @@ export class DatatableFundReportingComponent implements OnInit {
title: '本地校验',
type: 'string',
enum: [
{ label: '校验中', value: 0 },
{ label: '通过', value: 1 },
{ label: '不通过', value: 2 }
{ label: '检测中', value: '0' },
{ label: '通过', value: '1' },
{ label: '不通过', value: '2' }
],
ui: {
placeholder: '请选择',
@ -465,6 +465,23 @@ export class DatatableFundReportingComponent implements OnInit {
}
}
routeToOrder(item: any) {
if (item.orderType === '1') {
window.open(location.origin + `/#/order-management/vehicle/vehicle-detail/${item.orderId}`);
} else {
window.open(location.origin + `/#/order-management/bulk/bulk-detail/${item.orderId}`);
}
}
routeTowaybill(item: any) {
if (item.orderType === '1') {
window.open(location.origin + `/#/waybill-management/vehicle/vehicle-detail/${item.wayBillId}`);
} else {
window.open(location.origin + `/#/waybill-management/bulk/bulk-detail/${item.wayBillId}`);
}
}
}

4
src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html
View File

@ -49,10 +49,10 @@
</ng-template>
<ng-template st-row="billCode" let-item>
<span class="text-red-dark">{{item?.billCode}}</span>
<a class="text-red-dark" (click)="routeToOrder(item)">{{item?.billCode}}</a>
</ng-template>
<ng-template st-row="wayBillCode" let-item>
<span class="text-red-dark">{{item?.wayBillCode}}</span>
<a class="text-red-dark" (click)="routeTowaybill(item)">{{item?.wayBillCode}}</a>
</ng-template>
<ng-template st-row="freightAmount" let-item let-index="index">

34
src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts
View File

@ -23,13 +23,13 @@ export class DatatableOrderReportingComponent implements OnInit {
@ViewChild('sf', { static: false }) sf!: SFComponent;
tabType!: string;
tabs: any[] = [
{ name: '待上传', value: '1' },
{ name: '上传中', value: '2' },
{ name: '已上传', value: '3' },
{ name: '异常', value: '4' },
{ name: '待上传', value: '0' },
{ name: '上传中', value: '3' },
{ name: '已上传', value: '1' },
{ name: '异常', value: '2' },
{ name: '全部', value: '' }
];
selectedIndex = '1';
selectedIndex = '0';
isLoading: boolean = false;
selectedRows: any[] = [];
constructor(
@ -53,7 +53,7 @@ export class DatatableOrderReportingComponent implements OnInit {
*/
get reqParams() {
const params = Object.assign({}, this.sf?.value || {}, {
putStatus: this.selectedIndex,
billPutStatus: this.selectedIndex,
});
delete params._$expand;
return { ...params };
@ -169,7 +169,7 @@ export class DatatableOrderReportingComponent implements OnInit {
title: '本地校验',
type: 'string',
enum: [
{ label: '校验中', value: 0 },
{ label: '检测中', value: 0 },
{ label: '通过', value: 1 },
{ label: '不通过', value: 2 }
],
@ -583,7 +583,7 @@ export class DatatableOrderReportingComponent implements OnInit {
filterCheckStatus(status: number) {
switch (status) {
case 0:
return '校验中';
return '检测中';
case 1:
return '通过';
case 2:
@ -594,4 +594,22 @@ export class DatatableOrderReportingComponent implements OnInit {
}
}
routeToOrder(item: any) {
if (item.billType === '1') {
window.open(location.origin + `/#/order-management/vehicle/vehicle-detail/${item.orderId}`);
} else {
window.open(location.origin + `/#/order-management/bulk/bulk-detail/${item.orderId}`);
}
}
routeTowaybill(item: any) {
if (item.billType === '1') {
window.open(location.origin + `/#/waybill-management/vehicle/vehicle-detail/${item.waybillId}`);
} else {
window.open(location.origin + `/#/waybill-management/bulk/bulk-detail/${item.waybillId}`);
}
}
}

6
src/app/routes/datatable/reporting/components/view-track/view-track.component.ts
View File

@ -50,10 +50,10 @@ export class DatatableReportingvViewTrackComponent implements OnInit {
});
});
this.mapList = list;
this.addressItems = [...res.cityArray];
this.addressItems = [...res.parkArray];
if (this.addressItems && this.addressItems.length > 0) {
this.addressItems.forEach(item => {
item.vinOutTime = this.getLocalTime(item.vinOutTime);
item.parkBte = this.getLocalTime(item.parkBte);
});
}
}
@ -78,7 +78,7 @@ export class DatatableReportingvViewTrackComponent implements OnInit {
this.addressItems = [...res.enclosureDataAppTrack];
if (this.addressItems && this.addressItems.length > 0) {
this.addressItems.forEach(item => {
item.vinOutTime = item.vinOutTime ? this.getLocalTime(item.gtm) : '';
item.parkBte = item.parkBte ? this.getLocalTime(item.parkBte) : '';
item.cityName = item.appAdress;
});
}