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

src/app/routes/insurance-management/insurance-management.module.ts

@@ -1,5 +1,5 @@
 /*
- * @Description  : 
+ * @Description  :
  * @Version      : 1.0
  * @Author       : Shiming
  * @Date         : 2022-01-06 09:24:00
@@ -10,22 +10,14 @@
  */
 
 import { NgModule, Type } from '@angular/core';
-import { SharedModule } from '@shared';
+import { InsuranceTableModule, SharedModule } from '@shared';
 import { insuranceManagementListComponent } from './components/list/list.component';
 import { insuranceManagementSetComponent } from './components/set/set.component';
 import { InsuranceManagementRoutingModule } from './insurance-management-routing.module';
-const COMPONENTS: Type<void>[] = [
+const COMPONENTS: Type<void>[] = [insuranceManagementListComponent, insuranceManagementSetComponent];
-  insuranceManagementListComponent,
-  insuranceManagementSetComponent,
-  
-];
 
 @NgModule({
-  imports: [
+  imports: [SharedModule, InsuranceManagementRoutingModule, InsuranceTableModule],
-    SharedModule,
+  declarations: COMPONENTS
-    InsuranceManagementRoutingModule,
-    
-  ],
-  declarations: COMPONENTS,
 })
-export class InsuranceManagementModule { }
+export class InsuranceManagementModule {}

src/app/routes/supply-management/components/add-driver/add-driver.component.html

@@ -20,7 +20,7 @@
           <dt>正面照</dt>
           <dd>示例</dd>
         </dl>
-        <div class="pa"><img height="104" src="/assets/images/eg01.png" /></div>
+        <div class="pa"><img height="104" src="./assets/images/usercenter/certificate-demo-front.png" /></div>
       </div>
     </ng-template>
     <ng-template sf-template="tipsB" let-me let-ui="ui" let-schema="schema">
@@ -29,7 +29,7 @@
           <dt>背面照</dt>
           <dd>示例</dd>
         </dl>
-        <div class="pa"><img height="104" src="/assets/images/eg02.png" /></div>
+        <div class="pa"><img height="104" src="./assets/images/usercenter/certificate-demo-back.png" /></div>
       </div>
     </ng-template>
   </sf>

src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts

@@ -122,9 +122,6 @@ export class SupplyManagementBulkPublishComponent implements OnInit {
             change: (q: any) => {
               this.getRegionCode(q);
             },
-            visibleIf: {
-              _$expand: (value: boolean) => value
-            }
           } as SFSelectWidgetSchema
         },
         enterpriseProjectId: {

src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html

@@ -33,7 +33,7 @@
                 </nz-input-group>
               
                 <span  style="padding: 0 10px"
-                  ><i nz-icon nzType="minus-circle-o" nzTheme="fill" style="color: #d9001b" (click)="subStartInfo($event, idx, data.id)"></i
+                  ><i nz-icon nzType="minus-circle" nzTheme="outline" style="color: #d9001b" (click)="subStartInfo($event, idx, data.id)"></i
                 ></span>
               </div>
             </nz-form-control>
@@ -93,7 +93,7 @@
                     placeholder="请输入卸货地"
                   />
                 </nz-input-group>
-                <span style="padding: 0 10px"><i nz-icon nzType="minus-circle-o" nzTheme="fill" style="color: #d9001b" (click)="subEndInfo($event, idx)"></i></span>
+                <span style="padding: 0 10px"><i nz-icon nzType="minus-circle" nzTheme="outline" style="color: #d9001b" (click)="subEndInfo($event, idx)"></i></span>
               </div>
             </nz-form-control>
           </nz-form-item>

src/app/routes/supply-management/components/release-publish/release-publish.component.html

@@ -39,7 +39,7 @@
                   />
                 </nz-input-group>
                 <span style="padding: 0 10px"
-                  ><i nz-icon nzType="minus-circle-o" nzTheme="fill" style="color: #d9001b" (click)="subStartInfo($event, idx)"></i
+                  ><i nz-icon nzType="minus-circle" nzTheme="outline" style="color: #d9001b" (click)="subStartInfo($event, idx)"></i
                 ></span>
               </div>
             </nz-form-control>
@@ -104,7 +104,7 @@
                   />
                 </nz-input-group>
                 <span style="padding: 0 10px"
-                  ><i nz-icon nzType="minus-circle-o" nzTheme="fill" style="color: #d9001b" (click)="subEndInfo($event, idx)"></i
+                  ><i nz-icon nzType="minus-circle" nzTheme="outline" style="color: #d9001b" (click)="subEndInfo($event, idx)"></i
                 ></span>
               </div>
             </nz-form-control>

src/app/routes/supply-management/components/release-publish/release-publish.component.ts

@@ -147,9 +147,6 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
             change: (q: any) => {
               this.getRegionCode(q);
             },
-            visibleIf: {
-              _$expand: (value: boolean) => value
-            }
           } as SFSelectWidgetSchema
         },
         enterpriseProjectId: {
@@ -175,9 +172,6 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
           ui: {
             widget: 'select',
             placeholder: '请选择',
-            visibleIf: {
-              _$expand: (value: boolean) => value
-            },
             allowClear: true,
             asyncData: () => this.shipperSrv.getNetworkFreightForwarder()
           }

src/app/routes/usercenter/components/driver/add-driver/add-driver.component.html

@@ -10,7 +10,7 @@
                     <dt>正面照</dt>
                     <dd>示例</dd>
                 </dl>
-                <div class="pa"><img height="104" src="/assets/images/eg01.png" /></div>
+                <div class="pa"><img height="104" src="./assets/images/usercenter/certificate-demo-front.png" /></div>
             </div>
         </ng-template>
         <ng-template sf-template="tipsB" let-me let-ui="ui" let-schema="schema">
@@ -19,7 +19,7 @@
                     <dt>背面照</dt>
                     <dd>示例</dd>
                 </dl>
-                <div class="pa"><img height="104" src="/assets/images/eg02.png" /></div>
+                <div class="pa"><img height="104" src="./assets/images/usercenter/certificate-demo-back.png" /></div>
             </div>
         </ng-template>
     </sf>

src/app/routes/usercenter/components/driver/captain/add/add.component.html

@@ -9,7 +9,7 @@
               <dt>正面照</dt>
               <dd>示例</dd>
           </dl>
-          <div class="pa"><img height="104" src="/assets/images/eg01.png" /></div>
+          <div class="pa"><img height="104" src="./assets/images/usercenter/certificate-demo-front.png" /></div>
       </div>
   </ng-template>
   <ng-template sf-template="tipsB" let-me let-ui="ui" let-schema="schema">
@@ -18,7 +18,7 @@
               <dt>背面照</dt>
               <dd>示例</dd>
           </dl>
-          <div class="pa"><img height="104" src="/assets/images/eg02.png" /></div>
+          <div class="pa"><img height="104" src="./assets/images/usercenter/certificate-demo-back.png" /></div>
       </div>
   </ng-template>
   </sf>

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

@@ -7,13 +7,12 @@
  * @FilePath: \tms-obc-web\src\app\shared\components\amap\amap-poi-picker\amap-poi-picker.component.html
 -->
 <div nz-row class="mb-xl">
-    <div nz-col nzSpan="8">
+  <div nz-col nzSpan="8">
-      <input id="pickerInput" [(ngModel)]="addressInput" placeholder="请输入地址" />
+    <input id="pickerInput" [(ngModel)]="addressInput" placeholder="请输入地址" />
-    </div>
   </div>
-  <div class="map-container" id="container" tabindex="0" style="width: 800px; height: 500px"></div>
+</div>
-  <div *nzModalFooter>
+<div class="map-container" id="container" tabindex="0" style="width: 100%; height: 500px"></div>
-    <button nz-button nzType="default" (click)="cancel()">取消</button>
+<div *nzModalFooter>
-    <button nz-button nzType="primary" (click)="sure()">确定</button>
+  <button nz-button nzType="default" (click)="cancel()">取消</button>
-  </div>
+  <button nz-button nzType="primary" (click)="sure()">确定</button>
-  
+</div>

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

@@ -3,6 +3,7 @@ import { Component, OnInit, ViewChild } from '@angular/core';
 import { amapConf } from '@conf/amap.config';
 import { NzModalRef } from 'ng-zorro-antd/modal';
 import { throwError } from 'rxjs';
+import { AmapService } from '../amap.service';
 declare var AMap: any;
 declare var AMapUI: any;
 declare var Loca: any;
@@ -26,7 +27,7 @@ export class AmapPoiPickerComponent implements OnInit {
   infoWindow: any;
   geocoder: any;
 
-  constructor(private modalRef: NzModalRef) {}
+  constructor(private modalRef: NzModalRef, private service: AmapService) {}
   ngOnInit(): void {
     this.mapInit();
     // this.PoiPicker();
@@ -112,6 +113,13 @@ export class AmapPoiPickerComponent implements OnInit {
       radius: 1000 //范围，默认：500
     });
 
+    // 获取当前定位
+    this.service.getCurrentPosition().subscribe(res => {
+      if (res) {
+        this.selectedPOI(res.position);
+      }
+    });
+
     //选取了某个POI
     poiPicker.on('poiPicked', (poiResult: any) => {
       const source = poiResult.source,

src/app/shared/components/amap/amap.service.ts

@@ -20,8 +20,6 @@ const CONFIG = amapConf;
 })
 export class AmapService {
   constructor() {}
-  public length = 0;
-  public time = 0;
 
   sub = new Subject<any>();
   currentSub = new Subject<any>();

src/app/shared/components/imagelist/imagelist.component.spec.ts

@@ -1,23 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { ImageListComponent } from './imagelist.component';
-
-describe('ImageListComponent', () => {
-  let component: ImageListComponent;
-  let fixture: ComponentFixture<ImageListComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ImageListComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(ImageListComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});

src/app/shared/components/insurance-table/insurance-table.module.ts

@@ -1,5 +1,5 @@
 /*
- * @Description  : 
+ * @Description  :
  * @Version      : 1.0
  * @Author       : Shiming
  * @Date         : 2022-01-25 20:23:54
@@ -15,18 +15,15 @@ import { NzInputNumberModule } from 'ng-zorro-antd/input-number';
 import { NzTableModule } from 'ng-zorro-antd/table';
 import { InsuranceTableComponent } from './insurance-table.component';
 import { NzPopconfirmModule } from 'ng-zorro-antd/popconfirm';
-import { SHARED_ZORRO_MODULES } from '../../shared-zorro.module';
+import { NzInputModule } from 'ng-zorro-antd/input';
-import { SHARED_DELON_MODULES } from '../../shared-delon.module';
+import { DelonFormModule } from '@delon/form';
-const COMPONENTS = [InsuranceTableComponent,];
+import { NzButtonModule } from 'ng-zorro-antd/button';
-const COMPONENTSs = [  
+const COMPONENTS = [InsuranceTableComponent];
-  NzTableModule,
+const MODULES = [NzTableModule, NzInputNumberModule, NzPopconfirmModule, NzInputModule, NzButtonModule, DelonFormModule];
-  NzInputNumberModule,
-  NzPopconfirmModule,
-];
 
 @NgModule({
   declarations: COMPONENTS,
-  imports: [CommonModule, FormsModule,COMPONENTSs,SHARED_ZORRO_MODULES, SHARED_DELON_MODULES],
+  imports: [CommonModule, FormsModule, ...MODULES],
   exports: COMPONENTS
 })
 export class InsuranceTableModule {}

src/app/shared/shared.module.ts

@@ -37,7 +37,6 @@ import { ImageListModule } from './components/imagelist';
 import { DictSelectComponent } from './components/dict-select';
 import { PipeModule } from './pipes';
 import { AccountDetailComponent } from './components/account-detail/account-detail.component';
-import { InsuranceTableModule } from './components/insurance-table';
 
 const MODULES = [
   AddressModule,
@@ -52,7 +51,6 @@ const MODULES = [
   AmapModule,
   ImageListModule,
   PipeModule,
-  InsuranceTableModule,
   ...PRO_SHARED_MODULES
 ];
 // #endregion