Commit Graph

11290 Commits

Author SHA1 Message Date
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
fan
253408b866 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-10-26 09:41:40 +08:00
fan
b30ad33dfe 实训密码调整 2021-10-25 16:57:41 +08:00
fan
d2cef46f6e IBP局部控制盘 操作描述更改 2021-10-25 11:13:22 +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
07376fc8b9 上饶项目添加设备管理路由 2021-10-19 15:44:43 +08:00
fan
eb1721e2c2 添加上饶沙盘项目登录页面 2021-10-19 15:28:20 +08:00
fan
ed47671b45 南京二号线列车总览列车详览调整 2021-10-18 17:38:40 +08:00
fan
bb085ecddc 日记调整 2021-10-18 11:11:03 +08:00
fan
4dffdb5aba 连续扣车调整 2021-10-18 10:53:48 +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
a18a0db03f 南京二开启车队信号机状态调整 2021-10-15 15:16:06 +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
e8fa057adf 福州一号线实训人工折返策略设置调整 2021-10-14 14:04:05 +08:00