joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity
5,020 Commits 20 Branches 0 Tags 448 MiB
2abe815c87
Commit Graph

4918 Commits

Author SHA1 Message Date
zyy
e535b1e5d1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/views/competitionManage/index.vue
 2020-05-22 15:45:16 +08:00
zyy
eaeea84c8d 调整报名流程，竞赛管理页面 2020-05-22 15:41:35 +08:00
fan
bcbb5ff512 调整竞赛报名参赛路径弹框复制 2020-05-22 15:31:30 +08:00
fan
991af46e9a 调整竞赛报名参赛路径弹框复制 2020-05-22 15:23:18 +08:00
fan
8e1d552d18 调整竞赛报名参赛路径弹框复制 2020-05-22 15:20:14 +08:00
fan
32eb7faada 西安线路调整 2020-05-22 14:47:19 +08:00
fan
acfab51e85 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-22 13:05:36 +08:00
fan
f875cd69c3 大小交路回库颜色 2020-05-22 13:05:08 +08:00
zyy
87ddea085b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-22 11:31:10 +08:00
zyy
03bfdd76f2 调整西安线路错误提示信息 2020-05-22 11:30:56 +08:00
fan
efbdea79e8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-22 11:09:07 +08:00
fan
d7c5a1303d 新建列车调整 2020-05-22 11:09:00 +08:00
joylink_cuiweidong
4210599f6b 竞赛裁判系统代码调整 2020-05-22 11:07:10 +08:00
joylink_cuiweidong
3b81436fbb 竞赛裁判系统代码调整 
综合演练 仿真开始 修改成员角色代码调整
 2020-05-22 10:43:23 +08:00
joylink_cuiweidong
464363a6e8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-22 09:33:08 +08:00
joylink_cuiweidong
480df83efa 竞赛裁判系统代码调整 2020-05-22 09:32:48 +08:00
sunzhenyu
1257c252f5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-22 09:32:30 +08:00
sunzhenyu
87c52581f2 修改三维设备贴图配置bug 2020-05-22 09:32:09 +08:00
joylink_cuiweidong
b371d02866 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-22 09:08:36 +08:00
joylink_cuiweidong
16513c64d5 剧本编制代码调整 2020-05-22 09:07:39 +08:00
fan
1c9301a3d5 调整列车指令 2020-05-21 18:27:26 +08:00
fan
98f60b6d94 调整虚拟信号机侧向开放显示 2020-05-21 17:15:17 +08:00
fan
103ba6c139 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-21 17:03:43 +08:00
fan
4d9edad82b 调整加入创建列车菜单问题 2020-05-21 17:03:30 +08:00
joylink_cuiweidong
9dc0995e59 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/views/newMap/jointTrainingNew/menuDemon.vue
 2020-05-21 17:01:36 +08:00
joylink_cuiweidong
3a48755817 竞赛裁判系统代码调整 2020-05-21 16:59:36 +08:00
fan
aed5802b7f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-21 16:53:59 +08:00
fan
a861e4908f 哈尔滨虚拟信号机调整 2020-05-21 16:53:39 +08:00
sunzhenyu
2e40e63e9f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-21 16:49:16 +08:00
sunzhenyu
e0fd1ece86 修改车站贴图，修改驾驶提示 2020-05-21 16:48:59 +08:00
fan
e4bdd9c829 调整西安一ats人工控显示调整 2020-05-21 16:34:05 +08:00
fan
311f81f601 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-21 15:58:50 +08:00
fan
503c51af10 西安一三宁波一福州一佛山延续保护区段闪烁 2020-05-21 15:58:23 +08:00
zyy
0dc5804886 调整打包相关 2020-05-21 15:51:56 +08:00
zyy
81973b6967 添加实操考试 结束生成分值流程 2020-05-21 15:18:00 +08:00
zyy
9827e8aae8 调整盈达 文件配置 2020-05-21 15:03:42 +08:00
zyy
9918678b27 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-21 14:59:29 +08:00
zyy
568ac44bf9 调整打包模式， 报名系统逻辑 2020-05-21 14:59:18 +08:00
fan
fa4c481d40 删除新建列车参数 2020-05-21 14:40:21 +08:00
fan
82adf8e241 西安三号线列车识别号修改 2020-05-21 14:21:04 +08:00
fan
34fba46cc3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-21 13:16:36 +08:00
fan
96f5c31b18 新建列车调整 2020-05-21 13:16:20 +08:00
joylink_cuiweidong
b382b6e0d2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-21 10:44:22 +08:00
joylink_cuiweidong
cf021736b2 竞赛裁判系统代码调整 2020-05-21 10:43:32 +08:00
fan
19bd41b214 调整hydIcon路径 2020-05-21 10:02:13 +08:00
fan
6fc8d7edf6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-21 09:31:29 +08:00
fan
650b0c00ee 调整列车早晚点显示 2020-05-21 09:31:16 +08:00
zyy
81187912f0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-20 18:33:08 +08:00
zyy
af26f55e9b 调整裁判管理报名列表 2020-05-20 18:32:52 +08:00
joylink_cuiweidong
4132eba1ca Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/api/competition.js
#	src/views/jsxt/refereeList/index.vue
 2020-05-20 18:28:59 +08:00
joylink_cuiweidong
dc6819df4d 裁判平台代码调整 2020-05-20 18:26:04 +08:00
fan
9e8f4a48f4 调整站台扣车显示 2020-05-20 18:11:39 +08:00
fan
7bbe7b26d7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-20 17:44:57 +08:00
fan
ddee6156f7 竞赛管理显示地址 2020-05-20 17:44:47 +08:00
zyy
43ee4a89ed 调整报名接口调整 2020-05-20 17:35:48 +08:00
zyy
8b8f43378e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/utils/baseUrl.js
 2020-05-20 17:20:54 +08:00
zyy
801d420db8 调整竞赛报名api 2020-05-20 17:19:45 +08:00
fan
f93f432d7e ARB故障状态&哈尔滨列车早晚点时间 2020-05-20 17:08:21 +08:00
fan
3e84ec6a6b 裁判加载实操 2020-05-20 16:10:45 +08:00
fan
c2cee7817a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-20 15:36:57 +08:00
fan
e1f932c5e3 竞赛管理 2020-05-20 15:36:49 +08:00
joylink_cuiweidong
1cc644d893 剧本编制代码调整 2020-05-20 15:29:41 +08:00
joylink_cuiweidong
df718218e3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-20 14:51:35 +08:00
joylink_cuiweidong
0b37830a8d 剧本录制代码调整 2020-05-20 14:50:34 +08:00
fan
e3034f630e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-20 14:46:39 +08:00
fan
b137adbd69 哈尔滨地图问题调整&竞赛管理 2020-05-20 14:46:26 +08:00
zyy
93b92ad36a 调整报名系统增加电话验证码 2020-05-20 14:35:55 +08:00
zyy
31bcad0449 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-20 13:25:44 +08:00
zyy
61c3650621 路由权限生成调整逻辑 2020-05-20 13:25:31 +08:00
joylink_cuiweidong
71cd5af93b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-20 11:14:01 +08:00
joylink_cuiweidong
74665d7b25 剧本编制代码调整 2020-05-20 11:13:32 +08:00
sunzhenyu
a58f175afc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-20 10:50:18 +08:00
sunzhenyu
01f90f6a2d 隐藏三维站台 2020-05-20 10:50:13 +08:00
joylink_cuiweidong
5ad20c5659 剧本代码调整 2020-05-20 10:46:38 +08:00
joylink_cuiweidong
c8f362a213 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-20 10:28:35 +08:00
joylink_cuiweidong
ca7e92f6a1 剧本编制代码调整 2020-05-20 10:28:16 +08:00
fan
5435ac382f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-20 10:02:20 +08:00
fan
ea8222504e 添加竞赛接口 2020-05-20 10:02:07 +08:00
joylink_cuiweidong
582543dd22 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-19 18:56:49 +08:00
joylink_cuiweidong
a51ae0aa30 西安二号线 列车正占用的区段，计轴标示也会显示为红色 代码调整 2020-05-19 18:54:51 +08:00
fan
46a28d3cd5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-19 18:39:31 +08:00
fan
597af25b40 iscs&站台故障 2020-05-19 18:38:58 +08:00
sunzhenyu
e40de65e9f 三维贴图加载日志清除 2020-05-19 18:12:42 +08:00
sunzhenyu
4819efc14e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-19 18:00:47 +08:00
sunzhenyu
21beb69fcb 修改三维数据加载逻辑，增加贴图背景资源简易配置 2020-05-19 18:00:36 +08:00
zyy
ce0c5c074c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-19 17:26:20 +08:00
zyy
7b0f662912 调整裁判平台页面样式 2020-05-19 17:26:12 +08:00
fan
bfb3c9357c 竞赛系统调整 2020-05-19 17:06:34 +08:00
joylink_cuiweidong
394b60b007 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-19 17:05:38 +08:00
joylink_cuiweidong
e69840c87f 综合演练代码调整 2020-05-19 17:05:23 +08:00
zyy
cfe3ccd6bf 调整竞赛系统首页样式 2020-05-19 17:01:58 +08:00
zyy
85dde7c4f8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-19 16:56:46 +08:00
zyy
cb0fcd1a3f 增加报名页面 2020-05-19 16:56:36 +08:00
sunzhenyu
5046a886fd merge 2020-05-19 16:50:34 +08:00
sunzhenyu
6a25030a53 修改三维数据 2020-05-19 16:49:56 +08:00
joylink_cuiweidong
3b2d431400 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-19 15:45:17 +08:00
joylink_cuiweidong
c1ce6f46ae 综合演练代码调整 2020-05-19 15:44:57 +08:00
fan
247bc7ef30 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-19 15:44:13 +08:00
fan
45422c8cd2 信号机批量设置引导信号&虚拟信号机旋转 2020-05-19 15:44:01 +08:00
joylink_cuiweidong
e3b7d513ba 综合演练行调添加 列车选择 2020-05-19 14:47:47 +08:00
joylink_cuiweidong
eed312e72f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/views/newMap/jointTrainingNew/index.vue
 2020-05-19 14:03:44 +08:00
joylink_cuiweidong
736c81a61d 综合演练 剧本代码调整 2020-05-19 14:01:23 +08:00
fan
df83fbb904 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-19 13:42:06 +08:00
fan
cc3f117a8f 宁波一综合演练现地设置显示站 2020-05-19 13:41:48 +08:00
zyy
4b683de30f 调整竞赛开始考试 2020-05-19 13:15:36 +08:00
zyy
28123b0525 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-19 13:10:56 +08:00
zyy
63e52f1986 调整理论竞赛流程页面 2020-05-19 13:10:45 +08:00
fan
6afafc9371 调整绘图批量设置信号机类型&竞赛考试详情 2020-05-19 11:20:09 +08:00
fan
f6dd6b00cc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-19 10:34:51 +08:00
fan
c48ea602e7 去除登出清除project 2020-05-19 10:34:40 +08:00
zyy
f2430c3625 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/router/index_Common.js
 2020-05-19 10:32:07 +08:00
zyy
3a72195e15 调整竞赛系统页面路由 2020-05-19 10:30:27 +08:00
joylink_cuiweidong
f0cb7a11cf Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-19 10:25:09 +08:00
joylink_cuiweidong
9fc821f940 综合演练代码调整（添加获取所有需要值班员的车站接口） 2020-05-19 10:24:48 +08:00
fan
462b8e972b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-19 10:18:10 +08:00
fan
eba0bff786 竞赛系统 2020-05-19 10:18:01 +08:00
joylink_cuiweidong
a1097088ea Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-19 09:45:31 +08:00
joylink_cuiweidong
08991c8694 剧本代码调整 2020-05-19 09:45:15 +08:00
fan
1357400c75 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-19 09:09:47 +08:00
fan
46092a9b8e 西安三右键菜单 2020-05-19 09:09:38 +08:00
zyy
27891b29c8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/store/modules/permission.js
 2020-05-19 09:05:27 +08:00
zyy
09b3b684cf 调整竞赛系统路由 2020-05-19 09:03:38 +08:00
fan
9580d4b966 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-18 17:59:52 +08:00
fan
86d59db177 调整路由处理 2020-05-18 17:59:38 +08:00
zyy
3069cf2112 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-18 17:08:32 +08:00
zyy
b8bf51fc82 优化地图绘制 2020-05-18 17:08:21 +08:00
fan
9e03602403 草稿地图右键点击改变tree选中状态 2020-05-18 16:08:49 +08:00
fan
79f9f72c07 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-18 15:48:06 +08:00
fan
c8d7347e61 课程问题调整 2020-05-18 15:47:55 +08:00
joylink_cuiweidong
559c33bb2a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-18 15:19:43 +08:00
joylink_cuiweidong
cc8b700328 剧本录制代码调整 
退出剧本代码调整
 2020-05-18 15:18:57 +08:00
fan
5f9806cdb8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-18 14:49:29 +08:00
fan
135b328dd1 故障操作调整 2020-05-18 14:49:16 +08:00
joylink_cuiweidong
f0d51a2771 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-18 14:00:40 +08:00
joylink_cuiweidong
bdf627e812 剧本调整 2020-05-18 14:00:16 +08:00
zyy
8e57bbe91e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-18 13:35:21 +08:00
zyy
6fdf3b74aa 调整车次窗撤销操作问题 2020-05-18 13:34:46 +08:00
joylink_cuiweidong
71eca2ad9d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-18 13:33:20 +08:00
joylink_cuiweidong
25b1c09141 剧本代码调整 2020-05-18 13:32:25 +08:00
zyy
bbc79b1b17 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-18 13:08:56 +08:00
zyy
9591cbd268 调整竞赛系统登陆权限 2020-05-18 13:08:45 +08:00
joylink_cuiweidong
3e64c6da02 西安三号线 仿真系统车次与实际车次显示不符 修改 2020-05-18 11:32:46 +08:00
joylink_cuiweidong
f092b27282 剧本代码调整 2020-05-18 11:04:39 +08:00
joylink_cuiweidong
2844386ad3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-18 10:32:31 +08:00
joylink_cuiweidong
be4da83dcd 剧本代码调整 2020-05-18 10:31:55 +08:00
fan
fbd0dbee74 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-18 09:11:38 +08:00
fan
08f5edbb53 调整接口 2020-05-18 09:11:28 +08:00
joylink_cuiweidong
9bad1d2eb2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-15 20:47:11 +08:00
joylink_cuiweidong
8059353f06 剧本代码调整 2020-05-15 20:45:59 +08:00
fan
ce8ded0bfb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-15 19:25:35 +08:00
fan
cc6227f6f4 故障调整 2020-05-15 19:24:58 +08:00
zyy
93f7210596 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-15 19:01:18 +08:00
zyy
674bcea387 调整综合监控 2020-05-15 19:01:07 +08:00
fan
c0d75502fa Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-15 18:48:38 +08:00
fan
d47a986fcc 故障操作&贵州状态班级展示 2020-05-15 18:48:10 +08:00
zyy
191f9358be Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-15 18:36:42 +08:00
zyy
2faa2688e5 综合监控广播 2020-05-15 18:36:31 +08:00
joylink_cuiweidong
b1ca16b62f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-15 17:11:59 +08:00
joylink_cuiweidong
bda901f4c9 剧本代码调整 2020-05-15 17:11:15 +08:00
zyy
7945dedade Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-15 16:55:35 +08:00
zyy
dc783bd2a8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-15 16:55:14 +08:00
zyy
7992a2e11e 调整格式 2020-05-15 16:55:00 +08:00
joylink_cuiweidong
f775f76aa8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-15 16:54:59 +08:00
joylink_cuiweidong
901ab1a8bd 剧本添加提示 2020-05-15 16:54:31 +08:00
fan
6aeb2d1b8d 删除localStore 操作 2020-05-15 16:33:14 +08:00
fan
a13567faaf Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-15 16:26:37 +08:00
fan
9db76cbf52 添加贵州装备教师课程删除功能 2020-05-15 16:26:21 +08:00
zyy
bc00f1660a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-15 16:01:28 +08:00
zyy
6391e8e881 调整竞赛系统路径，页面路由配置 2020-05-15 16:01:16 +08:00
fan
e4b14d96e5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-15 15:58:19 +08:00
fan
dff3a090a5 调整右键跳转车站 2020-05-15 15:58:08 +08:00
zyy
399111c682 调整列表字段显示 2020-05-15 14:59:53 +08:00
zyy
322ca86dec Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-15 14:50:19 +08:00
zyy
ae5916b90a 调整竞赛系统路由配置 2020-05-15 14:50:05 +08:00
fan
c27204aeb7 信号机添加非空校验 2020-05-15 14:18:17 +08:00
fan
b7e8409b1a 西安二号线信号机内三角进路排列后显示样式调整 2020-05-15 13:56:19 +08:00
fan
4bf80d3e5b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-15 13:43:23 +08:00
fan
4e379324ea 调整贵州成绩计算小数 2020-05-15 13:43:02 +08:00
joylink_cuiweidong
f25a73c4e7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-15 13:17:33 +08:00
joylink_cuiweidong
d3df0afc94 剧本代码调整 2020-05-15 13:16:55 +08:00
fan
71efb6f575 配置icon 2020-05-15 11:31:22 +08:00
fan
912816d324 学生管理日期限制调整 2020-05-15 11:29:24 +08:00
fan
557d8d2b7a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-15 11:12:18 +08:00
fan
65a225accd 代码调整 2020-05-15 11:12:06 +08:00
zyy
cb47cd612d 调整加载线路字段 2020-05-15 10:34:15 +08:00
joylink_cuiweidong
fab4e149c8 代码调整 2020-05-14 19:42:49 +08:00
joylink_cuiweidong
bd730d5946 代码调整 2020-05-14 19:42:08 +08:00
joylink_cuiweidong
8f0129a742 代码调整 2020-05-14 19:34:22 +08:00
joylink_cuiweidong
8ff8356d28 代码调整 2020-05-14 19:33:48 +08:00
joylink_cuiweidong
ddbf334419 剧本代码调整 2020-05-14 19:13:44 +08:00
fan
396dd0d899 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-14 18:55:12 +08:00
fan
71682d00a5 区段计轴调整 2020-05-14 18:54:53 +08:00
zyy
94f33cc2c6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-14 18:50:07 +08:00
zyy
43e6b4bca1 保存道岔状态 2020-05-14 18:49:47 +08:00
joylink_cuiweidong
c55b7175e4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-14 17:58:55 +08:00
joylink_cuiweidong
a416b7b443 剧本代码调整 2020-05-14 17:58:26 +08:00
zyy
e3d773dfbe Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-14 17:48:17 +08:00
zyy
b975c1746b 调整西安三号线与一号线列车移入提示信息 2020-05-14 17:48:01 +08:00
fan
e5852949da Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-14 17:37:56 +08:00
fan
8ffd499c51 信号机调整 2020-05-14 17:37:46 +08:00
joylink_cuiweidong
3968331bbe Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-14 17:25:25 +08:00
joylink_cuiweidong
c226d75d6b 剧本代码调整 2020-05-14 17:24:47 +08:00
fan
027fe43467 删除日志，信号机调整 2020-05-14 17:24:35 +08:00
fan
5ef9b0aaaf Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-14 17:03:45 +08:00
fan
4f8de9cc6a 信号机批量操作调整 2020-05-14 17:03:30 +08:00
zyy
81c8ad5210 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-14 16:54:59 +08:00
zyy
ccf186e98e 调整区段停车点偏移量 2020-05-14 16:54:31 +08:00
fan
996b71da05 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-14 16:54:09 +08:00
fan
126278ee01 状态表示道岔故障调整 2020-05-14 16:53:58 +08:00
fan
abec4b2b4c 西安二号线添加是否灭灯显示(CTC级) 2020-05-14 16:45:48 +08:00
zyy
0533ddfcfe Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-14 16:44:39 +08:00
zyy
42402f6223 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-14 16:44:11 +08:00
zyy
b735cd5b06 调整区段回车问题 2020-05-14 16:43:55 +08:00
fan
eceaf463f8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-14 16:04:44 +08:00
fan
b3743326bc 西安二号线信号机调整逻辑点灯 2020-05-14 16:04:23 +08:00
joylink_cuiweidong
b78f20bbfb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-14 15:48:48 +08:00
joylink_cuiweidong
4fec468885 剧本预览代码调整 2020-05-14 15:48:25 +08:00
fan
6eb6cd5340 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-14 15:37:37 +08:00
fan
f8a6908d8c 西安二号线调整 2020-05-14 15:37:18 +08:00
joylink_cuiweidong
77a8fd7c41 西安二号线 列车在站台停车时，站台框也显示为绿色 2020-05-14 15:32:51 +08:00
joylink_cuiweidong
812a7534b7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-14 15:19:59 +08:00
joylink_cuiweidong
bbeb6d44aa 剧本预览代码调整 2020-05-14 15:19:07 +08:00
zyy
7833afa1fd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-14 15:05:32 +08:00
zyy
04aacc3818 调整物理区段创建逻辑区段逻辑 2020-05-14 15:05:19 +08:00
fan
7242d7ba76 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-14 14:39:55 +08:00
fan
48b931897c 调整考试列表实训类型 2020-05-14 14:39:38 +08:00
joylink_cuiweidong
0684d2a93c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-14 14:37:17 +08:00
joylink_cuiweidong
70f06409df 综合演练 语音聊天接口调整 
剧本预览 代码调整
 2020-05-14 14:36:15 +08:00
fan
55fdd65195 调整学生管理权限 2020-05-14 14:03:19 +08:00
fan
ae613fe174 绑定微信调整 2020-05-14 13:55:04 +08:00
fan
8ebe4df256 学生管理问题调整 2020-05-14 13:41:25 +08:00
fan
01456de62a 学生管理问题调整 2020-05-14 11:27:01 +08:00
fan
f95d5e46d7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-14 11:03:33 +08:00
fan
8335ee1259 调整列车详情显示和路由课程创建角色处理 2020-05-14 11:03:24 +08:00
zyy
ba1365b951 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-14 11:00:27 +08:00
zyy
2de0a0fc5b 调整区段鼠标移入元素绘制 2020-05-14 11:00:09 +08:00
joylink_cuiweidong
352becd47b 西安二号线 列车占用的光带显示为红光带 2020-05-14 10:55:20 +08:00
joylink_cuiweidong
b22365787c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-14 10:22:31 +08:00
joylink_cuiweidong
8fd1014203 西安二号线 车次窗显示车次号颜色为黑色 
列车车次号线显示为五位
实际列车到站开门的过程中列车方向图标不消失 调整
 2020-05-14 10:22:13 +08:00
fan
f7d772e192 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-14 09:15:35 +08:00
fan
034a36d25f 绑定微信调整 2020-05-14 09:15:23 +08:00
joylink_cuiweidong
8a284215c5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-13 19:31:38 +08:00
joylink_cuiweidong
36ca6dc3d1 综合演练 聊天代码调整 2020-05-13 19:31:14 +08:00
fan
e72fdcdb78 合并导航栏 2020-05-13 18:59:28 +08:00
fan
39edb68018 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-13 18:22:05 +08:00
fan
e35709ac2c 学生管理调整 2020-05-13 18:21:55 +08:00
joylink_cuiweidong
4631590df0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-13 18:06:15 +08:00
joylink_cuiweidong
2b8757a074 实训平台 综合演练 聊天代码调整 2020-05-13 18:05:48 +08:00
zyy
d82f381eb1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-13 18:01:06 +08:00
fan
9aca6deb77 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-13 18:01:03 +08:00