joylink_cuiweidong
|
ffdba3dc22
|
国际化调整
|
2019-09-17 16:08:11 +08:00 |
|
joylink_cuiweidong
|
021132ba0d
|
国际化调整
|
2019-09-17 14:14:29 +08:00 |
|
joylink_cuiweidong
|
a116539d80
|
国际化调整
|
2019-09-17 13:54:10 +08:00 |
|
joylink_cuiweidong
|
2c7f48fb28
|
课程模块国际化调整
|
2019-09-17 13:19:43 +08:00 |
|
sunzhenyu
|
2cd39f6fbd
|
baseurl
|
2019-09-17 13:18:19 +08:00 |
|
sunzhenyu
|
d1b9589188
|
pull
|
2019-09-17 13:17:15 +08:00 |
|
sunzhenyu
|
183f972884
|
pull
|
2019-09-17 13:16:49 +08:00 |
|
sunzhenyu
|
0c49756f08
|
s
|
2019-09-17 13:16:24 +08:00 |
|
joylink_cuiweidong
|
9ed649200c
|
地图绘制 模块 国际化调整
|
2019-09-17 11:29:34 +08:00 |
|
sunzhenyu
|
b8598c0ceb
|
Merge branch 'dev' into test
|
2019-09-17 10:52:55 +08:00 |
|
sunzhenyu
|
adc497cc1f
|
pull
|
2019-09-17 10:52:14 +08:00 |
|
sunzhenyu
|
b8afc684a3
|
pull
|
2019-09-17 10:51:38 +08:00 |
|
sunzhenyu
|
9fd032372c
|
修改下行方向初始轨迹，修改音频大小
|
2019-09-17 10:50:59 +08:00 |
|
joylink_cuiweidong
|
b68b10b125
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
2019-09-17 10:03:13 +08:00 |
|
joylink_cuiweidong
|
51eab16476
|
国际化调整
|
2019-09-17 09:49:24 +08:00 |
|
joylink_cuiweidong
|
7f934a428f
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-16 19:09:23 +08:00 |
|
joylink_cuiweidong
|
9cefb34ce1
|
国际化调整
|
2019-09-16 19:09:11 +08:00 |
|
fan
|
b1706b17c0
|
国际化调整
|
2019-09-16 19:07:40 +08:00 |
|
fan
|
bb272ae559
|
国际化调整
|
2019-09-16 19:06:18 +08:00 |
|
fan
|
a6ff9e2c08
|
国际化调整
|
2019-09-16 19:00:52 +08:00 |
|
sunzhenyu
|
3e2b812029
|
修改列车初始化获取轨迹和位置代码，修改倒车卡轨迹bug，增加跟速度相关的轨道声音
|
2019-09-16 18:47:15 +08:00 |
|
joylink_cuiweidong
|
c1bee69b5c
|
国际化调整
|
2019-09-16 18:40:41 +08:00 |
|
zyy
|
b9534a26e6
|
Merge branch 'dev' into test
|
2019-09-16 18:16:14 +08:00 |
|
zyy
|
815c2e6db4
|
desc: 调整信号机显示位置
|
2019-09-16 17:58:01 +08:00 |
|
zyy
|
607024c551
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-16 17:31:17 +08:00 |
|
zyy
|
c5c71253df
|
desc: 调整信号机字段显示，调整创建权限逻辑
|
2019-09-16 17:31:12 +08:00 |
|
joylink_cuiweidong
|
25402786f8
|
国际化调整
|
2019-09-16 16:08:55 +08:00 |
|
zyy
|
7abab1ba28
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-16 16:00:09 +08:00 |
|
zyy
|
ab9a02e232
|
desc: 调整琏计划运行图样式
|
2019-09-16 15:59:53 +08:00 |
|
ival
|
0cd99f16f1
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/views/publish/publishMap/index.vue
|
2019-09-16 14:31:56 +08:00 |
|
ival
|
b52bb52888
|
修改地图导出以及登录失败错误信息提示
|
2019-09-16 14:29:43 +08:00 |
|
joylink_cuiweidong
|
382b81b94e
|
国际化调整
|
2019-09-16 13:55:18 +08:00 |
|
joylink_cuiweidong
|
87637e89ae
|
弹出层国际化调整
|
2019-09-16 11:17:42 +08:00 |
|
joylink_cuiweidong
|
711f3195e3
|
国际化调整
|
2019-09-16 10:25:39 +08:00 |
|
fan
|
836aa798dd
|
国际化调整
|
2019-09-16 09:06:19 +08:00 |
|
fan
|
6e44740fe2
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
# Conflicts:
# src/i18n/langs/en/menu.js
# src/i18n/langs/zh/menu.js
|
2019-09-16 09:05:33 +08:00 |
|
fan
|
126fc80ea4
|
国际化调整菜单
|
2019-09-16 08:56:37 +08:00 |
|
joylink_cuiweidong
|
3f772f0cd5
|
地图右键菜单国际化
|
2019-09-12 18:37:42 +08:00 |
|
joylink_cuiweidong
|
88d96ace7d
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-12 17:38:17 +08:00 |
|
joylink_cuiweidong
|
24bbeda269
|
地图右键菜单国际化
|
2019-09-12 17:38:04 +08:00 |
|
fan
|
a362e629c7
|
国际化调整
|
2019-09-12 17:34:40 +08:00 |
|
fan
|
60522271fc
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
# Conflicts:
# src/i18n/langs/en/menu.js
# src/i18n/langs/zh/menu.js
|
2019-09-12 17:34:17 +08:00 |
|
fan
|
d9b8f1e8fd
|
国际化菜单调整调整
|
2019-09-12 17:28:02 +08:00 |
|
zyy
|
c777b3dbcc
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/i18n/langs/en/rules.js
# src/i18n/langs/zh/rules.js
|
2019-09-12 16:31:35 +08:00 |
|
zyy
|
f48a513df0
|
desc: 调整绘图逻辑，流程，字段显示
|
2019-09-12 16:30:42 +08:00 |
|
joylink_cuiweidong
|
6d03379cb0
|
地图右键菜单国际化
|
2019-09-12 16:03:03 +08:00 |
|
joylink_cuiweidong
|
b08cddc237
|
地图菜单国际化
|
2019-09-12 15:14:13 +08:00 |
|
joylink_cuiweidong
|
71a0f2d921
|
仿真国际化
|
2019-09-12 13:35:25 +08:00 |
|
fan
|
cf45174dad
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-09-12 13:22:40 +08:00 |
|
fan
|
2dffe78baf
|
国际化调整
|
2019-09-12 13:22:30 +08:00 |
|