From 1fae2c24f76f71add4895a9ca78150c63a07a1b9 Mon Sep 17 00:00:00 2001 From: leiqiaochu Date: Fri, 31 Mar 2023 18:05:16 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20bug=E7=AE=A1=E7=90=86=E5=91=98?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E5=8F=96=E6=B6=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/init-home/index.vue | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/views/init-home/index.vue b/src/views/init-home/index.vue index c54aa561..1543ea72 100644 --- a/src/views/init-home/index.vue +++ b/src/views/init-home/index.vue @@ -134,12 +134,8 @@ const submitData = async () => { * 判断是否已有配置 */ const judgeInitSet = async () => { - if (userInfo.$state.userInfos.username === 'admin') { - const resp: any = await getInit(); - if (resp.status === 200 && resp.result.length) { - window.location.href = '/'; - } - } else { + const resp: any = await getInit(); + if (resp.status === 200 && resp.result.length) { window.location.href = '/'; } }; From d58ec295a9b981d8896f4235cfae59d261d33b7e Mon Sep 17 00:00:00 2001 From: JiangQiming <291854119@qq.com> Date: Fri, 31 Mar 2023 18:55:45 +0800 Subject: [PATCH 2/4] fix: bug#11269 --- .../Role/Detail/components/PermissTree.vue | 53 +++++++++++-------- 1 file changed, 32 insertions(+), 21 deletions(-) diff --git a/src/views/system/Role/Detail/components/PermissTree.vue b/src/views/system/Role/Detail/components/PermissTree.vue index 72fc7a80..9e8a6705 100644 --- a/src/views/system/Role/Detail/components/PermissTree.vue +++ b/src/views/system/Role/Detail/components/PermissTree.vue @@ -98,7 +98,7 @@ From ed2eb21d4b2ec316cf56a5616cacbd965d17670e Mon Sep 17 00:00:00 2001 From: JiangQiming <291854119@qq.com> Date: Fri, 31 Mar 2023 20:32:02 +0800 Subject: [PATCH 4/4] fix: bug#11353 --- .../Department/components/AddDeviceOrProductDialog.vue | 6 +++++- vite.config.ts | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/views/system/Department/components/AddDeviceOrProductDialog.vue b/src/views/system/Department/components/AddDeviceOrProductDialog.vue index 9cb7eade..b85419a2 100644 --- a/src/views/system/Department/components/AddDeviceOrProductDialog.vue +++ b/src/views/system/Department/components/AddDeviceOrProductDialog.vue @@ -172,12 +172,16 @@ const confirm = () => { return message.warning('请先勾选数据'); } + console.log('table.selectedRows: ', table.selectedRows); const params = table.selectedRows.map((item: any) => ({ targetType: 'org', targetId: props.parentId, assetType: props.assetType, assetIdList: [item.id], - permission: item.selectPermissions, + // 保存时, 过滤没有的权限 + permission: item.selectPermissions.filter((f: any) => + item.permissionList.map((m: any) => m.value).includes(f), + ), })); // 分配产品资产后, 进入设备资产分配,默认查询第一个产品下的设备 diff --git a/vite.config.ts b/vite.config.ts index a55d7960..baf145c2 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -92,8 +92,8 @@ export default defineConfig(({ mode}) => { [env.VITE_APP_BASE_API]: { // target: 'http://192.168.33.22:8800', // target: 'http://192.168.32.244:8881', - // target: 'http://120.77.179.54:8844', // 120测试 - target: 'http://192.168.33.46:8844', // 本地开发环境 + target: 'http://120.77.179.54:8844', // 120测试 + // target: 'http://192.168.33.46:8844', // 本地开发环境 ws: 'ws://192.168.33.46:8844', changeOrigin: true, rewrite: (path) => path.replace(/^\/api/, '')