joylink_cuiweidong
|
dd0a0b2fdf
|
bug70（在课程树创建课程章节时，创建二级章节后无法继续创建一级章节）修改
|
2021-01-05 17:31:03 +08:00 |
|
fan
|
e630f870e2
|
merge
|
2021-01-05 16:43:00 +08:00 |
|
fan
|
c352214e89
|
代码暂提
|
2021-01-05 16:37:50 +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 |
|
fan
|
b71962d77c
|
浙大网新 扣车和取消扣车实训调整
|
2021-01-04 14:50:13 +08:00 |
|
joylink_cuiweidong
|
1a65264d64
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-04 14:48:28 +08:00 |
|
joylink_cuiweidong
|
4151680a6a
|
西安二号线 现地 控制权转移 代码调整
|
2021-01-04 14:48:09 +08:00 |
|
fan
|
3c7f96614d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-04 14:03:40 +08:00 |
|
fan
|
f73fcff33e
|
浙大网新 跳停和取消跳停
|
2021-01-04 14:03:26 +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 |
|
joylink_cuiweidong
|
ad2e6ed0f6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-31 18:03:17 +08:00 |
|
joylink_cuiweidong
|
a024699e8f
|
西安二号线 控制模式 绘图调整
|
2020-12-31 18:02:55 +08:00 |
|
fan
|
c5fd6a97a8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-31 16:40:29 +08:00 |
|
fan
|
386cda6dba
|
Bug54：苏电院交控仿真线路切换到车站一显示调整成员角色失败& 浙大网新部分实训调整
|
2020-12-31 16:40:13 +08:00 |
|
joylink_cuiweidong
|
5ec5d451d0
|
西安二号线 右键操作 代码调整
|
2020-12-31 14:57:53 +08:00 |
|
joylink_cuiweidong
|
2d831ca398
|
bug12（哈尔滨仿真线路里的交出控制功能逻辑问题）修改
|
2020-12-31 14:13:51 +08:00 |
|
joylink_cuiweidong
|
a3860cc279
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-31 13:47:23 +08:00 |
|
joylink_cuiweidong
|
18a318cda7
|
实训平台 添加试卷 编辑试卷规则 代码调整
|
2020-12-31 13:47:08 +08:00 |
|
lVAL
|
d85c30a905
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-31 13:39:16 +08:00 |
|
lVAL
|
ca4201d0b1
|
格式化代码
|
2020-12-31 13:38:54 +08:00 |
|
joylink_cuiweidong
|
d1ff775c1f
|
代码调整
|
2020-12-31 10:37:04 +08:00 |
|
joylink_cuiweidong
|
2aa8f961c6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-31 09:45:55 +08:00 |
|
joylink_cuiweidong
|
d206cb9b18
|
导出地图 添加iscs 数据
|
2020-12-31 09:45:18 +08:00 |
|
fan
|
a5c97fc6b5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-31 09:32:40 +08:00 |
|
fan
|
df158da3a5
|
取消课程详情页面路由记录
|
2020-12-31 09:32:25 +08:00 |
|