diff --git a/src/app/routes/insurance-management/insurance-management.module.ts b/src/app/routes/insurance-management/insurance-management.module.ts index 74ffcc31..00103336 100644 --- a/src/app/routes/insurance-management/insurance-management.module.ts +++ b/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[] = [ - insuranceManagementListComponent, - insuranceManagementSetComponent, - -]; +const COMPONENTS: Type[] = [insuranceManagementListComponent, insuranceManagementSetComponent]; @NgModule({ - imports: [ - SharedModule, - InsuranceManagementRoutingModule, - - ], - declarations: COMPONENTS, + imports: [SharedModule, InsuranceManagementRoutingModule, InsuranceTableModule], + declarations: COMPONENTS }) -export class InsuranceManagementModule { } +export class InsuranceManagementModule {} diff --git a/src/app/routes/supply-management/components/add-driver/add-driver.component.html b/src/app/routes/supply-management/components/add-driver/add-driver.component.html index 8b5b1d0b..9483e3f5 100644 --- a/src/app/routes/supply-management/components/add-driver/add-driver.component.html +++ b/src/app/routes/supply-management/components/add-driver/add-driver.component.html @@ -20,7 +20,7 @@
正面照
示例
-
+
@@ -29,7 +29,7 @@
背面照
示例
-
+
diff --git a/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts b/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts index 229c4d3e..c4274d73 100644 --- a/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts +++ b/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: { diff --git a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html index 3bbf089c..ef8707a1 100644 --- a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html +++ b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html @@ -33,7 +33,7 @@ @@ -93,7 +93,7 @@ placeholder="请输入卸货地" /> - + diff --git a/src/app/routes/supply-management/components/release-publish/release-publish.component.html b/src/app/routes/supply-management/components/release-publish/release-publish.component.html index a4e59d46..49e823ef 100644 --- a/src/app/routes/supply-management/components/release-publish/release-publish.component.html +++ b/src/app/routes/supply-management/components/release-publish/release-publish.component.html @@ -39,7 +39,7 @@ /> @@ -104,7 +104,7 @@ /> diff --git a/src/app/routes/supply-management/components/release-publish/release-publish.component.ts b/src/app/routes/supply-management/components/release-publish/release-publish.component.ts index 3c3ac21b..214ed987 100644 --- a/src/app/routes/supply-management/components/release-publish/release-publish.component.ts +++ b/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() } diff --git a/src/app/routes/usercenter/components/driver/add-driver/add-driver.component.html b/src/app/routes/usercenter/components/driver/add-driver/add-driver.component.html index c17d2c12..46d3ed3f 100644 --- a/src/app/routes/usercenter/components/driver/add-driver/add-driver.component.html +++ b/src/app/routes/usercenter/components/driver/add-driver/add-driver.component.html @@ -10,7 +10,7 @@
正面照
示例
-
+
@@ -19,7 +19,7 @@
背面照
示例
-
+
diff --git a/src/app/routes/usercenter/components/driver/captain/add/add.component.html b/src/app/routes/usercenter/components/driver/captain/add/add.component.html index 77904f23..1e60ca0b 100644 --- a/src/app/routes/usercenter/components/driver/captain/add/add.component.html +++ b/src/app/routes/usercenter/components/driver/captain/add/add.component.html @@ -9,7 +9,7 @@
正面照
示例
-
+
@@ -18,7 +18,7 @@
背面照
示例
-
+
diff --git a/src/app/shared/components/amap/amap-poi-picker/amap-poi-picker.component.html b/src/app/shared/components/amap/amap-poi-picker/amap-poi-picker.component.html index 169130cc..9a2f46c7 100644 --- a/src/app/shared/components/amap/amap-poi-picker/amap-poi-picker.component.html +++ b/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 -->
-
- -
+
+
-
-
- - -
- \ No newline at end of file +
+
+
+ + +
\ No newline at end of file diff --git a/src/app/shared/components/amap/amap-poi-picker/amap-poi-picker.component.ts b/src/app/shared/components/amap/amap-poi-picker/amap-poi-picker.component.ts index c9577188..fb9441d3 100644 --- a/src/app/shared/components/amap/amap-poi-picker/amap-poi-picker.component.ts +++ b/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, diff --git a/src/app/shared/components/amap/amap.service.ts b/src/app/shared/components/amap/amap.service.ts index d4c97636..4a08b43f 100644 --- a/src/app/shared/components/amap/amap.service.ts +++ b/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(); currentSub = new Subject(); diff --git a/src/app/shared/components/imagelist/imagelist.component.spec.ts b/src/app/shared/components/imagelist/imagelist.component.spec.ts deleted file mode 100644 index ca7d3ff8..00000000 --- a/src/app/shared/components/imagelist/imagelist.component.spec.ts +++ /dev/null @@ -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; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ImageListComponent], - }).compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(ImageListComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/shared/components/insurance-table/insurance-table.module.ts b/src/app/shared/components/insurance-table/insurance-table.module.ts index 2c72ccee..ab85e526 100644 --- a/src/app/shared/components/insurance-table/insurance-table.module.ts +++ b/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 { SHARED_DELON_MODULES } from '../../shared-delon.module'; -const COMPONENTS = [InsuranceTableComponent,]; -const COMPONENTSs = [ - NzTableModule, - NzInputNumberModule, - NzPopconfirmModule, -]; +import { NzInputModule } from 'ng-zorro-antd/input'; +import { DelonFormModule } from '@delon/form'; +import { NzButtonModule } from 'ng-zorro-antd/button'; +const COMPONENTS = [InsuranceTableComponent]; +const MODULES = [NzTableModule, NzInputNumberModule, NzPopconfirmModule, NzInputModule, NzButtonModule, DelonFormModule]; @NgModule({ declarations: COMPONENTS, - imports: [CommonModule, FormsModule,COMPONENTSs,SHARED_ZORRO_MODULES, SHARED_DELON_MODULES], + imports: [CommonModule, FormsModule, ...MODULES], exports: COMPONENTS }) export class InsuranceTableModule {} diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts index e972b229..776c0210 100644 --- a/src/app/shared/shared.module.ts +++ b/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 diff --git a/src/assets/images/eg01.png b/src/assets/images/eg01.png deleted file mode 100644 index 366bda19..00000000 Binary files a/src/assets/images/eg01.png and /dev/null differ diff --git a/src/assets/images/eg02.png b/src/assets/images/eg02.png deleted file mode 100644 index b9da9074..00000000 Binary files a/src/assets/images/eg02.png and /dev/null differ diff --git a/src/assets/images/usercenter/certificate-demo-back.png b/src/assets/images/usercenter/certificate-demo-back.png index b5b2ea22..b9da9074 100644 Binary files a/src/assets/images/usercenter/certificate-demo-back.png and b/src/assets/images/usercenter/certificate-demo-back.png differ diff --git a/src/assets/images/usercenter/certificate-demo-front.png b/src/assets/images/usercenter/certificate-demo-front.png index acd43987..366bda19 100644 Binary files a/src/assets/images/usercenter/certificate-demo-front.png and b/src/assets/images/usercenter/certificate-demo-front.png differ diff --git a/src/assets/images/vehicle/agree.png b/src/assets/images/vehicle/agree.png deleted file mode 100644 index 53ee1c1a..00000000 Binary files a/src/assets/images/vehicle/agree.png and /dev/null differ