From 7db20e1c5396fe020cebabec26aa6dd8b90550e9 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 22 Apr 2022 16:28:25 +0800 Subject: [PATCH] fix bug --- .../vehicle-detail.component.html | 2 +- .../view-track/view-track.component.html | 6 +- .../view-track/view-track.component.less | 92 ++----------------- .../view-track/view-track.component.ts | 20 ++-- 4 files changed, 19 insertions(+), 101 deletions(-) diff --git a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html index 77591f60..1da90e5c 100644 --- a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html +++ b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-28 14:42:03 * @LastEditors : Shiming - * @LastEditTime : 2022-04-21 17:03:50 + * @LastEditTime : 2022-04-22 16:27:43 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail\\vehicle-detail.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> diff --git a/src/app/routes/order-management/modal/vehicle/view-track/view-track.component.html b/src/app/routes/order-management/modal/vehicle/view-track/view-track.component.html index 97426178..b37da5ec 100644 --- a/src/app/routes/order-management/modal/vehicle/view-track/view-track.component.html +++ b/src/app/routes/order-management/modal/vehicle/view-track/view-track.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-02-22 13:53:29 * @LastEditors : Shiming - * @LastEditTime : 2022-03-08 15:01:14 + * @LastEditTime : 2022-04-22 16:27:40 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\view-track\\view-track.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -13,8 +13,8 @@ - + [page]="{ show: false, showSize: false }" size="small" class="map_st"> + diff --git a/src/app/routes/order-management/modal/vehicle/view-track/view-track.component.less b/src/app/routes/order-management/modal/vehicle/view-track/view-track.component.less index 64f5143e..529639f7 100644 --- a/src/app/routes/order-management/modal/vehicle/view-track/view-track.component.less +++ b/src/app/routes/order-management/modal/vehicle/view-track/view-track.component.less @@ -1,84 +1,10 @@ +/* stylelint-disable order/properties-order */ :host { - .btn-size { - font-size: 14px; - } - - .bdr { - border-right: 1px solid #ccc; - } - - .bdl { - border-left: 1px solid #ccc; - } - - .source-info { - p { - margin-bottom: .5em; - } - } - - .freight-info-box { - width: 95%; - } - - .freigth-label { - display : inline-block; - width : 50px; - text-align: right; - } - - ::ng-deep { - .approval-status { - .ant-steps { - width : 70%; - margin: 0 auto; - } - } - - } - - .leftPadding { - padding-right: 100px; - } - .hide{ - display: none; - } - .handling-info { - min-height: 100px; - border: 1px solid #ccc; - - .loading-row { - display: flex; - } - - .handling-info-icon { - width: 32px; - height: 32px; - margin-right: 24px; - color: #fff; - line-height: 32px; - text-align: center; - border-radius: 50%; - - &.loading-bg { - background-color: #50D4AB; - } - - &.unloaing-bg { - background: #F66F6A; - } - } - - .info { - flex: 1; - } - - .time-info { - margin-left: 56px; - } - } - .target-fix { - display: block; - margin-top: 290px; - } -} \ No newline at end of file + .map_st2 { + position: absolute; + top: 20px; + right: 49px; + height: 350px; + width: 360px; + } +} diff --git a/src/app/routes/order-management/modal/vehicle/view-track/view-track.component.ts b/src/app/routes/order-management/modal/vehicle/view-track/view-track.component.ts index b0864915..30bd5b74 100644 --- a/src/app/routes/order-management/modal/vehicle/view-track/view-track.component.ts +++ b/src/app/routes/order-management/modal/vehicle/view-track/view-track.component.ts @@ -4,27 +4,17 @@ * @Author : Shiming * @Date : 2022-02-22 13:53:29 * @LastEditors : Shiming - * @LastEditTime : 2022-04-22 15:49:04 + * @LastEditTime : 2022-04-22 16:24:06 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\view-track\\view-track.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ -import { Component, OnInit, ViewChild } from '@angular/core'; -import { STColumn } from '@delon/abc/st'; -import { - SFComponent, - SFCustomWidgetSchema, - SFNumberWidgetSchema, - SFRadioWidgetSchema, - SFSchema, - SFTextareaWidgetSchema, - SFUISchema -} from '@delon/form'; +import { Component, OnInit } from '@angular/core'; +import { STColumn, STComponent } from '@delon/abc/st'; import format from 'date-fns/format'; import { _HttpClient } from '@delon/theme'; import { NzMessageService } from 'ng-zorro-antd/message'; import { NzModalRef, NzModalService } from 'ng-zorro-antd/modal'; import { OrderManagementService } from '../../../services/order-management.service'; -import { ThisReceiver } from '@angular/compiler'; @Component({ selector: 'app-order-management-view-track', @@ -39,7 +29,7 @@ export class OneCarOrderViewtrackComponent implements OnInit { addressItems: any[] = []; //打点地址数据组 logColumns2: STColumn[] = [ { title: '时间', index: 'parkBte', width: 120, className: 'text-center' }, - { title: '地点', index: 'parkAdr' } + { title: '地点', index: 'parkAdr',width: 120,className: 'text-center' } ]; pois: any[] = []; @@ -102,6 +92,8 @@ export class OneCarOrderViewtrackComponent implements OnInit { } else { this.addressItems = []; } + console.log(this.addressItems); + } }); }