From ad327c87efdcf6e7bf061b0ba0e1f1028542cf29 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Tue, 14 Dec 2021 20:42:23 +0800 Subject: [PATCH] fix bug --- .../onecar-publish.component.ts | 13 ++- .../publish-success.component.html | 8 ++ .../publish-success.component.less | 88 +++++++++++++++++++ .../publish-success.component.ts | 31 +++++++ .../supply-management.module.ts | 7 +- 5 files changed, 144 insertions(+), 3 deletions(-) create mode 100644 src/app/routes/supply-management/components/onecar-publish/publish-success/publish-success.component.html create mode 100644 src/app/routes/supply-management/components/onecar-publish/publish-success/publish-success.component.less create mode 100644 src/app/routes/supply-management/components/onecar-publish/publish-success/publish-success.component.ts diff --git a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts index 5a5260aa..44843ba1 100644 --- a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts +++ b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts @@ -16,6 +16,7 @@ import { PublishGoodsChooseFamifiarComponent } from '../choose-famifiar/choose-f import { SupplyManagementService } from '../../services/supply-management.service'; import { debug } from 'console'; import { PublishAddressListComponent } from './address-list/address-list.component'; +import { PublishSuccessComponent } from './publish-success/publish-success.component'; @Component({ selector: 'app-publish-goods-onecar-publish', templateUrl: './onecar-publish.component.html', @@ -662,7 +663,17 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { } requests(url: any, params: any) { this.service.request(url, params).subscribe((res: any) => { - console.log(res) + if (res) { + this.modalService.create({ + nzTitle: '', + nzContent: PublishSuccessComponent, + nzWidth: 900, + nzFooter: null, + nzComponentParams: { type: 'onecar' } + }); + } else { + this.service.msgSrv.error(res.msg); + } }) } // 打开地图 diff --git a/src/app/routes/supply-management/components/onecar-publish/publish-success/publish-success.component.html b/src/app/routes/supply-management/components/onecar-publish/publish-success/publish-success.component.html new file mode 100644 index 00000000..e34bac36 --- /dev/null +++ b/src/app/routes/supply-management/components/onecar-publish/publish-success/publish-success.component.html @@ -0,0 +1,8 @@ +
+ +
+ + +
+
+
diff --git a/src/app/routes/supply-management/components/onecar-publish/publish-success/publish-success.component.less b/src/app/routes/supply-management/components/onecar-publish/publish-success/publish-success.component.less new file mode 100644 index 00000000..a33ce26d --- /dev/null +++ b/src/app/routes/supply-management/components/onecar-publish/publish-success/publish-success.component.less @@ -0,0 +1,88 @@ +@import '~@delon/theme/index'; +:host { + + ::ng-deep { + h3 { + margin-bottom: 20px; + font-size: 16px; + } + .submit { + width: 50%; + } + .login { + float: right; + line-height: @btn-height-lg; + } + } +} +::ng-deep { + .register-password-cdk { + .success, + .warning, + .error { + transition: color 0.3s; + } + .success { + color: @success-color; + } + .warning { + color: @warning-color; + } + .error { + color: @error-color; + } + .progress-pass > .progress { + .ant-progress-bg { + background-color: @warning-color; + } + } + } +} + +.form-box{ + display: block; + width: 368px; + margin: 0 auto; +} + +.content { + background-color: #f0f3f7; +} +.main { + max-width: 1200px; + margin: 0 auto; +} +.header { + background: #fff; +} +.layout { + min-height: 100vh; +} + +.logo { + display: flex; + margin: 16px 0; + line-height: 32px; + dt { + width: 95px; + height: 32px; + img { + vertical-align: top; + } + } + dd { + flex: 1; + margin-bottom: 0; + padding: 0 10px; + color: #1890ff; + font-weight: 500; + font-size: 24px; + } +} +.footer { + text-align: center; + background-color: #f0f3f7; +} + + + diff --git a/src/app/routes/supply-management/components/onecar-publish/publish-success/publish-success.component.ts b/src/app/routes/supply-management/components/onecar-publish/publish-success/publish-success.component.ts new file mode 100644 index 00000000..159310a7 --- /dev/null +++ b/src/app/routes/supply-management/components/onecar-publish/publish-success/publish-success.component.ts @@ -0,0 +1,31 @@ +/* + * @Author: your name + * @Date: 2021-12-14 20:39:34 + * @LastEditTime: 2021-12-14 20:41:43 + * @LastEditors: your name + * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE + * @FilePath: \tms-obc-web\src\app\routes\supply-management\components\onecar-publish\publish-success\publish-success.component.ts + */ +import { Component } from '@angular/core'; +import { ActivatedRoute, Router } from '@angular/router'; +import { NzMessageService } from 'ng-zorro-antd/message'; + +@Component({ + selector: 'publish-goods-publish-success', + templateUrl: './publish-success.component.html', + styleUrls: ['./publish-success.component.less'] +}) +export class PublishSuccessComponent { + type = 'onecar'; + constructor(private route: ActivatedRoute, private router: Router, public msg: NzMessageService) { + this.type = route.snapshot.queryParams.type || 'onecar'; + } + + continue() { + window.location.reload(); + } + + view() { + this.router.navigate(['/supply-management/list'], { queryParams: { type: this.type } }); + } +} diff --git a/src/app/routes/supply-management/supply-management.module.ts b/src/app/routes/supply-management/supply-management.module.ts index 1cda9cf5..5a5eb063 100644 --- a/src/app/routes/supply-management/supply-management.module.ts +++ b/src/app/routes/supply-management/supply-management.module.ts @@ -1,7 +1,7 @@ /* * @Author: your name * @Date: 2021-12-03 11:10:14 - * @LastEditTime: 2021-12-13 15:23:25 + * @LastEditTime: 2021-12-14 20:40:01 * @LastEditors: Please set LastEditors * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @FilePath: \tms-obc-web\src\app\routes\supply-management\supply-management.module.ts @@ -27,6 +27,7 @@ import { PublishchooseFamifiarSetCaptainComponent } from './components/choose-fa import { PublishchooseFamifiarAddComponent } from './components/choose-famifiar/add/add.component'; import { SupplyManagementBulkPublishComponent } from './components/bulk-publish/bulk-publish.component'; import { PublishAddressListComponent } from './components/onecar-publish/address-list/address-list.component'; +import { PublishSuccessComponent } from './components/onecar-publish/publish-success/publish-success.component'; const COMPONENTS: Type[] = [ SupplyManagementIndexComponent, @@ -46,7 +47,9 @@ const COMPONENTS: Type[] = [ PublishchooseFamifiarSetCaptainComponent, PublishchooseFamifiarAddComponent, SupplyManagementBulkPublishComponent, - PublishAddressListComponent + PublishAddressListComponent, + PublishSuccessComponent + ]; @NgModule({