Commit Graph

8729 Commits

Author SHA1 Message Date
fan
affd81e756 试卷创建调整 2021-01-12 14:13:56 +08:00
fan
e4cf9de494 绑定单位调整 2021-01-12 13:22:24 +08:00
fan
de395f9bb4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-12 13:20:12 +08:00
fan
dbc02056fb 绑定单位调整 2021-01-12 13:18:52 +08:00
lVAL
64df012fc3 设置应答器 绘图显示 仿真不显示 2021-01-12 11:32:39 +08:00
lVAL
ec5be4bccb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-12 11:00:38 +08:00
lVAL
8c261bb3a6 优化应答器 状态处理功能 2021-01-12 11:00:16 +08:00
fan
0e5ebf2445 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-12 10:20:49 +08:00
fan
097c95beaa 教学管理文字调整 2021-01-12 10:19:43 +08:00
joylink_cuiweidong
54a312c20f 岔心 地图绘图 代码调整 2021-01-12 10:11:16 +08:00
lVAL
7bacd3c49f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-12 10:07:50 +08:00
lVAL
9bd12bb82e 增加应答器配置 2021-01-12 10:07:31 +08:00
fan
c8150bfa32 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-11 17:52:12 +08:00
fan
9a74d3ee39 成绩导出调整 2021-01-11 17:51:54 +08:00
sunzhenyu
96e2179bd7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-11 15:55:57 +08:00
sunzhenyu
b2ab6d4fd1 修改综合演练中三维驾驶不显示选择司机 2021-01-11 15:55:48 +08:00
joylink_cuiweidong
e1af8e878e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-11 15:40:15 +08:00
joylink_cuiweidong
6ef0498ffd 添加 岔心 地图绘制页面 2021-01-11 15:39:06 +08:00
fan
0dca101acd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-11 15:24:10 +08:00
fan
84354dde17 课程迁移问题调整&区段限速取消限速仅逻辑区段显示 2021-01-11 15:23:56 +08:00
sunzhenyu
0dbc481e3f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-11 13:05:39 +08:00
sunzhenyu
857307644f 三维沙盒修改,通号VR内容隐藏 2021-01-11 13:05:30 +08:00
fan
ec5b0e0a1e 西门子列车未实现操作注释 2021-01-11 11:04:14 +08:00
fan
b248e69ffe 导入学生信息添加校验&哈尔滨打包不再区分路由文件 2021-01-11 10:55:07 +08:00
fan
be8821435b 课程迁移调整 2021-01-08 17:55:42 +08:00
fan
c6b81eada0 课程迁移调整 2021-01-08 17:53:04 +08:00
fan
ec5c335d37 课程迁移调整 2021-01-08 17:48:25 +08:00
fan
682a47f730 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-08 17:27:36 +08:00
fan
0051560fff 课程迁移调整 2021-01-08 17:27:25 +08:00
zyy
9e355206c7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-08 16:51:07 +08:00
zyy
bb22ed66ed 调整大屏预览显示流程 2021-01-08 16:50:50 +08:00
joylink_cuiweidong
ae722ee86f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-08 16:43:24 +08:00
joylink_cuiweidong
fd89b426b8 bug16 管理运行图计划中的查询功能缺失 代码调整 2021-01-08 16:42:59 +08:00
fan
6b7acc7f97 课程迁移调整 2021-01-08 11:26:43 +08:00
fan
4d3991f3e9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_lesson 2021-01-08 11:13:16 +08:00
fan
dfa815fe6d 课程创建迁移&调度电话调整 2021-01-08 11:12:58 +08:00
joylink_cuiweidong
18ff2dcd22 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-08 09:54:21 +08:00
joylink_cuiweidong
8145673f5d 成都三号线 代码调整 2021-01-08 09:54:04 +08:00
lVAL
d5f94f8539 修改 变量名称 2021-01-07 15:18:48 +08:00
lVAL
f5cfb5f787 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/jmapNew/config/skinCode/xian_01.js
2021-01-07 15:16:34 +08:00
lVAL
1a0612020e 增加,信号机灯丝故障处理 2021-01-07 15:15:54 +08:00
fan
680b043904 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-07 15:15:11 +08:00
fan
38be92528e 组织单位管理 2021-01-07 15:14:58 +08:00
joylink_cuiweidong
4d8932e155 触发故障管理 布局代码调整 2021-01-07 11:13:03 +08:00
joylink_cuiweidong
5469afd2ec 调度电话 代码调整
(现地工作站去掉 所有车站)
(呼叫 已经通话的人 会话逻辑处理)
2021-01-07 10:31:26 +08:00
fan
fe71e0b0a2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-06 18:17:54 +08:00
fan
e94ffd235a 故障模式快捷键&ISCS返回(退出)调整 2021-01-06 18:17:40 +08:00
joylink_cuiweidong
c266442842 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-06 18:15:34 +08:00
joylink_cuiweidong
558ea5cc95 代码调整 2021-01-06 18:15:14 +08:00
joylink_cuiweidong
85a6b0c617 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-06 16:01:51 +08:00