sunzhenyu
|
cda7d04dcc
|
Merge branch 'test' of git.cloud.tencent.com:joylink/jl-nclient into test
|
2019-11-11 15:17:08 +08:00 |
|
sunzhenyu
|
f5de76ff63
|
测试
|
2019-11-11 15:16:18 +08:00 |
|
fan
|
6ca155617f
|
label 调整
|
2019-11-11 14:08:54 +08:00 |
|
fan
|
04ec094ded
|
样式调整
|
2019-11-11 13:34:35 +08:00 |
|
fan
|
bf7b12cacb
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
# Conflicts:
# src/views/lesson/trainingmanage/index.vue
|
2019-11-11 13:23:35 +08:00 |
|
fan
|
907d95879e
|
代码调整
|
2019-11-11 13:22:22 +08:00 |
|
joylink_cuiweidong
|
b3a4e6ca8c
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/i18n/langs/zh/global.js
|
2019-11-11 13:11:50 +08:00 |
|
fan
|
56d11976db
|
设计平台剧本课程运行图统一风格样式
|
2019-11-11 13:10:36 +08:00 |
|
joylink_cuiweidong
|
aade09a303
|
权限分发调整
|
2019-11-11 13:10:23 +08:00 |
|
fan
|
be6bd12b52
|
代码调整
|
2019-11-11 09:56:11 +08:00 |
|
fan
|
3674833434
|
周末问题调整
|
2019-11-11 09:20:24 +08:00 |
|
fan
|
30f1997a08
|
Merge remote-tracking branch 'origin/dev' into test
|
2019-11-08 20:31:10 +08:00 |
|
fan
|
00458ff53f
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-11-08 20:25:26 +08:00 |
|
fan
|
46c6282a14
|
代码调整
|
2019-11-08 20:25:04 +08:00 |
|
ival
|
62097db613
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
2019-11-08 20:04:32 +08:00 |
|
ival
|
8855bb6c27
|
修改代码
|
2019-11-08 20:03:33 +08:00 |
|
ival
|
058e8cdcd5
|
修改
|
2019-11-08 19:34:12 +08:00 |
|
sunzhenyu
|
e805a97a6d
|
修改转换数据计算
|
2019-11-08 19:33:43 +08:00 |
|
ival
|
1e1400ac68
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/utils/baseUrl.js
|
2019-11-08 19:33:05 +08:00 |
|
ival
|
b049ff3be2
|
修改代码
|
2019-11-08 19:32:21 +08:00 |
|
joylink_cuiweidong
|
d64e838bcb
|
代码调整
|
2019-11-08 19:29:39 +08:00 |
|
joylink_cuiweidong
|
8f0ef88f59
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
2019-11-08 18:58:03 +08:00 |
|
joylink_cuiweidong
|
fcf4f542e0
|
代码调整
|
2019-11-08 18:57:27 +08:00 |
|
fan
|
62a7cce5f1
|
返回仿真不退出全屏
|
2019-11-08 18:52:09 +08:00 |
|
fan
|
b8b73a2151
|
merge
|
2019-11-08 18:45:08 +08:00 |
|
fan
|
daec7d5e4d
|
bug 调整
|
2019-11-08 18:43:46 +08:00 |
|
sunzhenyu
|
84dc26574b
|
Merge branch 'test' of git.cloud.tencent.com:joylink/jl-nclient into test
|
2019-11-08 18:42:43 +08:00 |
|
sunzhenyu
|
957f13fd2f
|
行车逻辑测试
|
2019-11-08 18:42:37 +08:00 |
|
zyy
|
a348552d1e
|
desc: 增加选中批量设置集中站操作
|
2019-11-08 18:32:39 +08:00 |
|
ival
|
4816ca97b8
|
Merge remote-tracking branch 'remotes/origin/dev' into test
# Conflicts:
# src/views/display/designIndex.vue
# src/views/display/index.vue
|
2019-11-08 18:20:56 +08:00 |
|
joylink_cuiweidong
|
ee600f8915
|
skinCode调整
|
2019-11-08 18:19:35 +08:00 |
|
ival
|
46effe5ca8
|
提交代码
|
2019-11-08 18:17:34 +08:00 |
|
ival
|
6049c04a74
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/utils/baseUrl.js
|
2019-11-08 18:16:43 +08:00 |
|
fan
|
2d04c6aa6a
|
订阅topic 区分平台--调整
|
2019-11-08 18:15:57 +08:00 |
|
ival
|
0776d08053
|
修改仿真房间代码
|
2019-11-08 18:15:52 +08:00 |
|
fan
|
2974f613f3
|
订阅topic 区分平台--调整
|
2019-11-08 18:15:23 +08:00 |
|
fan
|
f75f992776
|
订阅topic 区分平台
|
2019-11-08 17:52:30 +08:00 |
|
fan
|
75a871265e
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-11-08 16:22:32 +08:00 |
|
fan
|
e677b24f6d
|
调整查询地图列表接口
|
2019-11-08 16:22:05 +08:00 |
|
joylink_cuiweidong
|
95ae0de627
|
skinCode调整
|
2019-11-08 16:12:23 +08:00 |
|
joylink_cuiweidong
|
b923fa2a6b
|
代码调整
|
2019-11-08 15:17:04 +08:00 |
|
zyy
|
4483ee9253
|
desc: 导入运行图增加提示
|
2019-11-08 14:56:39 +08:00 |
|
zyy
|
4c48145465
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/views/planMonitor/editTool/menus/createEmptyPlan.vue
|
2019-11-08 14:37:17 +08:00 |
|
zyy
|
7a359e5f6e
|
desc: 修改代码
|
2019-11-08 14:36:41 +08:00 |
|
joylink_cuiweidong
|
11226b84ab
|
运行图设计代码调整
|
2019-11-08 14:35:58 +08:00 |
|
sunzhenyu
|
0a77a56196
|
Merge branch 'test' of git.cloud.tencent.com:joylink/jl-nclient into test
|
2019-11-08 14:31:23 +08:00 |
|
sunzhenyu
|
8e11c76cd7
|
测试站台停车坐标
|
2019-11-08 14:31:15 +08:00 |
|
fan
|
06f6b920e9
|
Merge remote-tracking branch 'origin/dev' into test
|
2019-11-08 14:00:09 +08:00 |
|
joylink_cuiweidong
|
713f411ffc
|
运行图设计调整
|
2019-11-08 13:47:51 +08:00 |
|
fan
|
71171625fa
|
删除console
|
2019-11-08 13:44:49 +08:00 |
|