Commit Graph

317 Commits

Author SHA1 Message Date
陈向学 f91388e3d2 配置表 2024-08-30 16:35:34 +08:00
YangHua 3ca2d5ecb8 修改垃圾触发逻辑 2024-08-30 14:52:04 +08:00
YangHua 55c6275293 Merge branch 'main' of http://7d2f0537.r5.cpolar.top/WangWeiZhi/YanCheng_Metrology 2024-08-30 14:33:23 +08:00
YangHua 1a4ec4d0e7 修改清理杂物判断逻辑 2024-08-30 14:33:19 +08:00
陈向学 903084333c Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology 2024-08-30 14:10:04 +08:00
陈向学 e50f397089 开关门 2024-08-30 14:10:01 +08:00
YangHua 4766fa4d06 Merge branch 'main' of http://7d2f0537.r5.cpolar.top/WangWeiZhi/YanCheng_Metrology 2024-08-30 13:26:49 +08:00
YangHua 148ed39fbf 换名称 2024-08-30 13:26:36 +08:00
陈向学 436a5c2213 d 2024-08-30 11:14:02 +08:00
陈向学 d8c5f310db 打分 2024-08-30 10:12:22 +08:00
YangHua 404e4c6277 Merge branch 'main' of http://7d2f0537.r5.cpolar.top/WangWeiZhi/YanCheng_Metrology 2024-08-30 09:37:20 +08:00
YangHua 642aee7904 优化 2024-08-30 09:37:15 +08:00
taosuqi 517e0b1899 Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology into main 2024-08-30 09:09:58 +08:00
taosuqi 2f2768686e 早上提交 2024-08-30 09:09:51 +08:00
YangHua d08e92b26d 注册事件 2024-08-29 21:18:02 +08:00
YangHua c01e05ddef Merge branch 'main' of http://7d2f0537.r5.cpolar.top/WangWeiZhi/YanCheng_Metrology 2024-08-29 20:23:51 +08:00
YangHua ade9b0e327 修改背包按钮根据场景名设置 2024-08-29 20:23:41 +08:00
陈向学 25ee0c522d Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology 2024-08-29 19:54:49 +08:00
陈向学 33f7e9de9a 开始结束事件 2024-08-29 19:54:45 +08:00
YangHua d78414e923 添加跳转流程提示 2024-08-29 19:46:36 +08:00
YangHua f6e4f487e7 Merge branch 'main' of http://7d2f0537.r5.cpolar.top/WangWeiZhi/YanCheng_Metrology 2024-08-29 19:29:29 +08:00
YangHua a156a7a228 优化流程代码 2024-08-29 19:23:37 +08:00
陈向学 9850407a11 Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology 2024-08-29 18:49:57 +08:00
陈向学 b968dadcaa 改bug 2024-08-29 18:49:53 +08:00
taosuqi 69a8bf6b68 Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology into main 2024-08-29 18:39:36 +08:00
taosuqi 72aad3aa78 换装镜 2024-08-29 18:39:29 +08:00
陈向学 f8bf4bd5a7 打分,收回操作 2024-08-29 18:36:04 +08:00
陈向学 4184b24f4b Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology 2024-08-29 18:00:19 +08:00
陈向学 8341539b4c 打分 2024-08-29 18:00:15 +08:00
YangHua c7beeb4a7d Merge branch 'main' of http://7d2f0537.r5.cpolar.top/WangWeiZhi/YanCheng_Metrology 2024-08-29 17:54:40 +08:00
YangHua 8cc5f369f5 添加步骤完成提示,修复封印提示问题 2024-08-29 17:54:36 +08:00
陈向学 0075e99e16 打分 2024-08-29 16:31:39 +08:00
YangHua 7ae873e658 Merge branch 'main' of http://7d2f0537.r5.cpolar.top/WangWeiZhi/YanCheng_Metrology 2024-08-29 15:45:09 +08:00
YangHua be5850143a 添加完成流程步骤triggerID提示 2024-08-29 15:45:05 +08:00
陈向学 9728a2de88 ss 2024-08-29 15:42:21 +08:00
YangHua 4cd46bb095 Merge branch 'main' of http://7d2f0537.r5.cpolar.top/WangWeiZhi/YanCheng_Metrology 2024-08-29 14:36:01 +08:00
陈向学 08ea738577 ll 2024-08-29 14:35:44 +08:00
YangHua e3c406b080 添加告知任务单 2024-08-29 14:35:38 +08:00
YangHua f49906f062 Merge branch 'main' of http://7d2f0537.r5.cpolar.top/WangWeiZhi/YanCheng_Metrology 2024-08-29 14:04:58 +08:00
YangHua f09f10fd0c 修改imageTips逻辑,修改任务书逻辑 2024-08-29 14:04:52 +08:00
陈向学 fa773a1cd9 打分 2024-08-29 13:53:56 +08:00
陈向学 bbbdd24351 打分 2024-08-29 11:38:23 +08:00
taosuqi d965c009e1 修改任务书动画 2024-08-29 09:37:39 +08:00
YangHua b15a843597 还原stepstate triggerID 发射逻辑 2024-08-29 09:25:35 +08:00
YangHua f796755ef4 修改提示问题,修改收回工具逻辑,修改继承重载问题,修改流程triggerID实时更新的问题 2024-08-29 00:38:45 +08:00
陈向学 20312ee14d 打分 2024-08-28 19:19:02 +08:00
陈向学 6e3ba07fe0 对话 2024-08-28 16:38:04 +08:00
陈向学 7c296885b4 s 2024-08-28 16:32:25 +08:00
陈向学 01eea00395 Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology 2024-08-28 16:09:27 +08:00
陈向学 afed813ff8 打分 2024-08-28 16:08:13 +08:00