Commits · 521df5d2313e0c38f228b3a07e4c52ec39e10d9e · 周磊 / GC_Branch · GitLab

Apr 19, 2019
- 添加三通道三检测相关，实验室在线合一。 · 521df5d2
  liu authored Apr 19, 2019
  
  521df5d2
Mar 19, 2019
- 主要将libmodbus slave改用nmodbus4 slave 用以解决modbus slave组分输出时间过程卡住的问题，其次修改了自定义控件实施谱图上单位显示问题和增加了多网口时可选择 · 06c79fd5
  liu authored Mar 19, 2019
  
  06c79fd5
Jan 23, 2019
- 仪器配置中仪器档次排序待验证 · edc81683
  liu authored Jan 23, 2019
  
  edc81683
Jan 16, 2019
- 修改用户界面显示内容，添加仪器方法界面Epc相关设置，修改仪器方法界面的内容，修改仪器配置界面的配置设置，辅助工具界面新添第一次点火延迟设置，新增epc错误... · 592d4b65
  liu authored Jan 16, 2019
  592d4b65
Sep 07, 2018
- update IO · 8b057b8b
  wangjunqiang authored Sep 07, 2018
  
  8b057b8b
- Merge branch 'wang_master' of https://gitee.com/wangwanxh/Vocs into wang_master · f1989b9c
  wangjunqiang authored Sep 07, 2018
  
  f1989b9c
- 添加线程监控 · eb024034
  wangjunqiang authored Sep 07, 2018
  
  eb024034
Aug 27, 2018
- Merge branch 'wang_master' of https://gitee.com/wangwanxh/Vocs into wang_master · e137df45
  wangwanxh@sina.com authored Aug 27, 2018
  
  e137df45
- 8-27 R · a31487e0
  wangwanxh@sina.com authored Aug 27, 2018
  
  a31487e0
- Merge branch 'wang_master' of https://gitee.com/wangwanxh/Vocs into wang_master · 634de4fb
  wangjunqiang authored Aug 27, 2018
  
  634de4fb
- 修复部分小bug · 1181eac7
  wangjunqiang authored Aug 27, 2018
  
  1181eac7
Aug 22, 2018
- 8-22 · f548e085
  wangwanxh@sina.com authored Aug 22, 2018
  
  f548e085
Aug 16, 2018
- Merge branch 'wang_master' of https://gitee.com/wangwanxh/Vocs into wang_master · 537fb05f
  wangwanxh@sina.com authored Aug 16, 2018
  
  537fb05f
- 5 · e60a026a
  wangwanxh@sina.com authored Aug 16, 2018
  
  e60a026a
- div 0 bug · 745fbdc6
  wangjunqiang authored Aug 16, 2018
  
  745fbdc6
Aug 15, 2018
- Merge branch 'wang_master' of https://gitee.com/wangwanxh/Vocs into wang_master · 60af091a
  wangjunqiang authored Aug 15, 2018
  
  60af091a
- 修复柱箱默认保护温度 · 83a094cb
  wangjunqiang authored Aug 15, 2018
  
  83a094cb
- 报警值 · 6f873fa3
  wangwanxh@sina.com authored Aug 15, 2018
  
  6f873fa3
- Merge branch 'wang_master' of https://gitee.com/wangwanxh/Vocs into wang_master · c4156cc6
  wangjunqiang authored Aug 15, 2018
  
  c4156cc6
- 测试修复0 salve bug · 403a62e9
  wangjunqiang authored Aug 15, 2018
  
  403a62e9
- 15/8 · e9f78a53
  wangwanxh@sina.com authored Aug 15, 2018
  
  e9f78a53
Aug 14, 2018
- Merge branch 'wang_master' of https://gitee.com/wangwanxh/Vocs into wang_master · 8508b00e
  wangjunqiang authored Aug 14, 2018
  
  8508b00e
- 修正计数器位置 · 2544a6c0
  wangjunqiang authored Aug 14, 2018
  
  2544a6c0
- 7 · 9015a986
  wangwanxh@sina.com authored Aug 14, 2018
  
  9015a986
- 添加自动校准进度反馈地址 · 4fa9a9cb
  wangjunqiang authored Aug 14, 2018
  
  4fa9a9cb
- 14 · 9de2ecab
  wangwanxh@sina.com authored Aug 14, 2018
  
  9de2ecab
Aug 10, 2018
- Merge branch 'wang_master' of https://gitee.com/wangwanxh/Vocs into wang_master · 017b67c6
  wangjunqiang authored Aug 10, 2018
  
  017b67c6
- 切换为新地址版本 · a83f5998
  wangjunqiang authored Aug 10, 2018
  
  a83f5998
- 6 · 9d8b5f0a
  wangwanxh@sina.com authored Aug 10, 2018
  
  9d8b5f0a
- 添加moudbus控制自动校准 · 6b7f5145
  wangjunqiang authored Aug 10, 2018
  
  6b7f5145
- Merge branch 'wang_master' of https://gitee.com/wangwanxh/Vocs into wang_master · 6635628f
  wangjunqiang authored Aug 10, 2018
  
  6635628f
- 同步 · e74df40c
  wangjunqiang authored Aug 10, 2018
  
  e74df40c
- 定时 · 4f2f7910
  wangwanxh@sina.com authored Aug 10, 2018
  
  4f2f7910
Aug 09, 2018
- 修复方法窗口问题 · f4b5b84e
  wangjunqiang authored Aug 09, 2018
  
  f4b5b84e
- Merge branch 'wang_master' of https://gitee.com/wangwanxh/Vocs into wang_master · b12f3fbe
  wangjunqiang authored Aug 09, 2018
  
  b12f3fbe
- 修改温度显示为一个小数点 · 4e2bed0e
  wangjunqiang authored Aug 09, 2018
  
  4e2bed0e
- 5 · 17dd8a1a
  wangwanxh@sina.com authored Aug 09, 2018
  
  17dd8a1a
- Merge branch 'wang_master' of https://gitee.com/wangwanxh/Vocs into wang_master · d39c641c
  wangwanxh@sina.com authored Aug 09, 2018
  
  d39c641c
- 4 · b0c66c26
  wangwanxh@sina.com authored Aug 09, 2018
  
  b0c66c26
- 修复自启动创建批处理文件问题 · b6ab6dae
  wangjunqiang authored Aug 09, 2018
  
  b6ab6dae