by2025/admin-vben5
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: by2025:5ac6cc89469afa3ddddbb97688d2889bb932943e
Branches Tags
by2025:master by2025:prod by2025:ec2f257a by2025:dev by2025:dev_front by2025:main
by2025:1.4.0-back5.4.0 by2025:1.3.6-back5.3.1 by2025:1.3.5-back5.3.1 by2025:1.3.4-back5.3.1 by2025:1.3.3-back5.3.1 by2025:1.3.2-back5.3.1 by2025:1.3.1-back5.3.1 by2025:1.3.0-back5.3.1 by2025:1.2.3-back5.3.1 by2025:1.2.2-back5.3.1 by2025:1.2.0-back5.3.0 by2025:1.1.3 by2025:1.1.2 by2025:1.1.1 by2025:1.1.0 by2025:1.0.0 by2025:1.0.0-beta
..
compare: by2025:0effa0b48fdde0f0c731ca767b1661680275e6ef
Branches Tags
by2025:master by2025:prod by2025:ec2f257a by2025:dev by2025:dev_front by2025:main
by2025:1.4.0-back5.4.0 by2025:1.3.6-back5.3.1 by2025:1.3.5-back5.3.1 by2025:1.3.4-back5.3.1 by2025:1.3.3-back5.3.1 by2025:1.3.2-back5.3.1 by2025:1.3.1-back5.3.1 by2025:1.3.0-back5.3.1 by2025:1.2.3-back5.3.1 by2025:1.2.2-back5.3.1 by2025:1.2.0-back5.3.0 by2025:1.1.3 by2025:1.1.2 by2025:1.1.1 by2025:1.1.0 by2025:1.0.0 by2025:1.0.0-beta

2 Commits
5ac6cc8946 ... 0effa0b48f

Author SHA1 Message Date
FLL
0effa0b48f Merge branch 'master' of http://47.109.37.87:3000/by2025/admin-vben5
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
Details
2025-07-17 14:10:57 +08:00
FLL
01da009de8 设备管理 2025-07-17 14:10:36 +08:00
2 changed files with 2 additions and 4 deletions
Expand all files Collapse all files

4
apps/web-antd/src/views/property/equipmentManagement/deviceLocation/data.ts
View File

@@ -42,10 +42,6 @@ export const columns: VxeGridProps['columns'] = [
}, },
}, },
}, },
{
title: '位置对象',
field: 'locationObject',
},
{ {
title: '备注', title: '备注',
field: 'remark', field: 'remark',

2
apps/web-antd/src/views/property/equipmentManagement/deviceLocation/deviceLocation-modal.vue
View File

@@ -105,9 +105,11 @@ const [BasicModal, modalApi] = useVbenModal({
isUpdate.value = !!id; isUpdate.value = !!id;
if (isUpdate.value && id) { if (isUpdate.value && id) {
const record = await deviceLocationInfo(id); const record = await deviceLocationInfo(id);
await setupCommunitySelect(record.locationType);
record.locationType = record.locationType?.toString(); record.locationType = record.locationType?.toString();
await formApi.setValues(record); await formApi.setValues(record);
} }
await markInitialized(); await markInitialized();
modalApi.modalLoading(false); modalApi.modalLoading(false);
}, },