Commit Graph

155 Commits

Author SHA1 Message Date
YangHua 1c3078e371 Merge branch 'master' of https://git.lgzn.space/zhuyayu/E_ElecCompetition 2023-09-17 16:45:23 +08:00
YangHua 1eca210fc0 添加图片 2023-09-17 16:45:17 +08:00
huangjiayu 922dd5c6a1 123 2023-09-17 16:41:20 +08:00
huangjiayu 517e50cac5 修改脚本 2023-09-17 16:40:47 +08:00
康地林 621d6fb702 提交相机修改,修改相位伏安表UI 2023-09-17 16:39:06 +08:00
huangjiayu 5f1c5a01b5 Merge branch 'master' of https://git.lgzn.space/zhuyayu/E_ElecCompetition 2023-09-17 15:56:22 +08:00
huangjiayu cd5ac9e432 修改 三相_有互感器_无光伏 2023-09-17 15:56:04 +08:00
康地林 072f03087d Merge branch 'master' of https://git.lgzn.space/zhuyayu/E_ElecCompetition 2023-09-17 15:54:38 +08:00
康地林 5e9052d137 提交万用表逻辑 2023-09-17 15:54:23 +08:00
huangjiayu 227ca91659 Merge branch 'master' of https://git.lgzn.space/zhuyayu/E_ElecCompetition 2023-09-17 14:42:18 +08:00
huangjiayu 0e0dec8040 修改Ui 2023-09-17 14:41:57 +08:00
YangHua 432f88c8a5 23 2023-09-17 14:40:46 +08:00
YangHua 737acb5a7b 修改工作卡 2023-09-17 14:40:06 +08:00
康地林 58df5fb8e6 提交预设修改 2023-09-17 14:31:50 +08:00
huangjiayu 7f1dc553a1 Merge branch 'master' of http://119.45.94.212:1280/zhuyayu/E_ElecCompetition 2023-09-17 12:21:13 +08:00
huangjiayu 2952b9d61a buxuyao 2023-09-17 12:21:06 +08:00
康地林 5df2cdb664 提交电箱预设 2023-09-17 12:19:04 +08:00
康地林 218cfa3de9 Merge branch 'master' of http://119.45.94.212:1280/zhuyayu/E_ElecCompetition 2023-09-17 12:02:39 +08:00
康地林 7d0cf17ddc 提交电流表预设 2023-09-17 12:02:26 +08:00
huangjiayu 013d7eb842 上传 2023-09-17 12:01:32 +08:00
huangjiayu 13d1868784 修改铭牌弹窗 2023-09-17 11:49:18 +08:00
huangjiayu b041c3bd5f 改铭牌 2023-09-17 11:37:00 +08:00
huangjiayu 437cc64ce8 融合 2023-09-17 11:32:36 +08:00
huangjiayu 7835c20f8a 123 2023-09-17 11:30:49 +08:00
康地林 084bbac10c 提交钳形电流表逻辑 2023-09-17 11:28:54 +08:00
康地林 61e7bde1a9 推送融合 2023-09-17 11:04:14 +08:00
huangjiayu 08666dfb46 Merge branch 'master' of http://119.45.94.212:1280/zhuyayu/E_ElecCompetition 2023-09-17 02:21:54 +08:00
huangjiayu 1634fd3c3c 123 2023-09-17 02:21:34 +08:00
康地林 4cf69a5f30 Merge branch 'master' of http://119.45.94.212:1280/zhuyayu/E_ElecCompetition 2023-09-17 02:19:59 +08:00
康地林 fb47d96870 提交逻辑 2023-09-17 02:19:49 +08:00
huangjiayu dceefa77f2 工具包 Tips 弹窗 2023-09-17 01:07:11 +08:00
康地林 8efe925d20 Merge branch 'master' of http://119.45.94.212:1280/zhuyayu/E_ElecCompetition 2023-09-17 00:19:20 +08:00
康地林 c19903a1b5 修复钳形电流表,修复分数逻辑 2023-09-17 00:19:12 +08:00
YangHua 5d476f941d Merge branch 'master' of http://119.45.94.212:1280/zhuyayu/E_ElecCompetition 2023-09-16 23:57:18 +08:00
YangHua 27597ba5c4 修改UI 2023-09-16 23:57:11 +08:00
huangjiayu 142fe3204f 电箱动画修改 2023-09-16 23:56:13 +08:00
huangjiayu e541ef2502 Merge branch 'master' of http://119.45.94.212:1280/zhuyayu/E_ElecCompetition 2023-09-16 23:45:19 +08:00
huangjiayu f15cdabf94 xiugai 工具间铭牌 2023-09-16 23:44:48 +08:00
康地林 33f584fbc0 Merge branch 'master' of http://119.45.94.212:1280/zhuyayu/E_ElecCompetition 2023-09-16 23:39:06 +08:00
康地林 5eb98ba499 提交钳形电流表 2023-09-16 23:38:54 +08:00
YangHua cb555d7071 1 2023-09-16 23:26:43 +08:00
YangHua 4395a64572 Merge branch 'master' of http://119.45.94.212:1280/zhuyayu/E_ElecCompetition 2023-09-16 23:24:36 +08:00
YangHua c3f218d838 改工作证 2023-09-16 23:24:05 +08:00
huangjiayu 90aa172a8f xiugai prefabs 2023-09-16 22:41:47 +08:00
huangjiayu 2cc1fa2c7b 1212 2023-09-16 22:19:27 +08:00
huangjiayu 2d310695e9 修改冲突 2023-09-16 22:13:08 +08:00
huangjiayu 6635e9013a 1 2023-09-16 22:11:31 +08:00
康地林 013e374928 融合 2023-09-16 22:03:58 +08:00
康地林 942c1f386b 1 2023-09-16 22:01:47 +08:00
YangHua f3f8eb6dac 还原电流表 2023-09-16 21:48:18 +08:00