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:
Taric Xin
2022-03-04 11:03:34 +08:00
parent 2a3a59737c 3b884de222
commit a1a73bebfa
3 changed files with 27 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.html
View File

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2021-12-23 13:39:58
* @LastEditors : Shiming
* @LastEditTime : 2022-03-01 13:41:57
* @LastEditTime : 2022-03-04 10:42:33
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail-change\\vehicle-detail-change.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
@ -81,9 +81,6 @@
readonly="true"
/>
</nz-input-group>
<!-- <span style="padding: 0 10px"
><i nz-icon nzType="menu" nzTheme="outline" style="color: #1890ff" (click)="chooseAddress(idx, 'start')"></i
></span> -->
</div>
</nz-form-control>
</nz-form-item>

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

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2021-12-23 13:39:58
* @LastEditors : Shiming
* @LastEditTime : 2022-02-28 11:53:31
* @LastEditTime : 2022-03-04 10:45:54
* @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.
*/
@ -14,7 +14,7 @@ import { ActivatedRoute, Router } from '@angular/router';
import { apiConf } from '@conf/api.conf';
import { STColumn, STComponent } from '@delon/abc/st';
import { SFComponent, SFSchema, SFSelectWidgetSchema, SFUISchema, SFUploadWidgetSchema } from '@delon/form';
import { AmapPoiPickerComponent, AmapService, EAEnvironmentService, ShipperBaseService } from '@shared';
import { AmapPoiPickerComponent, AmapService, EACacheService, EAEnvironmentService, ShipperBaseService } from '@shared';
import { NzCardComponent } from 'ng-zorro-antd/card';
import { NzMessageService } from 'ng-zorro-antd/message';
import { NzModalService } from 'ng-zorro-antd/modal';
@ -443,6 +443,13 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
this.loadTime = res.loadTime;
this.unloadTime = res.unloadTime;
this.dirvingMessage = res.billExpenseDetails;
// 计算里程，时间
if (this.startInfo?.[0]?.area && this.endInfo?.[0]?.area) {
this.amapService.drivingCompute([...this.startInfo], [...this.endInfo]).subscribe(res => {
this.totalDistance = res.distance;
this.totalTime = res.time;
});
}
}
});
}
@ -554,31 +561,34 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
// -------------------装卸货信息处理
// 打开地图
openMap(type: string, index: number) {
console.log(type);
console.log(index);
const modalRef = this.modalService.create({
nzTitle: '',
nzContent: AmapPoiPickerComponent,
nzWidth: 900,
nzOnOk: item => {
const poi = item.poi;
const locList = poi.location.toString().split(',');
const locList = poi.pois;
switch (type) {
case 'start':
this.startInfo[index].detailedAddress = poi.district + poi.name;
this.startInfo[index].detailedAddress = poi.formattedAddress;
this.startInfo[index].longitude = locList[0];
this.startInfo[index].latitude = locList[1];
this.startInfo[index].province = poi.cityInfo.province;
this.startInfo[index].city = poi.cityInfo.city;
this.startInfo[index].area = poi.cityInfo.district;
this.startInfo[index].address = poi.name;
this.startInfo[index].province = poi.addressComponent.province;
this.startInfo[index].city = poi.addressComponent.city;
this.startInfo[index].area = poi.addressComponent.district;
this.startInfo[index].address = poi.formattedAddress;
break;
case 'end':
this.endInfo[index].detailedAddress = poi.district + poi.name;
this.endInfo[index].detailedAddress = poi.formattedAddress;
this.endInfo[index].longitude = locList[0];
this.endInfo[index].latitude = locList[1];
this.endInfo[index].province = poi.cityInfo.province;
this.endInfo[index].city = poi.cityInfo.city;
this.endInfo[index].area = poi.cityInfo.district;
this.endInfo[index].address = poi.name;
this.endInfo[index].province = poi.addressComponent.province;
this.endInfo[index].city = poi.addressComponent.city;
this.endInfo[index].area = poi.addressComponent.district;
this.endInfo[index].address = poi.formattedAddress;
break;
default:
break;
@ -593,7 +603,6 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
}
});
}
initSF3() {
this.schema3 = {
properties: {
@ -874,4 +883,5 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
}
console.log(elf);
}
}

2
src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts
View File

@ -1050,6 +1050,8 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
}
// 打开地图
openMap(type: string, index: number) {
console.log(type);
console.log(index);
const modalRef = this.modalService.create({
nzTitle: '',
nzContent: AmapPoiPickerComponent,