fan
|
00fd8a168b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
Conflicts:
src/views/newMap/displayNew/menuSchema.vue
|
2022-06-15 09:20:26 +08:00 |
|
fan
|
e4fb05c1bf
|
打铁ctc调整
|
2022-06-15 09:18:36 +08:00 |
|
joylink_cuiweidong
|
949e3c3feb
|
大铁项目 车务管理端 代码调整
|
2022-06-14 14:39:07 +08:00 |
|
joylink_cuiweidong
|
dc7a117b0f
|
大铁项目 管理终端 页面 添加
|
2022-06-10 16:23:09 +08:00 |
|
joylink_cuiweidong
|
2a27cf6f46
|
大铁项目 地图绘制 指示灯关联 增加名称属性
|
2022-06-10 10:09:30 +08:00 |
|
fan
|
d36ee77d00
|
ctc显示调整
|
2022-06-09 18:06:47 +08:00 |
|
fan
|
d5e2e69965
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-06-06 16:30:38 +08:00 |
|
fan
|
19e70608a0
|
ctc显示调整 06/06
|
2022-06-06 16:29:42 +08:00 |
|
joylink_cuiweidong
|
942f728596
|
大铁项目 CTC 运行计划列表 代码调整
|
2022-06-02 15:13:59 +08:00 |
|
fan
|
270c32052c
|
ctc显示调整 05/31
|
2022-05-31 18:09:34 +08:00 |
|
fan
|
81667572fc
|
实训仿真结束 退出实训界面
|
2022-05-30 17:34:44 +08:00 |
|
fan
|
85dac873de
|
ctc界面调整2
|
2022-05-30 17:28:46 +08:00 |
|
fan
|
758b5b69e2
|
ctc界面调整1
|
2022-05-27 15:55:03 +08:00 |
|
fan
|
2d4a196dc8
|
区段增加方向运行端点
|
2022-05-27 15:54:14 +08:00 |
|
fan
|
5ebb0139ec
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-05-27 09:51:51 +08:00 |
|
fan
|
6149770821
|
指示灯关联调整
|
2022-05-27 09:51:29 +08:00 |
|
joylink_cuiweidong
|
8127b76cb6
|
大铁项目 仿真 不显示 时间
|
2022-05-25 14:18:55 +08:00 |
|
fan
|
7a7cbf9ae8
|
大铁调整 n5
|
2022-05-23 15:11:55 +08:00 |
|
fan
|
85fd48f700
|
大铁调整 n1
|
2022-05-11 14:56:08 +08:00 |
|
fan
|
88b21fc723
|
信号机增加类型
|
2022-05-09 09:12:48 +08:00 |
|
fan
|
826fbae799
|
大铁线路调整31
|
2022-05-06 14:22:26 +08:00 |
|
fan
|
aee6474645
|
大铁线路调整30
|
2022-05-05 17:08:17 +08:00 |
|
fan
|
7c8cbdf59c
|
大铁线路调整27 增加信号机类型
|
2022-04-29 16:32:23 +08:00 |
|
fan
|
7c2cddd441
|
大铁线路调整26 关联信号机调整
|
2022-04-28 13:34:17 +08:00 |
|
fan
|
7e8fdaf1a3
|
大铁线路调整25
|
2022-04-28 10:40:18 +08:00 |
|
fan
|
af2ffa23f3
|
大铁线路调整24 指示灯关联联锁数据调整
|
2022-04-28 10:35:41 +08:00 |
|
fan
|
1c04fd0bd6
|
大铁线路调整23
|
2022-04-27 17:35:36 +08:00 |
|
fan
|
0c57bdac50
|
大铁线路调整21
|
2022-04-24 17:06:21 +08:00 |
|
fan
|
9ed6c38a4e
|
大铁线路调整20
|
2022-04-24 15:20:12 +08:00 |
|
fan
|
b8a27f74aa
|
大铁线路调整19
|
2022-04-24 14:05:08 +08:00 |
|
fan
|
216166c572
|
大铁线路调整18
|
2022-04-24 14:03:48 +08:00 |
|
fan
|
279522f544
|
大铁线路调整17 precess调整
|
2022-04-24 13:17:57 +08:00 |
|
fan
|
e24b992ab9
|
大铁线路调整15
|
2022-04-24 11:14:44 +08:00 |
|
fan
|
a32a230ed8
|
大铁线路调整14
|
2022-04-24 11:04:04 +08:00 |
|
fan
|
3202fc1b40
|
大铁线路调整12
|
2022-04-22 19:13:44 +08:00 |
|
fan
|
93a3deb20c
|
大铁线路调整11
|
2022-04-22 17:55:42 +08:00 |
|
fan
|
3420059adf
|
大铁线路调整10
|
2022-04-22 16:34:34 +08:00 |
|
fan
|
daff80c19e
|
大铁线路调整9
|
2022-04-22 15:33:57 +08:00 |
|
fan
|
5e30c99d2c
|
大铁线路调整8
|
2022-04-22 14:40:31 +08:00 |
|
fan
|
140f6306ed
|
大铁线路调整7
|
2022-04-21 16:13:33 +08:00 |
|
fan
|
c5d60323e2
|
大铁线路调整6 联锁数据调整
|
2022-04-21 15:10:43 +08:00 |
|
fan
|
a045d2c776
|
大铁线路调整5
|
2022-04-21 10:02:13 +08:00 |
|
fan
|
c0bbf35455
|
大铁线路调整4
|
2022-04-19 17:55:27 +08:00 |
|
fan
|
0099c51a9d
|
大铁线路调整3
|
2022-04-19 16:14:17 +08:00 |
|
fan
|
1dcb5fe1dc
|
大铁线路调整2
(cherry picked from commit 6ed22109af )
|
2022-04-18 15:02:14 +08:00 |
|
fan
|
2f82b1729b
|
大铁线路调整
(cherry picked from commit 7fbe309f70 )
|
2022-04-18 15:01:47 +08:00 |
|
fan
|
92d192cfe5
|
联系方式调整
|
2022-03-15 10:04:39 +08:00 |
|
joylink_fanyuhong
|
12c3572807
|
iscs调整
|
2022-01-19 17:23:25 +08:00 |
|
“sunzy”
|
f2f2878a99
|
修改配置地址
|
2021-12-30 19:36:26 +08:00 |
|
joylink_fanyuhong
|
a7c56b3592
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-12-30 09:35:11 +08:00 |
|
joylink_fanyuhong
|
c4e9ab2341
|
扬州工业展示修改
|
2021-12-29 14:01:28 +08:00 |
|
joylink_fanyuhong
|
3c2563e3d1
|
暂提
|
2021-12-29 13:44:05 +08:00 |
|
fan
|
4b4b98003c
|
Merge remote-tracking branch 'origin/test'
|
2021-12-16 18:10:04 +08:00 |
|
fan
|
c98fd9e0e0
|
批量设置停车点偏移量增加停车轨设置
|
2021-12-13 18:06:29 +08:00 |
|
fan
|
afeec55025
|
延续保护 增加 保护区段ctc
|
2021-12-09 16:53:40 +08:00 |
|
fan
|
7b854e717e
|
显示配置车次窗设备修正=》判断调整
|
2021-12-09 14:57:55 +08:00 |
|
fan
|
17e7467edf
|
显示配置增加车次窗设备修正&加载备用车close时清除数据
|
2021-12-09 13:48:15 +08:00 |
|
fan
|
5a5dd046eb
|
仿真右侧列车显示过滤&加载备用车置灰已上线车辆
|
2021-12-07 14:10:07 +08:00 |
|
|
9631685998
|
Merge remote-tracking branch 'origin/test'
|
2021-12-06 21:19:18 +08:00 |
|
fan
|
830a630155
|
停车轨左右停车偏移放开
|
2021-12-03 17:50:37 +08:00 |
|
fan
|
84c4dd8ca1
|
批量翻转车头&车辆段仿真开放按计划行车和故障操作
|
2021-12-03 17:44:02 +08:00 |
|
fan
|
5ca3ca93ab
|
车辆段调整=》区段增加parkingTrack&列车增加stationCode&联锁配置项增加handleDepot
|
2021-12-03 13:25:20 +08:00 |
|
fan
|
690989cf75
|
南京二号线道岔问题调整
|
2021-11-29 14:41:03 +08:00 |
|
fan
|
054db072cf
|
Merge remote-tracking branch 'origin/test'
|
2021-11-29 13:38:44 +08:00 |
|
fan
|
0788172481
|
南京二号线问题调整
|
2021-11-26 17:37:22 +08:00 |
|
fan
|
07025e79e5
|
岔芯=》岔心&南京二岔芯实训增加强行消限、预复位&南二日记报错处理
|
2021-11-25 16:37:44 +08:00 |
|
fan
|
eee7c9fae4
|
南京二号线设置车站中心增加偏移
|
2021-11-25 13:48:50 +08:00 |
|
|
a09ec3dd13
|
Merge remote-tracking branch 'origin/test'
|
2021-11-25 12:11:19 +08:00 |
|
fan
|
034bb7e185
|
南京二号线列车右键操作不出列监
|
2021-11-25 10:47:12 +08:00 |
|
fan
|
d39a551142
|
南京二连续扣车参数调整&&南京二troDetail禁止拖动&&增加南京二行调故障按钮
|
2021-11-25 10:41:43 +08:00 |
|
fan
|
15cf2838da
|
南京二故障显示调整& 实训调整
|
2021-11-23 14:04:11 +08:00 |
|
fan
|
5412bb8ff0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-11-22 14:09:42 +08:00 |
|
fan
|
a617144386
|
调整南京二实训配置
|
2021-11-22 14:08:47 +08:00 |
|
|
d2217734e0
|
Merge remote-tracking branch 'origin/test'
|
2021-11-19 21:04:03 +08:00 |
|
joylink_cuiweidong
|
a0cdca405a
|
代码调整
|
2021-11-15 18:13:35 +08:00 |
|
fan
|
dd83568d04
|
地图绘制设置运行等级激活起始区段调整
|
2021-11-15 09:50:37 +08:00 |
|
fan
|
99088c9c4f
|
地图绘制设置运行等级报错调整
|
2021-11-15 09:41:00 +08:00 |
|
|
36630fd2ce
|
Merge branch 'test'
|
2021-11-13 20:46:59 +08:00 |
|
fan
|
fa9d0bb152
|
上饶沙盘&江西工贸 行调界面 不展示 chatView
|
2021-11-12 09:46:51 +08:00 |
|
fan
|
f5cca2da38
|
上饶沙盘&江西工贸 行调界面 不展示 chatView
|
2021-11-12 09:43:16 +08:00 |
|
fan
|
3ba20ae75c
|
上饶沙盘 列车操作
|
2021-11-08 14:55:03 +08:00 |
|
jade
|
2fd498aaf6
|
Merge remote-tracking branch 'origin/test'
|
2021-11-04 18:18:38 +08:00 |
|
fan
|
c4d754f1b9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-11-03 15:50:06 +08:00 |
|
fan
|
47eda59ad3
|
不展示计划车问题调整
|
2021-11-03 15:49:47 +08:00 |
|
joylink_cuiweidong
|
cf18a2dae2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-11-03 14:24:15 +08:00 |
|
joylink_cuiweidong
|
626ff900f5
|
代码调整
|
2021-11-03 14:23:52 +08:00 |
|
fan
|
1f7b6f5dc1
|
取消设备登录鼠标悬浮车次窗会展示&上饶项目登录不展示按计划行车
|
2021-11-03 14:06:00 +08:00 |
|
fan
|
a4172815ca
|
设备管理添加新的设备类型,修改设备配置接口
|
2021-11-03 13:48:35 +08:00 |
|
fan
|
6dc6e9725b
|
增加 城轨国赛竞赛系统(和利时)页面
|
2021-10-29 10:37:02 +08:00 |
|
fan
|
95d2200907
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_nanjing
|
2021-10-28 17:02:58 +08:00 |
|
fan
|
164386c9a1
|
南京二综合演练行调仿真调整
|
2021-10-28 16:02:26 +08:00 |
|
fan
|
db682c319b
|
Merge remote-tracking branch 'origin/test'
|
2021-10-27 18:02:58 +08:00 |
|
fan
|
ba38a19309
|
现地仿真实训显示问题调整
|
2021-10-27 17:51:27 +08:00 |
|
fan
|
36e4e72adf
|
现地仿真实训不展示停车场车辆段
|
2021-10-27 17:09:30 +08:00 |
|
fan
|
32a31a1eed
|
Merge remote-tracking branch 'origin/test'
# Conflicts:
# src/views/newMap/jointTrainingNew/menuDemon.vue
|
2021-10-27 13:09:12 +08:00 |
|
fan
|
5be842b664
|
南京二 综合演练行调界面调整暂提
|
2021-10-27 13:06:07 +08:00 |
|
fan
|
ed47671b45
|
南京二号线列车总览列车详览调整
|
2021-10-18 17:38:40 +08:00 |
|
fan
|
6fa514b99e
|
南京二号线列监创建列车 参数调整
|
2021-10-18 10:14:02 +08:00 |
|
fan
|
76c2589c54
|
ZC创建报错处理
|
2021-10-15 14:43:38 +08:00 |
|
fan
|
2625b66892
|
南京二号线atr&tmt调整
|
2021-10-15 14:15:23 +08:00 |
|