Commit Graph

7343 Commits

Author SHA1 Message Date
ival
be0b7f7a2f Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-08-09 15:10:28 +08:00
ival
7af324ab1e 国际化配置 2019-08-09 15:10:13 +08:00
joylink_cuiweidong
fe38c3dfb1 代码调整 2019-08-09 10:33:11 +08:00
ival
2db20932e1 精简配置 2019-08-09 10:10:26 +08:00
ival
66a13e6ede 修改运行图 2019-08-09 09:33:35 +08:00
ival
b89d99f2a5 修改i18n语言层次 2019-08-09 09:31:09 +08:00
joylink_cuiweidong
bf9a92d6b7 代码调整 2019-08-08 18:41:44 +08:00
joylink_cuiweidong
50c57837eb Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-08-08 18:39:05 +08:00
zyy
a288a21456 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-08-08 18:34:41 +08:00
zyy
b20686c0fa desc: 修改 订阅综合演练房间号发送判断,修改代码格式 2019-08-08 18:34:35 +08:00
ival
c89c781735 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-08-08 18:09:52 +08:00
ival
4f9478d495 修改代码格式 2019-08-08 18:09:10 +08:00
fan
62d9b6fc5d 调整:title修改 2019-08-08 18:00:30 +08:00
joylink_cuiweidong
7abbadd603 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-08-08 17:33:18 +08:00
joylink_cuiweidong
ee136f8867 获取剧本的地图定位并设置 2019-08-08 17:32:38 +08:00
fan
212fce48bb 调整:代码调整 2019-08-08 17:26:50 +08:00
fan
a504f3cd90 调整:剧本加载页面位置跳转 2019-08-08 17:06:18 +08:00
joylink_cuiweidong
73a7780118 更新定位 2019-08-08 16:56:34 +08:00
zyy
399006e31f desc: 修改传入select默认值 2019-08-08 16:54:49 +08:00
zyy
40ab6b247b Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
#	src/jmap/theme/beijing_01/menus/index.vue
2019-08-08 16:48:06 +08:00
zyy
6c5469ec90 修改代码格式 2019-08-08 16:47:34 +08:00
fan
6c7c08483f Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient 2019-08-08 16:45:37 +08:00
fan
aac75df8f7 调整:控制模式模式跳转disable状态调整 2019-08-08 16:45:22 +08:00
ival
01b871fa77 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-08-08 16:37:31 +08:00
ival
3adc1aafb1 修改界面菜单栏加载后出发 缩放按钮重新调整位置
删除代码中的无用代码
2019-08-08 16:37:15 +08:00
fan
b7679a6337 Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient 2019-08-08 16:26:54 +08:00
fan
e379696f46 调整:位置跳转测试 2019-08-08 16:26:34 +08:00
zyy
a250833772 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-08-08 16:03:15 +08:00
zyy
ff101dd603 删除debugger 2019-08-08 16:02:58 +08:00
fan
503991a758 Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient 2019-08-08 15:59:17 +08:00
fan
4a36ed4d3e 调整:修改修改列车识别号操作 2019-08-08 15:59:07 +08:00
zyy
4068555199 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-08-08 15:57:42 +08:00
zyy
c3f600b015 优化代码 2019-08-08 15:57:36 +08:00
joylink_cuiweidong
66c0939e6c 代码调整 2019-08-08 15:48:43 +08:00
zyy
b67a37bc33 desc: 修改查询问题 2019-08-08 15:27:30 +08:00
zyy
837ba489b6 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-08-08 14:47:39 +08:00
zyy
2443fd102c desc: 调整站台字段 2019-08-08 14:47:34 +08:00
fan
33844220d3 Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient 2019-08-08 14:37:39 +08:00
fan
289bffb435 调整:代码迁移(暂时注释掉位置跳转) 2019-08-08 14:36:57 +08:00
ival
842c7f9df2 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-08-08 14:32:47 +08:00
ival
66c599c0da 修改格式问题 2019-08-08 14:32:32 +08:00
sunzhenyu
f95b9eb1b7 merge 2019-08-08 14:20:00 +08:00
sunzhenyu
2aa7bfd759 修改js挂载 2019-08-08 14:19:03 +08:00
zyy
debecfba5a Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-08-08 14:08:09 +08:00
zyy
ea67901aa1 修改格式 2019-08-08 14:08:02 +08:00
fan
6b21fefaeb Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient 2019-08-08 13:47:39 +08:00
fan
bcf73c78c2 调整:代码迁移+列车调整 2019-08-08 13:47:30 +08:00
ival
dbc3cbf482 修改运行图编辑工具报错bug 2019-08-08 13:36:53 +08:00
ival
45295404c3 1. 修改福州线,取消扣车被禁用的问题
2. 修改i18n的获取当前语言的函数
2019-08-08 13:23:54 +08:00
ival
7a41260bae 增加国际化配置 2019-08-08 11:33:06 +08:00