joylink_cuiweidong
|
f9ad56bca6
|
Merge remote-tracking branch 'remotes/origin/test'
|
2021-01-12 19:06:59 +08:00 |
|
joylink_cuiweidong
|
b13136df51
|
代码调整
|
2021-01-12 19:05:28 +08:00 |
|
joylink_cuiweidong
|
cb35140942
|
Merge remote-tracking branch 'remotes/origin/test'
|
2021-01-12 19:01:29 +08:00 |
|
joylink_cuiweidong
|
3a5d5def46
|
考试系统 添加 修改试卷 代码调整
|
2021-01-12 18:59:16 +08:00 |
|
fan
|
73f98ce8b4
|
考试权限调整
|
2021-01-12 18:51:38 +08:00 |
|
fan
|
378d5430e6
|
考试权限调整
|
2021-01-12 18:34:10 +08:00 |
|
fan
|
35790f6693
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-12 18:27:05 +08:00 |
|
fan
|
21e2455472
|
项目登录行调 运行图预览跳转新页面
|
2021-01-12 18:26:55 +08:00 |
|
joylink_cuiweidong
|
7378220e85
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-12 18:07:08 +08:00 |
|
joylink_cuiweidong
|
12acee5bc7
|
代码调整
|
2021-01-12 18:06:52 +08:00 |
|
sunzhenyu
|
646836ecb4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-12 17:58:12 +08:00 |
|
sunzhenyu
|
057a6e41f8
|
删除无用注释
|
2021-01-12 17:57:59 +08:00 |
|
joylink_cuiweidong
|
b33e4b92ed
|
暂时 注释 西安二号线 未实现的 功能
|
2021-01-12 17:57:44 +08:00 |
|
sunzhenyu
|
d257bf254b
|
修改sdy行调沙盘，现地cctv
|
2021-01-12 17:57:04 +08:00 |
|
joylink_cuiweidong
|
b04792f529
|
运行图编辑 新增计划代码bug 调整
|
2021-01-12 17:38:30 +08:00 |
|
joylink_cuiweidong
|
1e2e8c2609
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/jmapNew/config/skinCode/nanjing_02.js
# src/jmapNew/shape/Responder/index.js
|
2021-01-12 17:27:25 +08:00 |
|
joylink_cuiweidong
|
85a88a9431
|
岔心 绘图代码调整
|
2021-01-12 17:25:32 +08:00 |
|
fan
|
a6481906fb
|
编辑用户信息强制要有名称=》去掉避免
|
2021-01-12 16:19:10 +08:00 |
|
fan
|
63e2a57f36
|
Bug48: 地图列表的位置锁定&仿真权限判断调整
|
2021-01-12 15:40:05 +08:00 |
|
fan
|
4b95be70dd
|
单位添加关联项目
|
2021-01-12 14:34:20 +08:00 |
|
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 |
|