From 72c72888dfea7f57d416f2904ed975cafbc32b5d Mon Sep 17 00:00:00 2001 From: easy <1358086367@qq.com> Date: Mon, 27 Feb 2023 17:49:40 +0800 Subject: [PATCH 1/3] =?UTF-8?q?update:=20=E5=BA=94=E7=94=A8=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E6=B7=BB=E5=8A=A0=E9=9B=86=E6=88=90=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E5=BC=B9=E7=AA=97=E3=80=81cardbox=E7=BB=84=E4=BB=B6=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E9=81=AE=E7=BD=A9=E5=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/system/apply.ts | 23 +- src/components/CardBox/index.vue | 49 +++-- .../system/Apply/Save/components/EditForm.vue | 76 +++++-- .../Apply/Save/components/MenuDialog.vue | 49 ----- .../Apply/Save/components/RequestTable.vue | 1 + src/views/system/Apply/Save/typing.d.ts | 4 +- .../system/Apply/componenets/MenuDialog.vue | 196 ++++++++++++++++++ src/views/system/Apply/index.vue | 21 +- 8 files changed, 323 insertions(+), 96 deletions(-) delete mode 100644 src/views/system/Apply/Save/components/MenuDialog.vue create mode 100644 src/views/system/Apply/componenets/MenuDialog.vue diff --git a/src/api/system/apply.ts b/src/api/system/apply.ts index 9bf97443..b3b4c218 100644 --- a/src/api/system/apply.ts +++ b/src/api/system/apply.ts @@ -4,17 +4,30 @@ import server from '@/utils/request'; // 获取应用管理列表 export const getApplyList_api = (data: any) => server.post(`/application/_query/`, data) // 修改应用状态 -export const changeApplyStatus_api = (id:string,data: any) => server.put(`/application/${id}`, data) +export const changeApplyStatus_api = (id: string, data: any) => server.put(`/application/${id}`, data) // 删除应用 -export const delApply_api = (id:string) => server.remove(`/application/${id}`) +export const delApply_api = (id: string) => server.remove(`/application/${id}`) // 获取组织列表 export const getDepartmentList_api = () => server.get(`/organization/_all/tree`); // 获取组织列表 -export const getAppInfo_api = (id:string) => server.get(`/application/${id}`); +export const getAppInfo_api = (id: string) => server.get(`/application/${id}`); // 新增应用 -export const addApp_api = (data:object) => server.post(`/application`, data); +export const addApp_api = (data: object) => server.post(`/application`, data); // 更新应用 -export const updateApp_api = (id:string, data:object) => server.put(`/application/${id}`, data); \ No newline at end of file +export const updateApp_api = (id: string, data: object) => server.put(`/application/${id}`, data); + + +// ---------集成菜单----------- + +// 获取所属系统 +export const getOwner_api = (data: object) => server.post(`/menu/owner`, data); +export const getOwnerStandalone_api = (appId: string, data: object) => server.post(`/application/${appId}/_/api/menu/owner`, data); + +// 获取对应系统菜单树 +export const getOwnerTree_api = (owner: string) => server.post(`/menu/owner/tree/${owner}`, {}); +export const getOwnerTreeStandalone_api = (appId: string, owner: string) => server.post(`/application/${appId}/_/api/menu/owner/tree/${owner}`, {}); +// 保存集成菜单 +export const saveOwnerMenu_api = (owner: string, appId: string, data: object) => server.patch(`/menu/owner/${owner}/${appId}/_all`, data); diff --git a/src/components/CardBox/index.vue b/src/components/CardBox/index.vue index dee607c8..bfe32ab1 100644 --- a/src/components/CardBox/index.vue +++ b/src/components/CardBox/index.vue @@ -40,11 +40,19 @@ +
+
+ +
+
-
+
- - + + + + + diff --git a/src/views/media/Device/Channel/index.vue b/src/views/media/Device/Channel/index.vue index 6ca977e2..0e17cec7 100644 --- a/src/views/media/Device/Channel/index.vue +++ b/src/views/media/Device/Channel/index.vue @@ -76,6 +76,12 @@ + + @@ -84,6 +90,7 @@ import ChannelApi from '@/api/media/channel'; import type { ActionsType } from '@/components/Table/index.vue'; import { useMenuStore } from 'store/menu'; import { message } from 'ant-design-vue'; +import Save from './Save.vue'; const menuStory = useMenuStore(); const route = useRoute(); @@ -163,6 +170,8 @@ const handleAdd = () => { const listRef = ref(); const playVis = ref(false); +const channelData = ref(); + const getActions = ( data: Partial>, type: 'card' | 'table', @@ -178,6 +187,7 @@ const getActions = ( icon: 'EditOutlined', onClick: () => { saveVis.value = true; + channelData.value = data; }, }, { From 9189d8a212d6c6310fcda95a75aa0370a7ba7555 Mon Sep 17 00:00:00 2001 From: wangshuaiswim Date: Mon, 27 Feb 2023 19:24:14 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E7=89=A9=E6=A8=A1=E5=9E=8B=E5=BC=80?= =?UTF-8?q?=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Metadata/Base/Edit/ExpandsForm.vue | 25 ++++- .../Metadata/Base/Edit/PropertyForm.vue | 91 ++++++++++++------- .../Metadata/Base/Edit/ValueTypeForm.vue | 9 +- .../components/Metadata/Base/Edit/index.vue | 31 +++++-- .../device/components/Metadata/Base/index.vue | 35 +++---- 5 files changed, 131 insertions(+), 60 deletions(-) diff --git a/src/views/device/components/Metadata/Base/Edit/ExpandsForm.vue b/src/views/device/components/Metadata/Base/Edit/ExpandsForm.vue index 7377c4d0..d4061d54 100644 --- a/src/views/device/components/Metadata/Base/Edit/ExpandsForm.vue +++ b/src/views/device/components/Metadata/Base/Edit/ExpandsForm.vue @@ -2,20 +2,33 @@ - + - + + + + + + + + +