joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity
10,681 Commits 20 Branches 0 Tags 448 MiB
2028a73d19
Commit Graph

3147 Commits

Author SHA1 Message Date
joylink_cuiweidong
a0861633f2 zc 添加管理的区段列表（计轴区段） 2021-06-15 15:33:50 +08:00
joylink_cuiweidong
6b7827bd91 zc 代码调整 2021-06-11 18:17:48 +08:00
joylink_cuiweidong
79fa65c145 宁波一号线 实训操作定义中的 实训说明 修改 2021-06-11 09:17:38 +08:00
joylink_cuiweidong
c024fd281f 更改宁波一号线的 操作定义中的 实训说明 2021-06-10 13:42:33 +08:00
joylink_cuiweidong
e31f5aaed5 更改福州一号线的 操作定义中的 实训说明 2021-06-10 11:10:53 +08:00
joylink_cuiweidong
de337d4aa6 西安三 菜单修改 
CM改成SM
URM改成NRM
 2021-06-09 17:05:40 +08:00
fan
4b7e2efcba 西安三号线ibp盘扣车显示调整 2021-06-08 16:00:55 +08:00
fan
1ed9fd4d5d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_tmt 2021-06-08 14:44:36 +08:00
fan
c09da2aa5d 列车操作调整 2021-06-08 14:44:23 +08:00
yuan
3093a1bc1c 修改PSL菜单显示逻辑为非故障模式且角色为车站值班员 2021-06-08 10:08:48 +08:00
yuan
c3a3f8ce63 修正PSL试灯按钮不显示 2021-06-07 10:08:50 +08:00
fan
2524e45c42 Revert "Revert "PSL"" 
This reverts commit 9832b0c8
 2021-06-07 09:12:43 +08:00
fan
c0c1ef8d05 Revert "Revert "PSL"" 
This reverts commit 74249e59
 2021-06-07 09:12:13 +08:00
fan
74249e5992 Revert "PSL" 
This reverts commit 185a3eff
 2021-06-04 18:06:01 +08:00
fan
9832b0c87f Revert "PSL" 
This reverts commit 786d0f7a
 2021-06-04 18:05:43 +08:00
yuan
95ce742d95 Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into yuanliye_PSL 2021-06-04 17:55:58 +08:00
yuan
786d0f7a9f PSL 2021-06-04 17:55:39 +08:00
fan
eb6ad1d7c8 调整列车故障处理 限速指令 参数范围和提示 2021-06-04 16:21:21 +08:00
fan
eeb52c7911 西安三列车菜单操作增加单位和提示 2021-06-04 16:12:16 +08:00
yuan
aa395d1206 Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into yuanliye_PSL 2021-06-04 16:06:12 +08:00
yuan
185a3eff6e PSL 2021-06-04 16:05:56 +08:00
fan
b6a373a34a 西安三列车菜单位置调整 2021-06-04 14:57:08 +08:00
fan
4d89906af4 Merge remote-tracking branch 'origin/test_xian03training' into test 2021-06-04 09:52:12 +08:00
fan
16c5659bb9 调整西安三号线早晚点文字提示 2021-06-03 18:09:43 +08:00
fan
7ea850497a 西安三号线问题调整 2021-06-03 17:31:50 +08:00
fan
70d1ed2ce6 Merge branch 'test_xian03training' of https://git.code.tencent.com/lian-cbtc/jl-client into test_xian03training 2021-06-03 13:09:49 +08:00
fan
ae756864cf 西安三号线实训调整 2021-06-03 13:09:35 +08:00
joylink_cuiweidong
2a5ab20cde 西安三 界面 设置停站时间 显示重叠 2021-06-03 11:19:07 +08:00
yuan
c9af4a7031 emmm 2021-06-03 09:58:24 +08:00
fan
ad0cbdbd0f 南京二号线现地初始化列车没清调整 2021-06-02 10:22:24 +08:00
fan
3301f9abcd 南京二号线车站显示模块调整 2021-06-01 18:13:13 +08:00
fan
e134b23fcf Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-06-01 17:50:46 +08:00
fan
25f546b205 南京二号线车站显示模块调整 2021-06-01 17:50:37 +08:00
joylink_cuiweidong
56ea29660f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-06-01 17:29:33 +08:00
joylink_cuiweidong
d58c80888e 西安三号线 添加道岔定反位失表 2021-06-01 17:29:02 +08:00
fan
35db44cd42 列车故障操作驾驶至调整 2021-06-01 15:36:18 +08:00
fan
a52c2d2126 信号机接近区段 2021-06-01 14:22:09 +08:00
fan
a8ce67ee4a 南京二号线调整 2021-06-01 14:06:18 +08:00
fan
9ac45050f9 列车指令调整 2021-06-01 11:01:02 +08:00
fan
a3b62e203d 列车指令调整 2021-06-01 10:22:10 +08:00
fan
9f4841e9e0 列车指令调整 2021-06-01 10:13:10 +08:00
fan
aec02b7752 南京二行调调整 2021-05-31 14:15:09 +08:00
fan
d11b0c6d47 增加列车故障操作-换端&联锁配置项-CTC列车进路延续保护仅折返站处锁闭 2021-05-28 17:18:51 +08:00
fan
70ca57d26c 时刻表列车总览详览迁移 2021-05-28 11:00:26 +08:00
fan
af8a7758c2 Merge remote-tracking branch 'origin/test-nan02' into test 
# Conflicts:
#	src/jmapNew/theme/nanjing_02/menus/menuBar.vue
 2021-05-28 10:18:57 +08:00
fan
1b5da46e80 背投轨道总览详览调整 2021-05-28 10:10:54 +08:00
joylink_cuiweidong
411099fdc1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-27 09:33:48 +08:00
joylink_cuiweidong
1c2f663d9c 西安三号线 行调添加设置/取消自动触发、自动进路 2021-05-27 09:33:15 +08:00
fan
b776b48bf5 哈尔滨列监显示条件限制 2021-05-26 17:25:16 +08:00
fan
7412e01b32 代码暂提 2021-05-26 17:18:20 +08:00
fan
46d74d3002 代码暂提 2021-05-26 15:46:29 +08:00
joylink_cuiweidong
04f156cc28 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-26 15:01:26 +08:00
joylink_cuiweidong
7b3e127898 南京二号线 十一站型 时刻表 页面添加 2021-05-26 15:01:02 +08:00
fan
49c1eba347 列监代码显示 2021-05-26 14:19:40 +08:00
fan
86e2520b05 代码暂提 2021-05-26 14:04:36 +08:00
fan
455fe9dccd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-26 10:40:29 +08:00
fan
c4b4955541 BUG176、174 2021-05-26 10:40:17 +08:00
joylink_cuiweidong
300dd3d6d2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-26 10:16:45 +08:00
joylink_cuiweidong
cc4eaf034c 西安三号线 右键的车站切换划分问题（bug281） 2021-05-26 10:16:22 +08:00
fan
5188192736 BUG275 南京11站：车次号步进，在马群创建的车次步进到油坊桥的区段后，列车不显示 2021-05-25 17:53:23 +08:00
fan
3b3c964636 宁波问题调整 2021-05-25 16:33:20 +08:00
fan
337ed03f78 哈尔滨问题调整 2021-05-25 16:05:45 +08:00
fan
a42e3ecafc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-25 13:18:19 +08:00
fan
3ea6c67b0f 哈尔滨问题调整 2021-05-25 13:17:55 +08:00
joylink_cuiweidong
60fce71f8a 西安三号线 鼠标右键无法出现菜单快速切换车站 处理 2021-05-25 10:36:20 +08:00
joylink_cuiweidong
8abbe2e05a 修改西安三号线问题 道岔失表不能设置定位或反位失表，只能设置成道岔定反位都失表 2021-05-25 09:48:54 +08:00
fan
6ec48dab9d BUG273 设置故障时，点击故障列表后，直接点击关闭按钮，故障列表还会显示 2021-05-24 17:41:54 +08:00
fan
8c1e968213 BUG269 哈尔滨：报警信息缺少故障描述 2021-05-24 17:01:10 +08:00
fan
640793241a BUG270 问题调整 2021-05-24 16:08:52 +08:00
fan
49011b95e2 添加线路配置delayWhenCancelRouteWithAbnormalInterlock & 哈尔滨部分问题调整 2021-05-24 15:53:38 +08:00
fan
4796e7f648 代码暂提 2021-05-24 11:29:59 +08:00
fan
22cfed1774 暂提 2021-05-21 09:42:03 +08:00
zyy
55ee64479f 调整系统绘图模块新增 2021-05-20 17:58:23 +08:00
zyy
c4ec37a403 调整权限字段显示 2021-05-20 17:13:05 +08:00
zyy
9789fb4d91 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-20 16:38:08 +08:00
zyy
3a2baf8374 调整权限流程 2021-05-20 16:37:55 +08:00
fan
3ac0069577 暂提 2021-05-20 15:53:21 +08:00
fan
1b62198d55 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-20 15:40:10 +08:00
fan
0b716d7bc3 pad检索调整 2021-05-20 15:39:44 +08:00
fan
32ef41b405 暂提 2021-05-20 15:18:02 +08:00
zyy
24aefdebd4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-20 15:13:54 +08:00
zyy
be1106fc20 调整权限字段显示，地图绘制新增 2021-05-20 15:13:37 +08:00
fan
6590c10ab7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-20 15:06:24 +08:00
fan
e212bd52e9 pdf上传检索调整 2021-05-20 15:06:14 +08:00
joylink_cuiweidong
7094b1d497 南京二号线 列车详览页面 代码调整 2021-05-20 15:05:57 +08:00
fan
5ee943a313 暂提 2021-05-20 11:04:21 +08:00
fan
db6e9503f3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test—nanjing02 2021-05-20 09:29:10 +08:00
joylink_cuiweidong
beb086e57f 南京二号线 列车总览页面 代码调整 2021-05-20 09:20:31 +08:00
joylink_cuiweidong
f20793ec0d 代码调整 2021-05-19 18:11:32 +08:00
fan
8db97250d8 暂提 2021-05-19 18:03:58 +08:00
joylink_cuiweidong
7cac00b163 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-19 16:46:29 +08:00
joylink_cuiweidong
e6e09d24fb 代码调整 2021-05-19 16:46:07 +08:00
fan
9b422cd3b9 南京二号线调整（未完） 2021-05-19 16:07:52 +08:00
zyy
267dc4d878 删除多余配置 2021-05-19 15:20:46 +08:00
zyy
4cd675cf67 增加系统预览绘制 2021-05-19 15:07:59 +08:00
zyy
850897bd4f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-19 10:22:53 +08:00
zyy
c281a51424 调整流程 2021-05-19 10:22:39 +08:00
fan
be74067c7e 轨道详览 2021-05-18 17:49:08 +08:00
fan
f1d41844dc 南京二列车操作报错提示 & BUG267 2021-05-18 13:47:22 +08:00
fan
df68e9a969 tro 轨道总览 2021-05-18 13:36:06 +08:00
zyy
6ba7b730a5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-17 18:16:38 +08:00
zyy
9a2785f126 调整南京二号线 行调操作---> ibp局部控制盘、车站、轨道 2021-05-17 18:16:22 +08:00
fan
4384e36314 BUG266 南京11站：建议修改车次号输入框只能输入7个数字，车组号6个数字 2021-05-17 18:03:44 +08:00
fan
d00f74e190 大铁线路图纸检索 2021-05-17 17:29:33 +08:00
fan
0a9c8665ff 代码调整 2021-05-17 16:37:56 +08:00
fan
9554643f05 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-17 16:14:17 +08:00
fan
02eaa33fec 背投调整 2021-05-17 16:14:00 +08:00
zyy
17f25b1e0b 处理冲突文件 
#    src/jmapNew/theme/nanjing_02/menus/menuBar.vue
 2021-05-17 15:58:57 +08:00
zyy
050d5854d1 增加南京区段操作流程，请求暂未调整 2021-05-17 15:57:07 +08:00
fan
5c5a1db13d Bug262 福州一：紧急停车状态表示有问题 2021-05-17 15:52:26 +08:00
fan
122ca9ec6b 列车操作调整 2021-05-17 15:13:26 +08:00
fan
dfc5d50fbe ATS显示调整 2021-05-17 14:39:16 +08:00
fan
bc2fa1fbae 代码调整 2021-05-17 13:35:49 +08:00
fan
01fdc0ef22 加载时刻表 2021-05-14 18:08:12 +08:00
fan
666e85dec6 车次号步进 2021-05-14 16:49:27 +08:00
fan
69c6526516 Bug260 、Bug261、郑州共赢代码调整 2021-05-14 15:59:04 +08:00
fan
006b9762e1 merge 2021-05-14 15:07:00 +08:00
fan
ddfddfa292 代码调整 2021-05-14 15:05:57 +08:00
joylink_cuiweidong
f4cd046f1a 大铁项目 根据车站值班员 显示绘图 2021-05-13 13:55:02 +08:00
joylink_cuiweidong
d52a5837b4 宁波三 列车绘图代码调整 2021-05-12 14:17:14 +08:00
fan
8cf5d36ce3 南京二号线调整 2021-05-11 15:36:11 +08:00
fan
4f07f16ecf 运行图解析调整 2021-05-10 14:40:37 +08:00
fan
a9da38daf2 运行图解析调整 2021-05-10 09:13:22 +08:00
fan
be3ea8384a 添加站台紧急停车 2021-05-08 13:31:19 +08:00
fan
67f1076dec 故障调整 2021-05-08 09:22:16 +08:00
fan
181caff10c 哈尔滨添加故障操作 2021-05-07 16:16:36 +08:00
fan
49d19a7d14 大铁去掉mBar 2021-05-06 16:25:13 +08:00
fan
6cb4ee9c27 场景语音训练调整 2021-05-06 16:15:09 +08:00
fan
8087d87b22 大铁线路操作调整 
(cherry picked from commit 0a0917dd32)
 2021-04-30 10:24:18 +08:00
fan
2849342be6 大铁线路操作调整 2021-04-29 16:26:08 +08:00
fan
0585502691 大铁线路操作调整 2021-04-29 15:50:15 +08:00
fan
ae5df5de5b 大铁线路操作调整 2021-04-29 13:25:48 +08:00
fan
ed7c4bb8f5 大铁线路操作调整 2021-04-29 10:35:34 +08:00
fan
5678d8dfad 信号机坐标编辑显示 2021-04-28 18:46:04 +08:00
fan
823c30118c 大铁仿真操作调整 2021-04-28 16:58:29 +08:00
fan
6ec82c158f 大铁仿真操作调整 2021-04-28 13:36:58 +08:00
fan
2d044a6810 大铁仿真操作调整 2021-04-28 09:01:27 +08:00
fan
83eddd42d3 大铁仿真操作调整 2021-04-27 15:52:39 +08:00
fan
b107ae58d6 大铁仿真操作调整 2021-04-27 14:40:17 +08:00
fan
19e3bb91d0 大铁仿真操作调整 2021-04-27 13:24:33 +08:00
fan
fad65a0d66 大铁仿真操作调整 2021-04-27 13:02:38 +08:00
fan
09781774c7 大铁线路操作调整 2021-04-26 17:59:23 +08:00
fan
cd84fbb4cd 大铁线路操作调整 2021-04-26 16:00:39 +08:00
fan
bb973a23d2 大铁线路操作调整 2021-04-26 13:39:19 +08:00
fan
d917ccce3d 大铁线路操作调整 2021-04-25 18:13:47 +08:00
fan
2bd741d4ab 大铁操作调整 2021-04-25 10:09:43 +08:00
fan
b26d17f607 信号机状态调整 2021-04-23 18:11:07 +08:00
fan
bd2165ff35 大铁仿真调整 2021-04-23 14:11:29 +08:00
fan
4fcaffae50 大铁仿真调整 2021-04-23 10:24:05 +08:00
fan
7379945c42 大铁仿真调整 2021-04-23 09:01:12 +08:00
fan
16fb67127b 信号按钮名称显示调整 2021-04-21 10:44:15 +08:00
fan
3ba2f8ac5b merge 2021-04-20 17:29:32 +08:00
fan
0226042942 宁波三Bug调整 2021-04-20 17:25:27 +08:00
joylink_cuiweidong
852d53f4a4 代码调整 2021-04-19 17:54:13 +08:00
joylink_cuiweidong
dfb80a8eb2 代码调整 2021-04-19 09:31:07 +08:00
joylink_cuiweidong
48c91eb1a9 信号机按钮绘图代码调整 2021-04-16 18:06:12 +08:00
fan
937689b177 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-16 16:51:58 +08:00
fan
0fc9c03d2b 宁波三信号右键菜单 2021-04-16 16:51:42 +08:00
joylink_cuiweidong
84169141ab 大铁 指示灯 代码调整 2021-04-16 14:22:29 +08:00
joylink_cuiweidong
ad03a0a2bf 信号机代码调整 2021-04-16 10:56:36 +08:00
ival
14f718ec1a 增加指示器显示 2021-04-15 18:15:12 +08:00
fan
3508380dd1 宁波三信号右键按钮 2021-04-15 17:51:23 +08:00
ival
b75483ded0 删除无用打印 2021-04-15 16:30:28 +08:00
ival
d903ce7fb7 增加区段的脱轨其设备 2021-04-15 16:26:12 +08:00
ival
86ad53cfe9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-14 13:55:30 +08:00
ival
22ddd9f722 修改代码 2021-04-14 13:55:16 +08:00
joylink_cuiweidong
eadb7a5748 大铁线路 车站绘图元素添加 2021-04-14 10:24:57 +08:00
joylink_cuiweidong
6b4bdbc8fd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-13 18:24:59 +08:00
joylink_cuiweidong
ea834dc86a 大铁项目 区段状态代码调整 2021-04-13 18:24:41 +08:00
fan
8575de2bd9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-13 18:09:52 +08:00
fan
0b5cc8e15d 信号按钮调整 2021-04-13 18:09:37 +08:00
ival
821d0b28e2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-13 17:37:48 +08:00
ival
693938a367 调整 打铁 道岔状态皮肤配置 2021-04-13 17:37:40 +08:00
joylink_cuiweidong
bc83661f1f 大铁线路 区段状态代码调整 2021-04-13 17:23:12 +08:00
joylink_cuiweidong
58d7f9233e 大铁 区段状态代码调整 2021-04-13 17:06:13 +08:00
joylink_cuiweidong
de4691da44 代码调整 2021-04-13 15:40:35 +08:00
fan
8a363c068a 大铁调整 2021-04-13 14:10:20 +08:00
fan
0bb06fd142 大铁调整 2021-04-13 13:52:39 +08:00
fan
34859f8f51 大铁调整 2021-04-13 13:50:24 +08:00
fan
0adef8a9c9 宁波三调整 2021-04-13 13:43:56 +08:00
fan
22c6924db8 宁波三操作调整 2021-04-12 18:58:40 +08:00
fan
5fbe0161ac 宁波三操作调整 2021-04-12 18:55:26 +08:00
fan
7901886d3b 宁波三操作调整 2021-04-12 18:19:52 +08:00
fan
5ebfa5ce38 宁波三号线操作调整 2021-04-12 13:29:26 +08:00
fan
51d2d32979 宁波三号线操作调整 2021-04-09 17:49:46 +08:00
fan
8e9afa9c9b 宁波三号线操作调整 2021-04-09 13:18:51 +08:00
fan
c58609528a 导入运行图调整 2021-04-08 17:55:35 +08:00
fan
7532c86e15 宁波三操作调整&导入运行图放开 2021-04-08 17:28:46 +08:00
fan
f5e00dd717 宁波三列车操作调整 2021-04-07 17:14:54 +08:00
fan
17995e2f40 取消mfa等故障状态add 2021-04-06 15:05:54 +08:00
fan
924e6154a3 南京十一站屏蔽门开启影响站停时间显示调整 2021-04-06 09:43:45 +08:00
joylink_cuiweidong
f8bebd192e 南京二号线 封锁岔心 状态代码跳转 2021-04-01 17:31:19 +08:00
joylink_cuiweidong
0fb623ef59 运行图编制 折返数据解析 代码调整 2021-03-30 11:26:25 +08:00
ival
7625666431 调整成都01，显示车站为等间距 2021-03-19 17:14:14 +08:00
ival
12f6bae8e5 解决冲突 2021-03-19 10:52:57 +08:00
ival
a1b6201f9b 新增文件 2021-03-19 10:11:33 +08:00
ival
d03315f8fd 重构运行图解析代码逻辑 2021-03-19 10:10:51 +08:00
ival
e183f40611 提交代码 2021-03-17 13:35:15 +08:00
ival
94bb1a0395 修改运行图代码代码 2021-03-17 10:15:21 +08:00
ival
13f3302cfc 修改新版运行图显示的问题 2021-03-15 17:32:12 +08:00
joylink_cuiweidong
8c05faab0a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-12 13:45:47 +08:00
joylink_cuiweidong
866b661c4f 南京二号线 岔心 绘图 代码调整 2021-03-12 13:45:14 +08:00
ival
ef0915ea98 线路：宁波3 
问题：调整实训流程
 2021-03-12 11:31:11 +08:00
ival
62c0bd160f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-11 18:31:01 +08:00
ival
50c206cad3 调整宁波3道岔封锁实训 2021-03-11 18:30:43 +08:00
fan
757c5d62df Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-11 18:11:27 +08:00
fan
330e15c993 南京二号线menuBar放开 2021-03-11 18:11:08 +08:00
ival
8481e2d927 删除宁波3 无用文件 2021-03-11 15:35:41 +08:00
ival
1a1745d49c 增加宁波3 状态逻辑判断 2021-03-11 15:33:43 +08:00
ival
13c1cc6819 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-11 15:27:38 +08:00
ival
0f0b95cafb 增加 宁波3 menuBar operation定义 
修改加载当日运行图界面没有显示运行图名称的问题
 2021-03-11 15:27:30 +08:00
joylink_cuiweidong
29a4dfac76 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-11 15:01:28 +08:00
joylink_cuiweidong
05ff67f546 南京二号线 岔心 通信车占用状态/非通信车占用状态 代码调整 2021-03-11 15:00:52 +08:00
ival
414bd05d0c 优化实训过程中，点击空白menuBar被关掉的问题 2021-03-11 13:44:40 +08:00
fan
8631b66be9 岔芯预复位报错调整 2021-03-11 09:17:57 +08:00
ival
1ee6c29666 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-10 17:44:30 +08:00
ival
cfe979fce4 线路：宁波3 
问题：调整页面样式
 2021-03-10 17:40:43 +08:00
fan
56c6cebbfe Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-10 17:18:51 +08:00
fan
d9d2e9b6cd 道岔计轴添加关联岔芯参数&宁波三排列进路到 2021-03-10 17:18:35 +08:00
joylink_cuiweidong
c986e22d53 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/jmapNew/theme/ningbo_03/menus/menuBar.vue
 2021-03-10 16:50:43 +08:00
ival
9991bf605d 增加确实窗口 2021-03-10 16:48:57 +08:00
joylink_cuiweidong
e8c7fbdfff Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/jmapNew/theme/ningbo_03/menus/menuBar.vue
#	src/jmapNew/theme/ningbo_03/menus/menuDialog/signalCanBlock.vue
 2021-03-10 16:48:26 +08:00
joylink_cuiweidong
96eef9053e 宁波三号线 菜单操作 代码调整 2021-03-10 16:39:53 +08:00
ival
3759386e1f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-10 15:09:24 +08:00
ival
90bdb12e57 线路：宁波3 
问题：优化初始化操作的事件模型
 2021-03-10 15:09:15 +08:00
fan
0b361fd0fc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-10 13:19:39 +08:00
fan
f9c9e25d08 登录路径错误调整 2021-03-10 10:31:16 +08:00
joylink_cuiweidong
4edb42bbbc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-10 10:25:39 +08:00
joylink_cuiweidong
2146b28b9a 宁波三号线 运行线 代码调整 2021-03-10 10:25:05 +08:00
ival
1aa009075f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-09 18:37:31 +08:00
ival
0c98c06440 线路：宁波3 
任务：修改带初始化的界面操作
 2021-03-09 18:37:20 +08:00
fan
b2bb43b47f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-09 15:47:15 +08:00
fan
c9f656c4a7 西安一实训调整 2021-03-09 15:46:54 +08:00
ival
c28be4acd7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-09 14:57:24 +08:00
ival
605280e7d5 1.宁波3号线 操作修正 
2.运行图编辑修改数据计算错误的问题
 2021-03-09 14:57:14 +08:00
fan
f2a7955bf3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-09 14:44:16 +08:00
fan
fd49034b57 南京十一站调整&添加线路配置switchTurnOperationCanRecoverSplitFault 2021-03-09 14:43:40 +08:00
joylink_cuiweidong
5352671383 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/views/planMonitor/editTool/menus/addTask.vue
 2021-03-09 10:34:16 +08:00
ival
b1552ccba5 Merge remote-tracking branch 'remotes/origin/test-tj' into test 
# Conflicts:
#	src/jmapNew/theme/ningbo_03/menus/menuBar.vue
#	src/jmapNew/theme/ningbo_03/menus/menuDialog/signalCanBlock.vue
#	src/jmapNew/theme/ningbo_03/menus/menuDialog/signalGuide.vue
 2021-03-09 10:17:25 +08:00
ival
8febc0c1d1 线路：宁波3 
问题：操作方式调整
 2021-03-09 10:14:16 +08:00
ival
d993771f72 线路：南京2 
问题：修改岔区设限报错问题，以及点击设置store值得优化
 2021-03-09 09:24:08 +08:00
ival
1e881ad0db 线路：南京2 
问题：修改岔区设限报错问题，以及点击设置store值得优化
 2021-03-09 09:20:25 +08:00
fan
ee6d3b41b1 实训调整 2021-03-08 18:03:33 +08:00
fan
48e26565df Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-08 16:20:42 +08:00
fan
a6d81b5e3a 实训调整&ibp图片更换 2021-03-08 16:20:29 +08:00
joylink_cuiweidong
142168fd14 宁波三号线 信号机操作代码调整 2021-03-08 13:49:14 +08:00
joylink_cuiweidong
03cab67c62 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-08 13:13:30 +08:00
joylink_cuiweidong
58c9ac7df7 宁波三号线 信号机 引导 操作代码调整 2021-03-08 13:13:06 +08:00
ival
12b804e110 Merge remote-tracking branch 'remotes/origin/test-tj' into test 2021-03-08 13:05:11 +08:00
ival
788ddfc228 线路：通用menuBar 
问题：点击空白关闭多级菜单时，所有层级都关闭。
 2021-03-08 09:42:02 +08:00