Commits · b963fc8a4ba793e5d8a2c6e1c8bb2d30023c044c · 周磊 / GC_Branch · GitLab

Jun 08, 2018
- Merge branch 'wang_master' of https://gitee.com/wangwanxh/Vocs into wang_master · b963fc8a
  wangwanxh@sina.com authored Jun 08, 2018
  
  b963fc8a
- 重新规划校准流程 · 52c79bf1
  wangwanxh@sina.com authored Jun 08, 2018
  
  52c79bf1
Jun 07, 2018
- Merge branch 'wang_master' of https://gitee.com/wangwanxh/Vocs into wang_master · fddea3e6
  wangjunqiang authored Jun 07, 2018
  
  fddea3e6
- 防止配置不载入导致的crash · 91d87d09
  wangjunqiang authored Jun 07, 2018
  
  91d87d09
- Merge branch 'wang_master' of https://gitee.com/wangwanxh/Vocs into wang_master · d1f6922e
  wangwanxh@sina.com authored Jun 07, 2018
  
  d1f6922e
- 配置同步 · 75111627
  wangwanxh@sina.com authored Jun 07, 2018
  
  75111627
- 修复一些bug · 5a2fce42
  wangjunqiang authored Jun 07, 2018
  
  5a2fce42
Jun 06, 2018
- 修复com不定和数字键盘bug · ccb3e4a3
  wangjunqiang authored Jun 06, 2018
  
  ccb3e4a3
Jun 05, 2018
- 添加624X输出限制开关 · 0f79d20c
  wangjunqiang authored Jun 05, 2018
  
  0f79d20c
- Merge branch 'wang_master' of https://gitee.com/wangwanxh/Vocs into wang_master · b0741b9c
  wangjunqiang authored Jun 05, 2018
  
  b0741b9c
- 限制本地连接添加624X模块输出 · da42b463
  wangjunqiang authored Jun 05, 2018
  
  da42b463
- 修改校准 · 495044b8
  wangwanxh@sina.com authored Jun 05, 2018
  
  495044b8
- Merge branch 'wang_master' of https://gitee.com/wangwanxh/Vocs into wang_master · 9ff1bfa2
  wangwanxh@sina.com authored Jun 05, 2018
  
  9ff1bfa2
- 屏蔽sleep · 0bfdcc3d
  wangwanxh@sina.com authored Jun 05, 2018
  
  0bfdcc3d
Jun 04, 2018
- 优化文件提交接口和自动批处理接口 · 814b29ff
  wangjunqiang authored Jun 04, 2018
  
  814b29ff
- Merge branch 'wang_master' of https://gitee.com/wangwanxh/Vocs into wang_master · 85349329
  wangwanxh@sina.com authored Jun 04, 2018
  
  85349329
- 调试输出 · cf8e02e8
  wangwanxh@sina.com authored Jun 04, 2018
  
  cf8e02e8
- 添加一些判断条件，严格化约束 · b4191e67
  wangjunqiang authored Jun 04, 2018
  
  b4191e67
Jun 01, 2018
- add FileClient Close · daaefa58
  wangjunqiang authored Jun 01, 2018
  
  daaefa58
- Merge branch 'wang_master' of https://gitee.com/wangwanxh/Vocs into wang_master · d97d5f31
  wangjunqiang authored Jun 01, 2018
  
  d97d5f31
- 修改部分代码 · 5b76b77c
  wangjunqiang authored Jun 01, 2018
  
  5b76b77c
- 自动批处理修改 · ca93ef8b
  wangwanxh@sina.com authored Jun 01, 2018
  
  ca93ef8b
May 29, 2018
- 修改标志位 · 7797ef44
  wangwanxh@sina.com authored May 29, 2018
  
  7797ef44
- Merge branch 'wang_master' of https://gitee.com/wangwanxh/Vocs into wang_master · c8656185
  wangwanxh@sina.com authored May 29, 2018
  
  c8656185
- 修改自动校准逻辑，周期完重绘等 · 4d23569a
  wangwanxh@sina.com authored May 29, 2018
  
  4d23569a
May 28, 2018
- 添加STD批处理非文件接口 · 08bdbac4
  wangjunqiang authored May 28, 2018
  
  08bdbac4
- update File Trans Dll · b7766bf5
  wangjunqiang authored May 28, 2018
  
  b7766bf5
- Merge branch 'wang_master' of https://gitee.com/wangwanxh/Vocs into wang_master · d9b9ab45
  wangjunqiang authored May 28, 2018
  
  d9b9ab45
- add WTD424X Test · 99c6abe7
  wangjunqiang authored May 28, 2018
  
  99c6abe7
May 25, 2018
- 更新绘画 · 6a292f85
  wangwanxh@sina.com authored May 25, 2018
  
  6a292f85
May 11, 2018
- 添加权限检测 · e4dcab82
  wangwanxh@sina.com authored May 11, 2018
  
  e4dcab82
- 修改modbus 组分输出 · cef76502
  wangjunqiang authored May 11, 2018
  
  cef76502
- 更新，增加了独立共享空间 · db9764e2
  wangwanxh@sina.com authored May 11, 2018
  
  db9764e2
- 修复开机时启动界面卡死bug · 2ba0fd40
  wangjunqiang authored May 11, 2018
  
  2ba0fd40
May 10, 2018
- 删除一些冗余文件，优化了启动界面 · 05093bee
  wangjunqiang authored May 10, 2018
  
  05093bee
- 添加了单次运行调试功能 · 5e1bfd33
  wangjunqiang authored May 10, 2018
  
  5e1bfd33
May 08, 2018
- 同步不代码修改朱工窗口出现位置 · d6c90070
  wangjunqiang authored May 08, 2018
  
  d6c90070
- 5-8 · 618a1e2e
  wangwanxh@sina.com authored May 08, 2018
  
  618a1e2e
Apr 28, 2018
- 4-28 · 0d5cddc5
  wangwanxh@sina.com authored Apr 28, 2018
  
  0d5cddc5
Apr 17, 2018
- Merge branch 'wang_master' of https://gitee.com/wangwanxh/Vocs into wang_master · 64091552
  wangwanxh@sina.com authored Apr 17, 2018
  
  64091552