fan
|
6b96fc928d
|
ibp删除console
|
2019-09-06 17:42:36 +08:00 |
|
fan
|
4cd1da15c0
|
Merge remote-tracking branch 'origin/dev' into test
|
2019-09-06 17:38:18 +08:00 |
|
fan
|
3ea2c656de
|
ibp调整电子钟停止
|
2019-09-06 17:37:43 +08:00 |
|
fan
|
3abd85ab67
|
Merge remote-tracking branch 'origin/dev' into test
|
2019-09-06 17:25:35 +08:00 |
|
fan
|
a9ec1672ae
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-09-06 17:24:45 +08:00 |
|
fan
|
05b41d659e
|
ibp拖动鼠标样式调整
|
2019-09-06 17:24:32 +08:00 |
|
zyy
|
37e8046241
|
Merge branch 'dev' into test
|
2019-09-06 17:22:36 +08:00 |
|
zyy
|
46a3f64f4d
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-06 17:22:03 +08:00 |
|
zyy
|
ba21d7af9d
|
desc: 修改权限打包字段， 修改地图绘制区段逻辑
|
2019-09-06 17:21:54 +08:00 |
|
fan
|
c3a98567a3
|
Merge remote-tracking branch 'origin/dev' into test
|
2019-09-06 17:03:07 +08:00 |
|
fan
|
9d5c5646a2
|
ibp盘调整
|
2019-09-06 17:01:51 +08:00 |
|
fan
|
ddfeeb6718
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-09-06 16:55:31 +08:00 |
|
fan
|
3faf8f3906
|
ibp盘调整
|
2019-09-06 16:54:55 +08:00 |
|
ival
|
f774edd652
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-06 16:11:46 +08:00 |
|
ival
|
7c5d453c29
|
修改绘制地图同步数据逻辑
|
2019-09-06 16:11:28 +08:00 |
|
zyy
|
0cfc1dc972
|
Merge branch 'dev' into test
|
2019-09-06 15:55:06 +08:00 |
|
zyy
|
10c4083ad3
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-06 15:54:11 +08:00 |
|
zyy
|
7b0b0d6d0c
|
desc: 修改绘制地图赋值
|
2019-09-06 15:54:05 +08:00 |
|
fan
|
327c35355f
|
ibp盘调整
|
2019-09-06 15:21:21 +08:00 |
|
fan
|
80edc1ad20
|
ibp盘调整
|
2019-09-06 15:08:47 +08:00 |
|
fan
|
32dab2fa7d
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-09-06 14:48:47 +08:00 |
|
fan
|
ceccbbc825
|
ibp盘调整
|
2019-09-06 14:48:06 +08:00 |
|
joylink_cuiweidong
|
37b72ddf7e
|
枣园站 ibp盘绘制
|
2019-09-06 14:23:31 +08:00 |
|
zyy
|
1faa4e0add
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-06 14:21:08 +08:00 |
|
zyy
|
11a49d1442
|
desc: 增加加载运行图模板接口，调整地图绘制优化
|
2019-09-06 14:21:01 +08:00 |
|
joylink_cuiweidong
|
d05a6583df
|
ibp盘 圆形指示灯 调整
|
2019-09-06 10:55:34 +08:00 |
|
fan
|
20acc0e667
|
ibp盘调整
|
2019-09-06 10:27:13 +08:00 |
|
fan
|
f8df75252f
|
ibp盘调整
|
2019-09-06 10:07:01 +08:00 |
|
fan
|
f5f7113c01
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-09-06 09:55:27 +08:00 |
|
fan
|
fa604188b0
|
ibp盘调整
|
2019-09-06 09:55:16 +08:00 |
|
joylink_cuiweidong
|
a3980e689e
|
修改钥匙，电话端子，提示框，线等组件的结构
|
2019-09-06 09:49:58 +08:00 |
|
fan
|
7f0d548cb4
|
ibp盘调整
|
2019-09-05 19:27:30 +08:00 |
|
fan
|
455202a851
|
ibp盘调整
|
2019-09-05 18:54:54 +08:00 |
|
fan
|
84d2c2f014
|
ibp盘调整
|
2019-09-05 17:47:05 +08:00 |
|
fan
|
4d3eda2131
|
ibp盘调整
|
2019-09-05 10:01:56 +08:00 |
|
fan
|
9ba4ce7681
|
ibp盘图片调整
|
2019-09-05 09:54:53 +08:00 |
|
fan
|
c4bf259918
|
销毁实例前清除ibp数据
|
2019-09-05 09:35:32 +08:00 |
|
fan
|
063b6392fc
|
查询剧本列表接口调整展示调整
|
2019-09-05 09:07:16 +08:00 |
|
zyy
|
0aed4d1680
|
Merge branch 'test'
|
2019-09-04 19:08:11 +08:00 |
|
zyy
|
2dadba36dd
|
Merge branch 'dev' into test
|
2019-09-04 19:07:43 +08:00 |
|
zyy
|
935e42fa5b
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-04 19:07:04 +08:00 |
|
zyy
|
921ef7c03d
|
desc: 调整接口请求次数
|
2019-09-04 19:06:55 +08:00 |
|
ival
|
664fbb8f7f
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
2019-09-04 19:04:58 +08:00 |
|
ival
|
99ffd6d36c
|
删除注释
|
2019-09-04 19:03:04 +08:00 |
|
ival
|
33c4a3afc2
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-04 19:00:38 +08:00 |
|
ival
|
02fc21e544
|
增加仿真的大屏角色以及IBP角色
|
2019-09-04 19:00:22 +08:00 |
|
joylink_cuiweidong
|
e537726127
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-04 18:49:29 +08:00 |
|
fan
|
fefe8bd104
|
ibp盘数据调整
|
2019-09-04 18:49:09 +08:00 |
|
joylink_cuiweidong
|
19870bb7c4
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-04 18:49:04 +08:00 |
|
joylink_cuiweidong
|
38f7b1a6e2
|
修复 时间组件拖拽 位置数据不更新的问题
|
2019-09-04 18:48:53 +08:00 |
|