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 |
|
joylink_cuiweidong
|
35645688a5
|
代码调整
|
2021-01-06 16:01:26 +08:00 |
|
fan
|
554d2e994f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-06 13:23:30 +08:00 |
|
fan
|
26d2556502
|
单位暂提
|
2021-01-06 13:23:16 +08:00 |
|
joylink_cuiweidong
|
728ba4b47b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-06 11:28:11 +08:00 |
|
joylink_cuiweidong
|
6e3cdc6bd1
|
bug56 设置运行等级后，查询站台状态显示自动 代码调整
|
2021-01-06 11:27:55 +08:00 |
|
lVAL
|
9993cc3d63
|
如果检测实训生成，就清空数据。
|
2021-01-06 11:21:38 +08:00 |
|
lVAL
|
c4e41ccd6a
|
修改 实训生成过程中，点击限制的问题
|
2021-01-06 11:18:15 +08:00 |
|
lVAL
|
0ad6925791
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-06 10:21:20 +08:00 |
|
lVAL
|
0e37349fcd
|
修改，站台设置跳停和取消跳停现地没有生成实训的配置问题
|
2021-01-06 10:21:11 +08:00 |
|
joylink_cuiweidong
|
923e3ba05c
|
bug57 苏电院西门子仿真线路：进路控制模式显示有误，自动显示人工 修改
|
2021-01-06 09:32:27 +08:00 |
|
joylink_cuiweidong
|
411bde3aee
|
bug 64 苏电院交控仿真线路：信号解封无效 调整
|
2021-01-05 18:19:02 +08:00 |
|
joylink_cuiweidong
|
dd0a0b2fdf
|
bug70（在课程树创建课程章节时，创建二级章节后无法继续创建一级章节）修改
|
2021-01-05 17:31:03 +08:00 |
|
lVAL
|
42dd23b716
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/jmapNew/theme/xian_02/menus/menuSignal.vue
|
2021-01-05 16:05:52 +08:00 |
|
lVAL
|
cc2814f722
|
增加西安2号线实训配置
|
2021-01-05 16:05:13 +08:00 |
|
joylink_cuiweidong
|
c0a949eafa
|
更改 西安二号线 信号机解封 实训提示
|
2021-01-05 15:32:12 +08:00 |
|
lVAL
|
e8d1777703
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-05 15:08:08 +08:00 |
|
fan
|
5dadc4747a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-05 15:09:25 +08:00 |
|
fan
|
382336971d
|
BUG 48:地图列表的位置锁定
|
2021-01-05 15:09:07 +08:00 |
|
lVAL
|
ea7d29f520
|
增加 信号机解封实训配置
|
2021-01-05 15:07:54 +08:00 |
|
joylink_cuiweidong
|
9684fd6937
|
信号机 取消封锁 使能 操作代码调整
|
2021-01-05 14:45:10 +08:00 |
|
fan
|
0a9ca02ae9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-05 13:57:05 +08:00 |
|
fan
|
175d5b1810
|
代码调整
|
2021-01-05 13:56:51 +08:00 |
|
joylink_cuiweidong
|
dcfd22463b
|
西安二号线 指令操作调整
|
2021-01-05 13:45:29 +08:00 |
|
joylink_cuiweidong
|
40a367a005
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-05 13:00:25 +08:00 |
|
joylink_cuiweidong
|
50a2085052
|
西安二号线 绘图代码 调整
|
2021-01-05 11:33:18 +08:00 |
|
lVAL
|
f11ded27f7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-05 11:30:34 +08:00 |
|
lVAL
|
f35628f130
|
修改道岔单锁实训流程问题
|
2021-01-05 11:30:25 +08:00 |
|
joylink_cuiweidong
|
bc791715f4
|
西安二号线 操作代码调整
|
2021-01-05 09:43:09 +08:00 |
|
lVAL
|
1c04595c38
|
补充 西安二号线 实训配置
|
2021-01-05 09:13:09 +08:00 |
|
lVAL
|
0d183d53ce
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-04 18:25:42 +08:00 |
|
lVAL
|
e9c3a49612
|
添加缺失的实训配置（未调整，未验证）
|
2021-01-04 18:25:33 +08:00 |
|
fan
|
d31c9c1da3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-04 17:52:52 +08:00 |
|
fan
|
43f039e5c6
|
浙大网新 发送请求提示调整
|
2021-01-04 17:52:38 +08:00 |
|
lVAL
|
7468e2edcb
|
注释掉，宁波三仿真操作功能无关的操作
|
2021-01-04 17:37:56 +08:00 |
|
sunzhenyu
|
5751a6bbad
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-04 16:21:43 +08:00 |
|
sunzhenyu
|
2a2dfd4d4e
|
三维沙盘修改
|
2021-01-04 16:21:38 +08:00 |
|
sunzhenyu
|
edb744cbc2
|
三维沙盘信号机更新状态验证
|
2021-01-04 16:19:14 +08:00 |
|
joylink_cuiweidong
|
e3584dc2ea
|
西安二号线 紧急本地控制（紧急站控） 操作代码调整
|
2021-01-04 15:39:54 +08:00 |
|