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/, '')