From 4a920bf101f903b8402cfbaa3ee7bc75d393918b Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 20 Apr 2022 14:01:38 +0800 Subject: [PATCH] fix bug --- proxy.conf.js | 24 +++++++++---------- .../components/list/list.component.ts | 2 +- .../insurance-management-routing.module.ts | 4 ++-- .../list/carauth/carauth.component.ts | 13 +++++----- 4 files changed, 22 insertions(+), 21 deletions(-) diff --git a/proxy.conf.js b/proxy.conf.js index 3639702c..5dd5c8b2 100644 --- a/proxy.conf.js +++ b/proxy.conf.js @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-18 09:51:21 * @LastEditors : Shiming - * @LastEditTime : 2022-04-19 14:20:28 + * @LastEditTime : 2022-04-20 13:45:11 * @FilePath : \\tms-obc-web\\proxy.conf.js * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -18,19 +18,9 @@ module.exports = { // secure: false, // Ignore invalid SSL certificates // changeOrigin: true // } - // '//api': { - // target: { - // host: 'tms-api.yunduoxing.com', - // protocol: 'https:', - // port: 443 - // }, - // secure: false, - // changeOrigin: true, - // logLevel: 'debug' - // }, '//api': { target: { - host: 'tms-api-test.eascs.com', + host: 'tms-api.yunduoxing.com', protocol: 'https:', port: 443 }, @@ -38,4 +28,14 @@ module.exports = { changeOrigin: true, logLevel: 'debug' }, + // '//api': { + // target: { + // host: 'tms-api-dev.eascs.com', + // protocol: 'https:', + // port: 443 + // }, + // secure: false, + // changeOrigin: true, + // logLevel: 'debug' + // }, }; diff --git a/src/app/routes/insurance-management/components/list/list.component.ts b/src/app/routes/insurance-management/components/list/list.component.ts index 4655ee58..cd287883 100644 --- a/src/app/routes/insurance-management/components/list/list.component.ts +++ b/src/app/routes/insurance-management/components/list/list.component.ts @@ -566,7 +566,7 @@ export class insuranceManagementListComponent implements OnInit { } // 保险配置 changeOrder() { - this.router.navigate(['/insurance-management/list-set', 1]); + this.router.navigate(['/insurance-management/list-set']); } exprot() { this.service.downloadFile(this.service.$api_get_asyncExport, { ...this.reqParams, pageSize: -1 }); diff --git a/src/app/routes/insurance-management/insurance-management-routing.module.ts b/src/app/routes/insurance-management/insurance-management-routing.module.ts index 845a621d..1ff630fd 100644 --- a/src/app/routes/insurance-management/insurance-management-routing.module.ts +++ b/src/app/routes/insurance-management/insurance-management-routing.module.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-06 09:24:00 * @LastEditors : Shiming - * @LastEditTime : 2022-01-25 17:21:54 + * @LastEditTime : 2022-04-20 10:16:09 * @FilePath : \\tms-obc-web\\src\\app\\routes\\insurance-management\\insurance-management-routing.module.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -16,7 +16,7 @@ import { insuranceManagementSetComponent } from './components/set/set.component' const routes: Routes = [ { path: 'list', component: insuranceManagementListComponent }, - { path: 'list-set/:id', component: insuranceManagementSetComponent }, + { path: 'list-set', component: insuranceManagementSetComponent }, ] @NgModule({ imports: [RouterModule.forChild(routes)], diff --git a/src/app/routes/vehicle/components/list/carauth/carauth.component.ts b/src/app/routes/vehicle/components/list/carauth/carauth.component.ts index 49342fda..d72f78f0 100644 --- a/src/app/routes/vehicle/components/list/carauth/carauth.component.ts +++ b/src/app/routes/vehicle/components/list/carauth/carauth.component.ts @@ -1,3 +1,4 @@ +import { Placeholder } from '@angular/compiler/src/i18n/i18n_ast'; import { Component, OnInit, ViewChild } from '@angular/core'; import { apiConf } from '@conf/api.conf'; import { cacheConf } from '@conf/cache.conf'; @@ -131,7 +132,8 @@ export class CarSettleCarauthComponent implements OnInit { }, ]; this.sf?.setValue('/carFrontPhotoWatermark', avatar); - this.detailData.carFrontPhoto = args.file.response.data.fullFilePath + this.detailData.carFrontPhoto = args.file.response.data.fullFilePath; + this.checkCarCard(args.file.response.data.fullFilePath, 'back'); } }, beforeUpload: (file: any, _fileList: any) => { @@ -174,12 +176,10 @@ export class CarSettleCarauthComponent implements OnInit { carModel: { title: '车型', type: 'string', + readOnly: true, ui: { - widget: 'dict-select', - params: { dictKey: 'car:model' }, - placeholder: '请选择车型', - containsAllLabel:false, - } as SFSelectWidgetSchema, + placeholder:'请上传行驶证自动带出' + }, }, carLength: { title: '车长', @@ -682,6 +682,7 @@ export class CarSettleCarauthComponent implements OnInit { this.sf.setValue('/carDistinguishCode', res.vin); this.sf.setValue('/carOwner', res.name); this.sf.setValue('/useNature', res.useCharacter === '非营运' ? 0 : 1); + this.sf.setValue('/carModel', res?.vehicleType); } else { this.sf.setValue('/curbWeight', res.unladenMass);