Commit Graph

3448 Commits

Author SHA1 Message Date
joylink_cuiweidong
79534ffa5e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-30 19:17:45 +08:00
joylink_cuiweidong
1c6eb510c9 故障代码调整 2020-06-30 19:17:29 +08:00
zyy
58a9b27939 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-30 15:44:48 +08:00
zyy
b43009ab06 调整权限分配时间限制 2020-06-30 15:44:31 +08:00
joylink_cuiweidong
b934ee7edb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-30 14:41:56 +08:00
fan
6a0433f12f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-30 14:43:20 +08:00
fan
755eab6301 调整考试系统获取数据为空时未清除原有数据 2020-06-30 14:42:56 +08:00
joylink_cuiweidong
619adde869 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-30 14:41:40 +08:00
joylink_cuiweidong
bb6c5319c7 故障管理页面代码调整 2020-06-30 14:41:22 +08:00
zyy
9748ca2f63 调整成都三号线操作定义,位置提示 2020-06-30 13:32:50 +08:00
zyy
82415903f5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-30 11:19:58 +08:00
zyy
7df86adff1 调整表单赋值拷贝 2020-06-30 11:19:33 +08:00
joylink_cuiweidong
f6982eb966 解决 实训平台邀请综合演练 设计平台弹出邀请弹窗的问题
仿真代码调整
2020-06-29 17:33:19 +08:00
joylink_cuiweidong
ccb976f078 仿真代码调整 2020-06-29 15:55:31 +08:00
joylink_cuiweidong
237aece890 代码调整 2020-06-28 18:34:32 +08:00
zyy
2ddd8f12d2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-28 16:04:18 +08:00
zyy
7873917d43 调整数据模型过滤空置,调整成都3号线实操 2020-06-28 16:03:59 +08:00
joylink_cuiweidong
36883d9587 iscs 转换函数代码调整
ibp盘绘制代码调整
2020-06-28 15:27:10 +08:00
joylink_cuiweidong
d76dfe293e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-28 13:44:22 +08:00
joylink_cuiweidong
24c975184c 设计平台 课程设计代码优化 2020-06-28 13:44:04 +08:00
zyy
e3ee44aae7 调整道岔失表状态,成都3号线实操定义 2020-06-28 13:27:10 +08:00
zyy
c570e418e1 调整佛山操作定义,调整个人信息 2020-06-24 17:37:09 +08:00
fan
599afaaeae Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-24 15:02:23 +08:00
fan
86c7e44876 iscs调整 2020-06-24 15:02:09 +08:00
zyy
45cac99681 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-24 14:06:45 +08:00
zyy
3b330a0932 调整佛山线路实训定义,删除区段定义 2020-06-24 14:06:17 +08:00
fan
9a620f8629 西安三道岔设置故障&iscs调整(未完) 2020-06-24 13:27:58 +08:00
fan
45b88d3a46 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-24 10:00:24 +08:00
fan
8c476d0dcc 新建课程参数丢失问题调整 2020-06-24 10:00:13 +08:00
fan
0128576386 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-24 09:25:04 +08:00
fan
d5cd233e98 调整故障操作 2020-06-24 09:24:54 +08:00
joylink_cuiweidong
45a0f35901 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-24 09:24:36 +08:00
joylink_cuiweidong
0f7cdb2b8e 剧本编制代码调整 2020-06-24 09:24:08 +08:00
joylink_cuiweidong
b85362460e 剧本代码调整 2020-06-23 18:59:20 +08:00
fan
0ae6ec9237 调整登录状态检测&删除冗余配置 2020-06-23 16:21:54 +08:00
fan
e67f98e9a0 合并代码 2020-06-23 15:26:26 +08:00
fan
a2664eb5dc 登录调整&综合演练调整&菜单调整 2020-06-23 15:18:44 +08:00
joylink_cuiweidong
f1004dd52a 剧本编制代码调整 2020-06-23 15:15:46 +08:00
joylink_cuiweidong
df475ab28a 剧本编制修改会话代码调整 2020-06-23 14:17:35 +08:00
joylink_cuiweidong
677ebcaa7f 剧本编制修改会话代码调整 2020-06-23 10:57:35 +08:00
joylink_cuiweidong
68624ba8ac 剧本编制修改会话代码调整 2020-06-23 10:27:18 +08:00
zyy
88211cee8f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-23 09:27:10 +08:00
zyy
4e36c7b456 调整默认配置 2020-06-23 09:26:58 +08:00
joylink_cuiweidong
d789a30333 剧本编制代码调整 2020-06-22 18:37:09 +08:00
joylink_cuiweidong
d3d17f7bf6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-22 14:30:14 +08:00
joylink_cuiweidong
5580a79344 仿真右侧列车列表调整
福州线操作代码调整
2020-06-22 14:29:55 +08:00
zyy
e934860885 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-22 13:49:59 +08:00
zyy
58ab773ec9 删除多余配置 2020-06-22 13:49:42 +08:00
fan
5cfec3e09f 课程创建角色可以直接发布课程&&sockjs恢复版本 2020-06-22 10:49:41 +08:00
fan
ab6b0036d2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-22 09:49:58 +08:00