joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity
11,714 Commits 20 Branches 0 Tags 448 MiB
808ae31174
Commit Graph

7090 Commits

Author SHA1 Message Date
fan
c0bbf35455 大铁线路调整4 2022-04-19 17:55:27 +08:00
fan
e07e06a3bf Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-04-19 16:14:41 +08:00
fan
0099c51a9d 大铁线路调整3 2022-04-19 16:14:17 +08:00
joylink_cuiweidong
4d694c459c 代码调整 2022-04-19 14:07:27 +08:00
joylink_cuiweidong
46fa576fa4 代码调整 2022-04-19 14:03:06 +08:00
joylink_cuiweidong
3b839937ac 代码调整 2022-04-19 13:45:00 +08:00
joylink_cuiweidong
4b86b7ac03 代码调整 2022-04-18 18:54:21 +08:00
joylink_cuiweidong
0312ebd77c 代码调整 2022-04-18 18:43:39 +08:00
joylink_cuiweidong
63ecb61501 代码调整 2022-04-18 17:13:54 +08:00
joylink_cuiweidong
377c1d34b6 代码调整 2022-04-18 17:10:12 +08:00
joylink_cuiweidong
955311e03c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-04-18 16:20:23 +08:00
joylink_cuiweidong
dfec35ff2c 代码调整 2022-04-18 15:41:37 +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
joylink_cuiweidong
3c109157c7 成绩统计代码调整 2022-04-18 14:40:05 +08:00
joylink_cuiweidong
5793ba270d 学生统计信息代码调整 2022-04-18 09:28:37 +08:00
joylink_cuiweidong
9b094a9814 代码调整 2022-04-15 18:45:08 +08:00
joylink_cuiweidong
e3da35b4df 代码调整 2022-04-15 15:26:12 +08:00
joylink_cuiweidong
75314eb114 学生统计页面添加 2022-04-15 14:46:24 +08:00
joylink_cuiweidong
e3b0189705 成绩统计 代码调整 2022-04-15 13:12:45 +08:00
joylink_cuiweidong
643467f9d2 学生单次考试成绩 页面添加 2022-04-15 13:10:29 +08:00
fan
92d192cfe5 联系方式调整 2022-03-15 10:04:39 +08:00
“sunzy”
f459c01246 增加三位课程页面滚动条 2022-01-24 09:55:52 +08:00
“sunzy”
6723006d27 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-01-21 17:36:42 +08:00
“sunzy”
8cb833d38c 修改三位课程例子事件，修改第一人称视角初始方向，增加徐州课程 2022-01-21 17:36:03 +08:00
joylink_fanyuhong
e9638e2524 提示调整 2022-01-21 13:55:37 +08:00
joylink_fanyuhong
31b5e1631b iscs调整 
(cherry picked from commit 38b1beeef5)
 2022-01-20 19:08:05 +08:00
joylink_fanyuhong
4b3376ec27 iscs调整 2022-01-19 17:56:27 +08:00
joylink_fanyuhong
1945434421 iscs调整 2022-01-19 17:41:46 +08:00
joylink_fanyuhong
732c9de068 iscs调整 2022-01-19 17:35:52 +08:00
joylink_fanyuhong
12c3572807 iscs调整 2022-01-19 17:23:25 +08:00
joylink_fanyuhong
9b8fdc0c7e iscs调整 2022-01-19 14:31:18 +08:00
joylink_fanyuhong
77040e93f4 iscs调整 2022-01-19 14:03:07 +08:00
joylink_fanyuhong
8d3a20cc01 iscs调整 2022-01-19 11:21:58 +08:00
joylink_fanyuhong
bcf3188046 iscs调整 2022-01-19 10:09:51 +08:00
joylink_fanyuhong
be904acb58 iscs调整 2022-01-19 10:09:12 +08:00
joylink_fanyuhong
39a2a21b95 iscs调整 2022-01-18 17:42:58 +08:00
joylink_fanyuhong
f1c77eca34 iscs调整 2022-01-18 16:50:24 +08:00
joylink_fanyuhong
cca82978c7 iscs调整 2022-01-18 16:43:26 +08:00
joylink_fanyuhong
3e15722d05 iscs调整 2022-01-18 15:51:24 +08:00
joylink_fanyuhong
a3d388ec96 iscs调整 2022-01-18 14:43:51 +08:00
joylink_fanyuhong
5b8681a9ff iscs调整 2022-01-17 16:23:22 +08:00
joylink_fanyuhong
a1696e7f06 iscs调整 2022-01-17 15:08:34 +08:00
joylink_fanyuhong
8194c24f4d iscs调整 2022-01-17 14:43:17 +08:00
joylink_fanyuhong
e8fb8abcf2 iscs调整 2022-01-17 14:19:03 +08:00
joylink_fanyuhong
02a499a26c iscs调整 2022-01-14 17:23:25 +08:00
joylink_fanyuhong
7372eb5897 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-01-13 16:14:28 +08:00
joylink_fanyuhong
b084600199 福州ISCS显示调整&音频资源管理&ISCS设备管理&ISCS资源管理 2022-01-13 16:08:23 +08:00
“sunzy”
e3f5ff363b 修改三维课程bug 2022-01-12 11:11:25 +08:00
“sunzy”
fbcef50f40 修改徐州三维课程排序，修改课程模式获取 2022-01-12 11:08:27 +08:00
“sunzy”
b34d46bd15 修改三位课程播放器动画，增加课程 2022-01-10 18:13:06 +08:00
“sunzy”
9974d6bc8a 修改徐州三维课程界面，三位课程播放器增加粒子效果 2022-01-07 17:40:51 +08:00
“sunzy”
a08dc3c847 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-12-31 10:19:21 +08:00
“sunzy”
92a4fba1e3 修改三位课程界面 2021-12-31 10:19:17 +08:00
joylink_fanyuhong
3834766080 域名项目 增加 TEST 测试 2021-12-31 10:13:02 +08:00
joylink_fanyuhong
838c32df01 merge 2021-12-31 10:04:58 +08:00
joylink_fanyuhong
9dcb9669aa 单位二维码生成调整 2021-12-31 10:03:18 +08:00
“sunzy”
d9b7ef8a6f 修改三位课程页面 2021-12-30 23:53:16 +08:00
“sunzy”
f2f2878a99 修改配置地址 2021-12-30 19:36:26 +08:00
“sunzy”
ff7187f58f merge 2021-12-30 17:21:40 +08:00
“sunzy”
f9375c0726 修改三位沙盘驾驶位置更新，修改三位课程页面 2021-12-30 17:19:59 +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
5816fbf205 baseUrl 调整 2021-12-30 09:34:50 +08:00
joylink_fanyuhong
c4e9ab2341 扬州工业展示修改 2021-12-29 14:01:28 +08:00
joylink_fanyuhong
3c2563e3d1 暂提 2021-12-29 13:44:05 +08:00
joylink_fanyuhong
ba80caeb82 域名管理调整 2021-12-29 09:14:09 +08:00
joylink_fanyuhong
b3fb8bff0a 试卷管理调整--增加校验和重新生成 2021-12-28 09:37:14 +08:00
joylink_fanyuhong
d7886eeb3f 试卷管理调整--规则置灰调整 2021-12-23 13:53:57 +08:00
joylink_fanyuhong
321fe3c076 试卷管理调整---新 2021-12-23 10:07:29 +08:00
joylink_fanyuhong
f906fe891f 试卷管理调整new11 2021-12-22 17:23:34 +08:00
joylink_fanyuhong
e15460322b 试卷管理调整new 2021-12-22 16:25:51 +08:00
joylink_fanyuhong
c4af4ee996 试卷管理调整 2021-12-22 13:34:52 +08:00
“sunzy”
72034ece10 merge 2021-12-20 12:38:59 +08:00
“sunzy”
9029407378 “修改oss配置” 2021-12-20 12:38:28 +08:00
joylink_fanyuhong
48e49334eb Merge branch 'master' into test 2021-12-20 11:17:34 +08:00
fan
88939d83ec 备案号调整 2021-12-17 13:55:38 +08:00
fan
294ac516f1 草稿课程编辑添加实训调整&编辑运行图loading调整 2021-12-17 13:34:03 +08:00
fan
4b4b98003c Merge remote-tracking branch 'origin/test' 2021-12-16 18:10:04 +08:00
sunzhenyu
7fa204b700 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-12-14 17:26:16 +08:00
sunzhenyu
72eebe0388 增加三维沙盘第一人称漫游，修改三维沙盘天气 2021-12-14 17:26:10 +08:00
fan
d9aaf08f3b 添加线路配置：站台折返策略不生效standTbStrategyIsInvalid，根据服务号更新车次计划updateTripPlanByServiceNumber；删除西安三 zc故障 2021-12-14 15:08:30 +08:00
fan
cf397fa9a0 取消登录进入 全屏 2021-12-14 10:06:01 +08:00
fan
c98fd9e0e0 批量设置停车点偏移量增加停车轨设置 2021-12-13 18:06:29 +08:00
joylink_cuiweidong
d8902f3db9 运行图编制 代码调整 2021-12-10 15:41:16 +08:00
joylink_cuiweidong
4bd0afbb44 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-12-10 14:17:27 +08:00
joylink_cuiweidong
cc431582e7 运行图编制 修改任务 代码调整 2021-12-10 14:16:25 +08:00
fan
f2ceea6567 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-12-10 10:17:43 +08:00
fan
cfdae77620 project错误 提示调整 2021-12-10 10:17:22 +08:00
sunzhenyu
a28d49e40c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-12-09 18:10:48 +08:00
sunzhenyu
37b23d54b0 修改三维沙盘天气 2021-12-09 18:10:42 +08:00
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
thesai
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
thesai
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
thesai
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
thesai
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
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
sunzhenyu
745a2439b7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-09-10 18:27:36 +08:00
sunzhenyu
25a9f51dab 修改三维课程大铁组件 2021-09-10 18:27:28 +08:00
yuan
ee26677046 TODO 2021-09-10 18:10:59 +08:00
yuan
8f3835ad32 Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into yly_ElmImport 2021-09-10 18:06:45 +08:00
yuan
eaed1afd1b commit 2021-09-10 18:03:17 +08:00
yuan
04dc6f3e1b commit 2021-09-10 18:03:11 +08:00
joylink_cuiweidong
d541259695 修改 道岔位置定位、反位 为pos字段 2021-09-10 17:11:49 +08:00
joylink_cuiweidong
f35684d74d 修改 中航锐创 实训平台 虚拟cctv页面 视频地址 2021-09-10 17:11:46 +08:00
joylink_cuiweidong
76854d925c 中航锐创 实训平台 虚拟cctv页面调整 2021-09-10 17:02:50 +08:00
joylink_cuiweidong
9ce42ff199 中航锐创 实训平台 综合演练添加 cctv页面 2021-09-10 16:25:23 +08:00
fan
a5335b1d81 ISCS订阅调整 2021-09-10 13:53:25 +08:00
fan
37bc5bfc53 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-09-10 13:15:10 +08:00
fan
7216861b67 ISCS订阅调整 2021-09-10 13:09:46 +08:00
fan
9060e0efe2 ISCS状态显示调整 2021-09-09 17:22:47 +08:00
sunzhenyu
5714bae120 merge 2021-09-09 16:09:31 +08:00
sunzhenyu
e0bb2d8532 修改三维课程编辑器逻辑 2021-09-09 16:09:01 +08:00
fan
7dfa74857c Revert "显示配置调整" 
This reverts commit ab38588a
 2021-09-08 14:42:44 +08:00
fan
7ed9e882cc Revert "显示配置调整" 
This reverts commit ab38588a
 2021-09-08 14:41:31 +08:00
fan
249e9f1a3d Revert "地图绘制添加属性ctcSetOverlap" 
This reverts commit 9ed4b26a
 2021-09-08 14:40:58 +08:00
fan
9bad0d61a7 Revert "显示配置调整" 
This reverts commit 5e5474ae
 2021-09-08 14:40:35 +08:00
fan
d7aec11a91 Revert "显示配置调整" 
This reverts commit 8bf3d38f
 2021-09-08 14:38:48 +08:00
fan
f8040a20e7 merge 2021-09-08 10:31:12 +08:00
fan
8bf3d38f95 显示配置调整 2021-09-08 10:30:04 +08:00
sunzhenyu
813d694ccc 增加三维课程事故特效管理模块 2021-09-07 18:21:35 +08:00
sunzhenyu
297e417113 修改三维驾驶门开关逻辑 2021-09-07 14:53:36 +08:00
sunzhenyu
453435ae94 修改三维驾驶面板 2021-09-07 13:41:50 +08:00
sunzhenyu
a8fb38add4 修改三维行车mmi界面 2021-09-07 13:31:17 +08:00
sunzhenyu
6e3ef32360 修改三维行车门开关 2021-09-07 13:22:23 +08:00
sunzhenyu
117487be56 merge 2021-09-07 09:54:47 +08:00
sunzhenyu
ba0999856c 修改三维行车和三维课程编辑器 2021-09-07 09:53:47 +08:00
fan
abf36ad841 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-09-06 17:50:01 +08:00
fan
5e5474aee9 显示配置调整 2021-09-06 17:49:44 +08:00
zyy
4813ba4783 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-09-06 16:11:06 +08:00
zyy
ab01e5e99d 增加大屏预览缩放功能 2021-09-06 16:10:27 +08:00
fan
9ed4b26a57 地图绘制添加属性ctcSetOverlap 2021-09-06 15:41:38 +08:00
fan
ab38588aaa 显示配置调整 2021-09-06 15:17:58 +08:00
joylink_cuiweidong
534fa3d106 福州一号线 添加 车辆段 操作按钮 2021-09-06 13:57:09 +08:00
fan
d9b5d5752c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-09-03 14:46:37 +08:00
fan
63b1c572d6 iscs调整 2021-09-03 14:46:22 +08:00
sunzhenyu
6759c3e680 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-09-02 18:05:35 +08:00
sunzhenyu
5fe4a7a3fb 修改三维课程编辑器组件名，修改播放器切换场景视角流程 2021-09-02 18:05:29 +08:00
fan
b9c03b591d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-09-02 16:48:02 +08:00
fan
ac67ca762a 添加中航锐创（实验室登录） 2021-09-02 16:47:48 +08:00
joylink_cuiweidong
284e051ef7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-09-01 10:56:33 +08:00
joylink_cuiweidong
197f560437 地图绘制 区段绘制 添加 向左延伸方式 2021-09-01 10:56:04 +08:00
fan
91be7c3a83 atr调整 2021-09-01 10:01:42 +08:00
fan
5bc819af6d 关闭南京二新版入口 2021-08-31 10:31:01 +08:00
fan
33b2c3cb43 西安三添加操作 设置默认发车轨 2021-08-31 09:28:34 +08:00
fan
0ce7e458b7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-08-30 15:20:32 +08:00
fan
24a887e7e8 南京二号线调整=》atr 2021-08-30 15:20:15 +08:00
sunzhenyu
babbbc68cf Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-08-27 18:06:17 +08:00
sunzhenyu
bdb734a5e4 修改三维课程编辑界面逻辑，增加三维驾驶设备柜 2021-08-27 18:06:08 +08:00
joylink_cuiweidong
88c327698f 地图绘制 添加 信号机设备里 信号机型号（signalModel） 字段 
更改 进路编辑里 信号是否开放绿灯字段 为 信号显示（aspect） 字段
 2021-08-27 10:17:13 +08:00
zyy
455e102696 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-08-25 11:09:58 +08:00
zyy
178e2aa4a9 调整运行图加载优化 2021-08-25 11:09:38 +08:00
fan
8182e2966c 添加线路配置routeDefaultCheckConflict=》进路默认开启冲突检测 2021-08-24 15:06:11 +08:00
sunzhenyu
128f00772d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-08-19 09:39:30 +08:00
sunzhenyu
5cc6aeb092 修改三维驾驶按钮runlevel影响 2021-08-19 09:39:20 +08:00
joylink_cuiweidong
7999dedba1 代码调整 2021-08-18 18:16:56 +08:00
joylink_cuiweidong
900ae7ca9f 仿真添加暂停/开始按钮，暂时只管理员可见 2021-08-18 17:36:04 +08:00
joylink_cuiweidong
9f1f985e3d 仿真发生异常，去掉初始化，由用户自行初始化 2021-08-17 17:48:30 +08:00