Commit Graph

132 Commits

Author SHA1 Message Date
joylink_cuiweidong
b7cb2a36db 产品分化 剧本接口调整 2019-10-09 10:14:30 +08:00
joylink_cuiweidong
2d1f13299e 产品分化运行图接口调整 2019-10-08 18:35:02 +08:00
fan
fd99f913de 城市轨道实训平台调整 2019-09-27 18:02:32 +08:00
fan
b998eee746 产品分化调整 2019-09-24 15:03:03 +08:00
joylink_cuiweidong
ffdba3dc22 国际化调整 2019-09-17 16:08:11 +08:00
joylink_cuiweidong
71a0f2d921 仿真国际化 2019-09-12 13:35:25 +08:00
joylink_cuiweidong
22a77b63fd 仿真 国际化调整 2019-09-12 09:37:40 +08:00
joylink_cuiweidong
1830952064 仿真 国际化调整 2019-09-11 15:33:00 +08:00
joylink_cuiweidong
37f1631585 仿真国际化调整 2019-09-11 14:35:26 +08:00
joylink_cuiweidong
ef5d425942 考试 仿真国际化调整 2019-09-11 13:40:46 +08:00
joylink_cuiweidong
5c184755e2 教学仿真 国际化调整 2019-09-11 11:30:44 +08:00
joylink_cuiweidong
d31f4e8493 教学和考试的仿真 国际化调整 2019-09-11 11:02:18 +08:00
joylink_cuiweidong
e1378c0961 国际化调整 2019-09-10 19:08:48 +08:00
zyy
11a49d1442 desc: 增加加载运行图模板接口,调整地图绘制优化 2019-09-06 14:21:01 +08:00
fan
063b6392fc 查询剧本列表接口调整展示调整 2019-09-05 09:07:16 +08:00
zyy
51274a044b Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-09-03 18:59:52 +08:00
zyy
abec58b726 desc: 修改弹窗点击蒙层不取消 2019-09-03 18:59:46 +08:00
ival
0879aef961 增加派班计划loading 2019-09-03 18:37:00 +08:00
ival
c97996fceb 设置冲突列颜色 2019-09-03 17:35:23 +08:00
ival
c433cb5045 添加加载脚本失败后,提示后台错误 2019-09-03 14:39:50 +08:00
ival
d60c989405 增加IBP盘操作 2019-09-03 11:12:48 +08:00
fan
914c9dc168 删除ibp按钮 2019-09-03 09:18:21 +08:00
fan
e86c1b025c Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
# Conflicts:
#	src/router/index.js
#	src/views/ibp/index.vue
2019-09-03 09:03:00 +08:00
fan
cc4a60687a ibp盘调整 2019-09-03 08:56:14 +08:00
ival
3ade8f6d92 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-09-02 15:38:11 +08:00
ival
61de3c222d App.vue页面增加全局尺寸混入并存放在app store,其他页面删除混入 2019-09-02 15:37:57 +08:00
zyy
0388b2a1df desc: 修改权限列表显示字段内容,逻辑流程 2019-09-02 14:43:16 +08:00
zyy
6fa64dd26b desc: 修改显示字段,增加loading 2019-09-02 11:04:23 +08:00
zyy
6c617d3e4a desc: 修改获取商品字段 2019-08-30 19:19:48 +08:00
ival
36facbb67d 修改重新生成排班计划的页面 2019-08-30 17:12:39 +08:00
ival
d3ff24c4f8 设置时间组件为可清空组件 2019-08-30 16:41:55 +08:00
ival
1dabf22fd6 修改数据显示 2019-08-30 16:35:13 +08:00
ival
546957e926 增加排版计划处理 2019-08-30 15:46:08 +08:00
ival
3da74652c5 增加派班计划 2019-08-30 09:00:36 +08:00
ival
c14e0c6055 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
#	src/views/display/index.vue
2019-08-29 10:35:55 +08:00
ival
cc54830f01 修改代码格式以及操作的bug 2019-08-29 10:33:50 +08:00
zyy
32cc251ef6 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
#	src/views/display/index.vue
#	src/views/display/menuDemon.vue
2019-08-29 09:33:42 +08:00
zyy
2d906ef9be desc: 调整权限列表接口对接 2019-08-29 09:31:58 +08:00
fan
be04a992c0 关闭ibp盘开关 2019-08-29 09:30:09 +08:00
fan
94f803072f ibp盘提交 2019-08-29 09:25:06 +08:00
fan
12b6535254 调整代码: 关闭ibp入口 2019-08-27 17:07:32 +08:00
fan
75a6b2ee58 合并 2019-08-27 15:22:55 +08:00
fan
7757094ce3 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-08-26 10:13:05 +08:00
fan
4b7873c2d7 ibp盘 2019-08-26 10:12:39 +08:00
zyy
2250bc970d desc: 修改名称显示放到皮肤配置中 2019-08-23 14:24:30 +08:00
fan
0ca2235549 加载剧本是先清除地图状态 2019-08-22 14:12:16 +08:00
fan
d068a74a6e 加载剧本前列车视图 2019-08-22 10:12:35 +08:00
fan
7334d282dd 调整: 剧本过滤角色调整 2019-08-20 18:57:14 +08:00
ival
474b1fff18 修改仿真暂停字段归属文件 2019-08-20 18:44:02 +08:00
ival
de0fd028ed 设置时间暂停 2019-08-20 18:35:42 +08:00