Commit Graph

301 Commits

Author SHA1 Message Date
zyy
7b400d83b5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-16 09:38:35 +08:00
zyy
f61ab58d0f 调整设备管理字段显示 2020-07-16 09:38:20 +08:00
joylink_cuiweidong
cce290e73c 剧本预览代码调整 2020-07-15 19:05:32 +08:00
joylink_cuiweidong
94d02dc0f8 剧本编制样式调整 2020-07-15 18:08:49 +08:00
joylink_cuiweidong
adde89a41d 剧本编制代码调整 2020-07-15 16:09:15 +08:00
joylink_cuiweidong
1d6868ee54 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-14 18:22:31 +08:00
joylink_cuiweidong
f9f58a70c4 剧本预览代码调整
绘图高级页面代码调整
2020-07-14 18:21:40 +08:00
zyy
172623c0f1 调整宁波线路道岔失表显示 2020-07-14 18:14:39 +08:00
zyy
77b02b947e 调整设备连接流程 2020-07-14 16:07:43 +08:00
joylink_cuiweidong
a96ace44d1 剧本预览代码调整 2020-07-14 14:48:26 +08:00
zyy
8fb216dbae 增加项目中设备管理页面 2020-07-14 13:27:00 +08:00
zyy
1b61866b37 删除样式 2020-07-13 17:28:32 +08:00
zyy
06fecf9aad Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-13 17:27:49 +08:00
zyy
1c15fdbdd9 增加所有线路列车故障模式 2020-07-13 17:27:33 +08:00
joylink_cuiweidong
3898f66e78 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-13 17:02:11 +08:00
joylink_cuiweidong
d9ed44b218 剧本预览代码调整
新版地图绘制代码优化
2020-07-13 17:01:34 +08:00
zyy
ee9cf9f54d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-13 14:30:16 +08:00
zyy
6817323fe1 调整宁波列车故障右键 2020-07-13 14:30:01 +08:00
fan
938e789173 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-13 13:01:44 +08:00
fan
a5649cc6e8 哈尔滨操作调整 2020-07-13 13:01:28 +08:00
joylink_cuiweidong
1add21a740 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-13 10:16:07 +08:00
joylink_cuiweidong
57125367fc 剧本编制与剧本预览代码调整 2020-07-13 10:15:44 +08:00
zyy
fccbc9ecd0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-10 18:42:05 +08:00
zyy
f205ddf0fc 删除多余配置 2020-07-10 18:41:29 +08:00
joylink_cuiweidong
9627e85bf0 剧本编制 会话消息代码调整 2020-07-10 18:06:55 +08:00
zyy
e6e0bb6d51 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-10 17:23:31 +08:00
zyy
1c98da6c11 调整路由配置 2020-07-10 17:23:17 +08:00
joylink_cuiweidong
2b5b21c1cf 剧本编制 角色列表代码调整 2020-07-10 16:40:42 +08:00
joylink_cuiweidong
54a5a29f26 剧本预览代码调整 2020-07-10 14:46:18 +08:00
joylink_cuiweidong
4c307cc848 剧本编制代码调整 2020-07-10 10:53:44 +08:00
joylink_cuiweidong
e13fcb02e5 故障设置代码调整 2020-07-10 10:36:10 +08:00
joylink_cuiweidong
0c9cd52c9a 剧本编制代码调整 2020-07-09 17:39:43 +08:00
joylink_cuiweidong
3aa0d55ea3 剧本编制代码调整 2020-07-09 16:54:31 +08:00
joylink_cuiweidong
ffab9631ce 代码调整 2020-07-09 15:45:32 +08:00
joylink_cuiweidong
84485c6f1d 剧本编制代码调整 2020-07-09 15:44:12 +08:00
joylink_cuiweidong
c315f9121a 剧本编制代码调整 2020-07-09 10:50:56 +08:00
joylink_cuiweidong
96ff4c49f6 剧本编制代码调整 2020-07-09 10:17:55 +08:00
joylink_cuiweidong
3cd9d9416b 剧本代码调整 2020-07-08 18:56:32 +08:00
joylink_cuiweidong
dac800a86f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-08 18:36:07 +08:00
joylink_cuiweidong
b1005fd2ac 剧本编制代码调整 2020-07-08 18:35:46 +08:00
fan
050fc8141c 设备登录调整 2020-07-08 17:36:32 +08:00
fan
e8d54bc1d0 合并代码 2020-07-08 15:42:23 +08:00
fan
714113c819 设备登录调整 2020-07-08 15:40:55 +08:00
zyy
753172433c 调整实训流程 2020-07-08 14:40:04 +08:00
joylink_cuiweidong
fc97643116 剧本编制代码调整 2020-07-08 13:05:09 +08:00
joylink_cuiweidong
eb6aca6114 剧本录制接口调整 2020-07-08 09:39:25 +08:00
joylink_cuiweidong
30b1163017 故障代码调整
设备代码调整
2020-07-08 09:21:54 +08:00
joylink_cuiweidong
00a4a8c184 自动设置故障(zc故障)代码调整 2020-07-07 17:08:01 +08:00
fan
aced111815 聊天室调整 2020-07-07 14:11:04 +08:00
joylink_cuiweidong
ebf86de377 故障操作代码调整 2020-07-03 18:39:24 +08:00
joylink_cuiweidong
654b79fc27 故障操作代码调整 2020-07-03 17:13:24 +08:00
joylink_cuiweidong
3ae8582f05 剧本接口调整(预览与 删除剧本开始执行接口) 2020-07-03 16:29:40 +08:00
joylink_cuiweidong
ac4c0baecf 西安三号线 仿真右侧列车列表代码调整
修改故障枚举
修改退出聊天会话接口
2020-07-02 17:44:20 +08:00
joylink_cuiweidong
146d6c2d0b 成都三号线站台操作代码调整 2020-07-02 13:28:36 +08:00
joylink_cuiweidong
50c7363791 故障操作代码调整 2020-07-02 10:10:16 +08:00
joylink_cuiweidong
4f866bf257 故障操作代码调整 2020-07-01 11:27:09 +08:00
joylink_cuiweidong
ff1e707112 故障代码调整 2020-07-01 09:32:36 +08:00
joylink_cuiweidong
c0e3c99dc8 故障代码调整 2020-07-01 09:32:01 +08:00
joylink_cuiweidong
1c6eb510c9 故障代码调整 2020-06-30 19:17:29 +08:00
joylink_cuiweidong
bb6c5319c7 故障管理页面代码调整 2020-06-30 14:41:22 +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
c570e418e1 调整佛山操作定义,调整个人信息 2020-06-24 17:37:09 +08:00
joylink_cuiweidong
0f7cdb2b8e 剧本编制代码调整 2020-06-24 09:24:08 +08:00
joylink_cuiweidong
b85362460e 剧本代码调整 2020-06-23 18:59:20 +08:00
joylink_cuiweidong
677ebcaa7f 剧本编制修改会话代码调整 2020-06-23 10:57:35 +08:00
joylink_cuiweidong
d789a30333 剧本编制代码调整 2020-06-22 18:37:09 +08:00
joylink_cuiweidong
5580a79344 仿真右侧列车列表调整
福州线操作代码调整
2020-06-22 14:29:55 +08:00
joylink_cuiweidong
32f4ead036 剧本代码调整 2020-06-19 18:58:55 +08:00
sunzhenyu
2a50dd1be2 修改三维驾驶刷新重连列车bug 2020-06-19 09:56:40 +08:00
joylink_cuiweidong
426aed9ef1 剧本代码调整 2020-06-18 09:20:42 +08:00
joylink_cuiweidong
eefbf70002 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-17 18:36:45 +08:00
joylink_cuiweidong
0983307bc7 剧本代码调整 2020-06-17 18:36:22 +08:00
sunzhenyu
47d77d6925 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-17 18:17:00 +08:00
sunzhenyu
b70feae183 增加三维驾驶超速报警和牵引状态mmi显示,增加剧本设计中三维驾驶 2020-06-17 18:16:49 +08:00
joylink_cuiweidong
068fc65f3d 剧本代码调整 2020-06-17 15:33:04 +08:00
joylink_cuiweidong
556d7fa109 仿真右侧列车显示代码调整 2020-06-17 15:31:15 +08:00
joylink_cuiweidong
b78f90034a 剧本录制代码调整 2020-06-17 14:18:46 +08:00
joylink_cuiweidong
584654daec 剧本代码调整 2020-06-17 09:56:51 +08:00
fan
a381bfdcd8 退出计划调整为初始化,并不限制点击 2020-06-15 13:34:24 +08:00
joylink_cuiweidong
3248f3badf 剧本代码调整 2020-06-12 18:29:14 +08:00
joylink_cuiweidong
29b0937253 剧本代码调整 2020-06-12 16:28:52 +08:00
joylink_cuiweidong
6d5ba33e1f 剧本代码调整 2020-06-12 16:12:33 +08:00
joylink_cuiweidong
b341735a8c 剧本代码调整 2020-06-11 18:32:26 +08:00
joylink_cuiweidong
f03880e59e 仿真聊天代码调整 2020-06-11 13:43:58 +08:00
joylink_cuiweidong
dda8f39adf 新版地图右键操作 弹窗代码调整 2020-06-11 13:29:06 +08:00
joylink_cuiweidong
cb3663722f 代码调整 2020-06-11 09:43:02 +08:00
joylink_cuiweidong
404a23e35e iscs 小系统代码调整 2020-06-08 17:59:28 +08:00
fan
7f08ae9e71 调整教学时切换题group为刷新的问题&自排全开全关=》自排单开单关 2020-06-04 14:21:19 +08:00
joylink_cuiweidong
0cf0caef1d 裁判系统代码调整
佛山左下角信息窗口调整
2020-06-04 11:12:55 +08:00
joylink_cuiweidong
7946d9f6e7 仿真聊天代码调整 2020-06-03 18:23:48 +08:00
fan
046a09f8b5 调整实操竞赛&星期显示 2020-06-03 16:18:40 +08:00
joylink_cuiweidong
c3736a02c8 北京/佛山/哈尔滨 现地 左下角 聊天信息窗口遮盖问题处理 2020-06-03 10:43:41 +08:00
joylink_cuiweidong
34016219dd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-02 18:30:38 +08:00
joylink_cuiweidong
4c38334d2c 西安三号线 按计划行车/添加列车 列车列表代码调整 2020-06-02 18:30:12 +08:00
sunzhenyu
620839876d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-02 17:00:26 +08:00
sunzhenyu
f4d41eb0de 修改通号模型信息显示功能 2020-06-02 16:57:38 +08:00
joylink_cuiweidong
979a9e78b2 仿真聊天代码调整
竞赛 实操代码调整
2020-06-02 15:00:48 +08:00
joylink_cuiweidong
799227f8c4 仿真页面刷新 时间代码调整 2020-06-01 11:21:10 +08:00