fan
|
7eafd16896
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-08-27 14:18:22 +08:00 |
|
fan
|
b2eb2076b0
|
ibp
|
2019-08-27 14:17:36 +08:00 |
|
joylink_cuiweidong
|
aeb424514f
|
ibp盘 按钮组件封装调整
|
2019-08-27 13:55:48 +08:00 |
|
ival
|
c6cbc3be66
|
Merge remote-tracking branch 'remotes/origin/test'
|
2019-08-27 11:21:51 +08:00 |
|
ival
|
0e55c3c53e
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
2019-08-27 10:30:23 +08:00 |
|
ival
|
1888ae855a
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-27 10:28:37 +08:00 |
|
ival
|
5fdc80855d
|
修改规则编辑的问题
|
2019-08-27 10:28:24 +08:00 |
|
zyy
|
5fd2efcb75
|
Merge branch 'test'
|
2019-08-27 09:47:05 +08:00 |
|
zyy
|
aaf4d92ad8
|
Merge branch 'dev' into test
|
2019-08-27 09:46:54 +08:00 |
|
zyy
|
e34d3abff4
|
desc: 修改主页扫码显示逻辑
|
2019-08-27 09:46:44 +08:00 |
|
zyy
|
1d2576e1a8
|
Merge branch 'test'
|
2019-08-27 09:37:56 +08:00 |
|
zyy
|
a0292849e2
|
Merge branch 'dev' into test
|
2019-08-27 09:37:09 +08:00 |
|
zyy
|
33c025aefa
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-27 09:36:34 +08:00 |
|
zyy
|
72355448a1
|
desc: 修改地图绘制显示问题
|
2019-08-27 09:36:22 +08:00 |
|
joylink_cuiweidong
|
4235afd00f
|
ibp盘按钮组件封装
|
2019-08-26 19:18:03 +08:00 |
|
sunzhenyu
|
f2f89d2be2
|
修改初始位置因为角度偏移问题
|
2019-08-26 18:56:46 +08:00 |
|
ival
|
a4d06b7743
|
修改试题编辑页面的bug
|
2019-08-26 15:30:36 +08:00 |
|
ival
|
9230df4ed3
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-26 14:30:21 +08:00 |
|
ival
|
0255a3250e
|
增加绘图的默认状态设置
|
2019-08-26 14:30:01 +08:00 |
|
fan
|
7fd73dbf37
|
ibp盘
|
2019-08-26 11:15:40 +08:00 |
|
fan
|
bc9180d814
|
ibp盘
|
2019-08-26 10:28:28 +08:00 |
|
fan
|
7757094ce3
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-08-26 10:13:05 +08:00 |
|
fan
|
4b7873c2d7
|
ibp盘
|
2019-08-26 10:12:39 +08:00 |
|
zyy
|
b49dc9fcf6
|
Merge branch 'dev' into test
|
2019-08-26 09:07:42 +08:00 |
|
zyy
|
b9b2fd5b77
|
desc: 调整地图绘制数据逻辑， 新增发布历史列表
|
2019-08-23 18:40:02 +08:00 |
|
zyy
|
7cf12c2c7e
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-23 14:24:36 +08:00 |
|
zyy
|
2250bc970d
|
desc: 修改名称显示放到皮肤配置中
|
2019-08-23 14:24:30 +08:00 |
|
ival
|
554db95dd6
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-23 13:44:56 +08:00 |
|
ival
|
0fe2f1a043
|
1.修改代码字典首字母大写导致select选项不出来的问题
|
2019-08-23 13:44:43 +08:00 |
|
zyy
|
f30084539a
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-23 09:14:27 +08:00 |
|
zyy
|
6a6bb3a405
|
desc: 修改地图绘制样式，逻辑调整
|
2019-08-23 09:14:21 +08:00 |
|
joylink_cuiweidong
|
2abda64836
|
剧本录制模块页面结构调整
|
2019-08-22 18:13:55 +08:00 |
|
fan
|
0ca2235549
|
加载剧本是先清除地图状态
|
2019-08-22 14:12:16 +08:00 |
|
program-walker
|
a0646d3588
|
Merge remote-tracking branch 'origin/test'
|
2019-08-22 13:32:31 +08:00 |
|
program-walker
|
b810fb1dae
|
Merge remote-tracking branch 'origin/dev' into test
|
2019-08-22 13:32:15 +08:00 |
|
program-walker
|
252ad5b593
|
修改仿真类型数据字典
|
2019-08-22 13:31:58 +08:00 |
|
zyy
|
69d4d2be72
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-22 10:25:29 +08:00 |
|
zyy
|
fde4d41727
|
desc: 修改样式，地图更新坐标
|
2019-08-22 10:25:23 +08:00 |
|
fan
|
b5a157fecd
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-08-22 10:12:55 +08:00 |
|
fan
|
d068a74a6e
|
加载剧本前列车视图
|
2019-08-22 10:12:35 +08:00 |
|
ival
|
52bacce3a3
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-22 09:45:31 +08:00 |
|
ival
|
977b47892f
|
增加综合仿真获取系统暂停状态的代码以及增加右侧偏移量的设置
|
2019-08-22 09:45:21 +08:00 |
|
fan
|
64ca6af5d6
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-08-22 09:15:06 +08:00 |
|
fan
|
3d5bc7c600
|
国际化调整
|
2019-08-22 09:14:26 +08:00 |
|
fan
|
b41c85b78e
|
合并代码
|
2019-08-22 09:12:29 +08:00 |
|
joylink_cuiweidong
|
1212d30677
|
调整剧本不能修改问题
|
2019-08-22 09:09:35 +08:00 |
|
fan
|
614aae8be0
|
国际化调整
|
2019-08-22 09:06:48 +08:00 |
|
program-walker
|
eae41bdd53
|
Merge remote-tracking branch 'origin/test'
|
2019-08-21 20:41:09 +08:00 |
|
program-walker
|
71e306bbcb
|
Merge remote-tracking branch 'origin/dev' into test
|
2019-08-21 20:40:35 +08:00 |
|
program-walker
|
cdb7ca645a
|
修改剧本编制界面样式
|
2019-08-21 20:40:02 +08:00 |
|