forked from drone/command-center-dashboard
parent: 5d21d9 | patch | commitdiff
张含笑
2025-04-21 58f72da6d6c2a15a4c86705c23f37c9b5c4b4b71
refs
author 张含笑 <zhx18749296735@163.com>
Monday, April 21, 2025 11:30 +0800
committer 张含笑 <zhx18749296735@163.com>
Monday, April 21, 2025 11:30 +0800
commit58f72da6d6c2a15a4c86705c23f37c9b5c4b4b71
tree bbf1042d98f48479a5dbbd367f9473f2067b1e9f tree | zip | gz
parent 5d21d930174f6b065632834743d4ba3a07d4e7f7 view | diff
132e112a7e9a81c80e2e1c1859bab7f0ae573233 view | diff 
Merge branch 'refs/heads/fix/v1.0.0/lgh/历史任务详情优化' into test

# Conflicts:
#	src/components/DeviceJobDetails/JobRelatedEvents.vue
#	src/views/SignMachineNest/MachineRight/InspectionRaskList.vue
4 files modified
10 ■■■■■ changed files
src/components/DeviceJobDetails/JobRelatedEvents.vue 2 ●●●●● diff | view | raw | blame | history
src/views/SignMachineNest/MachineLeft/MachineData.vue 2 ●●●●● diff | view | raw | blame | history
src/views/SignMachineNest/MachineRight/InspectionRaskList.vue 2 ●●●●● diff | view | raw | blame | history
src/views/TaskManage/TaskIntermediateContent/TaskIntermediateContent.vue 4 ●●●●● diff | view | raw | blame | history