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-05-06 10:38:29 +08:00
parent d3ab4611ba 77dc933e7c
commit 2c8f8250e4
15 changed files with 26 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html
View File

@ -288,7 +288,7 @@
<div nz-col [nzSpan]="24">
<amap-path-simplifier [mapWidth]="'100%'" [mapHeight]="'600px'" [mapList]="mapList">
</amap-path-simplifier>
<st [scroll]="{ y: '350px' }" #st [data]="addressItems" [columns]="logColumns2" [ps]="0"
<st [scroll]="{ y: '350px' }" #st [data]="addressItems" [noResult]='"暂无停车信息"' [columns]="logColumns2" [ps]="0"
[page]="{ show: false, showSize: false }" size="small" class="map_st">
</st>
<nz-radio-group [(ngModel)]="trajectory" (ngModelChange)="trajectoryChange($event)" class="map_radio">

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

@ -76,8 +76,8 @@ export class OrderManagementBulkDetailChangeComponent implements OnInit {
schema: SFSchema = {};
ui: SFUISchema = {};
logColumns2: STColumn[] = [
{ title: '时间', index: 'parkBte' },
{ title: '地点', index: 'parkAdr' }
{ title: '停车时间', index: 'parkBte' },
{ title: '停车地点', index: 'parkAdr' }
];
logColumns: STColumn[] = [
{ title: '款项', index: 'expenseCodeLabel' },

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

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2021-12-06 20:20:26
* @LastEditors : Shiming
* @LastEditTime : 2022-04-21 15:33:15
* @LastEditTime : 2022-05-06 10:02:52
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail\\bulk-detail.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
@ -287,7 +287,7 @@
<div nz-col [nzSpan]="24">
<amap-path-simplifier [mapWidth]="'100%'" [mapHeight]="'600px'" [mapList]="mapList" [pois]="pois">
</amap-path-simplifier>
<st [scroll]="{ y: '350px' }" #st [data]="addressItems" [columns]="logColumns2" [ps]="0"
<st [scroll]="{ y: '350px' }" [noResult]='"暂无停车信息"' #st [data]="addressItems" [columns]="logColumns2" [ps]="0"
[page]="{ show: false, showSize: false }" size="small" class="map_st">
</st>
<nz-radio-group [(ngModel)]="trajectory" (ngModelChange)="trajectoryChange($event)" class="map_radio">

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

@ -40,8 +40,8 @@ export class OrderManagementBulkeDetailComponent implements OnInit {
modalTitle: string = '';
isVisible = false;
logColumns2: STColumn[] = [
{ title: '时间', index: 'parkBte' },
{ title: '地点', index: 'parkAdr' }
{ title: '停车时间', index: 'parkBte' },
{ title: '停车地点', index: 'parkAdr' }
];
logColumns3: STColumn[] = [
{ title: '时间', index: 'warningTime' },

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

@ -322,7 +322,7 @@
<div nz-col [nzSpan]="24">
<amap-path-simplifier [mapWidth]="'100%'" [mapHeight]="'600px'" [mapList]="mapList">
</amap-path-simplifier>
<st [scroll]="{ y: '350px' }" #st [data]="addressItems" [columns]="logColumns2" [ps]="0"
<st [scroll]="{ y: '350px' }" #st [data]="addressItems" [noResult]='"暂无停车信息"' [columns]="logColumns2" [ps]="0"
[page]="{ show: false, showSize: false }" size="small" class="map_st">
</st>
<nz-radio-group [(ngModel)]="trajectory" (ngModelChange)="trajectoryChange($event)" class="map_radio">

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

@ -90,8 +90,8 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
mapList: any[] = []; //地图点位数据组
addressItems: any[] = []; //打点地址数据组
logColumns2: STColumn[] = [
{ title: '时间', index: 'parkBte' },
{ title: '地点', index: 'parkAdr' }
{ title: '停车时间', index: 'parkBte' },
{ title: '停车地点', index: 'parkAdr' }
];
constructor(
private route: ActivatedRoute,

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

@ -290,7 +290,7 @@
<div nz-col [nzSpan]="24">
<amap-path-simplifier [mapWidth]="'100%'" [mapHeight]="'600px'" [mapList]="mapList" [pois]="pois">
</amap-path-simplifier>
<st [scroll]="{ y: '350px' }" #st [data]="addressItems" [columns]="logColumns2" [ps]="0"
<st [scroll]="{ y: '350px' }" #st [data]="addressItems" [columns]="logColumns2" [noResult]='"暂无停车信息"' [ps]="0"
[page]="{ show: false, showSize: false }" size="small" class="map_st">
</st>
<nz-radio-group [(ngModel)]="trajectory" (ngModelChange)="trajectoryChange($event)" class="map_radio">

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

@ -46,8 +46,8 @@ export class OrderManagementVehicleDetailComponent implements OnInit {
approvalLsit: any;
isVisible = false;
logColumns2: STColumn[] = [
{ title: '时间', index: 'parkBte', width: 120, className: 'text-center' },
{ title: '地点', index: 'parkAdr' }
{ title: '停车时间', index: 'parkBte', width: 120, className: 'text-center' },
{ title: '停车地点', index: 'parkAdr' }
];
logColumns3: STColumn[] = [
{ title: '时间', index: 'warningTime' },

2
src/app/routes/order-management/modal/vehicle/view-track/view-track.component.html
View File

@ -12,7 +12,7 @@
<div nz-col [nzSpan]="24">
<amap-path-simplifier [mapWidth]="'100%'" [mapHeight]="'600px'" [mapList]="mapList" [pois]="pois">
</amap-path-simplifier>
<st [scroll]="{ y: '350px' }" #st [data]="addressItems" [columns]="logColumns2" [ps]="0"
<st [scroll]="{ y: '350px' }" #st [data]="addressItems" [noResult]='"暂无停车信息"' [columns]="logColumns2" [ps]="0"
[page]="{ show: false, showSize: false }" size="small" class="map_st">
</st>
<nz-radio-group [(ngModel)]="trajectory" (ngModelChange)="trajectoryChange($event)" class="map_radio">

4
src/app/routes/order-management/modal/vehicle/view-track/view-track.component.ts
View File

@ -28,8 +28,8 @@ export class OneCarOrderViewtrackComponent implements OnInit {
mapList: any[] = []; //地图点位数据组
addressItems: any[] = []; //打点地址数据组
logColumns2: STColumn[] = [
{ title: '时间', index: 'parkBte', width: 120, className: 'text-center' },
{ title: '地点', index: 'parkAdr',width: 120,className: 'text-center' }
{ title: '停车时间', index: 'parkBte', width: 120, className: 'text-center' },
{ title: '停车地点', index: 'parkAdr',width: 120,className: 'text-center' }
];
pois: any[] = [];

8
src/app/routes/vehicle/components/audit/detail/detail.component.html
View File

@ -7,7 +7,7 @@
</ng-template>
<ng-template #content>
<sv-container col="3" class="new-sv-container">
<h2>车牌号66：{{ detailData?.carNo }}
<h2>车牌号：{{ detailData?.carNo }}
</h2>
<sv-title style="font-weight: 700">
<!-- <span *ngIf="detailData?.approvalStatus === 1 || detailData?.approvalStatus === '1'">未上传</span>
@ -47,11 +47,7 @@
<div class="mb-xs common-order-header" nz-row>
<div style="display: flex;">
<button nz-button nzType="primary" nzSize="small" nzDanger>{{ carStatus[detailData?.approvalStatus] }}</button>
<div style="display: flex;align-items: center; ">
<b class="ml-md" style="font-size: 18px;padding-right: 10px;">车牌号: {{ detailData?.carNo }}</b>
<div *ngIf="detailData.networkStatus"> <span style="height: 5px; width: 5px; border-radius: 50%; background-color: green;display: inline-block;"></span> 已入网</div>
<div *ngIf="!detailData.networkStatus"><span style="height: 5px; width: 5px; border-radius: 50%; background-color: red;display: inline-block;"></span>未入网</div>
</div>
<b class="ml-md" style="font-size: 18px;padding-right: 10px;">车牌号: {{ detailData?.carNo }}</b>
</div>
<div>
<ng-container *ngIf="!isEdit">

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

@ -274,7 +274,7 @@
<div nz-col [nzSpan]="24">
<amap-path-simplifier [mapWidth]="'100%'" [mapHeight]="'600px'" [mapList]="mapList">
</amap-path-simplifier>
<st [scroll]="{ y: '350px' }" #st [data]="addressItems" [columns]="logColumns2" [ps]="0"
<st [scroll]="{ y: '350px' }" #st [data]="addressItems" [noResult]='"暂无停车信息"' [columns]="logColumns2" [ps]="0"
[page]="{ show: false, showSize: false }" size="small" class="map_st">
</st>
<nz-radio-group [(ngModel)]="trajectory" (ngModelChange)="trajectoryChange($event)" class="map_radio">

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

@ -38,8 +38,8 @@ export class WaybillManagementBulkeDetailComponent implements OnInit {
modalTitle: string = '';
unLoadingPlaceVOList: any = [];
logColumns2: STColumn[] = [
{ title: '时间', index: 'parkBte' },
{ title: '地点', index: 'parkAdr' }
{ title: '停车时间', index: 'parkBte' },
{ title: '停车地点', index: 'parkAdr' }
];
logColumns: STColumn[] = [
{ title: '款项', index: 'costCodeLabel' },

4
src/app/routes/waybill-management/components/vehicle-detail/vehicle-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:30
* @LastEditTime : 2022-05-06 10:04:19
* @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\\vehicle-detail\\vehicle-detail.component.html
@ -272,7 +272,7 @@
<div nz-col [nzSpan]="24">
<amap-path-simplifier [mapWidth]="'100%'" [mapHeight]="'600px'" [mapList]="mapList">
</amap-path-simplifier>
<st [scroll]="{ y: '350px' }" #st [data]="addressItems" [columns]="logColumns2" [ps]="0"
<st [scroll]="{ y: '350px' }" #st [data]="addressItems" [noResult]='"暂无停车信息"' [columns]="logColumns2" [ps]="0"
[page]="{ show: false, showSize: false }" size="small" class="map_st">
</st>
<nz-radio-group [(ngModel)]="trajectory" (ngModelChange)="trajectoryChange($event)" class="map_radio">

6
src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.ts
View File

@ -1,7 +1,7 @@
/*
* @Author: your name
* @Date: 2021-12-03 15:31:52
* @LastEditTime : 2022-04-01 11:11:14
* @LastEditTime : 2022-05-06 09:55:19
* @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\\vehicle-detail\\vehicle-detail.component.ts
@ -36,8 +36,8 @@ export class WaybillManagementVehicleDetailComponent implements OnInit, OnDestro
imges: any;
unLoadingPlaceVOList: any = [];
logColumns2: STColumn[] = [
{ title: '时间', index: 'parkBte' },
{ title: '地点', index: 'parkAdr' }
{ title: '停车时间', index: 'parkBte' },
{ title: '停车地点', index: 'parkAdr' }
];
modalcontent: any;
modalTitle: string = '';