joylink_cuiweidong
|
845f10caf6
|
岔心绘图代码调整
bug调整：新建完一个信号机 三个状态不发生改变
|
2021-01-14 13:04:04 +08:00 |
|
joylink_cuiweidong
|
becb6a03df
|
岔心代码调整
|
2021-01-13 18:33:07 +08:00 |
|
lVAL
|
9f4155b70d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-13 17:45:49 +08:00 |
|
lVAL
|
15f94a7d1d
|
优化 应答器创建 选择关联区段类型 以及优化绘制显示位置
|
2021-01-13 17:45:38 +08:00 |
|
joylink_cuiweidong
|
752b4e9a26
|
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/utils/parser.js
|
2021-01-13 17:43:15 +08:00 |
|
joylink_cuiweidong
|
99644039d3
|
新建车站以后 无法点击其他的东西 bug 调整
|
2021-01-13 17:34:57 +08:00 |
|
joylink_cuiweidong
|
ac6f3673d4
|
Merge branch 'master' of https://git.code.tencent.com/lian-cbtc/jl-client
|
2021-01-13 17:02:31 +08:00 |
|
joylink_cuiweidong
|
7599458c8f
|
岔心 元素绘图代码调整
|
2021-01-13 17:01:53 +08:00 |
|
lVAL
|
006d784178
|
修改应答器bug
|
2021-01-13 10:26:52 +08:00 |
|
|
|
032ec93af4
|
Merge remote-tracking branch 'origin/test'
|
2021-01-12 23:46:38 +08:00 |
|
|
|
2d154f1611
|
设备登录行值显示
|
2021-01-12 23:46:07 +08:00 |
|
|
|
8eb293f074
|
Merge remote-tracking branch 'origin/test'
|
2021-01-12 23:14:34 +08:00 |
|
|
|
4adc474b54
|
设备登录行值显示
|
2021-01-12 23:13:05 +08:00 |
|
joylink_cuiweidong
|
cb35140942
|
Merge remote-tracking branch 'remotes/origin/test'
|
2021-01-12 19:01:29 +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 |
|
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 |
|
sunzhenyu
|
d257bf254b
|
修改sdy行调沙盘，现地cctv
|
2021-01-12 17:57:04 +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 |
|
lVAL
|
64df012fc3
|
设置应答器 绘图显示 仿真不显示
|
2021-01-12 11:32:39 +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 |
|
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
|
b248e69ffe
|
导入学生信息添加校验&哈尔滨打包不再区分路由文件
|
2021-01-11 10:55:07 +08:00 |
|
zyy
|
bb22ed66ed
|
调整大屏预览显示流程
|
2021-01-08 16:50:50 +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
|
4d8932e155
|
触发故障管理 布局代码调整
|
2021-01-07 11:13:03 +08:00 |
|
joylink_cuiweidong
|
5469afd2ec
|
调度电话 代码调整
（现地工作站去掉 所有车站）
（呼叫 已经通话的人 会话逻辑处理）
|
2021-01-07 10:31:26 +08:00 |
|
fan
|
e94ffd235a
|
故障模式快捷键&ISCS返回（退出）调整
|
2021-01-06 18:17:40 +08:00 |
|
fan
|
43f039e5c6
|
浙大网新 发送请求提示调整
|
2021-01-04 17:52:38 +08:00 |
|
lVAL
|
cfa739338b
|
Merge branch 'master' of https://git.code.tencent.com/lian-cbtc/jl-client
|
2020-12-31 18:12:07 +08:00 |
|
fan
|
48b165e11c
|
国赛权限调整
|
2020-12-30 15:30:24 +08:00 |
|
joylink_cuiweidong
|
3329053207
|
仿真 综合演练 添加 联系方式
|
2020-12-29 16:15:10 +08:00 |
|
fan
|
56a47f48f9
|
Merge branch 'test'
|
2020-12-29 16:14:16 +08:00 |
|
sunzhenyu
|
f45262c245
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-29 11:07:41 +08:00 |
|
fan
|
855936a5db
|
调整功能按钮
|
2020-12-29 10:16:27 +08:00 |
|
fan
|
62f4695c50
|
Merge remote-tracking branch 'origin/test'
|
2020-12-29 10:08:38 +08:00 |
|
sunzhenyu
|
ec1f215104
|
merge
|
2020-12-29 10:00:44 +08:00 |
|
sunzhenyu
|
0eedf1bd6b
|
merge
|
2020-12-29 10:00:29 +08:00 |
|
sunzhenyu
|
e857d580ac
|
修改客流车站模型
|
2020-12-29 09:59:43 +08:00 |
|
fan
|
8b2291e18b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-29 09:59:26 +08:00 |
|
fan
|
fda2e940a5
|
调整路径
|
2020-12-29 09:59:11 +08:00 |
|
lVAL
|
f97a98da21
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-28 16:59:57 +08:00 |
|
