From e7be6d4770519acfd72e657082cc39e16d1baca4 Mon Sep 17 00:00:00 2001 From: jackhoo_98 Date: Fri, 31 Mar 2023 12:39:44 +0800 Subject: [PATCH 1/5] =?UTF-8?q?update:=20=E7=BB=9F=E4=B8=80=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=B5=8F=E8=A7=88=E5=99=A8=E6=A0=87=E7=AD=BE=E8=B7=B3?= =?UTF-8?q?=E8=BD=AC=E3=80=81=E8=AE=BE=E5=A4=87=E6=8E=A5=E5=85=A5=E7=BD=91?= =?UTF-8?q?=E5=85=B3=E6=96=B0=E5=A2=9E=E5=BF=AB=E9=80=9F=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/link/AccessConfig/Detail/index.vue | 21 +++++++++++++++---- .../AccessConfig/components/Channel/index.vue | 4 ++++ .../AccessConfig/components/Cloud/Ctwing.vue | 4 ++++ .../AccessConfig/components/Cloud/OneNet.vue | 4 ++++ .../AccessConfig/components/Edge/index.vue | 6 +++++- .../AccessConfig/components/Media/GB28181.vue | 2 +- .../AccessConfig/components/Media/index.vue | 2 +- .../AccessConfig/components/Network/index.vue | 1 - src/views/media/Device/Save/SaveProduct.vue | 2 +- .../system/Apply/Save/components/EditForm.vue | 2 +- .../system/Department/components/LeftTree.vue | 2 +- .../system/Role/components/AddDialog.vue | 2 +- .../system/User/components/EditUserDialog.vue | 2 +- 13 files changed, 41 insertions(+), 13 deletions(-) diff --git a/src/views/link/AccessConfig/Detail/index.vue b/src/views/link/AccessConfig/Detail/index.vue index 9e6c52d2..033cd858 100644 --- a/src/views/link/AccessConfig/Detail/index.vue +++ b/src/views/link/AccessConfig/Detail/index.vue @@ -88,6 +88,17 @@ const TypeMap = new Map([ ['edge-child-device', 'edge'], ['network', 'network'], ]); +// DataMap后期优化 +const DataMap = new Map(); +DataMap.set('fixed-media', { type: 'media', title: '视频类设备接入' }); +DataMap.set('gb28181-2016', { type: 'media', title: '视频类设备接入' }); +DataMap.set('OneNet', { type: 'cloud', title: '云平台接入' }); +DataMap.set('Ctwing', { type: 'cloud', title: '云平台接入' }); +DataMap.set('modbus-tcp', { type: 'channel', title: '通道类设备接入' }); +DataMap.set('opc-ua', { type: 'channel', title: '通道类设备接入' }); +DataMap.set('official-edge-gateway', { type: 'edge', title: '官方接入' }); +DataMap.set('edge-child-device', { type: 'edge', title: '官方接入' }); +DataMap.set('network', { type: 'network', title: '自定义设备接入' }); const getTypeList = (result: Record) => { const list = []; @@ -161,12 +172,14 @@ const queryProviders = async () => { // dataSource.value = getTypeList(resp.result)[0].list.filter( // (item) => item.name !== '插件设备接入', // ); - if (route.query.save) { - // 视频中心-设备快速添加产品, 添加接入网关 + + // 快速添加接入网关 + if (route.query.save && route.query?.type) { + const type = route.query.type; goProviders( dataSource.value - .find((f: any) => f.title === '视频类设备接入') - ?.list?.find((f: any) => f.id === route.query.type), + .find((f: any) => f.title === DataMap.get(type).title) + ?.list?.find((f: any) => f.id === type), ); } } diff --git a/src/views/link/AccessConfig/components/Channel/index.vue b/src/views/link/AccessConfig/components/Channel/index.vue index dcba196c..29d607d3 100644 --- a/src/views/link/AccessConfig/components/Channel/index.vue +++ b/src/views/link/AccessConfig/components/Channel/index.vue @@ -119,6 +119,10 @@ const onFinish = async (values: any) => { if (resp.status === 200) { onlyMessage('操作成功', 'success'); history.back(); + if ((window as any).onTabSaveSuccess) { + (window as any).onTabSaveSuccess(resp); + setTimeout(() => window.close(), 300); + } } }; diff --git a/src/views/link/AccessConfig/components/Cloud/Ctwing.vue b/src/views/link/AccessConfig/components/Cloud/Ctwing.vue index 2eccd985..11aae07f 100644 --- a/src/views/link/AccessConfig/components/Cloud/Ctwing.vue +++ b/src/views/link/AccessConfig/components/Cloud/Ctwing.vue @@ -413,6 +413,10 @@ const saveData = async () => { if (resp.status === 200) { onlyMessage('操作成功', 'success'); history.back(); + if ((window as any).onTabSaveSuccess) { + (window as any).onTabSaveSuccess(resp); + setTimeout(() => window.close(), 300); + } } }; diff --git a/src/views/link/AccessConfig/components/Cloud/OneNet.vue b/src/views/link/AccessConfig/components/Cloud/OneNet.vue index 314f81df..5530b7ee 100644 --- a/src/views/link/AccessConfig/components/Cloud/OneNet.vue +++ b/src/views/link/AccessConfig/components/Cloud/OneNet.vue @@ -501,6 +501,10 @@ const saveData = async () => { if (resp.status === 200) { onlyMessage('操作成功', 'success'); history.back(); + if ((window as any).onTabSaveSuccess) { + (window as any).onTabSaveSuccess(resp); + setTimeout(() => window.close(), 300); + } } }; diff --git a/src/views/link/AccessConfig/components/Edge/index.vue b/src/views/link/AccessConfig/components/Edge/index.vue index ddfba517..c6eee197 100644 --- a/src/views/link/AccessConfig/components/Edge/index.vue +++ b/src/views/link/AccessConfig/components/Edge/index.vue @@ -264,7 +264,11 @@ const onFinish = async (values: any) => { id === ':id' ? await save(params) : await update({ ...params, id }); if (resp.status === 200) { onlyMessage('操作成功', 'success'); - history.back(); + history.back(); + if ((window as any).onTabSaveSuccess) { + (window as any).onTabSaveSuccess(resp); + setTimeout(() => window.close(), 300); + } } }; diff --git a/src/views/link/AccessConfig/components/Media/GB28181.vue b/src/views/link/AccessConfig/components/Media/GB28181.vue index 9c8a73b7..b2897766 100644 --- a/src/views/link/AccessConfig/components/Media/GB28181.vue +++ b/src/views/link/AccessConfig/components/Media/GB28181.vue @@ -654,7 +654,7 @@ const saveData = () => { onlyMessage('操作成功', 'success'); if (route.query.save) { // @ts-ignore - window?.onSaveSuccess(resp.result); + window?.onTabSaveSuccess(resp.result); window.close(); } else { history.back(); diff --git a/src/views/link/AccessConfig/components/Media/index.vue b/src/views/link/AccessConfig/components/Media/index.vue index 697a4065..81dee461 100644 --- a/src/views/link/AccessConfig/components/Media/index.vue +++ b/src/views/link/AccessConfig/components/Media/index.vue @@ -124,7 +124,7 @@ const onFinish = async (values: any) => { if (route.query.save) { // @ts-ignore - window?.onSaveSuccess(resp.result); + window?.onTabSaveSuccess(resp.result); window.close(); } else { history.back(); diff --git a/src/views/link/AccessConfig/components/Network/index.vue b/src/views/link/AccessConfig/components/Network/index.vue index 0eb1478d..a9d76b6f 100644 --- a/src/views/link/AccessConfig/components/Network/index.vue +++ b/src/views/link/AccessConfig/components/Network/index.vue @@ -522,7 +522,6 @@ const saveData = () => { onlyMessage('操作成功', 'success'); history.back(); if ((window as any).onTabSaveSuccess) { - console.log(123); if (resp.result?.id) { (window as any).onTabSaveSuccess(resp); setTimeout(() => window.close(), 300); diff --git a/src/views/media/Device/Save/SaveProduct.vue b/src/views/media/Device/Save/SaveProduct.vue index 3be3b0df..0ef6920a 100644 --- a/src/views/media/Device/Save/SaveProduct.vue +++ b/src/views/media/Device/Save/SaveProduct.vue @@ -319,7 +319,7 @@ const handleAdd = () => { const tab: any = window.open( `${origin}/#/iot/link/accessConfig/detail/:id?save=true&view=false&type=${props.channel}`, ); - tab.onSaveSuccess = async (value: string) => { + tab.onTabSaveSuccess = async (value: string) => { await getGatewayList(); handleClick(value); }; diff --git a/src/views/system/Apply/Save/components/EditForm.vue b/src/views/system/Apply/Save/components/EditForm.vue index a2de009f..b75ba98a 100644 --- a/src/views/system/Apply/Save/components/EditForm.vue +++ b/src/views/system/Apply/Save/components/EditForm.vue @@ -1771,7 +1771,7 @@ function getOrgIdList() { // 添加角色/组织 function clickAddItem(data: string[], target: string) { const tab: any = window.open(`${origin}/#/system/${target}?save=true`); - tab.onSaveSuccess = (value: string) => { + tab.onTabSaveSuccess = (value: string) => { data.push(value); if (target === 'Role') getRoleIdList(); else getOrgIdList(); diff --git a/src/views/system/Department/components/LeftTree.vue b/src/views/system/Department/components/LeftTree.vue index e2972961..fe00fa10 100644 --- a/src/views/system/Department/components/LeftTree.vue +++ b/src/views/system/Department/components/LeftTree.vue @@ -187,7 +187,7 @@ function delDepartment(id: string) { } function refresh(id: string) { // @ts-ignore - window?.onSaveSuccess && window.onSaveSuccess(id); + window?.onTabSaveSuccess && window.onTabSaveSuccess(id); window.close(); getTree(); } diff --git a/src/views/system/Role/components/AddDialog.vue b/src/views/system/Role/components/AddDialog.vue index 05967b76..76ad205f 100644 --- a/src/views/system/Role/components/AddDialog.vue +++ b/src/views/system/Role/components/AddDialog.vue @@ -63,7 +63,7 @@ const confirm = () => { if (route.query.save) { // @ts-ignore - window?.onSaveSuccess(resp.result.id); + window?.onTabSaveSuccess(resp.result.id); window.close(); } else jumpPage(`system/Role/Detail`, { id: resp.result.id }); } diff --git a/src/views/system/User/components/EditUserDialog.vue b/src/views/system/User/components/EditUserDialog.vue index 5a53dcc2..ca333beb 100644 --- a/src/views/system/User/components/EditUserDialog.vue +++ b/src/views/system/User/components/EditUserDialog.vue @@ -345,7 +345,7 @@ const form = reactive({ IsShow: (...typeList: modalType[]) => typeList.includes(props.type), clickAddItem: (prop: 'roleIdList' | 'orgIdList', target: string) => { const tab: any = window.open(`${origin}/#/system/${target}?save=true`); - tab.onSaveSuccess = (value: string) => { + tab.onTabSaveSuccess = (value: string) => { form.data[prop] = [...(form.data[prop] || []), value]; if (prop === 'roleIdList') form.getRoleList(); else form.getDepartmentList(); From 008cd45ce7a2b2f536cef8a2878eacc22c95294d Mon Sep 17 00:00:00 2001 From: jackhoo_98 Date: Fri, 31 Mar 2023 13:51:03 +0800 Subject: [PATCH 2/5] =?UTF-8?q?fix:=20=E9=87=87=E9=9B=86=E5=99=A8=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E7=BB=84=E4=BB=B6=E5=BC=95=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Collector/Point/components/PointCardBox/index.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/DataCollect/Collector/Point/components/PointCardBox/index.vue b/src/views/DataCollect/Collector/Point/components/PointCardBox/index.vue index c381405e..72ec84ea 100644 --- a/src/views/DataCollect/Collector/Point/components/PointCardBox/index.vue +++ b/src/views/DataCollect/Collector/Point/components/PointCardBox/index.vue @@ -80,6 +80,7 @@