joylink_cuiweidong
|
381f26b661
|
成都三号线 设置/取消 自动进路/自动折返 实训 操作定义代码调整
|
2021-01-28 18:49:36 +08:00 |
|
lVAL
|
d4014b53c4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-28 18:44:21 +08:00 |
|
lVAL
|
31f9e2a4d3
|
修改生成实训配置 佛山1
|
2021-01-28 18:44:03 +08:00 |
|
fan
|
5bf8ffe9ac
|
BUG 149:浙大网新：现地仿真系统中车站切换显示有误;
|
2021-01-28 18:22:13 +08:00 |
|
fan
|
cc8c3aac36
|
成都工业调整配置
|
2021-01-28 18:03:17 +08:00 |
|
fan
|
370d538345
|
成都工业登录页面调整
|
2021-01-28 17:53:08 +08:00 |
|
fan
|
3f70632b84
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-28 17:47:56 +08:00 |
|
fan
|
b1d944c52f
|
国赛购买成功调整
|
2021-01-28 17:47:43 +08:00 |
|
lVAL
|
6a033b2a9d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-28 16:28:14 +08:00 |
|
lVAL
|
590fb34edf
|
修改 宁波线操作
|
2021-01-28 16:27:44 +08:00 |
|
fan
|
18dee86d9c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-28 16:20:30 +08:00 |
|
fan
|
f07981ce64
|
国赛购买权限 --暂提
|
2021-01-28 16:20:18 +08:00 |
|
joylink_cuiweidong
|
b6731bd25a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-28 16:12:37 +08:00 |
|
joylink_cuiweidong
|
694fe461a6
|
成都1和3，北京1，佛山有轨电车，哈尔滨1，南京2 运行图 折返点计算 代码调整
|
2021-01-28 16:12:10 +08:00 |
|
sunzhenyu
|
84e77d7fbc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-28 16:10:45 +08:00 |
|
sunzhenyu
|
e45e933436
|
修改三维驾驶中cctv视角按钮
|
2021-01-28 16:10:36 +08:00 |
|
joylink_cuiweidong
|
2e50989ac8
|
运行图添加任务 报错提示调整
运行图编制 折返时间 最少是2分钟
|
2021-01-28 15:21:06 +08:00 |
|
joylink_cuiweidong
|
cea7af664e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-28 14:45:52 +08:00 |
|
joylink_cuiweidong
|
909a5cb7f9
|
宁波一、三号线，西安二号线 运行图 转换函数 调整
|
2021-01-28 14:45:33 +08:00 |
|
fan
|
bf445ba174
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-28 14:29:08 +08:00 |
|
fan
|
3850bc6e34
|
BUG 105: 浙大网新线路在设计剧本的时候，两个窗口重叠后无法移动导致无法操作下面的窗口
|
2021-01-28 14:28:43 +08:00 |
|
joylink_cuiweidong
|
f6d3a6f030
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-28 13:38:29 +08:00 |
|
joylink_cuiweidong
|
c9a8d09e67
|
福州一号线 运行图绘图 折返点计算调整
|
2021-01-28 13:38:10 +08:00 |
|
fan
|
87ca64e33b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-28 10:30:08 +08:00 |
|
fan
|
9c341fed70
|
退出仿真时清除requestList请求栈堆数据
|
2021-01-28 10:29:38 +08:00 |
|
lVAL
|
035ae9d367
|
修改 南京2 实训配置
|
2021-01-28 09:27:32 +08:00 |
|
joylink_cuiweidong
|
a034a9ed91
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-27 18:38:59 +08:00 |
|
lVAL
|
369c5446cc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/jmapNew/theme/nanjing_02/menus/menuButton.vue
|
2021-01-27 18:39:11 +08:00 |
|
joylink_cuiweidong
|
e39bb88a1d
|
代码调整
|
2021-01-27 18:38:27 +08:00 |
|
lVAL
|
ba5de90773
|
配置 南京2实训
|
2021-01-27 18:32:16 +08:00 |
|
sunzhenyu
|
169bd38449
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-27 18:06:48 +08:00 |
|
sunzhenyu
|
59a785056d
|
更新北交大三维车站模型
|
2021-01-27 18:06:40 +08:00 |
|
fan
|
72e25c49f3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-27 15:54:07 +08:00 |
|
fan
|
3c499369a6
|
meger
|
2021-01-27 15:53:09 +08:00 |
|
joylink_cuiweidong
|
68fc7c255f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-27 15:40:18 +08:00 |
|
joylink_cuiweidong
|
8f82b0fdd5
|
北交大客流 车站人数代码调整
地图绘图代码调整
|
2021-01-27 15:39:53 +08:00 |
|
fan
|
cb894aec34
|
南京二号线操作调整显示
|
2021-01-27 15:37:01 +08:00 |
|
lVAL
|
fbcfca4f9b
|
优化 南京2 提示信息的代码
|
2021-01-27 13:42:33 +08:00 |
|
lVAL
|
89c0b4f693
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-27 13:31:31 +08:00 |
|
lVAL
|
d5dd86be69
|
删除南京2 无用代码
|
2021-01-27 13:31:18 +08:00 |
|
joylink_cuiweidong
|
ccaceffeca
|
删除暂不需要文件
|
2021-01-27 13:13:44 +08:00 |
|
joylink_cuiweidong
|
b2adbb8eda
|
删除不需要的文件
|
2021-01-27 13:06:24 +08:00 |
|
lVAL
|
14e7acd715
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/jmapNew/theme/nanjing_02/menus/menuBar.vue
|
2021-01-27 11:25:23 +08:00 |
|
lVAL
|
62d52fd27f
|
修改南京2错误提示功能
|
2021-01-27 11:24:14 +08:00 |
|
joylink_cuiweidong
|
030a603da4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-27 10:40:50 +08:00 |
|
joylink_cuiweidong
|
c52474b771
|
宁波三号线（泰雷兹）
扣车后没有显示扣车标识修改
|
2021-01-27 10:38:34 +08:00 |
|
fan
|
d562037967
|
调整报警闪烁
|
2021-01-27 10:18:47 +08:00 |
|
fan
|
c0d1ffffd6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-27 09:47:38 +08:00 |
|
fan
|
ca1b5892af
|
剧本编辑框和请求栈堆微调
|
2021-01-27 09:47:26 +08:00 |
|
lVAL
|
b237d09402
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-27 09:27:59 +08:00 |
|