Rainie/bbq
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Taric Xin
2022-01-21 10:31:06 +08:00
parent 96e2e5297b c05a8eb2ba
commit 77086c2ce8
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
proxy.conf.js
View File

@ -4,7 +4,7 @@
* @Author : Shiming * @Author : Shiming
* @Date : 2022-01-18 09:51:21 * @Date : 2022-01-18 09:51:21
* @LastEditors : Shiming * @LastEditors : Shiming
* @LastEditTime : 2022-01-20 20:39:28 * @LastEditTime : 2022-01-21 10:04:03
* @FilePath : \\tms-obc-web\\proxy.conf.js * @FilePath : \\tms-obc-web\\proxy.conf.js
* Copyright (C) 2022 huzhenhong. All rights reserved. * Copyright (C) 2022 huzhenhong. All rights reserved.
*/ */
@ -20,7 +20,7 @@ module.exports = {
// } // }
'//api': { '//api': {
target: { target: {
host: 'tms-api-test.eascs.com', host: 'tms-api-dev.eascs.com',
protocol: 'https:', protocol: 'https:',
port: 443 port: 443
}, },

2
src/app/routes/sys-setting/components/announcement-message/announcement-message.component.ts
View File

@ -184,7 +184,7 @@ this.ui2 = { '*': { spanLabelFixed: 120, grid: { span: 24 } } };
nzClosable: false, nzClosable: false,
nzCancelText: '取消', nzCancelText: '取消',
nzOnOk: () => { nzOnOk: () => {
this.service.request(this.service.$api_settlementCustomer_deletebatch, [item.id]).subscribe(res => { this.service.request(this.service.$api_delete_deleteAnnouncementInfoById, [item.id]).subscribe(res => {
if (res) { if (res) {
this.service.msgSrv.success('删除成功！'); this.service.msgSrv.success('删除成功！');
this.st.reload(1) this.st.reload(1)