ival
|
87e35cb38d
|
同步master代码以及修改交路的问题
|
2019-08-14 16:37:17 +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 |
|
zyy
|
3dd56879a4
|
desc: 修改国际化，调整角色显示
|
2019-08-14 15:03:41 +08:00 |
|
zyy
|
aa63be299b
|
desc: 增加地图编辑 国际化
|
2019-08-13 18:43:34 +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 |
|
fan
|
a3ecc1dfc6
|
调整：国际化
|
2019-08-13 18:11:58 +08:00 |
|
ival
|
346459e43a
|
修改配置
|
2019-08-13 11:15:39 +08:00 |
|
ival
|
d14d3b3221
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/i18n/langs/en/error.js
# src/i18n/langs/en/global.js
# src/i18n/langs/zh/error.js
# src/i18n/langs/zh/global.js
|
2019-08-13 11:13:27 +08:00 |
|
ival
|
0eaa4dbe1f
|
修改国际化配置
|
2019-08-13 11:10:55 +08:00 |
|
fan
|
8725104c7b
|
调整：国际化
|
2019-08-13 09:20:49 +08:00 |
|
fan
|
e0b7994b80
|
Merge branch 'master_loading2' into dev
# Conflicts:
# src/i18n/langs/en/tip.js
# src/i18n/langs/zh/tip.js
|
2019-08-13 09:02:46 +08:00 |
|
fan
|
13d7e5df8b
|
调整：国际化
|
2019-08-12 18:54:32 +08:00 |
|
ival
|
dc0b5301e0
|
增加导出部分地图数据
|
2019-08-12 18:22:14 +08:00 |
|
zyy
|
e7d1f478be
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-12 15:19:33 +08:00 |
|
zyy
|
fcb6076d64
|
desc: 增加地图编辑国际化
|
2019-08-12 15:19:26 +08:00 |
|
ival
|
52e9b1f79f
|
增加国际化配置
|
2019-08-12 10:18:59 +08:00 |
|
joylink_cuiweidong
|
f1b3906973
|
任务目标模块国际化
|
2019-08-09 19:00:37 +08:00 |
|
joylink_cuiweidong
|
b82393366c
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/i18n/langs/en/index.js
# src/i18n/langs/zh/index.js
|
2019-08-09 18:20:34 +08:00 |
|
zyy
|
7cde547775
|
desc: 增加英文文件内容
|
2019-08-09 17:40:53 +08:00 |
|
zyy
|
ca0cdeb7f9
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/i18n/langs/zh/index.js
|
2019-08-09 17:37:12 +08:00 |
|
zyy
|
374bf96525
|
desc: 增加规则，提示信息国际化
|
2019-08-09 17:36:20 +08:00 |
|
joylink_cuiweidong
|
6951bf9f3a
|
页面样式修改
国际化添加
|
2019-08-09 17:26:33 +08:00 |
|
ival
|
bfddddf7e6
|
修改代码
|
2019-08-09 17:25:45 +08:00 |
|
zyy
|
fdd28f3c45
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/i18n/langs/en/index.js
# src/i18n/langs/zh/index.js
|
2019-08-09 15:41:39 +08:00 |
|
zyy
|
de5ca5225a
|
desc: 配置地图国际化语言
|
2019-08-09 15:40:33 +08:00 |
|
ival
|
7af324ab1e
|
国际化配置
|
2019-08-09 15:10:13 +08:00 |
|
ival
|
b89d99f2a5
|
修改i18n语言层次
|
2019-08-09 09:31:09 +08:00 |
|
ival
|
7a41260bae
|
增加国际化配置
|
2019-08-08 11:33:06 +08:00 |
|
ival
|
c66d72a049
|
增加i18n国际化配置
|
2019-08-08 11:29:03 +08:00 |
|