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 15:21:48 +08:00
parent 5527688b10 3055e1824a
commit 9f499e7536
11 changed files with 82 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2021-12-24 16:58:02
* @LastEditors : Shiming
* @LastEditTime : 2022-04-21 15:33:31
* @LastEditTime : 2022-05-06 14:37:36
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail-change\\bulk-detail-change.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
@ -288,8 +288,14 @@
<div nz-col [nzSpan]="24">
<amap-path-simplifier [mapWidth]="'100%'" [mapHeight]="'600px'" [mapList]="mapList">
</amap-path-simplifier>
<st [scroll]="{ y: '350px' }" #st [data]="addressItems" [noResult]='"暂无停车信息"' [columns]="logColumns2" [ps]="0"
<st [scroll]="{ y: '350px' }" #st [data]="addressItems" [noResult]='fuck' [columns]="logColumns2" [ps]="0"
[page]="{ show: false, showSize: false }" size="small" class="map_st">
<ng-template #fuck>
<div>
<img class="mr-sm" [src]="'../../../../../assets/none.svg'" width="40" height="40" />
</div>
暂无停车信息
</ng-template>
</st>
<nz-radio-group [(ngModel)]="trajectory" (ngModelChange)="trajectoryChange($event)" class="map_radio">
<label nz-radio-button nzValue="car">车辆轨迹</label>

10
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-05-06 10:02:52
* @LastEditTime : 2022-05-06 14:36:18
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail\\bulk-detail.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
@ -287,8 +287,14 @@
<div nz-col [nzSpan]="24">
<amap-path-simplifier [mapWidth]="'100%'" [mapHeight]="'600px'" [mapList]="mapList" [pois]="pois">
</amap-path-simplifier>
<st [scroll]="{ y: '350px' }" [noResult]='"暂无停车信息"' #st [data]="addressItems" [columns]="logColumns2" [ps]="0"
<st [scroll]="{ y: '350px' }" [noResult]='fuck' #st [data]="addressItems" [columns]="logColumns2" [ps]="0"
[page]="{ show: false, showSize: false }" size="small" class="map_st">
<ng-template #fuck>
<div>
<img class="mr-sm" [src]="'../../../../../assets/none.svg'" width="40" height="40" />
</div>
暂无停车信息
</ng-template>
</st>
<nz-radio-group [(ngModel)]="trajectory" (ngModelChange)="trajectoryChange($event)" class="map_radio">
<label nz-radio-button nzValue="car">车辆轨迹</label>

10
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-04-21 15:33:42
* @LastEditTime : 2022-05-06 14:38:38
* @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.
-->
@ -322,8 +322,14 @@
<div nz-col [nzSpan]="24">
<amap-path-simplifier [mapWidth]="'100%'" [mapHeight]="'600px'" [mapList]="mapList">
</amap-path-simplifier>
<st [scroll]="{ y: '350px' }" #st [data]="addressItems" [noResult]='"暂无停车信息"' [columns]="logColumns2" [ps]="0"
<st [scroll]="{ y: '350px' }" #st [data]="addressItems" [noResult]='fuck' [columns]="logColumns2" [ps]="0"
[page]="{ show: false, showSize: false }" size="small" class="map_st">
<ng-template #fuck>
<div>
<img class="mr-sm" [src]="'../../../../../assets/none.svg'" width="40" height="40" />
</div>
暂无停车信息
</ng-template>
</st>
<nz-radio-group [(ngModel)]="trajectory" (ngModelChange)="trajectoryChange($event)" class="map_radio">
<label nz-radio-button nzValue="car">车辆轨迹</label>

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

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2021-12-28 14:42:03
* @LastEditors : Shiming
* @LastEditTime : 2022-04-22 16:27:43
* @LastEditTime : 2022-05-06 14:37:17
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail\\vehicle-detail.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
@ -290,8 +290,14 @@
<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" [noResult]='"暂无停车信息"' [ps]="0"
<st [scroll]="{ y: '350px' }" #st [data]="addressItems" [columns]="logColumns2" [noResult]='fuck' [ps]="0"
[page]="{ show: false, showSize: false }" size="small" class="map_st">
<ng-template #fuck>
<div>
<img class="mr-sm" [src]="'../../../../../assets/none.svg'" width="40" height="40" />
</div>
暂无停车信息
</ng-template>
</st>
<nz-radio-group [(ngModel)]="trajectory" (ngModelChange)="trajectoryChange($event)" class="map_radio">
<label nz-radio-button nzValue="car">车辆轨迹</label>

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

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2022-02-22 13:53:29
* @LastEditors : Shiming
* @LastEditTime : 2022-04-22 16:27:40
* @LastEditTime : 2022-05-06 14:38:09
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\view-track\\view-track.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
@ -12,8 +12,14 @@
<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" [noResult]='"暂无停车信息"' [columns]="logColumns2" [ps]="0"
<st [scroll]="{ y: '350px' }" #st [data]="addressItems" [noResult]='fuck' [columns]="logColumns2" [ps]="0"
[page]="{ show: false, showSize: false }" size="small" class="map_st">
<ng-template #fuck>
<div>
<img class="mr-sm" [src]="'../../../../../assets/none.svg'" width="40" height="40" />
</div>
暂无停车信息
</ng-template>
</st>
<nz-radio-group [(ngModel)]="trajectory" (ngModelChange)="trajectoryChange($event)" class="map_radio">
<label nz-radio-button nzValue="car">车辆轨迹</label>

22
src/app/routes/partner/account-management/components/list/list.component.html
View File

@ -1,3 +1,13 @@
<!--
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2022-04-29 17:28:23
* @LastEditors : Shiming
* @LastEditTime : 2022-05-06 14:47:43
* @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\account-management\\components\\list\\list.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<page-header-wrapper [title]="''"></page-header-wrapper>
<nz-card>
<!-- <div nz-row>
@ -19,15 +29,17 @@
[page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
[loading]="service.http.loading" multiSort>
<ng-template st-row="allBalance" let-item>
<div class="text-right">{{item.allBalance | currency:' '}}</div>
<div class="text-right">{{item.allBalance | currency}}</div>
</ng-template>
<ng-template st-row="unEntryAmount" let-item>
<a class="text-right text-blue-dark"
[routerLink]="'/partner/account-management/am/recorded/detail/'+item?.roleId">{{item.unEntryAmount | currency:'
'}} acl [acl-ability]="['AM-LIST-unEntryAmount']"</a>
<a class="text-right text-blue-dark" acl [acl-ability]="['AM-LIST-unEntryAmount']"
[routerLink]="'/partner/account-management/am/recorded/detail/'+item?.roleId">{{item.unEntryAmount | currency}} </a>
</ng-template>
<ng-template st-row="availableBalance" let-item>
<div class="text-right">{{item.availableBalance | currency:' '}}</div>
<div class="text-right">{{item.availableBalance | currency}}</div>
</ng-template>
<ng-template st-row="allBalance" let-item>
<div class="text-right">{{item.allBalance | currency}}</div>
</ng-template>

11
src/app/routes/partner/account-management/components/list/list.component.ts
View File

@ -62,13 +62,14 @@ export class PartnerAccountManagementListComponent implements OnInit {
{ title: '合伙人名称', index: 'name', className: 'text-center', width: 250 },
{ title: '手机号', index: 'phone', className: 'text-center', width: 200 },
{
title: '账户总额（元）', index: 'allBalance', className: 'text-right', sort: true, width: 150, type: 'currency',
title: '账户总额（元）', render: 'allBalance', className: 'text-right', width: 150,
},
// sort: true,
{
title: '待入账余额（元）', render: 'unEntryAmount', className: 'text-right', width: 200,
},
{
title: '待入账余额（元）', render: 'unEntryAmount', className: 'text-right', width: 150,
},
{
title: '可用余额（元）', index: 'availableBalance', className: 'text-right', sort: true, width: 150, type: 'currency'
title: '可用余额（元）', index: 'availableBalance', className: 'text-right', width: 150, type: 'currency'
},
{ title: '虚拟账户', index: 'virtualAccount', className: 'text-center', width: 220 },
{

4
src/app/routes/usercenter/components/freight/freight-config/freight-config.component.ts
View File

@ -257,7 +257,7 @@ export class FreightConfigComponent extends BasicTableComponent implements OnIni
format: item => `${item.contractSurchargeRatio}%`
},
{
title: '合同单业务量（万元）',
title: '合同单业务量（元）',
index: 'contractQuota',
width: 170,
type: 'widget',
@ -265,7 +265,7 @@ export class FreightConfigComponent extends BasicTableComponent implements OnIni
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.contractQuota }) }
},
{
title: '货源单业务量（万元）',
title: '货源单业务量（元）',
index: 'goodsQuota',
width: 170,
type: 'widget',

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

@ -274,8 +274,14 @@
<div nz-col [nzSpan]="24">
<amap-path-simplifier [mapWidth]="'100%'" [mapHeight]="'600px'" [mapList]="mapList">
</amap-path-simplifier>
<st [scroll]="{ y: '350px' }" #st [data]="addressItems" [noResult]='"暂无停车信息"' [columns]="logColumns2" [ps]="0"
<st [scroll]="{ y: '350px' }" #st [data]="addressItems" [noResult]='fuck' [columns]="logColumns2" [ps]="0"
[page]="{ show: false, showSize: false }" size="small" class="map_st">
<ng-template #fuck>
<div>
<img class="mr-sm" [src]="'../../../../../assets/none.svg'" width="40" height="40" />
</div>
暂无停车信息
</ng-template>
</st>
<nz-radio-group [(ngModel)]="trajectory" (ngModelChange)="trajectoryChange($event)" class="map_radio">
<label nz-radio-button nzValue="car">车辆轨迹</label>

10
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-05-06 10:04:19
* @LastEditTime : 2022-05-06 14:38:33
* @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,8 +272,14 @@
<div nz-col [nzSpan]="24">
<amap-path-simplifier [mapWidth]="'100%'" [mapHeight]="'600px'" [mapList]="mapList">
</amap-path-simplifier>
<st [scroll]="{ y: '350px' }" #st [data]="addressItems" [noResult]='"暂无停车信息"' [columns]="logColumns2" [ps]="0"
<st [scroll]="{ y: '350px' }" #st [data]="addressItems" [noResult]='fuck' [columns]="logColumns2" [ps]="0"
[page]="{ show: false, showSize: false }" size="small" class="map_st">
<ng-template #fuck>
<div>
<img class="mr-sm" [src]="'../../../../../assets/none.svg'" width="40" height="40" />
</div>
暂无停车信息
</ng-template>
</st>
<nz-radio-group [(ngModel)]="trajectory" (ngModelChange)="trajectoryChange($event)" class="map_radio">
<label nz-radio-button nzValue="car">车辆轨迹</label>

2
src/assets/none.svg Normal file
View File

@ -0,0 +1,2 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1651818563831" class="icon" viewBox="0 0 1837 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6717" xmlns:xlink="http://www.w3.org/1999/xlink" width="358.7890625" height="200"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
</style></defs><path d="M920.928443 169.843587m52.840157 0l573.693128 0q52.840157 0 52.840157 52.840156l0 0q0 52.840157-52.840157 52.840157l-573.693128 0q-52.840157 0-52.840157-52.840157l0 0q0-52.840157 52.840157-52.840156Z" fill="#FFFFFF" opacity=".5" p-id="6718"></path><path d="M1335.191496 381.204213h-195.331187A52.900545 52.900545 0 0 0 1192.67782 328.364057a52.896771 52.896771 0 0 0-52.840157-52.840157h195.361382A53.08926 53.08926 0 0 0 1283.260945 328.364057a53.081712 53.081712 0 0 0 51.926777 52.840156z" fill="#FFFFFF" opacity=".5" p-id="6719"></path><path d="M1068.126022 381.204213m52.840157 0l573.693128 0q52.840157 0 52.840157 52.840157l0 0q0 52.840157-52.840157 52.840156l-573.693128 0q-52.840157 0-52.840157-52.840156l0 0q0-52.840157 52.840157-52.840157Z" fill="#FFFFFF" opacity=".5" p-id="6720"></path><path d="M0 569.919058m52.840157 0l573.693128 0q52.840157 0 52.840157 52.840157l0 0q0 52.840157-52.840157 52.840156l-573.693128 0q-52.840157 0-52.840157-52.840156l0 0q0-52.840157 52.840157-52.840157Z" fill="#FFFFFF" opacity=".5" p-id="6721"></path><path d="M429.360241 781.279684h-195.331188A52.900545 52.900545 0 0 0 286.846564 728.439528a52.896771 52.896771 0 0 0-52.840156-52.840157h195.361381A53.08926 53.08926 0 0 0 377.42969 728.439528a53.081712 53.081712 0 0 0 51.926777 52.840156z" fill="#FFFFFF" opacity=".5" p-id="6722"></path><path d="M162.294767 781.279684m52.840156 0l573.693129 0q52.840157 0 52.840156 52.840157l0 0q0 52.840157-52.840156 52.840157l-573.693129 0q-52.840157 0-52.840156-52.840157l0 0q0-52.840157 52.840156-52.840157Z" fill="#FFFFFF" opacity=".5" p-id="6723"></path><path d="M662.370234 451.474073h427.329669v48.28458H662.370234z m0 212.458946h261.558775v48.284581h-261.558775z" fill="#DFDFDF" p-id="6724"></path><path d="M1183.861062 973.768826H567.408924a97.844873 97.844873 0 0 1-37.018304-7.242876 84.766934 84.766934 0 0 1-29.775428-20.120776 92.745798 92.745798 0 0 1-20.120777-29.775429 97.844873 97.844873 0 0 1-7.242876-37.014529V238.211201a97.844873 97.844873 0 0 1 7.242876-37.018304 84.766934 84.766934 0 0 1 20.120777-29.775428 92.742023 92.742023 0 0 1 29.775428-20.120777 97.844873 97.844873 0 0 1 37.018304-7.242876h93.35346v47.480655h-93.35346a47.556141 47.556141 0 0 0-47.480655 47.480655v641.400241a47.556141 47.556141 0 0 0 47.480655 47.480655h615.648213a47.556141 47.556141 0 0 0 47.480655-47.480655V238.211201a47.556141 47.556141 0 0 0-47.480655-47.480655H1090.507603v-47.480655h93.353459a97.844873 97.844873 0 0 1 37.018304 7.242876 84.766934 84.766934 0 0 1 29.775428 20.120776 92.742023 92.742023 0 0 1 20.120777 29.775429 97.844873 97.844873 0 0 1 7.242876 37.018304V878.807516a97.844873 97.844873 0 0 1-7.242876 37.018304 84.76316 84.76316 0 0 1-20.120777 29.775428 92.742023 92.742023 0 0 1-29.775428 20.120777 85.348176 85.348176 0 0 1-37.018304 8.046801z" fill="#DFDFDF" p-id="6725"></path><path d="M666.529509 117.807356V259.671853h413.979981V104.548251l-102.041891-9.956596s-35.67088-76.323832-104.548024-73.006225-102.876011 72.991128-102.87601 72.991128z" fill="#FFFFFF" p-id="6726"></path><path d="M1112.23623 285.691856H639.033756V131.175915a59.418756 59.418756 0 0 1 59.554631-59.554631h61.14361a130.869971 130.869971 0 0 1 233.383649 0h61.143609a59.418756 59.418756 0 0 1 59.581051 59.554631z m-425.74069-47.480655H1065.5595V131.175915a12.37592 12.37592 0 0 0-12.07775-12.07775h-94.149836l-5.635025-16.093602a82.634456 82.634456 0 0 0-156.123791 0l-5.635026 16.093602h-94.157384a12.37592 12.37592 0 0 0-12.07775 12.07775v107.035286z" fill="#DFDFDF" p-id="6727"></path></svg>
Side by Side

After

Width:  |  Height:  |  Size: 4.1 KiB