ival
|
4917108e3e
|
修改绘图card被撑开的问题
|
2019-08-15 16:19:03 +08:00 |
|
zyy
|
300d1f9638
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-15 16:11:16 +08:00 |
|
zyy
|
ecc9806d61
|
desc: 修改地图配置
|
2019-08-15 16:11:09 +08:00 |
|
ival
|
0d8770e9e1
|
Merge remote-tracking branch 'remotes/origin/master' into dev
# Conflicts:
# src/views/demonstration/deomonList/index.vue
|
2019-08-15 16:10:13 +08:00 |
|
ival
|
7a08dabc30
|
修改jenkinsfile-test
|
2019-08-15 16:06:08 +08:00 |
|
ival
|
11658a283e
|
修改主页
|
2019-08-15 15:53:11 +08:00 |
|
fan
|
0b3ad87bc3
|
创建仿真失败时关闭loading
|
2019-08-15 15:21:28 +08:00 |
|
ival
|
4519d753e3
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-15 14:28:47 +08:00 |
|
ival
|
d4ba56d31d
|
修该查询进路的接口
|
2019-08-15 14:28:31 +08:00 |
|
joylink_cuiweidong
|
2e53745790
|
剧本管理模块
|
2019-08-15 14:06:53 +08:00 |
|
fan
|
9787c8aaeb
|
调整：国际化
|
2019-08-15 10:47:59 +08:00 |
|
fan
|
1b42eec5e3
|
调整：国际化
|
2019-08-15 10:37:47 +08:00 |
|
fan
|
951fdd9719
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
# Conflicts:
# src/i18n/langs/zh/map.js
# src/i18n/langs/zh/tip.js
# src/views/map/product/draft.vue
# src/views/map/product/list.vue
# src/views/map/skinStyle/draft.vue
# src/views/map/skinStyle/index.vue
|
2019-08-15 10:34:31 +08:00 |
|
zyy
|
7cabec1c1f
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-15 10:26:37 +08:00 |
|
zyy
|
fad339f977
|
desc: 调整地图绘制国际化
|
2019-08-15 10:26:29 +08:00 |
|
fan
|
414000331e
|
调整：国际化
|
2019-08-15 09:45:31 +08:00 |
|
joylink_cuiweidong
|
ca7b21e61e
|
修改剧本管理界面
|
2019-08-15 09:04:17 +08:00 |
|
ival
|
68c8757dad
|
修改配置
|
2019-08-15 08:58:21 +08:00 |
|
ival
|
fd2b66e984
|
Merge remote-tracking branch 'remotes/origin/master' into dev
# Conflicts:
# src/i18n/langs/zh/rules.js
# src/views/trainRoom/index.vue
|
2019-08-14 16:50:50 +08:00 |
|
zyy
|
7fdedec00f
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-14 16:48:03 +08:00 |
|
zyy
|
62674f84ff
|
desc: 修改快速入口提示问题
|
2019-08-14 16:47:54 +08:00 |
|
ival
|
b1fd1f43e9
|
删除返回主页的错误
|
2019-08-14 16:46:44 +08:00 |
|
ival
|
87e35cb38d
|
同步master代码以及修改交路的问题
|
2019-08-14 16:37:17 +08:00 |
|
zyy
|
eef2fed8a2
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-14 16:15:50 +08:00 |
|
zyy
|
ed8b14dac2
|
desc: 修改综合演练，socket创建
|
2019-08-14 16:15:44 +08:00 |
|
ival
|
3bb449080f
|
Merge remote-tracking branch 'remotes/origin/master' into dev
# Conflicts:
# src/i18n/langs/zh/tip.js
# src/jlmap3d/jl3ddrive/jl3ddrive.js
# src/views/components/pay/index.vue
# src/views/demonstration/detail/index.vue
# src/views/display/index.vue
# src/views/exam/detail/courseDetail.vue
# src/views/exam/detail/examDetail.vue
# src/views/exam/detail/questionDetail.vue
# src/views/jlmap3d/drive/jl3ddrive.vue
# src/views/jlmap3d/simulation/jl3dsimulation.vue
# src/views/jointTraining/index.vue
# src/views/map/mapdraft/mapedit/automaticoperate/preview.vue
# src/views/map/mapdraft/mapedit/mapoperate/link.vue
# src/views/map/mapdraft/mapedit/mapoperate/section.vue
# src/views/map/mapdraft/mapedit/mapoperate/signal.vue
# src/views/map/mapdraft/mapedit/mapoperate/station.vue
# src/views/map/mapdraft/mapedit/mapoperate/stationcontrol.vue
# src/views/map/mapdraft/mapedit/mapoperate/stationstand.vue
# src/views/map/mapdraft/mapedit/mapoperate/stoppoint.vue
# src/views/map/mapdraft/mapedit/mapoperate/switch.vue
# src/views/map/mapdraft/mapedit/pathoperate/pathRoute.vue
# src/views/map/mapdraft/mapedit/routeoperate/detail.vue
# src/views/map/mapdraft/mapedit/routeoperate/preview.vue
# src/views/map/mapdraft/mapedit/routeoperate/related.vue
# src/views/map/mapdraft/mapedit/routeoperate/route.vue
# src/views/map/mapdraft/mapmanage/operateMenu.vue
# src/views/map/product/draft.vue
# src/views/map/product/list.vue
# src/views/map/skinStyle/draft.vue
# src/views/map/skinStyle/index.vue
# src/views/planMonitor/detail.vue
# src/views/planMonitor/editTool/index.vue
# src/views/planMonitor/editTool/menus/modifyingStationIntervalTime.vue
# src/views/planMonitor/editTool/schedule.vue
# src/views/teach/detail/index.vue
# src/views/teach/practical/index.vue
|
2019-08-14 15:57:52 +08:00 |
|
ival
|
6ea6c8a2e9
|
修改代码
|
2019-08-14 15:28:15 +08:00 |
|
ival
|
230d118d30
|
修改name错误的问题
|
2019-08-14 15:25:01 +08:00 |
|
ival
|
4886587d2d
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/views/map/mapdraft/mapedit/routeoperate/detail.vue
|
2019-08-14 15:21:06 +08:00 |
|
ival
|
72d3a5f475
|
修改进路查询方式
|
2019-08-14 15:19:11 +08:00 |
|
zyy
|
c304af4811
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-14 15:03:47 +08:00 |
|
zyy
|
3dd56879a4
|
desc: 修改国际化，调整角色显示
|
2019-08-14 15:03:41 +08:00 |
|
ival
|
4a224b630f
|
增加首先显示
|
2019-08-14 14:52:21 +08:00 |
|
ival
|
6343a79f81
|
修改接口
|
2019-08-14 14:01:28 +08:00 |
|
ival
|
72c1f1d4ca
|
修改搜索
|
2019-08-14 13:48:06 +08:00 |
|
ival
|
c61a673513
|
修改添加
|
2019-08-14 13:42:35 +08:00 |
|
ival
|
ed05cb123e
|
修改类车添加功能
|
2019-08-14 13:38:28 +08:00 |
|
ival
|
576ac7eacb
|
修改导航配置
|
2019-08-14 10:36:55 +08:00 |
|
ival
|
c97dfd18c5
|
修改配置
|
2019-08-14 10:15:26 +08:00 |
|
ival
|
25479392ff
|
修改配置
|
2019-08-14 10:12:51 +08:00 |
|
ival
|
d8480207aa
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-08-14 09:35:52 +08:00 |
|
ival
|
78a805cd2f
|
修改皮肤skinStyle为skinCode
|
2019-08-14 09:35:38 +08:00 |
|
ival
|
4e88c02363
|
修改目录结构
|
2019-08-14 09:33:24 +08:00 |
|
zyy
|
9a4e982c08
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-13 18:43:40 +08:00 |
|
zyy
|
aa63be299b
|
desc: 增加地图编辑 国际化
|
2019-08-13 18:43:34 +08:00 |
|
fan
|
8c799d7ee6
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-08-13 18:32:48 +08:00 |
|
fan
|
3a0202a1e9
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-08-13 18:27:09 +08:00 |
|
ival
|
e0d76d03c5
|
修改运行图右键菜单
|
2019-08-13 18:26:36 +08:00 |
|
ival
|
45417f0072
|
修改代码
|
2019-08-13 18:14:19 +08:00 |
|
fan
|
2ab09d664f
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-08-13 18:12:14 +08:00 |
|