0017
/
iot-ui-vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: bug#11353

This commit is contained in:
JiangQiming 2023-03-31 20:32:02 +08:00
parent 2013ecbddd
commit ed2eb21d4b
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/views/system/Department/components/AddDeviceOrProductDialog.vue
View File

@ -172,12 +172,16 @@ const confirm = () => {
return message.warning('请先勾选数据'); return message.warning('请先勾选数据');
} }
console.log('table.selectedRows: ', table.selectedRows);
const params = table.selectedRows.map((item: any) => ({ const params = table.selectedRows.map((item: any) => ({
targetType: 'org', targetType: 'org',
targetId: props.parentId, targetId: props.parentId,
assetType: props.assetType, assetType: props.assetType,
assetIdList: [item.id], assetIdList: [item.id],
permission: item.selectPermissions, // 保存时, 过滤没有的权限
permission: item.selectPermissions.filter((f: any) =>
item.permissionList.map((m: any) => m.value).includes(f),
),
})); }));
// 分配产品资产后, 进入设备资产分配,默认查询第一个产品下的设备 // 分配产品资产后, 进入设备资产分配,默认查询第一个产品下的设备

4
vite.config.ts
View File

@ -92,8 +92,8 @@ export default defineConfig(({ mode}) => {
[env.VITE_APP_BASE_API]: { [env.VITE_APP_BASE_API]: {
// target: 'http://192.168.33.22:8800', // target: 'http://192.168.33.22:8800',
// target: 'http://192.168.32.244:8881', // target: 'http://192.168.32.244:8881',
// target: 'http://120.77.179.54:8844', // 120测试 target: 'http://120.77.179.54:8844', // 120测试
target: 'http://192.168.33.46:8844', // 本地开发环境 // target: 'http://192.168.33.46:8844', // 本地开发环境
ws: 'ws://192.168.33.46:8844', ws: 'ws://192.168.33.46:8844',
changeOrigin: true, changeOrigin: true,
rewrite: (path) => path.replace(/^\/api/, '') rewrite: (path) => path.replace(/^\/api/, '')