Commit Graph

1691 Commits

Author SHA1 Message Date
joylink_cuiweidong
e5a5c391f0 剧本编制代码调整 2020-09-11 16:36:13 +08:00
joylink_cuiweidong
06796c439b 剧本编制 会话样式调整 2020-09-11 16:01:41 +08:00
fan
2875444ed7 会话调整 2020-09-11 15:52:15 +08:00
fan
5d7b1db6be 调整添加仿真成员管理 2020-09-11 13:35:08 +08:00
fan
e29bdb35e6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-11 13:23:44 +08:00
fan
3ca753a31b 调整会话和drts倒计时时间 2020-09-11 13:23:24 +08:00
zyy
e5687c13dd 调整道岔生成逻辑 2020-09-11 10:28:55 +08:00
zyy
9ca3612715 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-11 10:18:20 +08:00
zyy
50c9a4eabb 调整道岔生成 道岔区段问题 2020-09-11 10:18:07 +08:00
fan
60bfa0504b 剧本加载重新获取运行数据&会话调整&drts添加连接 2020-09-11 10:08:25 +08:00
fan
f98242374b 会话调整 2020-09-11 09:26:51 +08:00
zyy
620d7aba3c 调整目的码判断 2020-09-09 13:38:30 +08:00
zyy
3986185b1b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-09 11:25:43 +08:00
zyy
85f4a5e1b0 增加系统通知流程 2020-09-09 11:25:31 +08:00
fan
4df950f495 调整加载动画 2020-09-09 10:42:05 +08:00
fan
ff4072c6da 调整加载动画 2020-09-09 10:28:56 +08:00
zyy
c3c5850bbf 调整仿真时间同步 2020-09-07 17:07:09 +08:00
fan
878b62e494 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-07 16:03:03 +08:00
fan
c521f39b2a 设备登录增加退出方式 2020-09-07 16:02:53 +08:00
zyy
074d4677fe 调整考试系统判断 2020-09-07 13:51:25 +08:00
zyy
518bf2eeac 调整西安二号线右键操作 2020-09-07 13:17:11 +08:00
zyy
bb3b202eb1 调整西安二号线列车操作 2020-09-07 11:28:12 +08:00
fan
b47b63305a 运行图预览调整 2020-09-04 18:04:32 +08:00
zyy
11d3c6d129 调整必须字段 2020-09-04 09:24:34 +08:00
zyy
6883fce3a7 调整配置 2020-09-03 16:21:19 +08:00
zyy
8c23957881 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-03 15:44:42 +08:00
zyy
2af510b991 调整目的码流程 2020-09-03 15:44:30 +08:00
fan
890fc5f851 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-03 14:44:28 +08:00
fan
5f0b8a05ac 运行图流程调整 2020-09-03 14:44:16 +08:00
zyy
ab538b9bb2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/jmapNew/theme/ningbo_03/menus/menuBar.vue
2020-09-03 14:22:44 +08:00
zyy
31eb1f8446 调整目的码接口 2020-09-03 14:17:52 +08:00
joylink_cuiweidong
9a2e007d3f 福州一号线新版 扣车样式调整 站台操作调整 2020-09-03 11:14:51 +08:00
zyy
69388e4f91 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-02 17:11:23 +08:00
zyy
efcd46cf37 增加宁波三区段样式,增加目的码表单 2020-09-02 17:11:06 +08:00
fan
910517e076 剧本调整 2020-09-02 10:59:04 +08:00
joylink_cuiweidong
4789fa23de 代码调整 2020-09-02 09:48:30 +08:00
joylink_cuiweidong
4c6ab4f046 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-02 09:46:46 +08:00
joylink_cuiweidong
935588ab32 剧本预览代码调整 2020-09-02 09:46:17 +08:00
fan
86c1dff4be Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-02 09:17:50 +08:00
fan
ecbb6a964f 接收重置仿真信息时清除活动列车 2020-09-02 09:17:27 +08:00
joylink_cuiweidong
b42ffaa00f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-01 18:27:56 +08:00
joylink_cuiweidong
de8263e062 剧本编制代码优化调整 2020-09-01 18:27:36 +08:00
fan
15039440b7 运行图预览初始化动态数据和选中数据 2020-09-01 17:20:59 +08:00
fan
fcd2c41517 成员司机排序&福州新版折返策略教学调整 2020-09-01 17:11:09 +08:00
zyy
57cb96eb48 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/views/newMap/mapsystemNew/common/index.vue
2020-09-01 15:11:59 +08:00
zyy
5590e43bd5 调整代码 2020-09-01 15:10:35 +08:00
fan
13764f98a7 修改会话问题
(cherry picked from commit 716e7c2117)
2020-09-01 11:22:01 +08:00
fan
46e6ec68d5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-31 18:32:56 +08:00
fan
1164be59a4 修改剧本id 2020-08-31 18:32:33 +08:00
joylink_cuiweidong
9ef2ac1287 剧本代码调整 2020-08-31 16:37:45 +08:00
fan
972d5a33bb 响应式布局 2020-08-31 15:31:15 +08:00
fan
c44a081afa Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-31 13:27:38 +08:00
fan
8c07cf764a 代码调整 2020-08-31 13:27:27 +08:00
sunleking
9ca8f50dea 修改按钮文字描述 2020-08-31 11:16:18 +08:00
zyy
8e6280e542 调整格式 2020-08-31 10:34:51 +08:00
fan
e6f7ade236 调度大赛调整 2020-08-31 09:23:12 +08:00
fan
bf381cb697 调度大赛调整 2020-08-28 18:04:46 +08:00
fan
818010b18f 调度大赛调整 2020-08-28 17:57:42 +08:00
fan
ba505a899e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-28 16:58:33 +08:00
fan
a28f7a3975 调度大赛调整 2020-08-28 16:58:17 +08:00
joylink_cuiweidong
576c62bf4a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-28 16:52:33 +08:00
joylink_cuiweidong
d5dabca2c6 代码调整
区段(parentCode)字段处理
2020-08-28 16:52:19 +08:00
fan
56aefdb207 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-28 15:28:37 +08:00
fan
16a4b0fb84 调度大赛调整 2020-08-28 15:28:24 +08:00
joylink_cuiweidong
b4c5a29026 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-28 14:43:47 +08:00
joylink_cuiweidong
3ffffffe8d 宁波一号线实训调整
剧本编制代码调整
2020-08-28 14:43:30 +08:00
zyy
a5180c306c 调整运行图 2020-08-28 14:29:59 +08:00
zyy
152c472b69 调整考试流程 2020-08-28 13:29:45 +08:00
zyy
d991a65517 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-28 11:31:10 +08:00
zyy
1f8641e3ea 调整运行图 2020-08-28 11:30:55 +08:00
fan
0adf841597 行调大赛调整 2020-08-28 10:59:44 +08:00
joylink_cuiweidong
ea1f4c4dee 剧本预览代码调整 2020-08-27 18:46:00 +08:00
zyy
ae9f9a962b 调整加载代码 2020-08-27 18:41:33 +08:00
zyy
a34d3eb9ef Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-27 17:04:47 +08:00
zyy
47a9d56d3b 删除配置 2020-08-27 17:04:21 +08:00
joylink_cuiweidong
6ac28534ea Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-27 17:03:24 +08:00
joylink_cuiweidong
c2989a1548 剧本代码调整 2020-08-27 17:03:10 +08:00
zyy
dde1f6e1a6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-27 16:43:51 +08:00
zyy
ad29ed8890 调整考试系统加载流程 2020-08-27 16:43:37 +08:00
joylink_cuiweidong
1e844407c0 仿真目录结构调整 2020-08-27 14:02:27 +08:00
joylink_cuiweidong
d33b645c69 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-27 13:12:54 +08:00
joylink_cuiweidong
92219adba0 剧本录制预览代码调整 2020-08-27 13:12:36 +08:00
fan
0a90249b37 调度大赛调整 2020-08-27 11:33:37 +08:00
zyy
c2f549523a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-27 09:56:15 +08:00
zyy
699053f46f 调整西安运行图流程 2020-08-27 09:56:00 +08:00
joylink_cuiweidong
7e80bb0ccb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-26 18:42:17 +08:00
joylink_cuiweidong
df2f5705c4 剧本提示代码调整 2020-08-26 18:42:00 +08:00
zyy
bbae7bfb1b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-26 17:44:17 +08:00
zyy
fc14cc41a7 调整发布地图导出,调整大屏流程 2020-08-26 17:44:01 +08:00
fan
242840f244 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-26 17:43:45 +08:00
fan
e43d91cad1 调整ibp盘显示位置 2020-08-26 17:43:34 +08:00
joylink_cuiweidong
f2df9fb453 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-26 17:25:43 +08:00
joylink_cuiweidong
43fe4d728a 剧本提示代码调整 2020-08-26 17:25:18 +08:00
fan
08a33ae6aa 项目登录虚拟ibp调整 2020-08-26 17:09:55 +08:00
joylink_cuiweidong
fe5dd8861a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-26 15:28:46 +08:00
joylink_cuiweidong
c2a868714d 剧本提示代码调整 2020-08-26 15:28:32 +08:00
fan
73c3bd7a78 调整菜单样式 2020-08-26 15:16:47 +08:00
fan
0bac7098d3 调度大赛项目退出时清理仿真 2020-08-26 14:41:24 +08:00
fan
7ebbadca81 merge 2020-08-26 14:10:11 +08:00
fan
8d35c1353f 调度实训平台问题调整 2020-08-26 14:08:50 +08:00