Commit Graph

Select branches

Hide Pull Requests

dep

dep_deliver

dep_nodyang

master

wangsr

alpha-V1.0

Mono Color

• 2eead45dcd change - 還原 wangsr 2023-08-10 14:13:21 +0800
• ef5ad1188a fixCode nodyang 2023-08-10 14:00:36 +0800
• 35a9e622af Revert "change - 干混机报表导出事件" wangsr 2023-08-10 13:38:22 +0800
• 2dbc258001 change - 提交 wangsr 2023-08-10 13:37:59 +0800
• d2a83d1392 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep wangsr 2023-08-10 08:54:31 +0800
• 2705805e9e 解决冲突 wangsr 2023-08-10 08:41:22 +0800
• 68ef3b8f49 change - 干混机报表导出事件 wangsr 2023-08-09 17:12:00 +0800
• 845d3aa2c0 add - 干混机报表事件：初始化、查询、双击加载明细、导出 wangsr 2023-08-09 17:03:52 +0800
• e369e85122 add - 干混机报表事件：初始化、查询、明细加载、导出 wangsr 2023-08-09 15:55:25 +0800
• 918e13579f change - 报警逻辑代码优化 wenjy 2023-08-09 11:20:54 +0800
• 1704350b44 change - 报警读取逻辑代码优化 wenjy 2023-08-09 11:18:02 +0800
• fcd32f6ee7 change - 报表数据保存代码优化 wenjy 2023-08-09 10:45:27 +0800
• 4a9bef5fac Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep wenjy 2023-08-09 10:43:02 +0800
• 3c9dd0e37f change - 代码整理 wenjy 2023-08-09 10:42:49 +0800
• 5fae34a7e4 Merge remote-tracking branch 'origin/dep' into dep wangsr 2023-08-09 10:22:50 +0800
• f59f92144c change - 数据源修改 wangsr 2023-08-09 10:22:39 +0800
• ae8f502a86 add - 干混机报表数据保存 wenjy 2023-08-09 10:19:04 +0800
• ae58b33366 Merge branch 'wangsr' into dep_plan nodyang 2023-08-09 08:58:37 +0800
• e091fb94e8 demo nodyang 2023-08-09 08:57:26 +0800
• 127f02c930 222 wangsr 2023-08-09 08:45:01 +0800
• fbf5894f9f 测试 wangsr 2023-08-09 08:40:49 +0800
• fcdf6ce7d6 change - 干混机报表数据读取 wenjy 2023-08-08 16:55:11 +0800
• 39159ad352 窗口美化 完毕 wangsr 2023-08-08 15:08:04 +0800
• 069ce8225d Merge branch 'dep' into wangsr wangsr 2023-08-08 14:29:23 +0800
• 00ebb2f69d 报警灯完善 wangsr 2023-08-08 13:49:46 +0800
• c29239fef0 change - 初始化引擎时加载Hsl、报警灯模块 wenjy 2023-08-08 13:30:38 +0800
• febbba11c9 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into wangsr wangsr 2023-08-08 13:16:35 +0800
• 1faaf589c4 change - 接入报警灯 wangsr 2023-08-08 13:14:24 +0800
• 969946be45 add - 增加报警灯控制 wenjy 2023-08-08 11:24:03 +0800
• 22b6de500b Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep wenjy 2023-08-08 10:54:57 +0800
• 440d9564c2 change - 保存报警信息 wenjy 2023-08-08 10:54:40 +0800
• 8f7481b3bc Merge branch 'wangsr' into dep_plan wangsr 2023-08-08 10:44:12 +0800
• ad016a535e 前端页面修改 -未完成 wangsr 2023-08-08 10:39:05 +0800
• 71092f75f6 qqw wangsr 2023-08-08 09:48:04 +0800
• 90d62551a6 Merge branch 'dep_plan' into wangsr wangsr 2023-08-08 09:47:10 +0800
• 5bf766ff4a 都没 nodyang 2023-08-08 09:41:45 +0800
• 7034f0a654 Merge branch 'dep' into dep_plan nodyang 2023-08-07 20:55:44 +0800
• 59fb13fa48 修复物料和大仓的关系 nodyang 2023-08-07 20:52:03 +0800
• 6ccb7b82f9 Merge remote-tracking branch 'haiwei/dep' into dep nodyang 2023-08-07 20:32:41 +0800
• 3521fa2333 SiemensPLCS.S200Smart=> s1200 nodyang 2023-08-07 20:32:34 +0800
• 245656cc68 change - 报警数据读取 wenjy 2023-08-07 18:06:31 +0800
• 6ac73f7201 demo nodyang 2023-08-07 16:46:02 +0800
• 3b544355fc change - HSL 读取Plc测试 wenjy 2023-08-07 16:45:22 +0800
• 30661be234 change - 集成HSL PLC读取模块 wenjy 2023-08-07 16:37:56 +0800
• 10f3db53bf change - 报警维护 wenjy 2023-08-07 15:02:58 +0800
• 425828021a 临时提交 nodyang 2023-08-07 13:37:30 +0800
• fad533557a change - plc点位标注 wenjy 2023-08-07 10:43:55 +0800
• b9baefc7a4 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into wangsr wangsr 2023-08-04 20:37:05 +0800
• 8bcbdd5105 到可用版本 wangsr 2023-08-04 20:34:11 +0800
• a1d32cd167 change - 设备控件修改 wenjy 2023-08-04 16:53:43 +0800
• 8e286eeb01 add - 设备细节界面 wenjy 2023-08-03 10:59:03 +0800
• e4da793b9c 临时提交代码到服务器 nodyang 2023-08-02 10:47:00 +0800
• a441d9ca59 0801 临时提交 nodyang 2023-08-01 21:08:14 +0800
• 896c081d3b 修复产线不neng nodyang 2023-08-01 08:57:01 +0800
• 65292edda5 0801 新的分支 nodyang 2023-08-01 08:44:25 +0800
• 1c86b66fd1 haiwei nodyang 2023-07-28 13:20:21 +0800
• 8afe01f752 demo nodyang 2023-07-26 16:16:58 +0800
• 1d6383267f 0725 提交的数据 nodyang 2023-07-25 08:36:01 +0800
• e068ae7bb0 TestAction nodyang 2023-07-24 13:29:44 +0800
• 7cd2db0e45 周日提价 nodyang 2023-07-23 15:33:43 +0800
• a61f54582e 周五特别版本 nodyang 2023-07-21 13:21:38 +0800
• 1ec39f960d 0719 提交 nodyang 2023-07-19 16:32:35 +0800
• 4495a59df6 设备管理 nodyang 2023-07-19 15:53:08 +0800
• b20ef12c7e asd nodyang 2023-07-18 20:26:27 +0800
• 485e125ed5 ti nodyang 2023-07-18 16:33:51 +0800
• 0c97c41f7c 设备管理 nodyang 2023-07-18 13:08:09 +0800
• 021aae2686 最近调试 nodyang 2023-07-17 15:23:54 +0800
• fb8f844d46 设备管理 nodyang 2023-07-17 10:44:34 +0800
• df11b817fc 0717 新的一周 nodyang 2023-07-17 08:48:56 +0800
• 77aaf28db2 0714 nodyang 2023-07-14 09:16:19 +0800
• 0a2e658997 0713模板 nodyang 2023-07-13 08:58:16 +0800
• f55495ddf1 今日提交 nodyang 2023-07-12 15:56:43 +0800
• 01025812a6 维护点位 nodyang 2023-07-11 16:45:55 +0800
• f03b412359 qw3 nodyang 2023-07-11 10:37:42 +0800
• 0394fd935d 周日提交 nodyang 2023-07-09 14:39:19 +0800
• eaf940b8cd ToSingle 仓库 nodyang 2023-07-07 14:50:48 +0800
• b213bf6e6e 20230707 中午提交代码 nodyang 2023-07-07 14:06:01 +0800
• 042dc669da 20230707昨日提交 nodyang 2023-07-07 08:40:27 +0800
• 12f23cdb56 修复完成 nodyang 2023-07-06 16:44:27 +0800
• c971b5330b 临时提交 nodyang 2023-07-03 08:52:08 +0800
• 9cb1a81080 0628 对plc 就行测试 nodyang 2023-06-28 09:43:30 +0800
• 5287b9e0b5 nodeDevice 点位维持成功 nodyang 2023-06-27 13:29:18 +0800
• 01a1df4aad 第二个备份 nodyang 2023-06-27 09:47:33 +0800
• 3fb18aec2c ParametersWithPc备份 nodyang 2023-06-27 09:13:37 +0800
• ba97852627 dll testActioc 测试代码 nodyang 2023-06-26 10:49:18 +0800
• b3bc61b404 本周最后的提交 nodyang 2023-06-16 17:15:16 +0800
• 9457fe92fe 0616提交代码 nodyang 2023-06-16 16:32:05 +0800
• 424dad6312 临时提交 nodyang 2023-06-16 14:00:41 +0800
• c65d6d3cb9 20120616临时提交 nodyang 2023-06-16 08:36:28 +0800
• 8e0bda9d3b 20230614 日常提交代码 nodyang 2023-06-15 08:42:05 +0800
• dc08c7a09e 自定义几个控件 nodyang 2023-06-14 10:33:47 +0800
• ffc4a8fc8f 小车封装 nodyang 2023-06-13 09:45:14 +0800
• a69f8847d8 E:\mesnac\化工项目源码\源码 nodyang 2023-06-12 09:09:14 +0800
• 5c20c450f9 20220907保存最新源码 baogq 2022-09-07 10:25:07 +0800
• 3c99b28127 监控界面V1.0 baogq 2022-08-02 19:37:36 +0800
• 6d879836fa 提交最新源码 baogq 2022-07-26 18:14:27 +0800
• f473200669 提交最新源码 baogq 2022-07-26 12:38:08 +0800
• 0daec0fed8 change - 注释修改 wenjy 2022-06-19 14:10:28 +0800
• 2c0c501dfb change - 角色信息 wenjy 2022-06-19 13:26:25 +0800
• d804444f07 change - 计划重传、终止 wenjy 2022-06-19 10:10:08 +0800