Commit Graph

404 Commits

Author SHA1 Message Date
fan
c91a4efdcc 修改:国际化调整 2019-08-19 16:35:27 +08:00
ival
70e1236099 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-08-19 15:59:16 +08:00
ival
ae500285ba 修改实训加载顺序错误的问题 2019-08-19 15:59:04 +08:00
zyy
921f67938e 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-08-19 15:54:53 +08:00
zyy
a6b8d8a21a desc: 删除重复的国际化标识, 国际化翻译 2019-08-19 15:53:14 +08:00
fan
30433bfcd0 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-08-19 15:47:07 +08:00
fan
d0f7bd46a9 修改:国际化调整 2019-08-19 15:46:52 +08:00
ival
2d8f94f47a Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-08-19 15:19:50 +08:00
ival
94f3659cf3 修改国际化 2019-08-19 15:19:33 +08:00
zyy
91b2674de4 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-08-19 15:06:53 +08:00
zyy
fdfa413567 desc: 调整国际化翻译 2019-08-19 15:06:47 +08:00
ival
9ca049157c Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-08-19 14:02:32 +08:00
ival
d87a4fff22 国际化处理 2019-08-19 14:02:20 +08:00
zyy
fd5ab1f30d desc: 地图绘制 逻辑修改 2019-08-19 14:01:45 +08:00
zyy
138dfe5e06 desc: 修改地图绘制图层配置, 调整道岔时间显示 2019-08-19 11:18:46 +08:00
zyy
bb1a98507b desc: 地图编辑区分绘图数据,地图数据 2019-08-16 18:02:50 +08:00
zyy
25493993d9 desc: 修改路由监听 2019-08-16 16:33:59 +08:00
joylink_cuiweidong
2598087dac Merge remote-tracking branch 'remotes/origin/master' into dev
# Conflicts:
#	src/i18n/langs/en/map.js
#	src/i18n/langs/en/tip.js
#	src/i18n/langs/zh/map.js
#	src/i18n/langs/zh/rules.js
#	src/i18n/langs/zh/tip.js
#	src/utils/baseUrl.js
#	src/views/map/mapdraft/mapedit/routingoperate/detail.vue
#	src/views/map/mapdraft/mapedit/routingoperate/route.vue
#	src/views/map/mapdraft/mapedit/switchoperate/detail.vue
2019-08-16 13:45:49 +08:00
zyy
ecc9806d61 desc: 修改地图配置 2019-08-15 16:11:09 +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
fad339f977 desc: 调整地图绘制国际化 2019-08-15 10:26:29 +08:00
fan
414000331e 调整:国际化 2019-08-15 09:45:31 +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
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