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:
潘晓云
2022-04-13 17:01:32 +08:00
parent 2e0096b03b 16906ba5ad
commit b5896cfdaf
4 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
proxy.conf.js
View File

@ -20,7 +20,7 @@ module.exports = {
// } // }
'//api': { '//api': {
target: { target: {
host: 'tms-api-test.eascs.com', host: 'tms-api.yunduoxing.com',
protocol: 'https:', protocol: 'https:',
port: 443 port: 443
}, },

8
src/app/routes/datatable/components/datascreen/datascreen.component.html
View File

@ -4,7 +4,7 @@
* @Author : Shiming * @Author : Shiming
* @Date : 2022-04-06 10:57:56 * @Date : 2022-04-06 10:57:56
* @LastEditors : Shiming * @LastEditors : Shiming
* @LastEditTime : 2022-04-13 10:33:08 * @LastEditTime : 2022-04-13 15:20:32
* @FilePath : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\datascreen\\datascreen.component.html * @FilePath : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\datascreen\\datascreen.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved. * Copyright (C) 2022 huzhenhong. All rights reserved.
--> -->
@ -23,7 +23,7 @@
</div> </div>
<div nz-row [nzGutter]="24"> <div nz-row [nzGutter]="24">
<div nz-col class="gutter-row" [nzSpan]="8"> <div nz-col class="gutter-row" nzXs="12" nzSm="12" nzMd="12" nzLg="12" nzXl="8" nzXXl="8">
<nz-card nzTitle="2022全年交易情况"> <nz-card nzTitle="2022全年交易情况">
<nz-row [nzGutter]="16"> <nz-row [nzGutter]="16">
<nz-col [nzSpan]="12"> <nz-col [nzSpan]="12">
@ -72,7 +72,7 @@
</st> </st>
</nz-card> </nz-card>
</div> </div>
<div nz-col class="gutter-row" [nzSpan]="8"> <div nz-col class="gutter-row" nzXs="12" nzSm="12" nzMd="12" nzLg="12" nzXl="8" nzXXl="8">
<nz-card> <nz-card>
<nz-row [nzGutter]="24"> <nz-row [nzGutter]="24">
<nz-col [nzSpan]="8"> <nz-col [nzSpan]="8">
@ -93,7 +93,7 @@
</nz-row> </nz-row>
</nz-card> </nz-card>
</div> </div>
<div nz-col class="gutter-row" [nzSpan]="8"> <div nz-col class="gutter-row" nzXs="12" nzSm="12" nzMd="12" nzLg="12" nzXl="8" nzXXl="8">
<nz-card> <nz-card>
<nz-row [nzGutter]="24"> <nz-row [nzGutter]="24">
<nz-col [nzSpan]="6"> <nz-col [nzSpan]="6">

3
src/app/routes/datatable/components/datascreen/map/map.component.html
View File

@ -4,8 +4,9 @@
* @Author : Shiming * @Author : Shiming
* @Date : 2022-04-06 17:57:07 * @Date : 2022-04-06 17:57:07
* @LastEditors : Shiming * @LastEditors : Shiming
* @LastEditTime : 2022-04-13 14:30:10 * @LastEditTime : 2022-04-13 15:20:33
* @FilePath : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\datascreen\\map\\map.component.html * @FilePath : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\datascreen\\map\\map.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved. * Copyright (C) 2022 huzhenhong. All rights reserved.
--> -->
<g2-custom #map div style="height: 680px; " delay="200" (render)="render($event)" ></g2-custom> <g2-custom #map div style="height: 680px; " delay="200" (render)="render($event)" ></g2-custom>
<!-- <nz-col nzXs="0" nzSm="0" nzMd="0" nzLg="14" nzXl="14" nzXXl="14" style="z-index: 9999;"></nz-col> -->

2
src/app/shared/components/amap/amap-path-simplifier/amap-path-simplifier.component.ts
View File

@ -153,7 +153,7 @@ export class AmapPathSimplifierComponent implements OnInit, OnChanges, OnDestroy
}); });
this.setData(this.pathList); this.setData(this.pathList);
if (this.pathList.length > 0) { if (this.mapList.length > 0) {
this.setPathIndex(this.selectedIndex); this.setPathIndex(this.selectedIndex);
this.getPoiByPositon('起', 'blue', this.mapList[0]?.lnglat, '时间：' + this.amapService.formatTime(this.mapList[0]?.time)); this.getPoiByPositon('起', 'blue', this.mapList[0]?.lnglat, '时间：' + this.amapService.formatTime(this.mapList[0]?.time));
this.getPoiByPositon( this.getPoiByPositon(