Commit Graph

86 Commits (ef5ad1188a594c522128a606e9ca68af011d8aad)
 

Author SHA1 Message Date
nodyang ef5ad1188a fixCode
nodyang ae58b33366 Merge branch 'wangsr' into dep_plan
nodyang e091fb94e8 demo
wangsr 39159ad352 窗口美化 完毕
wangsr 069ce8225d Merge branch 'dep' into wangsr
wangsr 00ebb2f69d 报警灯完善
wenjy c29239fef0 change - 初始化引擎时加载Hsl、报警灯模块
wangsr febbba11c9 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into wangsr
wangsr 1faaf589c4 change - 接入报警灯
wenjy 969946be45 add - 增加报警灯控制
wenjy 22b6de500b Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
wenjy 440d9564c2 change - 保存报警信息
wangsr 8f7481b3bc Merge branch 'wangsr' into dep_plan
# Conflicts:
#	Main/MCEdit/Data/MCProject/SCWSProject2.mprj
wangsr ad016a535e 前端页面修改 -未完成
wangsr 71092f75f6 qqw
wangsr 90d62551a6 Merge branch 'dep_plan' into wangsr
# Conflicts:
#	Main/MCEdit/Data/MCProject/SCWSProject2.mprj
nodyang 5bf766ff4a 都没
nodyang 7034f0a654 Merge branch 'dep' into dep_plan
# Conflicts:
#	Main/MCEdit/Data/MCProject/SCWSProject2.mprj
nodyang 59fb13fa48 修复物料和大仓的关系
nodyang 6ccb7b82f9 Merge remote-tracking branch 'haiwei/dep' into dep
nodyang 3521fa2333 SiemensPLCS.S200Smart=> s1200
wenjy 245656cc68 change - 报警数据读取
nodyang 6ac73f7201 demo
wenjy 3b544355fc change - HSL 读取Plc测试
wenjy 30661be234 change - 集成HSL PLC读取模块
wenjy 10f3db53bf change - 报警维护
nodyang 425828021a 临时提交
wenjy fad533557a change - plc点位标注
wangsr b9baefc7a4 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into wangsr
wangsr 8bcbdd5105 到可用版本
wenjy a1d32cd167 change - 设备控件修改
wenjy 8e286eeb01 add - 设备细节界面
nodyang e4da793b9c 临时提交代码到服务器
nodyang a441d9ca59 0801 临时提交
nodyang 896c081d3b 修复产线不neng
nodyang 65292edda5 0801 新的分支
nodyang 1c86b66fd1 haiwei
nodyang 8afe01f752 demo
nodyang 1d6383267f 0725 提交的数据
nodyang e068ae7bb0 TestAction
nodyang 7cd2db0e45 周日提价
nodyang a61f54582e 周五特别版本
nodyang 1ec39f960d 0719 提交
nodyang 4495a59df6 设备管理
nodyang b20ef12c7e asd
nodyang 485e125ed5 ti
nodyang 0c97c41f7c 设备管理
nodyang 021aae2686 最近调试
nodyang fb8f844d46 设备管理
nodyang df11b817fc 0717 新的一周