From 8239b2c308c4240c7be835e8ee357c0bee2bb738 Mon Sep 17 00:00:00 2001 From: JiangQiming <291854119@qq.com> Date: Thu, 30 Mar 2023 16:36:11 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20bug#11174=E3=80=8111227?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/link/AccessConfig/components/Media/GB28181.vue | 8 +++++++- src/views/notice/Config/SyncUser/index.vue | 4 ++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/views/link/AccessConfig/components/Media/GB28181.vue b/src/views/link/AccessConfig/components/Media/GB28181.vue index 4b1be3ea..9c8a73b7 100644 --- a/src/views/link/AccessConfig/components/Media/GB28181.vue +++ b/src/views/link/AccessConfig/components/Media/GB28181.vue @@ -652,7 +652,13 @@ const saveData = () => { if (resp?.status === 200) { onlyMessage('操作成功', 'success'); - history.back(); + if (route.query.save) { + // @ts-ignore + window?.onSaveSuccess(resp.result); + window.close(); + } else { + history.back(); + } } }); }; diff --git a/src/views/notice/Config/SyncUser/index.vue b/src/views/notice/Config/SyncUser/index.vue index 1dc561b4..fc157478 100644 --- a/src/views/notice/Config/SyncUser/index.vue +++ b/src/views/notice/Config/SyncUser/index.vue @@ -47,7 +47,7 @@ total: dataSource.length, current: current, pageSize: pageSize, - pageSizeOptions: ['5', '10', '20', '50', '100'], + pageSizeOptions: ['10', '20', '50', '100'], showSizeChanger: true, hideOnSinglePage: false, showTotal: (total: number, range: number) => `第 ${range[0]} - ${range[1]} 条/总共 ${total} 条`, @@ -399,7 +399,7 @@ const getTableData = (terms?: any) => { * 前端分页 */ const current = ref(1); -const pageSize = ref(5); +const pageSize = ref(10); const handleTableChange = (pagination: any) => { current.value = pagination.current; pageSize.value = pagination.pageSize;