Commits · 029f82ac0d731358369932f0feefc1e9dec4cce9 · Zhang Xin / max_android_panel · GitLab

19 Jul, 2018 5 commits
- 接口对接，开门逻辑完善，socket完善 · 029f82ac
  Zhang Xin committed Jul 19, 2018
  
  029f82ac Browse Files
- 连接socket的后续功能 · 6125ac60
  Zhang Xin committed Jul 19, 2018
  
  6125ac60 Browse Files
- Merge branch 'dev' of git.mjitech.com:zhangxin/max_android_panel into dev · 0917214c
  yaxiLiuu committed Jul 19, 2018
  
  0917214c Browse Files
- fixed the whole function â · 7b2c4ebd
  yaxiLiuu committed Jul 19, 2018
  
  7b2c4ebd Browse Files
- 增加websocket获取信息 · b0614921
  Zhang Xin committed Jul 19, 2018
  
  b0614921 Browse Files
18 Jul, 2018 12 commits
- cfixed conflict · 1aaa99ca
  yaxiLiuu committed Jul 18, 2018
  
  1aaa99ca Browse Files
- 增加倒计时功能 · 8805f661
  Zhang Xin committed Jul 18, 2018
  
  8805f661 Browse Files
- fixed other problem part â · 7d8a7463
  yaxiLiuu committed Jul 18, 2018
  
  7d8a7463 Browse Files
- 找回代码 · 77528d08
  Zhang Xin committed Jul 18, 2018
  
  77528d08 Browse Files
- Merge branch 'dev' of git.mjitech.com:zhangxin/max_android_panel into dev · 1fd1a5ef
  yaxiLiuu committed Jul 18, 2018
  
  1fd1a5ef Browse Files
- fixed the other problem redecer â · f1338701
  yaxiLiuu committed Jul 18, 2018
  
  f1338701 Browse Files
- Merge remote-tracking branch 'refs/remotes/origin/dev' into dev · 3a2942b8
  Zhang Xin committed Jul 18, 2018
  
  3a2942b8 Browse Files
- fix · e120d176
  Zhang Xin committed Jul 18, 2018
  
  e120d176 Browse Files
- lose filesâ · 28aeea91
  yaxiLiuu committed Jul 18, 2018
  
  28aeea91 Browse Files
- 添修改弹窗组建，增加倒计时操作 · 71d9abd0
  Zhang Xin committed Jul 18, 2018
  
  71d9abd0 Browse Files
- 解决冲突 · af5d4ffc
  yaxiLiuu committed Jul 18, 2018
  
  af5d4ffc Browse Files
- finished commonimg component · c1c9e40a
  yaxiLiuu committed Jul 18, 2018
  
  c1c9e40a Browse Files
17 Jul, 2018 3 commits
- fix · a3801e6c
  Zhang Xin committed Jul 17, 2018
  
  a3801e6c Browse Files
- 刷新图片获取最新图片 · 4c35b702
  Zhang Xin committed Jul 17, 2018
  
  4c35b702 Browse Files
- 优化故障页面逻辑 · 81c73473
  Zhang Xin committed Jul 17, 2018
  
  81c73473 Browse Files
16 Jul, 2018 5 commits
- 处理故障列表提交部分 · d27922d1
  Zhang Xin committed Jul 16, 2018
  
  d27922d1 Browse Files
- 改回样式 · 37a39bc8
  Zhang Xin committed Jul 16, 2018
  
  37a39bc8 Browse Files
- resolve conflict â · 336d5a4a
  yaxiLiuu committed Jul 16, 2018
  
  336d5a4a Browse Files
- developer other problems â · e6962545
  yaxiLiuu committed Jul 16, 2018
  
  e6962545 Browse Files
- 填添加首é¡故障离å列表»辑 · de45c121
  Zhang Xin committed Jul 16, 2018
  
  de45c121 Browse Files
15 Jul, 2018 3 commits
- add storeinfo · 144150e6
  Zhang Xin committed Jul 15, 2018
  
  144150e6 Browse Files
- add storeinfo · 83bb3475
  Zhang Xin committed Jul 15, 2018
  
  83bb3475 Browse Files
- 添加关门，选择任务，弹窗样式 · bad1eacb
  Zhang Xin committed Jul 15, 2018
  
  bad1eacb Browse Files
14 Jul, 2018 5 commits
- fix props · 9a161e43
  Zhang Xin committed Jul 14, 2018
  
  9a161e43 Browse Files
- 清冲突 · ecfdaeb0
  Zhang Xin committed Jul 14, 2018
  
  ecfdaeb0 Browse Files
- 增加textarea 和增加弹窗公共样式 · 89b8b7af
  Zhang Xin committed Jul 14, 2018
  
  89b8b7af Browse Files
- fixed conflict â · b3eb18e0
  yaxiLiuu committed Jul 14, 2018
  
  b3eb18e0 Browse Files
- develop img component â · f273990f
  yaxiLiuu committed Jul 14, 2018
  
  f273990f Browse Files
13 Jul, 2018 7 commits
- add iconfont & fix header & finish trouble UI · 0d6fc89f
  Zhang Xin committed Jul 13, 2018
  
  0d6fc89f Browse Files
- fixed conflict â · 36f2dc27
  yaxiLiuu committed Jul 13, 2018
  
  36f2dc27 Browse Files
- dev damegeproduct list part1 · 51142f08
  yaxiLiuu committed Jul 13, 2018
  
  51142f08 Browse Files
- fix bugs · 7571411d
  Zhang Xin committed Jul 13, 2018
  
  7571411d Browse Files
- â fixed confilct code â · 1fb80874
  yaxiLiuu committed Jul 13, 2018
  
  1fb80874 Browse Files
- fixed the css · 354f8e97
  yaxiLiuu committed Jul 13, 2018
  
  354f8e97 Browse Files
- 完finish upload ScanBarCodeContainer · 141017d2
  yaxiLiuu committed Jul 13, 2018
  
  141017d2 Browse Files