geg-gas/geg-gas-web
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://47.94.165.164:13000/geg-gas/geg-gas-web into dev

Browse Source 
# Conflicts:
#	src/router/routes/basic.ts
This commit is contained in:
张福财
2025-12-05 10:05:50 +08:00
parent 7454813b2c 2506d02e95
commit d9780c488d
32 changed files with 902 additions and 333 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/erp/device/components/AlarmInfomation.vue
View File

@ -46,7 +46,7 @@
alarmtInfo.value = await getDeviceAlarmCheck(data.id);
imgSrc.value = alarmtInfo.value?.state === 0 ? 'check_tip_no1' : 'check_tip_pass1';
if (alarmtInfo.value.filePath) {
imgList.value = await getFileList({ folderId: alarmtInfo.value.filePath });
imgList.value = await getFileList({ tableId: alarmtInfo.value.filePath });
}
});
</script>

2
src/views/erp/device/components/InspectInfomation.vue
View File

@ -49,7 +49,7 @@
inspectInfo.value = await getDeviceInspectInfo(data.id);
imgSrc.value = inspectInfo.value?.state === 0 ? 'check_tip_no' : 'check_tip_pass';
if (inspectInfo.value.filePath) {
imgList.value = await getFileList({ folderId: inspectInfo.value.filePath });
imgList.value = await getFileList({ tableId: inspectInfo.value.filePath });
}
});
</script>