Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

src/app/app.component.ts

@@ -51,7 +51,7 @@ export class AppComponent implements OnInit {
     });
     const screen: any = window.screen
     var zoom = window.devicePixelRatio || screen.deviceXDPI / screen?.logicalXDPI;
-    console.log(zoom)
+    // console.log(zoom)
     if (document.body.clientWidth >= 1280) {
       if (zoom != 1 && zoom != 2 && zoom != 3) {
         this.themeService.toggleTheme().then();

src/app/routes/financial-management/components/refund-record/refund-record.component.ts

@@ -167,7 +167,7 @@ export class RefundRecordComponent implements OnInit {
             placeholder: '请选择'
           }
         },
-        shipperId: {
+        enterpriseInfoName: {
           type: 'string',
           title: '货主',
           ui: {
@@ -184,7 +184,7 @@ export class RefundRecordComponent implements OnInit {
             placeholder: '请输入'
           }
         },
-        enterpriseProjectId: {
+        enterpriseProjectName: {
           type: 'string',
           title: '所属项目',
           ui: {
@@ -197,7 +197,7 @@ export class RefundRecordComponent implements OnInit {
             }
           }
         },
-        resourceId: {
+        resourceCode: {
           type: 'string',
           title: '货源号',
           ui: {
@@ -220,7 +220,7 @@ export class RefundRecordComponent implements OnInit {
             nzShowTime: true
           } as SFDateWidgetSchema
         },
-        ltdid: {
+        ltdId: {
           type: 'string',
           title: '网络货运人',
           ui: {

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

@@ -45,13 +45,11 @@ export class AmapPathSimplifierComponent implements OnInit, OnChanges {
       ];
       this.setData(this.pathList);
       this.setPathIndex(this.selectedIndex);
+      console.log(this.MapList);
     }
   }
   ngOnInit(): void {
     this.mapInit();
-    console.log(this.MapList);
-    
-    // this.DataInit();
   }
   ngOnDestroy(): void {
     if (this.aMap) {

src/app/shared/components/amap/amap-poi-picker/amap-poi-picker.component.ts

@@ -3,6 +3,7 @@ import { ChangeDetectorRef, Component, Input, OnInit, ViewChild } from '@angular
 import { amapConf } from '@conf/amap.config';
 import { NzModalRef } from 'ng-zorro-antd/modal';
 import { throwError } from 'rxjs';
+import { Script } from 'vm';
 import { AmapService } from '../amap.service';
 declare var AMap: any;
 declare var AMapUI: any;