~admin/command-center-dashboard.git

forked from drone/command-center-dashboard

Merge remote-tracking branch 'origin/master'

张含笑

2025-04-10 fee18d19a1d961847cd09469a20fc8231c1df46c

refs
author	张含笑 <zhx18749296735@163.com>
	Thursday, April 10, 2025 11:09 +0800
committer	张含笑 <zhx18749296735@163.com>
	Thursday, April 10, 2025 11:09 +0800
commit	fee18d19a1d961847cd09469a20fc8231c1df46c
tree	efab51dbc92b4a0b8342edd490284863563cf47c tree \| zip \| gz
parent	3124dced3b901426803137204ddbd58016b60760 view \| diff 1703ac780eb094b6c8f193d0cbbb537c3d04cef2 view \| diff

Merge remote-tracking branch 'origin/master'

16 files modified

2 files added

	src/api/home/machineNest.js	3 ●●●●● diff \| view \| raw \| blame \| history
	src/api/home/task.js	21 ●●●●● diff \| view \| raw \| blame \| history
	src/store/modules/home.js	5 ●●●●● diff \| view \| raw \| blame \| history
	src/views/Home/AINowFly.vue	228 ●●●●● diff \| view \| raw \| blame \| history
	src/views/Home/Footer.vue	55 ●●●●● diff \| view \| raw \| blame \| history
	src/views/Home/Home.vue	25 ●●●●● diff \| view \| raw \| blame \| history
	src/views/Home/HomeLeft/MachineNestList.vue	1 ●●●●● diff \| view \| raw \| blame \| history
	src/views/Home/HomeLeft/OverviewNext.vue	5 ●●●●● diff \| view \| raw \| blame \| history
	src/views/Home/HomeLeft/components/MachineNestTotal.vue	4 ●●●●● diff \| view \| raw \| blame \| history
	src/views/Home/useMapAggregation/DevicePopUpBox.vue	4 ●●●●● diff \| view \| raw \| blame \| history
	src/views/Home/useMapAggregation/useMapAggregation.js	73 ●●●●● diff \| view \| raw \| blame \| history
	src/views/SignMachineNest/MachineLeft/MachineLeft.vue	1 ●●●●● diff \| view \| raw \| blame \| history
	src/views/SignMachineNest/MachineRight/MachineStatus/MachineTableDetails/DeviceJob/DeviceJobDetails/DeviceJobDetailsMap.vue	1 ●●●●● diff \| view \| raw \| blame \| history
	src/views/TaskManage/TaskIntermediateContent/AddTask.vue	141 ●●●●● diff \| view \| raw \| blame \| history
	src/views/TaskManage/TaskIntermediateContent/CurrentTaskDetails.vue	20 ●●●●● diff \| view \| raw \| blame \| history
	src/views/TaskManage/TaskIntermediateContent/TaskIntermediateContent.vue	43 ●●●●● diff \| view \| raw \| blame \| history
	src/views/TaskManage/TaskIntermediateContent/TaskMap.vue	542 ●●●●● diff \| view \| raw \| blame \| history
	src/views/TaskManage/TaskIntermediateContent/TaskTable.vue	123 ●●●●● diff \| view \| raw \| blame \| history