fix bug
This commit is contained in:
@ -149,7 +149,7 @@
|
|||||||
<div>
|
<div>
|
||||||
总计:<span style="color: #da001b; font-size: 18px">{{ i?.totalAmount | currency }}</span>
|
总计:<span style="color: #da001b; font-size: 18px">{{ i?.totalAmount | currency }}</span>
|
||||||
(运费{{i?.totalFreight | currency}},
|
(运费{{i?.totalFreight | currency}},
|
||||||
附加费{{ i?.totalSurcharge | currency }},附加费率{{i?.totalRate }}%)
|
附加费{{ i?.totalSurcharge | currency }},附加费率{{i?.totalRate * 100 }}%)
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div>收款人:{{ i?.payeeName }}/{{ i?.payeePhone }}</div>
|
<div>收款人:{{ i?.payeeName }}/{{ i?.payeePhone }}</div>
|
||||||
|
|||||||
@ -4,7 +4,7 @@
|
|||||||
* @Author : Shiming
|
* @Author : Shiming
|
||||||
* @Date : 2021-12-28 14:42:03
|
* @Date : 2021-12-28 14:42:03
|
||||||
* @LastEditors : Shiming
|
* @LastEditors : Shiming
|
||||||
* @LastEditTime : 2022-02-10 14:45:46
|
* @LastEditTime : 2022-02-11 13:55:32
|
||||||
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail\\vehicle-detail.component.html
|
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail\\vehicle-detail.component.html
|
||||||
* Copyright (C) 2022 huzhenhong. All rights reserved.
|
* Copyright (C) 2022 huzhenhong. All rights reserved.
|
||||||
-->
|
-->
|
||||||
@ -139,7 +139,7 @@
|
|||||||
<div>
|
<div>
|
||||||
总计:<span style="color: #da001b; font-size: 18px">{{ i?.totalAmount | currency }}</span>
|
总计:<span style="color: #da001b; font-size: 18px">{{ i?.totalAmount | currency }}</span>
|
||||||
(运费{{i?.totalFreight | currency}},
|
(运费{{i?.totalFreight | currency}},
|
||||||
附加费{{ i?.totalSurcharge | currency }},附加费率{{i?.totalRate }}%)
|
附加费{{ i?.totalSurcharge | currency }},附加费率{{i?.totalRate * 100 }}%)
|
||||||
</div>
|
</div>
|
||||||
<div>收款人:{{ i?.payeeName }}/{{ i?.payeePhone }}</div>
|
<div>收款人:{{ i?.payeeName }}/{{ i?.payeePhone }}</div>
|
||||||
</nz-card>
|
</nz-card>
|
||||||
|
|||||||
@ -64,7 +64,7 @@
|
|||||||
<a href="javascript:;" (click)="setMakeInvoice()">设置</a>
|
<a href="javascript:;" (click)="setMakeInvoice()">设置</a>
|
||||||
</ng-template>
|
</ng-template>
|
||||||
<ng-template st-row="electronicContractAccount" let-item let-index="index">
|
<ng-template st-row="electronicContractAccount" let-item let-index="index">
|
||||||
<a href="javascript:;" (click)="setMakeInvoice()">设置</a>
|
<a href="javascript:;" (click)="setMakeInvoice2(item)">设置</a>
|
||||||
</ng-template>
|
</ng-template>
|
||||||
<ng-template st-row="bankName" let-item let-index="index">
|
<ng-template st-row="bankName" let-item let-index="index">
|
||||||
<a href="javascript:;" (click)="setMakeInvoice()">开通子账户</a>
|
<a href="javascript:;" (click)="setMakeInvoice()">开通子账户</a>
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
import { Component, OnInit, ViewChild } from '@angular/core';
|
import { Component, OnInit, ViewChild } from '@angular/core';
|
||||||
import { STComponent, STColumn, STChange } from '@delon/abc/st';
|
import { STComponent, STColumn, STChange } from '@delon/abc/st';
|
||||||
import { SFCascaderWidgetSchema, SFComponent, SFRadioWidgetSchema, SFSchema, SFUISchema } from '@delon/form';
|
import { SFCascaderWidgetSchema, SFComponent, SFRadioWidgetSchema, SFSchema, SFUISchema } from '@delon/form';
|
||||||
import { DynamicSettingModalComponent } from '@shared';
|
import { DynamicSettingModalComponent, SinglepageSettingModalComponent } from '@shared';
|
||||||
import { NzModalService } from 'ng-zorro-antd/modal';
|
import { NzModalService } from 'ng-zorro-antd/modal';
|
||||||
import { takeLast } from 'rxjs/operators';
|
import { takeLast } from 'rxjs/operators';
|
||||||
import { SystemService } from '../../services/system.service';
|
import { SystemService } from '../../services/system.service';
|
||||||
@ -411,4 +411,16 @@ export class NetworkFreightComponent implements OnInit {
|
|||||||
getRegionDetailByCode(regionCode: any) {
|
getRegionDetailByCode(regionCode: any) {
|
||||||
return this.service.request(this.service.$api_get_region_by_code, { regionCode });
|
return this.service.request(this.service.$api_get_region_by_code, { regionCode });
|
||||||
}
|
}
|
||||||
|
setMakeInvoice2(item:any) {
|
||||||
|
this.nzModalService.create({
|
||||||
|
nzTitle: '基础设置',
|
||||||
|
nzContent: SinglepageSettingModalComponent,
|
||||||
|
nzWidth: 900,
|
||||||
|
nzComponentParams: {
|
||||||
|
extendType: '1',
|
||||||
|
businessId: item.id
|
||||||
|
},
|
||||||
|
nzFooter: null
|
||||||
|
});
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -7,9 +7,9 @@
|
|||||||
</div>
|
</div>
|
||||||
<div nz-col [nzXl]="_$expand ? 24 : 8" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right"
|
<div nz-col [nzXl]="_$expand ? 24 : 8" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right"
|
||||||
[class.expend-options]="_$expand">
|
[class.expend-options]="_$expand">
|
||||||
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
|
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)" acl [acl-ability]="['USERCENTER-FREIGHT-ENTERPRISE-list']">查询</button>
|
||||||
<button *ngIf="tabType === 1" nz-button nzType="primary" [disabled]="service.http.loading"
|
<button *ngIf="tabType === 1" nz-button nzType="primary" [disabled]="service.http.loading"
|
||||||
(click)="exportList()">导出</button>
|
(click)="exportList()" acl [acl-ability]="['USERCENTER-FREIGHT-ENTERPRISE-export']">导出</button>
|
||||||
<button nz-button (click)="resetSF()" [disabled]="service.http.loading">重置</button>
|
<button nz-button (click)="resetSF()" [disabled]="service.http.loading">重置</button>
|
||||||
<button nz-button nzType="link" (click)="expandToggle(!_$expand)">
|
<button nz-button nzType="link" (click)="expandToggle(!_$expand)">
|
||||||
{{ !_$expand ? '展开' : '收起' }}
|
{{ !_$expand ? '展开' : '收起' }}
|
||||||
|
|||||||
@ -175,7 +175,12 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit {
|
|||||||
fixed: 'right',
|
fixed: 'right',
|
||||||
width: '180px',
|
width: '180px',
|
||||||
className: 'text-center',
|
className: 'text-center',
|
||||||
buttons: [{ text: '查看', click: _record => this.View(_record) }]
|
buttons: [
|
||||||
|
{ text: '查看',
|
||||||
|
click: _record => this.View(_record),
|
||||||
|
acl: { ability: ['USERCENTER-FREIGHT-ENTERPRISE-view'] },
|
||||||
|
}
|
||||||
|
]
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
@ -204,7 +209,12 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit {
|
|||||||
fixed: 'right',
|
fixed: 'right',
|
||||||
width: '180px',
|
width: '180px',
|
||||||
className: 'text-center',
|
className: 'text-center',
|
||||||
buttons: [{ text: '审核', click: _record => this.ViewAdimin(_record), iif: (item: any) => item.approvalStatus === 10 }]
|
buttons: [
|
||||||
|
{ text: '审核',
|
||||||
|
click: _record => this.ViewAdimin(_record), iif: (item: any) => item.approvalStatus === 10,
|
||||||
|
acl: { ability: ['USERCENTER-FREIGHT-ENTERPRISE-adminAudit'] },
|
||||||
|
}
|
||||||
|
]
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
@ -53,11 +53,11 @@
|
|||||||
</ng-container>
|
</ng-container>
|
||||||
<ng-container *ngIf="detailData?.approvalStatus!=10">
|
<ng-container *ngIf="detailData?.approvalStatus!=10">
|
||||||
<button [disabled]="service.http.loading" nz-button nzDanger nz-popconfirm [nzPopconfirmTitle]="enable"
|
<button [disabled]="service.http.loading" nz-button nzDanger nz-popconfirm [nzPopconfirmTitle]="enable"
|
||||||
(nzOnConfirm)="freezeOrResume(0)" nzPopconfirmPlacement="bottomRight" *ngIf="detailData?.stateLocked">
|
(nzOnConfirm)="freezeOrResume(0)" nzPopconfirmPlacement="bottomRight" *ngIf="detailData?.stateLocked" acl [acl-ability]="['USERCENTER-FREIGHT-LIST-DETAIL-lock']">
|
||||||
启用
|
启用
|
||||||
</button>
|
</button>
|
||||||
<button [disabled]="service.http.loading" nz-button nzDanger nz-popconfirm [nzPopconfirmTitle]="frozen"
|
<button [disabled]="service.http.loading" nz-button nzDanger nz-popconfirm [nzPopconfirmTitle]="frozen"
|
||||||
(nzOnConfirm)="freezeOrResume(1)" nzPopconfirmPlacement="bottomRight" *ngIf="!detailData?.stateLocked">
|
(nzOnConfirm)="freezeOrResume(1)" nzPopconfirmPlacement="bottomRight" *ngIf="!detailData?.stateLocked" acl [acl-ability]="['USERCENTER-FREIGHT-LIST-DETAIL-lock']">
|
||||||
冻结
|
冻结
|
||||||
</button>
|
</button>
|
||||||
<button [disabled]="service.http.loading" nz-button nzDanger nz-popconfirm
|
<button [disabled]="service.http.loading" nz-button nzDanger nz-popconfirm
|
||||||
@ -71,7 +71,7 @@
|
|||||||
关闭支付权限
|
关闭支付权限
|
||||||
</button>
|
</button>
|
||||||
</ng-container>
|
</ng-container>
|
||||||
<button [disabled]="service.http.loading" nz-button nzDanger (click)="ratify()">
|
<button [disabled]="service.http.loading" nz-button nzDanger (click)="ratify()" acl [acl-ability]="['USERCENTER-FREIGHT-LIST-DETAIL-save']">
|
||||||
修改
|
修改
|
||||||
</button>
|
</button>
|
||||||
</ng-template>
|
</ng-template>
|
||||||
|
|||||||
@ -4,7 +4,7 @@
|
|||||||
* @Author : Shiming
|
* @Author : Shiming
|
||||||
* @Date : 2022-01-12 10:52:50
|
* @Date : 2022-01-12 10:52:50
|
||||||
* @LastEditors : Shiming
|
* @LastEditors : Shiming
|
||||||
* @LastEditTime : 2022-02-09 15:28:00
|
* @LastEditTime : 2022-02-11 15:08:47
|
||||||
* @FilePath : \\tms-obc-web\\src\\app\\routes\\usercenter\\components\\freight\\list\\list.component.html
|
* @FilePath : \\tms-obc-web\\src\\app\\routes\\usercenter\\components\\freight\\list\\list.component.html
|
||||||
* Copyright (C) 2022 huzhenhong. All rights reserved.
|
* Copyright (C) 2022 huzhenhong. All rights reserved.
|
||||||
-->
|
-->
|
||||||
@ -18,9 +18,9 @@
|
|||||||
<sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
|
<sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
|
||||||
</div>
|
</div>
|
||||||
<div nz-col [nzXl]="_$expand ? 24 : 8" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right">
|
<div nz-col [nzXl]="_$expand ? 24 : 8" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right">
|
||||||
<button nz-button nzType="primary" (click)="creat()">新增企业</button>
|
<button nz-button nzType="primary" (click)="creat()" acl [acl-ability]="['USERCENTER-FREIGHT-LIST-save']">新增企业</button>
|
||||||
<button nz-button nzType="primary" [disabled]="!loadingList && service.http.loading" [nzLoading]="loadingList" (click)="st?.load(1)">查询</button>
|
<button nz-button nzType="primary" [disabled]="!loadingList && service.http.loading" [nzLoading]="loadingList" (click)="st?.load(1)" acl [acl-ability]="['USERCENTER-FREIGHT-LIST-list']">查询</button>
|
||||||
<button nz-button nzType="primary" [disabled]="service.http.loading" (click)="exportList()">导出</button>
|
<button nz-button nzType="primary" [disabled]="service.http.loading" (click)="exportList()" acl [acl-ability]="['USERCENTER-FREIGHT-LIST-export']">导出</button>
|
||||||
<button nz-button (click)="resetSF()" [disabled]="service.http.loading">重置</button>
|
<button nz-button (click)="resetSF()" [disabled]="service.http.loading">重置</button>
|
||||||
<button nz-button nzType="link" (click)="expandToggle()">
|
<button nz-button nzType="link" (click)="expandToggle()">
|
||||||
{{ !_$expand ? '展开' : '收起' }}
|
{{ !_$expand ? '展开' : '收起' }}
|
||||||
@ -50,7 +50,7 @@
|
|||||||
{{ item.contacter }}/{{item.mobile}}
|
{{ item.contacter }}/{{item.mobile}}
|
||||||
</ng-template>
|
</ng-template>
|
||||||
<ng-template st-row="promotersTelephone" let-item let-index="index">
|
<ng-template st-row="promotersTelephone" let-item let-index="index">
|
||||||
<a (click)="addPromoter(item)">{{ item.promotersTelephone || '添加' }}</a>
|
<a acl [acl-ability]="['USERCENTER-FREIGHT-LIST-salesman']" (click)="addPromoter(item)">{{ item.promotersTelephone || '添加' }}</a>
|
||||||
</ng-template>
|
</ng-template>
|
||||||
<ng-template st-row="stateCol" let-item let-index="index">
|
<ng-template st-row="stateCol" let-item let-index="index">
|
||||||
<nz-tag *ngIf="item.stateLocked" nzColor="error">冻结</nz-tag>
|
<nz-tag *ngIf="item.stateLocked" nzColor="error">冻结</nz-tag>
|
||||||
|
|||||||
@ -194,16 +194,19 @@ export class FreightComponentsListComponent implements OnInit {
|
|||||||
buttons: [
|
buttons: [
|
||||||
{
|
{
|
||||||
text: '查看<br/>',
|
text: '查看<br/>',
|
||||||
|
acl: { ability: ['USERCENTER-FREIGHT-LIST-view'] },
|
||||||
click: item => {
|
click: item => {
|
||||||
this.router.navigate(['./detail', item.id], { relativeTo: this.ar });
|
this.router.navigate(['./detail', item.id], { relativeTo: this.ar });
|
||||||
// this.router.navigate(['./view', item.id], { relativeTo: this.ar, queryParams: { tenantId: item.tenantId } });
|
// this.router.navigate(['./view', item.id], { relativeTo: this.ar, queryParams: { tenantId: item.tenantId } });
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
acl: { ability: ['USERCENTER-FREIGHT-LIST-basicSetting'] },
|
||||||
text: '基础设置',
|
text: '基础设置',
|
||||||
click: item => this.settingAction(item)
|
click: item => this.settingAction(item)
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
acl: { ability: ['USERCENTER-FREIGHT-LIST-balance'] },
|
||||||
text: '资金账户',
|
text: '资金账户',
|
||||||
click: item => this.showAccountDetail(item)
|
click: item => this.showAccountDetail(item)
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,12 +1,22 @@
|
|||||||
|
<!--
|
||||||
|
* @Description :
|
||||||
|
* @Version : 1.0
|
||||||
|
* @Author : Shiming
|
||||||
|
* @Date : 2022-01-14 14:39:04
|
||||||
|
* @LastEditors : Shiming
|
||||||
|
* @LastEditTime : 2022-02-11 15:13:48
|
||||||
|
* @FilePath : \\tms-obc-web\\src\\app\\shared\\components\\account-detail\\account-detail.component.html
|
||||||
|
* Copyright (C) 2022 huzhenhong. All rights reserved.
|
||||||
|
-->
|
||||||
<st #st [data]="url" [columns]="columns" bordered size="small"
|
<st #st [data]="url" [columns]="columns" bordered size="small"
|
||||||
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, process: beforeReq }"
|
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, process: beforeReq }"
|
||||||
[res]="{ reName: { list: 'data'} }"
|
[res]="{ reName: { list: 'data'} }"
|
||||||
[page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
|
[page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
|
||||||
[loading]="service.http.loading" [scroll]="{ y: '370px' }">
|
[loading]="service.http.loading" [scroll]="{ y: '370px' }">
|
||||||
<ng-template st-row="paAccount" let-item let-index="index">
|
<ng-template st-row="paAccount" let-item let-index="index">
|
||||||
<a (click)="createAccount(item,'1')">{{ item.paAccount || '添加' }}</a>
|
<a (click)="createAccount(item,'1')" acl [acl-ability]="['USERCENTER-FREIGHT-LIST-createAccount']" >{{ item.paAccount || '添加' }}</a>
|
||||||
</ng-template>
|
</ng-template>
|
||||||
<ng-template st-row="pfAccount" let-item let-index="index">
|
<ng-template st-row="pfAccount" let-item let-index="index">
|
||||||
<a (click)="createAccount(item,'2')">{{ item.pfAccount || '添加' }}</a>
|
<a (click)="createAccount(item,'2')" acl [acl-ability]="['USERCENTER-FREIGHT-LIST-createAccount']" >{{ item.pfAccount || '添加' }}</a>
|
||||||
</ng-template>
|
</ng-template>
|
||||||
</st>
|
</st>
|
||||||
@ -1 +1,11 @@
|
|||||||
|
<!--
|
||||||
|
* @Description :
|
||||||
|
* @Version : 1.0
|
||||||
|
* @Author : Shiming
|
||||||
|
* @Date : 2021-12-07 14:19:25
|
||||||
|
* @LastEditors : Shiming
|
||||||
|
* @LastEditTime : 2022-02-11 15:26:06
|
||||||
|
* @FilePath : \\tms-obc-web\\src\\app\\shared\\components\\amap\\amap-path-simplifier\\amap-path-simplifier.component.html
|
||||||
|
* Copyright (C) 2022 huzhenhong. All rights reserved.
|
||||||
|
-->
|
||||||
<div class="map-container" id="container" tabindex="0" [style]="{width: mapWidth, height: mapHeight}"></div>
|
<div class="map-container" id="container" tabindex="0" [style]="{width: mapWidth, height: mapHeight}"></div>
|
||||||
@ -94,654 +94,187 @@ export class AmapPathSimplifierComponent implements OnInit, OnChanges {
|
|||||||
ngOnInit(): void {
|
ngOnInit(): void {
|
||||||
this.mapInit();
|
this.mapInit();
|
||||||
const points = [
|
const points = [
|
||||||
{
|
{
|
||||||
"agl":"0",
|
"agl":"0",
|
||||||
"gtm":"20210818/143018",
|
"gtm":"20210818/150440",
|
||||||
"hgt":"500",
|
"hgt":"500",
|
||||||
"lat":"23986841",
|
"lat":"18107328",
|
||||||
"lon":"69807550",
|
"lon":"69664449",
|
||||||
"mlg":"1002.0",
|
"mlg":"2033.0",
|
||||||
"spd":"60.0"
|
"spd":"0.0"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"agl":"0",
|
"agl":"0",
|
||||||
"gtm":"20210818/143018",
|
"gtm":"20210818/150450",
|
||||||
"hgt":"500",
|
"hgt":"500",
|
||||||
"lat":"23986841",
|
"lat":"18107298",
|
||||||
"lon":"69807550",
|
"lon":"69664449",
|
||||||
"mlg":"1002.0",
|
"mlg":"2036.0",
|
||||||
"spd":"60.0"
|
"spd":"0.0"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"agl":"0",
|
"agl":"0",
|
||||||
"gtm":"20210818/143019",
|
"gtm":"20210818/150500",
|
||||||
"hgt":"500",
|
"hgt":"500",
|
||||||
"lat":"23986841",
|
"lat":"18107298",
|
||||||
"lon":"69807550",
|
"lon":"69664449",
|
||||||
"mlg":"1002.0",
|
"mlg":"2039.0",
|
||||||
"12spd":"60.0"
|
"spd":"0.0"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"agl":"0",
|
"agl":"0",
|
||||||
"gtm":"20210818/143020",
|
"gtm":"20210818/150510",
|
||||||
"hgt":"500",
|
"hgt":"500",
|
||||||
"lat":"23986841",
|
"lat":"18107310",
|
||||||
"lon":"69807550",
|
"lon":"69664458",
|
||||||
"mlg":"1002.0",
|
"mlg":"2042.0",
|
||||||
"spd":"60.0"
|
"spd":"0.0"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"agl":"0",
|
"agl":"183",
|
||||||
"gtm":"20210818/143104",
|
"gtm":"20210818/150520",
|
||||||
"hgt":"500",
|
"hgt":"500",
|
||||||
"lat":"23986841",
|
"lat":"18107298",
|
||||||
"lon":"69807550",
|
"lon":"69664449",
|
||||||
"mlg":"1002.0",
|
"mlg":"2045.0",
|
||||||
"spd":"60.0"
|
"spd":"7.0"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"agl":"0",
|
"agl":"192",
|
||||||
"gtm":"20210818/143105",
|
"gtm":"20210818/150530",
|
||||||
"hgt":"500",
|
"hgt":"500",
|
||||||
"lat":"23986841",
|
"lat":"18105558",
|
||||||
"lon":"69807550",
|
"lon":"69664200",
|
||||||
"mlg":"1002.0",
|
"mlg":"2048.0",
|
||||||
"spd":"60.0"
|
"spd":"52.0"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"agl":"0",
|
"agl":"196",
|
||||||
"gtm":"20210818/143106",
|
"gtm":"20210818/150540",
|
||||||
"hgt":"500",
|
"hgt":"500",
|
||||||
"lat":"23986841",
|
"lat":"18099798",
|
||||||
"lon":"69807550",
|
"lon":"69662679",
|
||||||
"mlg":"1002.0",
|
"mlg":"2051.0",
|
||||||
"spd":"60.0"
|
"spd":"73.0"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"agl":"0",
|
"agl":"199",
|
||||||
"gtm":"20210818/143106",
|
"gtm":"20210818/150550",
|
||||||
"hgt":"500",
|
"hgt":"500",
|
||||||
"lat":"23986841",
|
"lat":"18092538",
|
||||||
"lon":"69807550",
|
"lon":"69659478",
|
||||||
"mlg":"1002.0",
|
"mlg":"2054.0",
|
||||||
"spd":"60.0"
|
"spd":"84.0"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"agl":"0",
|
"agl":"187",
|
||||||
"gtm":"20210818/143110",
|
"gtm":"20210818/150600",
|
||||||
"hgt":"500",
|
"hgt":"500",
|
||||||
"lat":"23986841",
|
"lat":"18085290",
|
||||||
"lon":"69807550",
|
"lon":"69657000",
|
||||||
"mlg":"1002.0",
|
"mlg":"2057.0",
|
||||||
"spd":"60.0"
|
"spd":"83.0"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"agl":"0",
|
"agl":"184",
|
||||||
"gtm":"20210818/143113",
|
"gtm":"20210818/150610",
|
||||||
"hgt":"500",
|
"hgt":"500",
|
||||||
"lat":"23986841",
|
"lat":"18078798",
|
||||||
"lon":"69807549",
|
"lon":"69656340",
|
||||||
"mlg":"1002.0",
|
"mlg":"2060.0",
|
||||||
"spd":"60.0"
|
"spd":"64.0"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"agl":"0",
|
"agl":"219",
|
||||||
"gtm":"20210818/143114",
|
"gtm":"20210818/150620",
|
||||||
"hgt":"500",
|
"hgt":"500",
|
||||||
"lat":"23986841",
|
"lat":"18072798",
|
||||||
"lon":"69807549",
|
"lon":"69654069",
|
||||||
"mlg":"1002.0",
|
"mlg":"2063.0",
|
||||||
"spd":"60.0"
|
"spd":"83.0"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"agl":"0",
|
"agl":"273",
|
||||||
"gtm":"20210818/143115",
|
"gtm":"20210818/150630",
|
||||||
"hgt":"500",
|
"hgt":"500",
|
||||||
"lat":"23986841",
|
"lat":"18071670",
|
||||||
"lon":"69807549",
|
"lon":"69646119",
|
||||||
"mlg":"1002.0",
|
"mlg":"2066.0",
|
||||||
"spd":"60.0"
|
"spd":"71.0"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"agl":"0",
|
"agl":"273",
|
||||||
"gtm":"20210818/143116",
|
"gtm":"20210818/150640",
|
||||||
"hgt":"500",
|
"hgt":"500",
|
||||||
"lat":"23986841",
|
"lat":"18072078",
|
||||||
"lon":"69807549",
|
"lon":"69638340",
|
||||||
"mlg":"1002.0",
|
"mlg":"2069.0",
|
||||||
"spd":"60.0"
|
"spd":"79.0"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"agl":"213",
|
"agl":"274",
|
||||||
"gtm":"20210818/145810",
|
"gtm":"20210818/150650",
|
||||||
"hgt":"500",
|
"hgt":"500",
|
||||||
"lat":"18249159",
|
"lat":"18072090",
|
||||||
"lon":"69784998",
|
"lon":"69638208",
|
||||||
"mlg":"1913.0",
|
"mlg":"2072.0",
|
||||||
"spd":"75.0"
|
"spd":"78.0"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"agl":"201",
|
"agl":"257",
|
||||||
"gtm":"20210818/145820",
|
"gtm":"20210818/150700",
|
||||||
"hgt":"500",
|
"hgt":"500",
|
||||||
"lat":"18241809",
|
"lat":"18071898",
|
||||||
"lon":"69781350",
|
"lon":"69631200",
|
||||||
"mlg":"1916.0",
|
"mlg":"2075.0",
|
||||||
"spd":"104.0"
|
"spd":"69.0"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"agl":"201",
|
"agl":"246",
|
||||||
"gtm":"20210818/145830",
|
"gtm":"20210818/150710",
|
||||||
"hgt":"500",
|
"hgt":"500",
|
||||||
"lat":"18234378",
|
"lat":"18068829",
|
||||||
"lon":"69777969",
|
"lon":"69623100",
|
||||||
"mlg":"1919.0",
|
"mlg":"2078.0",
|
||||||
"spd":"79.0"
|
"spd":"86.0"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"agl":"226",
|
"agl":"265",
|
||||||
"gtm":"20210818/145840",
|
"gtm":"20210818/150720",
|
||||||
"hgt":"500",
|
"hgt":"500",
|
||||||
"lat":"18227730",
|
"lat14":"18067518",
|
||||||
"lon":"69773709",
|
"lon":"69619899",
|
||||||
"mlg":"1922.0",
|
"mlg":"2081.0",
|
||||||
"spd":"80.0"
|
"spd":"6.0"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"agl":"244",
|
"agl":"0",
|
||||||
"gtm":"20210818/145850",
|
"gtm":"20210818/150730",
|
||||||
"hgt":"500",
|
"hgt":"500",
|
||||||
"lat":"18223848",
|
"lat":"18067458",
|
||||||
"lon":"69765879",
|
"lon":"69619680",
|
||||||
"mlg":"1925.0",
|
"mlg":"2084.0",
|
||||||
"spd":"76.0"
|
"spd":"0.0"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"agl":"237",
|
"agl":"230",
|
||||||
"gtm":"20210818/145900",
|
"gtm":"20210818/150740",
|
||||||
"hgt":"500",
|
"hgt":"500",
|
||||||
"lat":"18220848",
|
"lat":"18067449",
|
||||||
"lon":"69759309",
|
"lon":"69619650",
|
||||||
"mlg":"1928.0",
|
"mlg":"2087.0",
|
||||||
"spd":"62.0"
|
"spd":"3.0"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"agl":"223",
|
"agl":"0",
|
||||||
"gtm":"20210818/145910",
|
"gtm":"20210818/150750",
|
||||||
"hgt":"500",
|
"hgt":"500",
|
||||||
"lat":"18216108",
|
"lat":"18067410",
|
||||||
"lon":"69752670",
|
"lon":"69619560",
|
||||||
"mlg":"1931.0",
|
"mlg":"2090.0",
|
||||||
"spd":"90.0"
|
"spd":"0.0"
|
||||||
},
|
}
|
||||||
{
|
|
||||||
"agl":"215",
|
|
||||||
"gtm":"20210818/145920",
|
|
||||||
"hgt":"500",
|
|
||||||
"lat":"18210438",
|
|
||||||
"lon":"69747369",
|
|
||||||
"mlg":"1934.0",
|
|
||||||
"spd":"80.0"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"agl":"223",
|
|
||||||
"gtm":"20210818/145930",
|
|
||||||
"hgt":"500",
|
|
||||||
"lat":"18204129",
|
|
||||||
"lon":"69741948",
|
|
||||||
"mlg":"1937.0",
|
|
||||||
"spd":"76.0"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"agl":"229",
|
|
||||||
"gtm":"20210818/145940",
|
|
||||||
"hgt":"500",
|
|
||||||
"lat":"18199218",
|
|
||||||
"lon":"69735558",
|
|
||||||
"mlg":"1940.0",
|
|
||||||
"spd":"84.0"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"agl":"197",
|
|
||||||
"gtm":"20210818/145950",
|
|
||||||
"hgt":"500",
|
|
||||||
"lat":"18193989",
|
|
||||||
"lon":"69730818",
|
|
||||||
"mlg":"1943.0",
|
|
||||||
"spd":"76.0"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"agl":"207",
|
|
||||||
"gtm":"20210818/150000",
|
|
||||||
"hgt":"500",
|
|
||||||
"lat":"18178518",
|
|
||||||
"lon":"69724290",
|
|
||||||
"mlg":"1949.0",
|
|
||||||
"spd":"101.0"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"agl":"221",
|
|
||||||
"gtm":"20210818/150010",
|
|
||||||
"hgt":"500",
|
|
||||||
"lat":"18172389",
|
|
||||||
"lon":"69719379",
|
|
||||||
"mlg":"1952.0",
|
|
||||||
"spd":"84.0"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"agl":"231",
|
|
||||||
"gtm":"20210818/150020",
|
|
||||||
"hgt":"500",
|
|
||||||
"lat":"18167088",
|
|
||||||
"lon":"69712380",
|
|
||||||
"mlg":"1955.0",
|
|
||||||
"spd":"91.0"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"agl":"224",
|
|
||||||
"gtm":"20210818/150030",
|
|
||||||
"hgt":"500",
|
|
||||||
"lat":"18161859",
|
|
||||||
"lon":"69705558",
|
|
||||||
"mlg":"1958.0",
|
|
||||||
"spd":"81.0"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"agl":"225",
|
|
||||||
"gtm":"20210818/150040",
|
|
||||||
"hgt":"500",
|
|
||||||
"lat":"18156309",
|
|
||||||
"lon":"69699270",
|
|
||||||
"mlg":"1961.0",
|
|
||||||
"spd":"90.0"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"agl":"227",
|
|
||||||
"gtm":"20210818/150050",
|
|
||||||
"hgt":"500",
|
|
||||||
"lat":"18151590",
|
|
||||||
"lon":"69692910",
|
|
||||||
"mlg":"1964.0",
|
|
||||||
"spd":"82.0"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"agl":"224",
|
|
||||||
"gtm":"20210818/150100",
|
|
||||||
"hgt":"500",
|
|
||||||
"lat":"18146079",
|
|
||||||
"lon":"69687138",
|
|
||||||
"mlg":"1967.0",
|
|
||||||
"spd":"85.0"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"agl":"233",
|
|
||||||
"gtm":"20210818/150110",
|
|
||||||
"hgt":"500",
|
|
||||||
"lat":"18141198",
|
|
||||||
"lon":"69680229",
|
|
||||||
"mlg":"1970.0",
|
|
||||||
"spd":"90.0"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"agl":"231",
|
|
||||||
"gtm":"20210818/150120",
|
|
||||||
"hgt":"500",
|
|
||||||
"lat":"18136299",
|
|
||||||
"lon":"69673020",
|
|
||||||
"mlg":"1973.0",
|
|
||||||
"spd":"88.0"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"agl":"198",
|
|
||||||
"gtm":"20210818/150130",
|
|
||||||
"hgt":"500",
|
|
||||||
"lat":"18130170",
|
|
||||||
"lon":"69668670",
|
|
||||||
"mlg":"1976.0",
|
|
||||||
"spd":"80.0"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"agl":"191",
|
|
||||||
"gtm":"20210818/150140",
|
|
||||||
"hgt":"500",
|
|
||||||
"lat":"18123399",
|
|
||||||
"lon":"69666309",
|
|
||||||
"mlg":"1979.0",
|
|
||||||
"spd":"77.0"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"agl":"183",
|
|
||||||
"gtm":"20210818/150150",
|
|
||||||
"hgt":"500",
|
|
||||||
"lat":"1813116928",
|
|
||||||
"lon":"69665250",
|
|
||||||
"mlg":"1982.0",
|
|
||||||
"spd":"73.0"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"agl":"184",
|
|
||||||
"gtm":"20210818/150200",
|
|
||||||
"hgt":"500",
|
|
||||||
"lat":"18110490",
|
|
||||||
"lon":"69664770",
|
|
||||||
"mlg":"1985.0",
|
|
||||||
"spd":"55.0"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"agl":"0",
|
|
||||||
"gtm":"20210818/150210",
|
|
||||||
"hgt":"500",
|
|
||||||
"lat":"18108669",
|
|
||||||
"lon":"69664578",
|
|
||||||
"mlg":"1988.0",
|
|
||||||
"spd":"0.0"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"agl":"184",
|
|
||||||
"gtm":"20210818/150220",
|
|
||||||
"hgt":"500",
|
|
||||||
"lat":"18108639",
|
|
||||||
"lon":"69664578",
|
|
||||||
"mlg":"1991.0",
|
|
||||||
"spd":"3.0"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"agl":"184",
|
|
||||||
"gtm":"20210818/150230",
|
|
||||||
"hgt":"500",
|
|
||||||
"lat":"18108639",
|
|
||||||
"lon":"69664578",
|
|
||||||
"mlg":"1994.0",
|
|
||||||
"spd":"3.0"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"agl":"0",
|
|
||||||
"gtm":"20210818/150240",
|
|
||||||
"hgt":"500",
|
|
||||||
"lat":"18108579",
|
|
||||||
"lon":"69664569",
|
|
||||||
"mlg":"1997.0",
|
|
||||||
"spd":"0.1"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"agl":"0",
|
|
||||||
"gtm":"20210818/150250",
|
|
||||||
"hgt":"500",
|
|
||||||
"lat":"18108588",
|
|
||||||
"lon":"69664590",
|
|
||||||
"mlg":"2000.0",
|
|
||||||
"spd":"0.1"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"agl":"186",
|
|
||||||
"gtm":"20210818/150300",
|
|
||||||
"hgt":"500",
|
|
||||||
"lat":"18108570",
|
|
||||||
"lon":"69664590",
|
|
||||||
"mlg":"2003.0",
|
|
||||||
"spd":"3.0"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"agl":"0",
|
|
||||||
"gtm":"20210818/150310",
|
|
||||||
"hgt":"500",
|
|
||||||
"lat":"18108480",
|
|
||||||
"lon":"69664590",
|
|
||||||
"mlg":"2006.0",
|
|
||||||
"spd":"0.1"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"agl":"0",
|
|
||||||
"gtm":"20210818/150320",
|
|
||||||
"hgt":"500",
|
|
||||||
"lat":"18108348",
|
|
||||||
"lon":"69664560",
|
|
||||||
"mlg":"2009.0",
|
|
||||||
"spd":"2.0"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"agl":"0",
|
|
||||||
"gtm":"20210818/150330",
|
|
||||||
"hgt":"500",
|
|
||||||
"lat":"18108330",
|
|
||||||
"lon":"69664560",
|
|
||||||
"mlg":"2012.0",
|
|
||||||
"spd":"2.0"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"agl":"0",
|
|
||||||
"gtm":"20210818/150340",
|
|
||||||
"hgt":"500",
|
|
||||||
"lat":"18108330",
|
|
||||||
"lon":"69664548",
|
|
||||||
"mlg":"2015.0",
|
|
||||||
"spd":"0.0"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"agl":"0",
|
|
||||||
"gtm":"20210818/150350",
|
|
||||||
"hgt":"500",
|
|
||||||
"lat":"18108390",
|
|
||||||
"lon":"69664560",
|
|
||||||
"mlg":"2018.0",
|
|
||||||
"spd":"0.0"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"agl":"0",
|
|
||||||
"gtm":"20210818/150400",
|
|
||||||
"hgt":"500",
|
|
||||||
"lat":"18108369",
|
|
||||||
"lon":"69664548",
|
|
||||||
"mlg":"2021.0",
|
|
||||||
"spd":"3.0"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"agl":"0",
|
|
||||||
"gtm":"20210818/150410",
|
|
||||||
"hgt":"500",
|
|
||||||
"lat":"18108348",
|
|
||||||
"lon":"69664548",
|
|
||||||
"mlg":"2024.0",
|
|
||||||
"spd":"0.0"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"agl":"0",
|
|
||||||
"gtm":"20210818/150420",
|
|
||||||
"hgt":"500",
|
|
||||||
"lat":"18108330",
|
|
||||||
"lon":"69664539",
|
|
||||||
"mlg":"2027.0",
|
|
||||||
"spd":"3.0"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"agl":"189",
|
|
||||||
"gtm":"20210818/150430",
|
|
||||||
"hgt":"500",
|
|
||||||
"lat":"18107700",
|
|
||||||
"lon":"69664509",
|
|
||||||
"mlg":"2030.0",
|
|
||||||
"spd":"23.0"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"agl":"0",
|
|
||||||
"gtm":"20210818/150440",
|
|
||||||
"hgt":"500",
|
|
||||||
"lat":"18107328",
|
|
||||||
"lon":"69664449",
|
|
||||||
"mlg":"2033.0",
|
|
||||||
"spd":"0.0"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"agl":"0",
|
|
||||||
"gtm":"20210818/150450",
|
|
||||||
"hgt":"500",
|
|
||||||
"lat":"18107298",
|
|
||||||
"lon":"69664449",
|
|
||||||
"mlg":"2036.0",
|
|
||||||
"spd":"0.0"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"agl":"0",
|
|
||||||
"gtm":"20210818/150500",
|
|
||||||
"hgt":"500",
|
|
||||||
"lat":"18107298",
|
|
||||||
"lon":"69664449",
|
|
||||||
"mlg":"2039.0",
|
|
||||||
"spd":"0.0"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"agl":"0",
|
|
||||||
"gtm":"20210818/150510",
|
|
||||||
"hgt":"500",
|
|
||||||
"lat":"18107310",
|
|
||||||
"lon":"69664458",
|
|
||||||
"mlg":"2042.0",
|
|
||||||
"spd":"0.0"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"agl":"183",
|
|
||||||
"gtm":"20210818/150520",
|
|
||||||
"hgt":"500",
|
|
||||||
"lat":"18107298",
|
|
||||||
"lon":"69664449",
|
|
||||||
"mlg":"2045.0",
|
|
||||||
"spd":"7.0"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"agl":"192",
|
|
||||||
"gtm":"20210818/150530",
|
|
||||||
"hgt":"500",
|
|
||||||
"lat":"18105558",
|
|
||||||
"lon":"69664200",
|
|
||||||
"mlg":"2048.0",
|
|
||||||
"spd":"52.0"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"agl":"196",
|
|
||||||
"gtm":"20210818/150540",
|
|
||||||
"hgt":"500",
|
|
||||||
"lat":"18099798",
|
|
||||||
"lon":"69662679",
|
|
||||||
"mlg":"2051.0",
|
|
||||||
"spd":"73.0"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"agl":"199",
|
|
||||||
"gtm":"20210818/150550",
|
|
||||||
"hgt":"500",
|
|
||||||
"lat":"18092538",
|
|
||||||
"lon":"69659478",
|
|
||||||
"mlg":"2054.0",
|
|
||||||
"spd":"84.0"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"agl":"187",
|
|
||||||
"gtm":"20210818/150600",
|
|
||||||
"hgt":"500",
|
|
||||||
"lat":"18085290",
|
|
||||||
"lon":"69657000",
|
|
||||||
"mlg":"2057.0",
|
|
||||||
"spd":"83.0"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"agl":"184",
|
|
||||||
"gtm":"20210818/150610",
|
|
||||||
"hgt":"500",
|
|
||||||
"lat":"18078798",
|
|
||||||
"lon":"69656340",
|
|
||||||
"mlg":"2060.0",
|
|
||||||
"spd":"64.0"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"agl":"219",
|
|
||||||
"gtm":"20210818/150620",
|
|
||||||
"hgt":"500",
|
|
||||||
"lat":"18072798",
|
|
||||||
"lon":"69654069",
|
|
||||||
"mlg":"2063.0",
|
|
||||||
"spd":"83.0"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"agl":"273",
|
|
||||||
"gtm":"20210818/150630",
|
|
||||||
"hgt":"500",
|
|
||||||
"lat":"18071670",
|
|
||||||
"lon":"69646119",
|
|
||||||
"mlg":"2066.0",
|
|
||||||
"spd":"71.0"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"agl":"273",
|
|
||||||
"gtm":"20210818/150640",
|
|
||||||
"hgt":"500",
|
|
||||||
"lat":"18072078",
|
|
||||||
"lon":"69638340",
|
|
||||||
"mlg":"2069.0",
|
|
||||||
"spd":"79.0"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"agl":"274",
|
|
||||||
"gtm":"20210818/150650",
|
|
||||||
"hgt":"500",
|
|
||||||
"lat":"18072090",
|
|
||||||
"lon":"69638208",
|
|
||||||
"mlg":"2072.0",
|
|
||||||
"spd":"78.0"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"agl":"257",
|
|
||||||
"gtm":"20210818/150700",
|
|
||||||
"hgt":"500",
|
|
||||||
"lat":"18071898",
|
|
||||||
"lon":"69631200",
|
|
||||||
"mlg":"2075.0",
|
|
||||||
"spd":"69.0"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"agl":"246",
|
|
||||||
"gtm":"20210818/150710",
|
|
||||||
"hgt":"500",
|
|
||||||
"lat":"18068829",
|
|
||||||
"lon":"69623100",
|
|
||||||
"mlg":"2078.0",
|
|
||||||
"spd":"86.0"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"agl":"265",
|
|
||||||
"gtm":"20210818/150720",
|
|
||||||
"hgt":"500",
|
|
||||||
"lat14":"18067518",
|
|
||||||
"lon":"69619899",
|
|
||||||
"mlg":"2081.0",
|
|
||||||
"spd":"6.0"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"agl":"0",
|
|
||||||
"gtm":"20210818/150730",
|
|
||||||
"hgt":"500",
|
|
||||||
"lat":"18067458",
|
|
||||||
"lon":"69619680",
|
|
||||||
"mlg":"2084.0",
|
|
||||||
"spd":"0.0"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"agl":"230",
|
|
||||||
"gtm":"20210818/150740",
|
|
||||||
"hgt":"500",
|
|
||||||
"lat":"18067449",
|
|
||||||
"lon":"69619650",
|
|
||||||
"mlg":"2087.0",
|
|
||||||
"spd":"3.0"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"agl":"0",
|
|
||||||
"gtm":"20210818/150750",
|
|
||||||
"hgt":"500",
|
|
||||||
"lat":"18067410",
|
|
||||||
"lon":"69619560",
|
|
||||||
"mlg":"2090.0",
|
|
||||||
"spd":"0.0"
|
|
||||||
}
|
|
||||||
]
|
]
|
||||||
// "lat":"23986841",
|
// "lat":"23986841",
|
||||||
// "lon":"69807550",
|
// "lon":"69807550",
|
||||||
@ -750,8 +283,8 @@ export class AmapPathSimplifierComponent implements OnInit, OnChanges {
|
|||||||
points.forEach((item) => {
|
points.forEach((item) => {
|
||||||
this.pathList[0].points.push(
|
this.pathList[0].points.push(
|
||||||
{
|
{
|
||||||
name: '海淀区',
|
name: item?.hgt,
|
||||||
lnglat: [Number(item?.mlg), Number(item?.spd)]
|
lnglat: [(Number(item?.lon) / 6000000).toFixed(6), (Number(item?.lat)/ 6000000).toFixed(6)]
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
})
|
})
|
||||||
|
|||||||
12
src/app/shared/components/singlepage-setting/index.ts
Normal file
12
src/app/shared/components/singlepage-setting/index.ts
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
/*
|
||||||
|
* @Description :
|
||||||
|
* @Version : 1.0
|
||||||
|
* @Author : Shiming
|
||||||
|
* @Date : 2022-02-11 14:23:46
|
||||||
|
* @LastEditors : Shiming
|
||||||
|
* @LastEditTime : 2022-02-11 14:30:28
|
||||||
|
* @FilePath : \\tms-obc-web\\src\\app\\shared\\components\\singlepage-setting\\index.ts
|
||||||
|
* Copyright (C) 2022 huzhenhong. All rights reserved.
|
||||||
|
*/
|
||||||
|
export * from './singlepage-setting.module';
|
||||||
|
export * from './singlepage-setting-modal/singlepage-setting-modal.component';
|
||||||
@ -0,0 +1,86 @@
|
|||||||
|
<!--
|
||||||
|
* @Description :
|
||||||
|
* @Version : 1.0
|
||||||
|
* @Author : Shiming
|
||||||
|
* @Date : 2022-02-11 14:23:46
|
||||||
|
* @LastEditors : Shiming
|
||||||
|
* @LastEditTime : 2022-02-11 14:31:45
|
||||||
|
* @FilePath : \\tms-obc-web\\src\\app\\shared\\components\\singlepage-setting\\singlepage-setting-h5\\singlepage-setting-h5.component.html
|
||||||
|
* Copyright (C) 2022 huzhenhong. All rights reserved.
|
||||||
|
-->
|
||||||
|
<nz-card [nzLoading]="service.http.loading">
|
||||||
|
<div nz-row [nzGutter]="8">
|
||||||
|
<div nz-col [nzSpan]="tabSpan">
|
||||||
|
<ul nz-menu nzMode="inline" class="card-height">
|
||||||
|
<li nz-menu-item [nzSelected]="idx === 0" (click)="changeType(item)"
|
||||||
|
*ngFor="let item of tabs; let idx = index">
|
||||||
|
{{ item.name }}
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div nz-col [nzSpan]="24-tabSpan" style="overflow: scroll">
|
||||||
|
<nz-card class="card-height" [nzBordered]="null" nzSize="small">
|
||||||
|
<h2 style="font-weight: 800;">{{selectedTab?.name}}</h2>
|
||||||
|
<div nz-row nzGutter="8">
|
||||||
|
<div nz-col nzSpan="24" se-container [labelWidth]="labelWidth">
|
||||||
|
<se [label]="item.name" *ngFor="let item of configList" col="1">
|
||||||
|
<ng-container [ngSwitch]="item.itemType">
|
||||||
|
<ng-container *ngSwitchCase="1">
|
||||||
|
<nz-input-group [nzAddOnAfter]="item.remark?.afterLable" style="width: 155px;"
|
||||||
|
class="ml-md mr-xl">
|
||||||
|
<input type="number" nz-input [(ngModel)]="item.itemValue" placeholder="请输入" />
|
||||||
|
</nz-input-group>
|
||||||
|
</ng-container>
|
||||||
|
<ng-container *ngSwitchCase="2">
|
||||||
|
<nz-radio-group [(ngModel)]="item.itemValue" class="mr-xl">
|
||||||
|
<label nz-radio [nzValue]="0" class="ml-xl">{{item.remark?.[0] || '否'}}</label>
|
||||||
|
<label nz-radio [nzValue]="1" class="ml-xl">{{item.remark?.[1] || '是'}}</label>
|
||||||
|
</nz-radio-group>
|
||||||
|
</ng-container>
|
||||||
|
<ng-container *ngSwitchCase="3">
|
||||||
|
<nz-time-picker nzFormat="HH:mm" nzPlaceHolder="请选择时间" [(ngModel)]="item.itemValue"
|
||||||
|
class="ml-md mr-xl">
|
||||||
|
</nz-time-picker>
|
||||||
|
</ng-container>
|
||||||
|
<ng-container *ngSwitchCase="5">
|
||||||
|
<div class="d-flex" style="align-items: center;justify-content: space-between;">
|
||||||
|
<input type="time" [(ngModel)]="item.itemValue.startTime" placeHolder="开始时间"
|
||||||
|
style="margin-left: 23px;">
|
||||||
|
<label class="ml-sm mr-sm"> --</label>
|
||||||
|
<input type="time" [(ngModel)]="item.itemValue.endTime" placeHolder="结束时间"
|
||||||
|
style="margin-left: 0;" class=" mr-xl">
|
||||||
|
</div>
|
||||||
|
</ng-container>
|
||||||
|
<ng-container *ngSwitchCase="6">
|
||||||
|
<div class="d-flex" style="align-items: center;justify-content: space-between;">
|
||||||
|
|
||||||
|
<nz-radio-group [(ngModel)]="item.itemValue.radio" class="mr-xl">
|
||||||
|
<label nz-radio [nzValue]="0" class="ml-xl">{{item.remark?.[0] ||
|
||||||
|
'否'}}</label>
|
||||||
|
<label nz-radio [nzValue]="1" class="ml-xl">{{item.remark?.[1] ||
|
||||||
|
'是'}}</label>
|
||||||
|
</nz-radio-group>
|
||||||
|
|
||||||
|
<input type="time" [(ngModel)]="item.itemValue.startTime" placeHolder="开始时间"
|
||||||
|
style="margin-left: 23px;">
|
||||||
|
<label class="ml-sm mr-sm"> --</label>
|
||||||
|
<input type="time" [(ngModel)]="item.itemValue.endTime" placeHolder="结束时间"
|
||||||
|
style="margin-left: 0;" class=" mr-xl">
|
||||||
|
</div>
|
||||||
|
</ng-container>
|
||||||
|
</ng-container>
|
||||||
|
|
||||||
|
</se>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</nz-card>
|
||||||
|
|
||||||
|
|
||||||
|
<div class="mb-md save-btn">
|
||||||
|
<button class="ml-lg" nz-button nzSize="large" nzType="primary" (click)="saveAction()"
|
||||||
|
*ngIf="selectedTab?.configKey!=='freight'">保存</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</nz-card>
|
||||||
@ -0,0 +1,27 @@
|
|||||||
|
:host {
|
||||||
|
::ng-deep {
|
||||||
|
.card-height {
|
||||||
|
min-height: 600px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.save-btn {
|
||||||
|
width : 100%;
|
||||||
|
text-align: right;
|
||||||
|
}
|
||||||
|
|
||||||
|
.block-radio {
|
||||||
|
display : flex;
|
||||||
|
min-height: 32px;
|
||||||
|
}
|
||||||
|
|
||||||
|
input {
|
||||||
|
width : 100px;
|
||||||
|
margin-left: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ant-form-item-control-input-content {
|
||||||
|
display: flex;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@ -0,0 +1,69 @@
|
|||||||
|
/*
|
||||||
|
* @Description :
|
||||||
|
* @Version : 1.0
|
||||||
|
* @Author : Shiming
|
||||||
|
* @Date : 2022-02-11 14:23:46
|
||||||
|
* @LastEditors : Shiming
|
||||||
|
* @LastEditTime : 2022-02-11 14:29:00
|
||||||
|
* @FilePath : \\tms-obc-web\\src\\app\\shared\\components\\singlepage-setting\\singlepage-setting-h5\\singlepage-setting-h5.component.ts
|
||||||
|
* Copyright (C) 2022 huzhenhong. All rights reserved.
|
||||||
|
*/
|
||||||
|
import { Component, OnInit, EventEmitter, Input, Output } from '@angular/core';
|
||||||
|
import { BaseService } from '@shared';
|
||||||
|
|
||||||
|
const JSONTYPE = new Set([5,6]);
|
||||||
|
@Component({
|
||||||
|
selector: 'app-singlepage-setting-h5',
|
||||||
|
templateUrl: './singlepage-setting-h5.component.html',
|
||||||
|
styleUrls: ['./singlepage-setting-h5.component.less']
|
||||||
|
})
|
||||||
|
export class SinglepageSettingH5Component implements OnInit {
|
||||||
|
@Input()
|
||||||
|
tabs: any[] = [];
|
||||||
|
@Input()
|
||||||
|
selectedTab: any = null;
|
||||||
|
|
||||||
|
@Input()
|
||||||
|
configList: any = [];
|
||||||
|
@Output()
|
||||||
|
selectedEvent = new EventEmitter<any>();
|
||||||
|
@Output()
|
||||||
|
saveEvent = new EventEmitter<any>();
|
||||||
|
|
||||||
|
@Input()
|
||||||
|
tabSpan = 4;
|
||||||
|
@Input()
|
||||||
|
labelWidth = 250;
|
||||||
|
@Input()
|
||||||
|
itemValue = 'itemValue';
|
||||||
|
|
||||||
|
constructor(public service: BaseService) {}
|
||||||
|
|
||||||
|
ngOnInit() {}
|
||||||
|
|
||||||
|
changeType(type: any): void {
|
||||||
|
this.selectedTab = type;
|
||||||
|
console.log(type);
|
||||||
|
|
||||||
|
this.selectedEvent.emit(this.selectedTab);
|
||||||
|
}
|
||||||
|
|
||||||
|
saveAction() {
|
||||||
|
if (this.configList?.length < 0) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
let params = [...this.configList];
|
||||||
|
params = params.map((item: any) => {
|
||||||
|
if (JSONTYPE.has(item.itemType)) {
|
||||||
|
item.itemValue = item.itemValue ? JSON.stringify(item.itemValue) : null;
|
||||||
|
}
|
||||||
|
return {
|
||||||
|
...item,
|
||||||
|
remark: item.remark ? JSON.stringify(item.remark) : null,
|
||||||
|
itemData: item.itemData ? JSON.stringify(item.itemData) : null
|
||||||
|
};
|
||||||
|
});
|
||||||
|
this.saveEvent.emit(params);
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,13 @@
|
|||||||
|
<!--
|
||||||
|
* @Description :
|
||||||
|
* @Version : 1.0
|
||||||
|
* @Author : Shiming
|
||||||
|
* @Date : 2022-02-11 14:23:46
|
||||||
|
* @LastEditors : Shiming
|
||||||
|
* @LastEditTime : 2022-02-11 14:29:21
|
||||||
|
* @FilePath : \\tms-obc-web\\src\\app\\shared\\components\\singlepage-setting\\singlepage-setting-modal\\singlepage-setting-modal.component.html
|
||||||
|
* Copyright (C) 2022 huzhenhong. All rights reserved.
|
||||||
|
-->
|
||||||
|
<app-singlepage-setting-h5 [tabs]="tabs" [configList]="configList" [selectedTab]="selectedTab"
|
||||||
|
(selectedEvent)="changeType($event)" (saveEvent)="saveAction($event)" [tabSpan]="6" [labelWidth]="200" >
|
||||||
|
</app-singlepage-setting-h5>
|
||||||
@ -0,0 +1,101 @@
|
|||||||
|
/*
|
||||||
|
* @Description :
|
||||||
|
* @Version : 1.0
|
||||||
|
* @Author : Shiming
|
||||||
|
* @Date : 2022-02-11 14:23:46
|
||||||
|
* @LastEditors : Shiming
|
||||||
|
* @LastEditTime : 2022-02-11 14:33:08
|
||||||
|
* @FilePath : \\tms-obc-web\\src\\app\\shared\\components\\singlepage-setting\\singlepage-setting-modal\\singlepage-setting-modal.component.ts
|
||||||
|
* Copyright (C) 2022 huzhenhong. All rights reserved.
|
||||||
|
*/
|
||||||
|
import { Component, Input, OnInit } from '@angular/core';
|
||||||
|
import { ModalHelper } from '@delon/theme';
|
||||||
|
import { NzModalRef } from 'ng-zorro-antd/modal';
|
||||||
|
import { BaseService } from 'src/app/shared/services';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-singlepage-setting-modal',
|
||||||
|
templateUrl: './singlepage-setting-modal.component.html',
|
||||||
|
styleUrls: ['./singlepage-setting-modal.component.less']
|
||||||
|
})
|
||||||
|
export class SinglepageSettingModalComponent implements OnInit {
|
||||||
|
tabs: any[] = [];
|
||||||
|
selectedTab: any = null;
|
||||||
|
|
||||||
|
configList: any = [];
|
||||||
|
|
||||||
|
@Input()
|
||||||
|
extendType!: string;
|
||||||
|
@Input()
|
||||||
|
businessId!: string;
|
||||||
|
|
||||||
|
constructor(public service: BaseService, private modalHelp: NzModalRef) {}
|
||||||
|
|
||||||
|
ngOnInit() {
|
||||||
|
this.getTypeList();
|
||||||
|
}
|
||||||
|
|
||||||
|
getTypeList() {
|
||||||
|
this.service
|
||||||
|
.request('/api/mdc/pbc/sysConfigItemExtend/getSysConfigExtend', {
|
||||||
|
configFullKey: 'insurance',
|
||||||
|
extendType: this.extendType,
|
||||||
|
businessId: this.businessId
|
||||||
|
})
|
||||||
|
.subscribe((res: Array<any>) => {
|
||||||
|
if (res?.length > 0) {
|
||||||
|
const typeData = res.find(config => config.configFullKey === 'insurance');
|
||||||
|
if (typeData) {
|
||||||
|
this.tabs = typeData.children;
|
||||||
|
this.selectedTab = typeData.children[0];
|
||||||
|
|
||||||
|
this.configList = this.formatItems(this.selectedTab.items);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
changeType(type: any): void {
|
||||||
|
this.selectedTab = type;
|
||||||
|
this.configList = this.formatItems(type.items);
|
||||||
|
}
|
||||||
|
|
||||||
|
saveAction(params: Array<any>) {
|
||||||
|
const p = params.map(config => ({
|
||||||
|
businessId: this.businessId,
|
||||||
|
configId: config.configId,
|
||||||
|
extendType: this.extendType,
|
||||||
|
id: config.extendId,
|
||||||
|
configItemId: config.id,
|
||||||
|
parentId: config.parentId,
|
||||||
|
itemData: config.itemData,
|
||||||
|
itemValue: config.itemValue,
|
||||||
|
remark: config.remark
|
||||||
|
}));
|
||||||
|
this.service.request('/api/mdc/pbc/sysConfigItemExtend/saveBatch', p).subscribe(res => {
|
||||||
|
if (res) {
|
||||||
|
this.service.msgSrv.success('修改配置成功');
|
||||||
|
this.modalHelp.destroy();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
private formatItems(items: Array<any>): Array<any> {
|
||||||
|
if (items?.length > 0) {
|
||||||
|
return items
|
||||||
|
.map(item => ({
|
||||||
|
...item,
|
||||||
|
itemData: item.extendItemData || item.itemData,
|
||||||
|
itemValue: item.extendItemValue || item.itemValue
|
||||||
|
}))
|
||||||
|
.map(item => ({
|
||||||
|
...item,
|
||||||
|
remark: item.remark ? JSON.parse(item.remark) : null,
|
||||||
|
extend: item.extend ? JSON.parse(item.extend) : [],
|
||||||
|
// itemData: item.itemData ? JSON.parse(item.itemData) : item.itemData,
|
||||||
|
itemValue: item.itemValue ? JSON.parse(item.itemValue) : item.itemValue
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,24 @@
|
|||||||
|
/*
|
||||||
|
* @Description :
|
||||||
|
* @Version : 1.0
|
||||||
|
* @Author : Shiming
|
||||||
|
* @Date : 2022-02-11 14:23:46
|
||||||
|
* @LastEditors : Shiming
|
||||||
|
* @LastEditTime : 2022-02-11 14:30:15
|
||||||
|
* @FilePath : \\tms-obc-web\\src\\app\\shared\\components\\singlepage-setting\\singlepage-setting.module.ts
|
||||||
|
* Copyright (C) 2022 huzhenhong. All rights reserved.
|
||||||
|
*/
|
||||||
|
import { NgModule } from '@angular/core';
|
||||||
|
import { CommonModule } from '@angular/common';
|
||||||
|
import { SinglepageSettingH5Component } from './singlepage-setting-h5/singlepage-setting-h5.component';
|
||||||
|
import { SHARED_ZORRO_MODULES } from '../../shared-zorro.module';
|
||||||
|
import { SHARED_DELON_MODULES } from '../../shared-delon.module';
|
||||||
|
import { FormsModule } from '@angular/forms';
|
||||||
|
import { SinglepageSettingModalComponent } from './singlepage-setting-modal/singlepage-setting-modal.component';
|
||||||
|
const COMPONENTS = [SinglepageSettingH5Component, SinglepageSettingModalComponent];
|
||||||
|
@NgModule({
|
||||||
|
declarations: [...COMPONENTS],
|
||||||
|
imports: [CommonModule, FormsModule, SHARED_ZORRO_MODULES, SHARED_DELON_MODULES],
|
||||||
|
exports: [...COMPONENTS]
|
||||||
|
})
|
||||||
|
export class SinglepageSettingModule {}
|
||||||
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* @Author: your name
|
* @Author: your name
|
||||||
* @Date: 2021-11-29 10:04:12
|
* @Date: 2021-11-29 10:04:12
|
||||||
* @LastEditTime : 2022-01-25 20:34:23
|
* @LastEditTime : 2022-02-11 14:31:22
|
||||||
* @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\\shared\\index.ts
|
* @FilePath : \\tms-obc-web\\src\\app\\shared\\index.ts
|
||||||
@ -19,6 +19,7 @@ export * from './components/captcha/index';
|
|||||||
export * from './components/amap/index';
|
export * from './components/amap/index';
|
||||||
export * from './components/dict-select/index';
|
export * from './components/dict-select/index';
|
||||||
export * from './components/dynamic-setting';
|
export * from './components/dynamic-setting';
|
||||||
|
export * from './components/singlepage-setting';
|
||||||
export * from './components/insurance-table/index';
|
export * from './components/insurance-table/index';
|
||||||
|
|
||||||
// Utils
|
// Utils
|
||||||
|
|||||||
Reference in New Issue
Block a user