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 develop

Browse Source
This commit is contained in:
heqinghang
2022-03-12 15:30:13 +08:00
parent dd8f5afaa1 8940aec409
commit e330724811
4 changed files with 514 additions and 499 deletions
Download Patch File Download Diff File Expand all files Collapse all files

873
src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts
View File

File diff suppressed because it is too large Load Diff

126
src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts
View File

@ -4,7 +4,7 @@
* @Author : Shiming * @Author : Shiming
* @Date : 2021-12-23 13:39:58 * @Date : 2021-12-23 13:39:58
* @LastEditors : Shiming * @LastEditors : Shiming
* @LastEditTime : 2022-03-11 11:24:29 * @LastEditTime : 2022-03-11 17:58:28
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail-change\\vehicle-detail-change.component.ts * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail-change\\vehicle-detail-change.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved. * Copyright (C) 2022 huzhenhong. All rights reserved.
*/ */
@ -93,11 +93,11 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
} }
]; ];
trajectory = 'car'; trajectory = 'car';
mapList:any[] = []; //地图点位数据组 mapList: any[] = []; //地图点位数据组
addressItems:any[] = []; //打点地址数据组 addressItems: any[] = []; //打点地址数据组
logColumns2: STColumn[] = [ logColumns2: STColumn[] = [
{ title: '时间', index: 'vinOutTime' }, { title: '时间', index: 'vinOutTime' },
{ title: '地点', index: 'cityName' }, { title: '地点', index: 'cityName' }
]; ];
constructor( constructor(
private route: ActivatedRoute, private route: ActivatedRoute,
@ -204,14 +204,6 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
listType: 'picture-card' listType: 'picture-card'
} as SFUploadWidgetSchema } as SFUploadWidgetSchema
}, },
no4: {
type: 'string',
title: '',
ui: {
widget: 'text'
},
default: ''
},
no7: { no7: {
type: 'string', type: 'string',
title: '', title: '',
@ -405,7 +397,6 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
} }
}); });
// 对装货凭证进行初始化 // 对装货凭证进行初始化
if (res?.loadingLadingBillFilePath) {
this.formData = { this.formData = {
loadingLadingBillFilePath: [ loadingLadingBillFilePath: [
{ {
@ -425,7 +416,7 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
status: 'done', status: 'done',
url: res?.loadingPeopleVehiclesGoodsFilePath, url: res?.loadingPeopleVehiclesGoodsFilePath,
response: { response: {
url: res?.loadingPeopleVehiclesGoodsFilePath url: res?.loadingPeopleVehiclesGoodsFilePath,
} }
} }
], ],
@ -452,7 +443,6 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
} }
] ]
}; };
}
// 发车时间到车时间初始化 // 发车时间到车时间初始化
this.loadTime = res?.loadTime; this.loadTime = res?.loadTime;
this.unloadTime = res?.unloadTime; this.unloadTime = res?.unloadTime;
@ -683,7 +673,7 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
'*': { '*': {
spanLabelFixed: 110, spanLabelFixed: 110,
grid: { span: 12 } grid: { span: 12 }
}, }
}; };
} }
changeGoodsType(value: string, data: any) { changeGoodsType(value: string, data: any) {
@ -821,7 +811,7 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
file.preview = await getBase64(file.originFileObj!); file.preview = await getBase64(file.originFileObj!);
} }
console.log('888888888'); console.log('888888888');
this.previewImage1 = file.url || file.preview; this.previewImage1 = file.url || file.preview;
this.previewVisible1 = true; this.previewVisible1 = true;
}; };
@ -921,60 +911,60 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
}); });
} }
} }
// 获取车辆轨迹 // 获取车辆轨迹
getTrajectory(){ getTrajectory() {
this.service.request(this.service.$api_get_getTrajectory, { id: this.id }).subscribe(res => { this.service.request(this.service.$api_get_getTrajectory, { id: this.id }).subscribe(res => {
if (res) { if (res) {
const points = res?.trackArray; const points = res?.trackArray;
let list :any[] = []; let list: any[] = [];
points?.forEach((item: any) => { points?.forEach((item: any) => {
list.push({ list.push({
name: item.hgt, name: item.hgt,
lnglat: [Number((Number(item.lon) / 600000).toFixed(6)), Number((Number(item.lat) / 600000).toFixed(6))] lnglat: [Number((Number(item.lon) / 600000).toFixed(6)), Number((Number(item.lat) / 600000).toFixed(6))]
});
}); });
this.mapList = list; });
this.addressItems = res?.cityArray; this.mapList = list;
if(this.addressItems && this.addressItems.length > 0){ this.addressItems = res?.cityArray;
this.addressItems.forEach(item => { if (this.addressItems && this.addressItems.length > 0) {
item.vinOutTime = this.getLocalTime(item.vinOutTime); this.addressItems.forEach(item => {
}); item.vinOutTime = this.getLocalTime(item.vinOutTime);
}
}
});
}
// 获取司机轨迹
getDriverTrajectory(){
this.service.request(this.service.$api_get_getAppDriverPosition, { id: this.id }).subscribe(res => {
if (res) {
const points = res?.tracks;
let list :any[] = [];
points?.forEach((item: any) => {
list.push({
name: item.hgt,
lnglat: [Number((Number(item.lon) / 600000).toFixed(6)), Number((Number(item.lat) / 600000).toFixed(6))]
});
}); });
this.mapList = list;
this.addressItems = [...res?.enclosureDataAppTrack];
if(this.addressItems && this.addressItems.length > 0){
this.addressItems.forEach(item => {
item.vinOutTime = this.getLocalTime(item.gtm);
item.cityName = item.appAdress;
});
}
} }
});
}
trajectoryChange(event:any){
if(event ==='car'){
this.getTrajectory()
}else if(event ==='driver'){
this.getDriverTrajectory();
} }
} });
getLocalTime(time: any) { }
return format(new Date(parseInt(time)), 'yyyy-MM-dd HH:mm:ss');
// 获取司机轨迹
getDriverTrajectory() {
this.service.request(this.service.$api_get_getAppDriverPosition, { id: this.id }).subscribe(res => {
if (res) {
const points = res?.tracks;
let list: any[] = [];
points?.forEach((item: any) => {
list.push({
name: item.hgt,
lnglat: [Number((Number(item.lon) / 600000).toFixed(6)), Number((Number(item.lat) / 600000).toFixed(6))]
});
});
this.mapList = list;
this.addressItems = [...res?.enclosureDataAppTrack];
if (this.addressItems && this.addressItems.length > 0) {
this.addressItems.forEach(item => {
item.vinOutTime = this.getLocalTime(item.gtm);
item.cityName = item.appAdress;
});
}
}
});
}
trajectoryChange(event: any) {
if (event === 'car') {
this.getTrajectory();
} else if (event === 'driver') {
this.getDriverTrajectory();
} }
}
getLocalTime(time: any) {
return format(new Date(parseInt(time)), 'yyyy-MM-dd HH:mm:ss');
}
} }

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

@ -1,7 +1,7 @@
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-12-03 15:31:52 * @Date: 2021-12-03 15:31:52
* @LastEditTime : 2022-03-11 16:40:09 * @LastEditTime : 2022-03-11 17:27:42
* @LastEditors : Shiming * @LastEditors : Shiming
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @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 * @FilePath : \\tms-obc-web\\src\\app\\routes\\waybill-management\\components\\bulk-detail\\bulk-detail.component.html
@ -83,7 +83,7 @@
{{i?.driver?.name}}/{{i?.driver?.phone}} {{i?.driver?.name}}/{{i?.driver?.phone}}
</sv> </sv>
<sv label="车型车长载重"> <sv label="车型车长载重">
{{i?.carVO?.carModelLabel}},{{i?.carVO?.carLengthLabel}}米,{{i?.carVO?.carLoad ? i?.carVO?.carLoad +'吨': ''}} {{i?.car?.carModelLabel}},{{i?.car?.carLengthLabel}}米,{{i?.car?.carLoad ? i?.car?.carLoad +'吨': ''}}
</sv> </sv>
<!-- <sv label="计划装货时间"> <!-- <sv label="计划装货时间">
{{i?.loadPlanTime}} {{i?.loadPlanTime}}

10
src/app/routes/waybill-management/services/waybill-management.service.ts
View File

@ -2,7 +2,7 @@ import { WaybillManagementBulkComponent } from './../components/bulk/bulk.compon
/* /*
* @Author: your name * @Author: your name
* @Date: 2021-12-07 14:52:29 * @Date: 2021-12-07 14:52:29
* @LastEditTime : 2022-03-08 14:51:11 * @LastEditTime : 2022-03-11 17:26:20
* @LastEditors : Shiming * @LastEditors : Shiming
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath : \\tms-obc-web\\src\\app\\routes\\waybill-management\\services\\waybill-management.service.ts * @FilePath : \\tms-obc-web\\src\\app\\routes\\waybill-management\\services\\waybill-management.service.ts
@ -53,10 +53,10 @@ export class WaybillManagementServe extends BaseService {
$api_get_listOperatePage = '/api/sdc/exceptionReport/listOperateUnReplyPage'; $api_get_listOperatePage = '/api/sdc/exceptionReport/listOperateUnReplyPage';
// 查询运营端已回复异常上报 // 查询运营端已回复异常上报
$api_get_listOperateReplyPage = '/api/sdc/exceptionReport/listOperateReplyPage'; $api_get_listOperateReplyPage = '/api/sdc/exceptionReport/listOperateReplyPage';
// 获取轨迹 // 获取轨迹
$api_get_getTrajectory = `/api/sdc/billShipper/getTrajectoryByBillId`; $api_get_getTrajectory = `/api/sdc/billShipper/getTrajectoryByBillId`;
// 获取订单司机轨迹 // 获取订单司机轨迹
$api_get_getAppDriverPosition = `/api/sdc/billShipper/getAppDriverPosition`; $api_get_getAppDriverPosition = `/api/sdc/billShipper/getAppDriverPosition`;
// 获取货主企业列表 // 获取货主企业列表
public $api_enterpriceList = '/api/mdc/cuc/enterpriseInfo/operate/enterpriceList'; public $api_enterpriceList = '/api/mdc/cuc/enterpriseInfo/operate/enterpriceList';
constructor(public injector: Injector) { constructor(public injector: Injector) {