~admin/command-center-dashboard.git

forked from drone/command-center-dashboard

罗广辉

2025-04-14 083b65c625ddfd238b4d325f856ab3bf706f71a4

refs
author	罗广辉 <guanghui.luo@foxmail.com>
	Monday, April 14, 2025 15:26 +0800
committer	罗广辉 <guanghui.luo@foxmail.com>
	Monday, April 14, 2025 15:26 +0800
commit	083b65c625ddfd238b4d325f856ab3bf706f71a4
tree	193c8d6e2899e9f4b98da01e09ba8223616a5c23 tree \| zip \| gz
parent	4144b687e5001ccad52f118e9fcd3f91609e87c4 view \| diff edab6a6c463eb13accdadd412e9481d88ccf4e0d view \| diff

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/TaskManage/TaskIntermediateContent/TaskIntermediateContent.vue

9 files modified

	src/store/modules/task.js	5 ●●●●● diff \| view \| raw \| blame \| history
	src/views/SignMachineNest/MachineLeft/InspectionRaskDetails.vue	2 ●●●●● diff \| view \| raw \| blame \| history
	src/views/SignMachineNest/MachineRight/MachineStatus/MachineTableDetails/DeviceEvent.vue	46 ●●●●● diff \| view \| raw \| blame \| history
	src/views/SignMachineNest/MachineRight/MachineStatus/MachineTableDetails/DeviceJob/DeviceJob.vue	9 ●●●●● diff \| view \| raw \| blame \| history
	src/views/TaskManage/SearchBox.vue	11 ●●●●● diff \| view \| raw \| blame \| history
	src/views/TaskManage/TaskIntermediateContent/TaskIntermediateContent.vue	5 ●●●●● diff \| view \| raw \| blame \| history
	src/views/TaskManage/TaskTop/TaskEvent.vue	20 ●●●●● diff \| view \| raw \| blame \| history
	src/views/TaskManage/TaskTop/TaskIndustry.vue	20 ●●●●● diff \| view \| raw \| blame \| history
	src/views/TaskManage/TaskTop/TaskTime.vue	17 ●●●●● diff \| view \| raw \| blame \| history