ival
|
1d0a920f7c
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-12 09:24:26 +08:00 |
|
ival
|
9e5838c647
|
删除多余指令
|
2019-11-12 09:24:11 +08:00 |
|
program-walker
|
17a29d92c9
|
Merge remote-tracking branch 'origin/dev' into test
|
2019-11-11 20:05:26 +08:00 |
|
program-walker
|
eec5403678
|
Merge remote-tracking branch 'origin/test' into test
# Conflicts:
# src/utils/baseUrl.js
|
2019-11-11 20:05:02 +08:00 |
|
program-walker
|
6acea50779
|
注销退出监听处理
|
2019-11-11 20:04:31 +08:00 |
|
zyy
|
e9ef8efa17
|
Merge branch 'dev' into test
|
2019-11-11 19:29:31 +08:00 |
|
zyy
|
db1681b54e
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-11 19:24:39 +08:00 |
|
zyy
|
6e29cec983
|
desc: 修改代码
|
2019-11-11 19:24:30 +08:00 |
|
fan
|
154e15b428
|
Merge remote-tracking branch 'origin/dev' into test
|
2019-11-11 18:53:41 +08:00 |
|
fan
|
e069821071
|
路由跳转调整
|
2019-11-11 18:53:11 +08:00 |
|
joylink_cuiweidong
|
e4dffd17af
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
2019-11-11 18:45:09 +08:00 |
|
fan
|
90a45dc5bd
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-11-11 18:42:34 +08:00 |
|
fan
|
c35cef4800
|
样式调整
|
2019-11-11 18:42:14 +08:00 |
|
sunzhenyu
|
e36ef1b3da
|
三维行车测试
|
2019-11-11 18:32:03 +08:00 |
|
joylink_cuiweidong
|
c4f79f3b1a
|
skinCode调整
|
2019-11-11 18:28:21 +08:00 |
|
joylink_cuiweidong
|
9851ac01a1
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
2019-11-11 17:39:23 +08:00 |
|
joylink_cuiweidong
|
16b0aab0e5
|
运行图skinCode修改
|
2019-11-11 17:38:43 +08:00 |
|
ival
|
912f61cda7
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-11 17:03:36 +08:00 |
|
ival
|
87f0b2a69d
|
修改代码
|
2019-11-11 17:03:21 +08:00 |
|
joylink_cuiweidong
|
4c0f965a47
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-11 15:54:15 +08:00 |
|
joylink_cuiweidong
|
e8c8e491f5
|
skinCode调整
|
2019-11-11 15:54:04 +08:00 |
|
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 |
|