joylink_cuiweidong
|
bc89210894
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-12-09 17:57:41 +08:00 |
|
joylink_cuiweidong
|
a97f83ef45
|
运行图代码调整
|
2021-12-09 17:56:54 +08:00 |
|
fan
|
66b72b101f
|
增加江苏安全技术职业学院登录页面
|
2021-12-09 17:54:19 +08:00 |
|
fan
|
afeec55025
|
延续保护 增加 保护区段ctc
|
2021-12-09 16:53:40 +08:00 |
|
fan
|
7b854e717e
|
显示配置车次窗设备修正=》判断调整
|
2021-12-09 14:57:55 +08:00 |
|
fan
|
27a56355dd
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-12-09 13:48:41 +08:00 |
|
fan
|
17e7467edf
|
显示配置增加车次窗设备修正&加载备用车close时清除数据
|
2021-12-09 13:48:15 +08:00 |
|
joylink_cuiweidong
|
8b86a8ddeb
|
运行图编制 添加计划/修改计划号码 代码调整
|
2021-12-09 13:23:24 +08:00 |
|
joylink_cuiweidong
|
3ee1dd21e5
|
运行图编制 新增计划 根据配置文件 设置服务号长度
|
2021-12-09 10:57:28 +08:00 |
|
sunzhenyu
|
32b785280e
|
merge
|
2021-12-08 15:11:48 +08:00 |
|
sunzhenyu
|
1ef4810214
|
修改开发模式下三维模型存储配置,添加沙盘天气图标
|
2021-12-08 15:09:54 +08:00 |
|
fan
|
e942f94c25
|
增加线路配置:tripNumberIsUnique:运行图中车次号是否唯一
|
2021-12-08 14:53:14 +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 |
|
sunzhenyu
|
8923a888c8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-12-02 10:00:49 +08:00 |
|
sunzhenyu
|
fd10d6532f
|
修改三维驾驶设备柜
|
2021-12-02 10:00:41 +08:00 |
|
fan
|
7cc99b0a08
|
请求服务器域名调整&增减管理界面
|
2021-11-30 16:27:35 +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
|
6014c6253e
|
扬州工业项目登录参数调整
|
2021-11-29 13:15:52 +08:00 |
|
fan
|
4c9d9b6705
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-11-26 17:38:32 +08:00 |
|
fan
|
0788172481
|
南京二号线问题调整
|
2021-11-26 17:37:22 +08:00 |
|
sunzhenyu
|
fc0393ff08
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-11-26 17:24:05 +08:00 |
|
sunzhenyu
|
7d734bc554
|
修改展示线路三维车站加载,修改徐州三维课程
|
2021-11-26 17:23:56 +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 |
|
sunzhenyu
|
94de3ba762
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-11-19 15:05:23 +08:00 |
|
sunzhenyu
|
343d71fdab
|
增加徐州三维课程案例
|
2021-11-19 15:05:16 +08:00 |
|
joylink_cuiweidong
|
a0cdca405a
|
代码调整
|
2021-11-15 18:13:35 +08:00 |
|
fan
|
dd83568d04
|
地图绘制设置运行等级激活起始区段调整
|
2021-11-15 09:50:37 +08:00 |
|
fan
|
ab87adabb3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-11-15 09:41:17 +08:00 |
|
fan
|
99088c9c4f
|
地图绘制设置运行等级报错调整
|
2021-11-15 09:41:00 +08:00 |
|
|
36630fd2ce
|
Merge branch 'test'
|
2021-11-13 20:46:59 +08:00 |
|
sunzhenyu
|
c1ef47929a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-11-12 14:40:02 +08:00 |
|
sunzhenyu
|
beb96905e5
|
修改三维课程组件,增加点击提示音
|
2021-11-12 14:39:43 +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
|
ba7b9f39eb
|
增加江西工贸登录页面
|
2021-11-11 14:32:58 +08:00 |
|
sunzhenyu
|
a46018cdbe
|
修改三维驾驶托管
|
2021-11-09 18:11:15 +08:00 |
|
joylink_cuiweidong
|
0505d5d4d3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-11-09 10:22:21 +08:00 |
|
joylink_cuiweidong
|
7e9259be88
|
运行图
修改表号的时候 自动补零位数调整
修改任务的时候,没选交路不允许提交
|
2021-11-09 10:22:02 +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
|
d18bd5ea6c
|
删除设备管理多余接口&线路配置signalForceCancelRoute=》singleApproachLockCancelRoute
|
2021-11-04 16:38:39 +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
|
980f06ecb9
|
剧本编制代码调整
|
2021-11-03 14:45:28 +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
|
2e0449bb43
|
国赛设计平台登录 调整
|
2021-11-01 13:37:43 +08:00 |
|
fan
|
24473bb1f3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_nanjing
|
2021-10-29 10:37:15 +08:00 |
|
fan
|
6dc6e9725b
|
增加 城轨国赛竞赛系统(和利时)页面
|
2021-10-29 10:37:02 +08:00 |
|
sunzhenyu
|
fe156c28bb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-10-28 18:04:32 +08:00 |
|
sunzhenyu
|
7984983f12
|
增加三维沙盘天气模块
|
2021-10-28 18:04:25 +08:00 |
|
fan
|
d8a377dd69
|
删除上次提交带的日志
|
2021-10-28 17:17:45 +08:00 |
|
fan
|
92dc2798cd
|
教学管理增加导入学生模板校验
|
2021-10-28 17:16:44 +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 |
|
sunzhenyu
|
97d486d450
|
修改三维课程
|
2021-10-22 18:07:12 +08:00 |
|
sunzhenyu
|
34efc14cf0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-10-21 16:59:10 +08:00 |
|
sunzhenyu
|
2792cafd3a
|
修改三维编辑器
|
2021-10-21 16:59:03 +08:00 |
|
fan
|
c8570ec853
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-10-20 15:48:01 +08:00 |
|
fan
|
211f7df03b
|
设备管理添加设备类型
|
2021-10-20 15:47:48 +08:00 |
|
sunzhenyu
|
287af31db5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-10-19 18:10:45 +08:00 |
|
sunzhenyu
|
a2b55b62f6
|
修改三维课程编辑器
|
2021-10-19 18:10:32 +08:00 |
|
fan
|
0d5a57fe11
|
设备管理添加项目
|
2021-10-19 15:53:04 +08:00 |
|
fan
|
ed47671b45
|
南京二号线列车总览列车详览调整
|
2021-10-18 17:38:40 +08:00 |
|
fan
|
12c16cb9d7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-10-18 10:14:14 +08:00 |
|
fan
|
6fa514b99e
|
南京二号线列监创建列车 参数调整
|
2021-10-18 10:14:02 +08:00 |
|
sunzhenyu
|
27f6f47288
|
修改三维课程编辑器事件参数
|
2021-10-15 18:16:16 +08:00 |
|
sunzhenyu
|
2e5b6d6fbf
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-10-15 18:10:53 +08:00 |
|
sunzhenyu
|
3660628203
|
修改三维课程编辑器,增加动画事件逻辑
|
2021-10-15 18:10:46 +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 |
|
fan
|
f0328df54f
|
南京二号线atr调整
|
2021-10-15 11:03:41 +08:00 |
|
fan
|
9960b87c42
|
绘图调整 区段可以同时为转换轨或折返轨
|
2021-10-15 10:16:59 +08:00 |
|
fan
|
c81d4301fa
|
南京二号线列监调整
|
2021-10-15 09:54:21 +08:00 |
|
fan
|
3271ef15b6
|
获取车辆段偏移增加限制
|
2021-10-14 18:05:24 +08:00 |
|
fan
|
6979eaf778
|
menubutton 增加scope
|
2021-10-14 16:57:24 +08:00 |
|
fan
|
e02efd15ff
|
iscs订阅调整
|
2021-10-14 16:12:37 +08:00 |
|
fan
|
a53a4435d6
|
南京二号线列监操作调整
|
2021-10-14 15:34:52 +08:00 |
|
fan
|
5498a7e756
|
司机、通号增加初始化设备显隐
|
2021-10-14 14:13:55 +08:00 |
|
fan
|
c319a73f0c
|
南京二添加列车后按计划行车列车不消失问题修复
|
2021-10-14 13:35:43 +08:00 |
|