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 |
|
fan
|
2028a73d19
|
大屏分屏prdType写死
|
2021-10-14 09:35:32 +08:00 |
|
fan
|
37aa25a453
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-10-14 09:18:18 +08:00 |
|
fan
|
e620df092c
|
南京二号线行调问题调整
|
2021-10-14 09:18:06 +08:00 |
|
yuan
|
f5f4db14c5
|
大屏登录后跳转url增加prdType字段用于车辆段显隐处理
|
2021-10-13 17:16:13 +08:00 |
|
fan
|
b3b5780a27
|
南京二号线行调调整
|
2021-10-12 15:50:02 +08:00 |
|
fan
|
720a638720
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-10-12 14:31:58 +08:00 |
|
fan
|
5768b8d263
|
南京二号线车站调整
|
2021-10-12 14:31:49 +08:00 |
|
yuan
|
36bd886cb2
|
设备管理增加派班工作站,修改车辆段和派班工作站的路径
|
2021-10-12 11:02:36 +08:00 |
|
fan
|
4acb11fa2d
|
区段信号机道岔添加字段srCode 沙盘设备编号
|
2021-10-12 10:52:37 +08:00 |
|
fan
|
414e7f16a4
|
大屏配置回显
|
2021-10-12 10:36:25 +08:00 |
|
fan
|
e4d8d5650e
|
大屏显示调整 （调用行调配置处理设备）
|
2021-10-12 09:36:52 +08:00 |
|
fan
|
d9c040dbe9
|
ISCS 订阅调整
|
2021-10-11 17:45:15 +08:00 |
|
fan
|
48efa2cfb8
|
车辆段显示位置初始化调整
|
2021-10-11 16:41:56 +08:00 |
|
fan
|
edc9fee0a7
|
南京二号线计算行车间隔指令参数调整
|
2021-10-11 14:24:31 +08:00 |
|
fan
|
2454ed857f
|
Merge remote-tracking branch 'origin/test'
|
2021-10-09 15:45:42 +08:00 |
|
fan
|
6e5ceeeb66
|
关闭南京二号线行调显示界面
|
2021-10-09 15:44:00 +08:00 |
|
fan
|
ee7d8e9300
|
南京二号线调整行车间隔
|
2021-10-08 09:53:49 +08:00 |
|
fan
|
4c5bc63030
|
南京二行调增加日记界面和命令界面
|
2021-09-30 09:43:10 +08:00 |
|
fan
|
34b156df80
|
侧防列表显示调整
|
2021-09-29 17:02:37 +08:00 |
|
fan
|
fd6e7c9f09
|
南京二号线 atr 列车信息
|
2021-09-29 15:35:26 +08:00 |
|
sunzhenyu
|
d23143a1cb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-09-29 13:18:31 +08:00 |
|
sunzhenyu
|
36fee6efda
|
其他三维相关内容分拆
|
2021-09-29 13:18:24 +08:00 |
|
fan
|
01732b6b9a
|
修正： 现地显示配置生成权限的时候未生成车站数据
|
2021-09-29 09:46:25 +08:00 |
|
fan
|
f1b3b9ab8f
|
Merge remote-tracking branch 'origin/test'
# Conflicts:
# src/scripts/ProjectConfig.js
|
2021-09-28 18:41:07 +08:00 |
|
fan
|
096e87803d
|
综合演练列车显示bug调整
|
2021-09-28 18:16:05 +08:00 |
|
fan
|
8aa97948b6
|
车辆段联锁工作站 增加初始化
|
2021-09-28 17:44:25 +08:00 |
|
fan
|
86be83d612
|
综合演练车辆段切行调现地显示调整
|
2021-09-28 13:10:12 +08:00 |
|
fan
|
6786dd92f4
|
进路预览进路编辑增加 endButtonSignalCode
|
2021-09-28 11:26:30 +08:00 |
|
fan
|
aedf08b85f
|
排列进路问题调整
|
2021-09-28 10:01:48 +08:00 |
|
fan
|
15f5fdf664
|
综合演练切换车联段停车场后显示调整
|
2021-09-28 09:42:00 +08:00 |
|
fan
|
673d2e474c
|
添加信号机类型出段信号机 进段信号机
|
2021-09-27 16:43:57 +08:00 |
|
fan
|
4225f58d50
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-09-27 14:38:26 +08:00 |
|
fan
|
6df79d9ca9
|
aspect W&B处理
|
2021-09-27 10:45:08 +08:00 |
|
sunzhenyu
|
64cbe4c857
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-09-27 10:24:24 +08:00 |
|
sunzhenyu
|
47ec0a8b7d
|
修改三维驾驶atp按钮，修改屏蔽门不开bug
|
2021-09-27 10:24:15 +08:00 |
|
fan
|
306bdb7cba
|
仿真结束清除SimulationUserList
|
2021-09-26 18:11:13 +08:00 |
|
fan
|
48ea31da91
|
导出地图取消必选和默认选中&删除调试日志
|
2021-09-26 17:55:08 +08:00 |
|
fan
|
0928d8cfa9
|
显示配置中添加信号机位置修正
|
2021-09-26 17:37:57 +08:00 |
|
fan
|
48d4a7129f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-09-26 16:02:20 +08:00 |
|
fan
|
c79329cee7
|
显示配置 select label 调整
|
2021-09-26 16:02:03 +08:00 |
|
sunzhenyu
|
db908d63a1
|
修改三維駕駛psl
|
2021-09-26 15:01:07 +08:00 |
|
sunzhenyu
|
589747ae92
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-09-26 14:27:44 +08:00 |
|
sunzhenyu
|
c73386766a
|
修改三维驾驶信息显示，剔除无用方法
|
2021-09-26 14:27:36 +08:00 |
|
fan
|
e543b6e357
|
模型初始值添加 显示方向 showRight
|
2021-09-26 13:32:08 +08:00 |
|
fan
|
28da81ef1f
|
批量反向操作提示调整
|
2021-09-26 13:21:19 +08:00 |
|
fan
|
ab8ff51a0e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-09-26 13:07:31 +08:00 |
|
fan
|
b0e387edd6
|
故障枚举值修改
|
2021-09-26 13:07:16 +08:00 |
|
sunzhenyu
|
bf8631c521
|
修改三维驾驶消息加边框，按钮和后端同步，ato亮灯规则修改
|
2021-09-26 11:21:00 +08:00 |
|
sunzhenyu
|
7b5f4de1bd
|
修改三维驾驶亮灯
|
2021-09-26 09:52:54 +08:00 |
|
sunzhenyu
|
577828dd6f
|
三维驾驶按钮样式调整
|
2021-09-24 17:39:37 +08:00 |
|
sunzhenyu
|
8ff4f20e06
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-09-24 17:20:21 +08:00 |
|
sunzhenyu
|
41536232f6
|
增加三维驾驶psl
|
2021-09-24 17:20:15 +08:00 |
|
fan
|
18cf41f555
|
merge
|
2021-09-24 16:51:25 +08:00 |
|
fan
|
5c9cd85d52
|
显示配置调整
|
2021-09-24 16:49:57 +08:00 |
|
sunzhenyu
|
93ca66674c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-09-24 16:29:22 +08:00 |
|
sunzhenyu
|
5d01ca21b4
|
修改三维驾驶操作
|
2021-09-24 16:29:12 +08:00 |
|
fan
|
549079fbdb
|
增加批量反向操作（区段左右关联关系信号机运行方向反向）， 信号机批量设置显示方向，新增信号机显示方向字段showRight
|
2021-09-24 15:05:50 +08:00 |
|
sunzhenyu
|
8e34f93a9d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-09-24 10:04:14 +08:00 |
|
sunzhenyu
|
f9ed9cca22
|
修改三维列车驾驶
|
2021-09-24 10:04:05 +08:00 |
|
fan
|
e0abfe2798
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-09-22 10:12:30 +08:00 |
|
fan
|
19a6663762
|
添加信号机型号 黄红白（列车兼调车信号机）
|
2021-09-22 10:12:15 +08:00 |
|
sunzhenyu
|
d92906d7d5
|
修改三维课程大铁考试数据结构
|
2021-09-18 18:01:53 +08:00 |
|
joylink_cuiweidong
|
14324f80dc
|
代码调整
|
2021-09-16 15:56:06 +08:00 |
|
fan
|
40624c3177
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-09-15 17:35:40 +08:00 |
|
fan
|
7f6f3f0db1
|
清除设备setShowMode函数&&岔芯显示问题调整
|
2021-09-15 17:35:27 +08:00 |
|
sunzhenyu
|
6ad577695f
|
merge
|
2021-09-15 17:15:34 +08:00 |
|
sunzhenyu
|
739d3749b7
|
综合演练三维通号故障增加，北交大站台车厢三维通信修改
|
2021-09-15 17:14:51 +08:00 |
|
fan
|
6bc79aca79
|
merge
|
2021-09-15 16:58:27 +08:00 |
|
fan
|
01fa5856dc
|
显示问题调整
|
2021-09-15 16:56:25 +08:00 |
|
yuan
|
7b3a441b5d
|
地图草稿列表增加一键删除按钮
|
2021-09-15 16:54:49 +08:00 |
|
joylink_cuiweidong
|
1a06ea9c43
|
福州一号线 车辆段仿真 车站station操作调整
|
2021-09-14 18:07:05 +08:00 |
|
joylink_cuiweidong
|
f1f2bf4029
|
Merge remote-tracking branch 'remotes/origin/test' into test_deplotSimulation
# Conflicts:
# src/jmapNew/shape/graph/Switch/index.js
# src/utils/baseUrl.js
# src/views/newMap/displayNew/menuSchema.vue
|
2021-09-14 17:15:37 +08:00 |
|
fan
|
05854c4239
|
车辆段显示调整
|
2021-09-14 17:10:00 +08:00 |
|
joylink_cuiweidong
|
0c356f18b8
|
福州一号线 车辆段仿真 去除多余的按钮（button)
|
2021-09-14 16:53:23 +08:00 |
|
joylink_cuiweidong
|
5e3006bf91
|
Merge remote-tracking branch 'remotes/origin/test_switch' into test_deplotSimulation
|
2021-09-14 10:56:03 +08:00 |
|
fan
|
c425aa572b
|
贵装备综合演练添加cctv
|
2021-09-14 09:52:06 +08:00 |
|
fan
|
13ff4ae7c0
|
显示配置添加清除配置
|
2021-09-14 09:37:20 +08:00 |
|
fan
|
7e02fa4f1c
|
行调显示配置自动生成添加车站 && 信号机recover隐藏箭头
|
2021-09-13 18:14:29 +08:00 |
|
fan
|
c0831fd403
|
数据操作 配置 点击响应范围调整&生成车辆段联锁数据后关闭弹框
|
2021-09-13 17:51:12 +08:00 |
|
fan
|
8c8fa154d3
|
车辆段生成联锁数据3
|
2021-09-13 16:49:55 +08:00 |
|
fan
|
b1042ee52b
|
车辆段生成联锁数据
|
2021-09-13 16:26:08 +08:00 |
|
fan
|
de040bdc45
|
生成车辆段联锁数据
|
2021-09-13 16:24:00 +08:00 |
|
fan
|
e84bbf7470
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_display
|
2021-09-13 15:33:09 +08:00 |
|
fan
|
083362cde8
|
ISCS新添状态调整
|
2021-09-13 15:19:46 +08:00 |
|
yuan
|
de11b14023
|
bugfix
|
2021-09-13 15:00:57 +08:00 |
|
yuan
|
11f4805417
|
bugfix
|
2021-09-13 14:58:48 +08:00 |
|
yuan
|
106307b9cc
|
Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into test
|
2021-09-13 14:22:50 +08:00 |
|
yuan
|
12a585b93a
|
导入导出bugfix
|
2021-09-13 14:19:34 +08:00 |
|
fan
|
bef8fee318
|
绘图显现调整
|
2021-09-13 13:43:24 +08:00 |
|
yuan
|
b5eab3f1cd
|
Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into yly_ElmImport
|
2021-09-13 11:12:22 +08:00 |
|
yuan
|
0f74396bab
|
地图绘制-元素导入导出
|
2021-09-13 11:02:45 +08:00 |
|
fan
|
0bb4fe4008
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_display
|
2021-09-13 10:14:15 +08:00 |
|
fan
|
cd69b0ff63
|
merge
|
2021-09-13 10:12:20 +08:00 |
|
fan
|
9f743c2521
|
Revert "Revert "Revert "显示配置调整"""
This reverts commit 2086a06d
|
2021-09-13 10:04:44 +08:00 |
|
fan
|
51d54d2463
|
添加CTC级别是否办理延续保护
|
2021-09-13 10:04:01 +08:00 |
|
fan
|
ba7233d1c8
|
Revert "Revert "Revert "显示配置调整"""
This reverts commit 15cfbd02
|
2021-09-13 10:00:03 +08:00 |
|
fan
|
2f703ebedb
|
merge
|
2021-09-13 09:51:22 +08:00 |
|
joylink_cuiweidong
|
a4cab2090e
|
删掉 中航锐创 实训平台 虚拟cctv页面 退出按钮
|
2021-09-13 09:29:38 +08:00 |
|
fan
|
b130f4ce5b
|
显示调整
|
2021-09-13 09:06:50 +08:00 |
|