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

7473 Commits

Author SHA1 Message Date
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
sunzhenyu
b1e951a2bb 三维课程修改大铁停车场相关内容 2021-08-12 17:50:15 +08:00
sunzhenyu
7ba34c4f3f 修改三维驾驶列车位置初始化 2021-08-12 10:01:40 +08:00
sunzhenyu
744544d2a6 修改三维驾驶tms界面逻辑，修改三维课程成绩考试模块 2021-08-06 16:36:33 +08:00
sunzhenyu
bc47132b21 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-08-06 10:28:59 +08:00
sunzhenyu
69ef5440f7 修改综合演练中数字沙盘显示 2021-08-06 10:28:40 +08:00
fan
486c3afd8c 调整应答器 IB 保存数据 signalCode 2021-08-06 10:24:28 +08:00
fan
8ed470fffa Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-08-05 18:26:18 +08:00
fan
cb128f6f21 超限区段数据 调整 2021-08-05 18:25:58 +08:00
fan
8d0edf3e52 关联超限区段 显示调整 2021-08-05 18:25:43 +08:00
fan
9e6cb0788d IB 应答器 放开关联信号机 2021-08-05 18:25:30 +08:00
fan
693a60d72c 关联超限区段调整 2021-08-05 18:25:01 +08:00
fan
c321020325 超限区段 rules 调整 2021-08-05 18:24:34 +08:00
fan
b55f0cc583 进路关联超限区段 2021-08-05 18:24:21 +08:00
fan
ed42c57f36 添加超限区段调整 2021-08-05 18:17:29 +08:00
fan
5656e77cb2 添加超限区段 2021-08-05 18:17:14 +08:00
sunzhenyu
2f4026f320 修改三维课程界面 2021-08-04 18:14:00 +08:00
fan
69e0e54c6c 保存延续保护和进路 2021-08-03 14:58:13 +08:00
sunzhenyu
b7819fb259 修改综合演练换车 2021-08-02 10:40:25 +08:00
sunzhenyu
4ad7f3d9d2 修改三维注释 2021-07-30 19:04:16 +08:00
sunzhenyu
a31a6288f7 修改三维驾驶面板逻辑 2021-07-30 19:02:10 +08:00
sunzhenyu
87f94e2dbe Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-07-30 17:00:11 +08:00
sunzhenyu
bec9e1d8c9 修改三维驾驶面板逻辑 2021-07-30 17:00:05 +08:00
joylink_cuiweidong
62977147c5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-07-29 11:09:01 +08:00
joylink_cuiweidong
ab96efb1c6 地图绘制 现地配置 增加 可切换显示的车站 字段 2021-07-29 11:08:36 +08:00
sunzhenyu
7b55ce33b8 修改三维驾驶界面 2021-07-29 09:36:57 +08:00
sunzhenyu
a98fa35a45 三维驾驶界面修改 2021-07-28 17:57:42 +08:00
sunzhenyu
4c5c312fb5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-07-28 17:07:21 +08:00
sunzhenyu
994df74123 升级threejs版本，修改vr参数 2021-07-28 17:07:13 +08:00
fan
11700cb81f 西安三现地问题调整 33 & 39 2021-07-28 10:26:36 +08:00
sunzhenyu
5d08ecb813 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-07-26 16:11:20 +08:00
sunzhenyu
da1bc67b5e 修改三维课程控制逻辑，修改三维驾驶界面大小，优化操作 2021-07-26 16:11:15 +08:00
joylink_cuiweidong
fd53f8643b 西安三号线问题 菜单下方时间显示有误 修改 2021-07-26 10:49:18 +08:00
fan
c9ce97534a 进路添加批量操作 2021-07-20 13:48:21 +08:00
fan
cdfe2a9a65 添加联锁配置项 =》 进路联锁不包含站台扣车 routeInterlockDoNotIncludeStandHoldTrain 2021-07-19 13:19:56 +08:00
yuan
6a674f7db9 综合演练 上下行列表显示问题修复 2021-07-16 10:30:27 +08:00
sunzhenyu
d6f5205ae4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-07-15 10:56:10 +08:00
sunzhenyu
663e874e06 修改三维课程编辑器 2021-07-15 10:56:04 +08:00
fan
d2357e0797 一键生成集中站现地配置 2021-07-15 10:50:29 +08:00
fan
3bb9c2a8d4 调整集中站设备显示 2021-07-14 09:32:12 +08:00
fan
24ec537739 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-07-12 10:39:01 +08:00
fan
79a85639fc 非管理员开放倍速功能（5倍速） 2021-07-12 10:38:39 +08:00
yuan
01ed5397ad ibp盘按钮增加亮灯颜色字段 2021-07-12 10:37:14 +08:00
yuan
ebbfc85acc IBP盘增加关门按钮 2021-07-08 13:43:38 +08:00
fan
ab699c2f79 添加线路配置 setManualWhenHeadTrainArriveTarget 头码车抵达目的地后变为人工车 2021-07-05 16:37:12 +08:00
fan
bdd06c3f1e 登录页面添加教师登录 2021-07-05 16:16:17 +08:00
fan
41be6dbd8f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-07-05 14:28:33 +08:00
fan
eaa60a811b 邮箱=》邮箱（账号） 2021-07-05 14:28:18 +08:00
joylink_cuiweidong
a39996e457 福州一号线 运行图 加线抽线 
去除 西安三 运行图 加线抽线
 2021-07-02 16:45:51 +08:00
joylink_cuiweidong
6ddee3ac9d Merge remote-tracking branch 'remotes/origin/test_cx' into test 2021-07-02 13:45:32 +08:00
joylink_cuiweidong
7dff579224 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-07-02 13:45:11 +08:00
joylink_cuiweidong
4e2b07829c 西安三号线 运行图 加线抽线功能 添加 2021-07-02 13:44:21 +08:00
fan
813a0771d9 添加线路配置：transferRouteCanOnlyFaultUnlock 转换轨进路只能通过故障解锁来取消 2021-07-02 10:02:41 +08:00
joylink_cuiweidong
87095b4f4e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/store/modules/runplan.js
 2021-07-01 10:09:23 +08:00
joylink_cuiweidong
c7e75739c3 西安三加线逻辑调整 2021-07-01 10:06:35 +08:00
fan
8d5664d9da 西安地铁页面调整 2021-07-01 09:42:36 +08:00
fan
a8f4b06fbf 删除runPlan 弃用代码 2021-07-01 09:42:13 +08:00
fan
4707434ed4 添加线路配置：设置头码车时检查方向checkDirectionWhenSetHead 2021-06-30 16:59:17 +08:00
fan
b5a225905e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-06-30 14:55:41 +08:00
fan
bcf9cc1d7f 左键点击关闭车次窗 2021-06-30 14:55:28 +08:00
yuan
e208182caa ibp盘增加试灯 2021-06-30 13:01:24 +08:00
fan
53041725ac 更换折返方式枚举 2021-06-29 13:53:39 +08:00
joylink_cuiweidong
cd2c43ac97 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-06-29 09:43:38 +08:00
joylink_cuiweidong
95882eeeef 第三方登陆联系方式调整 2021-06-29 09:43:20 +08:00
yuan
65d84a98a8 信号机距离计算方式修改 2021-06-24 18:14:36 +08:00
joylink_cuiweidong
8528475bcb 删除404页面的 一些文字 2021-06-24 15:15:31 +08:00
fan
b9eb5f061d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-06-24 13:55:06 +08:00
fan
e1b5c43fb7 zc设备数据添加noService属性 2021-06-24 13:54:44 +08:00
joylink_cuiweidong
26c6e18284 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-06-24 13:05:20 +08:00
joylink_cuiweidong
65c235bfcd 第三方登陆跳转代码调整 2021-06-24 13:05:00 +08:00
sunzhenyu
50102fb62a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-06-23 18:09:31 +08:00
sunzhenyu
0e2ee25cb6 修改三维单体设备屏蔽门，增加拆解逻辑 2021-06-23 18:09:23 +08:00
joylink_cuiweidong
3d4ba98297 zc 代码调整 2021-06-23 15:55:04 +08:00
joylink_cuiweidong
8f9ab98fb2 zc 绘图 添加 集中站列表 2021-06-23 15:36:23 +08:00
joylink_cuiweidong
b841022401 zc 绘图 代码调整 2021-06-23 13:52:22 +08:00
yuan
55ae33c204 移除无用代码 2021-06-22 18:03:29 +08:00
yuan
f032e3f1ee 地图编辑-应答器增加一键关联到信号机功能 2021-06-22 17:18:49 +08:00
yuan
1523ab6f51 应答器关联区段显示bug修复,增加选中高亮 2021-06-22 14:40:21 +08:00
yuan
5d22b7a548 IBP盘 - 报警器,圆灯,按钮增加区分上下行字段 2021-06-18 10:36:45 +08:00
yuan
71c4735088 Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into yly_ibp 2021-06-18 09:10:46 +08:00
fan
320662e6a0 西安三站台状态管理显示调整(again) 2021-06-17 18:18:25 +08:00
fan
82f38c349b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_cunzai 2021-06-17 17:52:46 +08:00
fan
841763d48a 存在仿真管理调整 2021-06-17 17:52:28 +08:00
joylink_cuiweidong
e68991538d 哈尔滨设备登陆 车辆段 运行图编辑 报错调整 2021-06-17 17:35:17 +08:00
joylink_cuiweidong
b96b77e927 哈尔滨设备登陆 车辆段 运行图编辑 报错调整 2021-06-17 17:00:33 +08:00
joylink_cuiweidong
fefbf97c99 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-06-17 15:57:09 +08:00
joylink_cuiweidong
c1a3ba8b00 哈尔滨设备登陆 车辆段 运行图编辑 报错调整 2021-06-17 15:56:08 +08:00
sunzhenyu
ee21f2f67c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-06-17 15:50:25 +08:00
sunzhenyu
e3e7bf4a8d 修改三维大铁驾驶面板，增加云效果 2021-06-17 15:50:18 +08:00
joylink_cuiweidong
e24690fdec Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-06-17 15:40:25 +08:00
joylink_cuiweidong
a1b42ba0c0 哈尔滨设备登陆 车辆段 运行图编辑 报错调整 2021-06-17 15:39:24 +08:00
fan
7c70199614 添加线路配置项 2021-06-17 15:31:45 +08:00
yuan
dbfbbc9034 ibp盘多个报警器处理 2021-06-17 14:52:58 +08:00
yuan
ecea32ad9c ibp编辑 - 紧急停车按钮和报警器区分上下行 2021-06-17 13:51:54 +08:00
sunzhenyu
0879173066 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-06-16 18:27:19 +08:00
sunzhenyu
26e0347ae8 修改三维大铁驾驶刹车盘数值 2021-06-16 18:27:14 +08:00
fan
c574f0249c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-06-16 16:55:49 +08:00
fan
1fdde772c1 BUG316哈尔滨：右键点击列车车次框，不应弹出列监对话框，只左键点击弹出即可&BUG312哈尔滨：现地无法追踪全开 2021-06-16 16:55:38 +08:00
joylink_cuiweidong
4f74d4b33d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-06-16 16:07:11 +08:00
joylink_cuiweidong
23d760d1a9 哈尔滨项目 右下角退出操作 代码调整 2021-06-16 16:06:30 +08:00
fan
5cf6a1e84f 哈尔滨项目打开运行图报错调整 2021-06-16 15:31:55 +08:00
joylink_cuiweidong
49d30f0e6d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-06-16 14:41:10 +08:00
joylink_cuiweidong
d1083cc871 哈尔滨 项目 生成计划接口调整 2021-06-16 14:40:36 +08:00
yuan
7ef2f896cf Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into yly_xa3_jzfw 2021-06-16 14:30:22 +08:00
yuan
35cb4fcb32 IBP盘报警器逻辑修复 2021-06-16 14:30:11 +08:00
fan
9726928f1a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-06-16 14:27:53 +08:00
fan
152b7983a3 模板运行图添加编辑 2021-06-16 14:27:44 +08:00
joylink_cuiweidong
67c10547a1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-06-16 13:38:27 +08:00
joylink_cuiweidong
4ede6b61da 哈尔滨 综合监控设备登陆 代码调整 2021-06-16 13:37:50 +08:00
fan
c84c50efbb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-06-16 13:23:30 +08:00
fan
9c991484d7 西安仿真测试反馈40、42调整 扣车跳停标志显示点击调整 2021-06-16 13:23:15 +08:00
yuan
0a1720920e Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into yly_xa3_jzfw 2021-06-16 11:26:08 +08:00
yuan
6cc2cfcbd2 IBP盘改造 2021-06-16 11:23:55 +08:00
joylink_cuiweidong
6128cc8d50 地图发布 添加描述字段 
发布地图 发布历史展示描述字段
 2021-06-16 11:15:31 +08:00
yuan
6965c2f9fd bugfix-ibp盘复位按钮缺少字段 2021-06-15 17:43:23 +08:00
yuan
a12106a329 Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into yly_xa3_jzfw 2021-06-15 17:24:41 +08:00
yuan
da1b23404d 计轴复位暂存 2021-06-15 17:24:26 +08:00
joylink_cuiweidong
eeb75b6a6d Merge remote-tracking branch 'remotes/origin/test_thirdLogin' into test 2021-06-15 15:34:42 +08:00
joylink_cuiweidong
a0861633f2 zc 添加管理的区段列表（计轴区段） 2021-06-15 15:33:50 +08:00
fan
4c52f9354f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_tmt 2021-06-15 10:12:01 +08:00
fan
580ef87fa7 列监显示调整 2021-06-15 10:11:48 +08:00
joylink_cuiweidong
6b7827bd91 zc 代码调整 2021-06-11 18:17:48 +08:00
joylink_cuiweidong
2007c3b3ce Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-06-11 15:37:10 +08:00
joylink_cuiweidong
bea9855e79 地图绘制 地图列表代码bug处理 2021-06-11 15:36:23 +08:00
yuan
263d32e9cb 计轴预复位修改字段 2021-06-11 13:52:05 +08:00
yuan
c089649220 Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into yly_xa3_jzfw 2021-06-11 11:04:14 +08:00
yuan
63033dc90a 西安3 修改计轴复位逻辑(双按钮三秒) 2021-06-11 11:04:06 +08:00
joylink_cuiweidong
602dc9df71 在线用户管理 登陆系统字段 调整 2021-06-11 10:33:21 +08:00
joylink_cuiweidong
7a861f406f Merge remote-tracking branch 'remotes/origin/test_thirdLogin' into test 2021-06-11 09:41:48 +08:00
joylink_cuiweidong
151eb83981 用户管理添加根据账户、父账户条件查询 2021-06-11 09:40:24 +08:00
sunzhenyu
a2216d8608 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-06-10 18:07:35 +08:00
sunzhenyu
734a69751b 三维大铁驾驶简化 2021-06-10 18:07:27 +08:00
joylink_cuiweidong
7577c5571d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-06-10 16:08:25 +08:00
joylink_cuiweidong
ce78cb8e08 Merge remote-tracking branch 'remotes/origin/test_thirdLogin' into test 2021-06-10 16:08:04 +08:00
yuan
a4e6119c4b 应答器批量创建增加区段偏移值 2021-06-10 15:46:20 +08:00
joylink_cuiweidong
298999d7ff 删除账户(逻辑删除) 代码调整 2021-06-10 14:48:24 +08:00
joylink_cuiweidong
b1a0fd88d0 将权限分发包分发给指定账户 2021-06-10 14:31:30 +08:00
joylink_cuiweidong
3a2670a367 Merge remote-tracking branch 'remotes/origin/test_thirdLogin' into test 2021-06-10 10:15:52 +08:00
joylink_cuiweidong
4b75808aea 在线用户代码调整 2021-06-10 10:09:55 +08:00
yuan
4bd21b30c5 地图编辑-应答器-批量创建 页面修改 2021-06-10 10:01:34 +08:00
joylink_cuiweidong
15c94bd50c 添加 在线用户查询 2021-06-09 18:10:21 +08:00
joylink_cuiweidong
7781801171 第三方账号通过url登陆 以及 创建第三方账号 功能添加 2021-06-09 16:37:02 +08:00
sunzhenyu
62f339d3cf Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-06-08 14:55:58 +08:00
sunzhenyu
9a2e993b5d 修改大铁三维单体设备通信和显示逻辑 2021-06-08 14:55:37 +08:00
fan
1ed9fd4d5d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_tmt 2021-06-08 14:44:36 +08:00
fan
c09da2aa5d 列车操作调整 2021-06-08 14:44:23 +08:00
fan
891db1539c 教学管理添加使用时长 2021-06-07 16:11:36 +08:00
sunzhenyu
85e1faa60c 增加三维大铁返回按钮 2021-06-04 18:05:12 +08:00
sunzhenyu
23ad69529a 增加三维大铁驾驶界面更新，增加三维大铁信号机，修改大铁三维加载和大铁信号模块 2021-06-04 17:26:41 +08:00
fan
50a7b6e039 南京二号线列监暂提 2021-06-04 14:22:39 +08:00
sunzhenyu
9ae1cf2ead Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-06-03 18:03:50 +08:00
sunzhenyu
1258bc4771 单独分出大铁三维单体设备，剔除无用接口，修改大铁驾驶界面，调试接口 2021-06-03 18:03:44 +08:00
fan
8004071e6f 绘图添加出站信号机进站信号机 2021-06-03 17:40:44 +08:00
fan
e34cafce7a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_tmt 2021-06-03 09:47:50 +08:00
fan
0d27da9d3b 南京二号线列监调整--暂提 2021-06-03 09:47:40 +08:00
fan
9dc64e67ed 南京二号线列监调整 2021-06-02 17:58:18 +08:00
fan
5bd0f380b6 南京二号线列监调整 2021-06-02 17:55:24 +08:00
fan
ad0cbdbd0f 南京二号线现地初始化列车没清调整 2021-06-02 10:22:24 +08:00
fan
3301f9abcd 南京二号线车站显示模块调整 2021-06-01 18:13:13 +08:00
fan
6b90da452b 添加运行图加载规则 2021-06-01 14:57:40 +08:00
fan
a8ce67ee4a 南京二号线调整 2021-06-01 14:06:18 +08:00
fan
c71f2fde96 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-06-01 10:13:25 +08:00
fan
9f4841e9e0 列车指令调整 2021-06-01 10:13:10 +08:00
zyy
e1958b1b8e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-31 15:53:03 +08:00
zyy
137b427ebe 调整新路预览配置 2021-05-31 15:52:46 +08:00
sunzhenyu
cde07e6859 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-31 15:50:14 +08:00
sunzhenyu
8ec3baa515 修改三维大铁驾驶通信接口 2021-05-31 15:50:07 +08:00
fan
aec02b7752 南京二行调调整 2021-05-31 14:15:09 +08:00
fan
2fd6a971f3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-28 18:25:00 +08:00
fan
cec41aeccf 注释南京二行调 2021-05-28 18:23:42 +08:00
zyy
58f1e06267 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-28 18:12:53 +08:00
zyy
224bbc0177 调整进路更新延续保护配置 2021-05-28 18:12:35 +08:00
sunzhenyu
397c80a967 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-28 18:09:16 +08:00
sunzhenyu
9ea7abf401 修改三维大铁驾驶模块接通车速变化 2021-05-28 18:09:10 +08:00
zyy
5678498fa6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-28 17:20:33 +08:00
zyy
d86566be12 调整延续保护字段 2021-05-28 17:20:16 +08:00
fan
d11b0c6d47 增加列车故障操作-换端&联锁配置项-CTC列车进路延续保护仅折返站处锁闭 2021-05-28 17:18:51 +08:00
fan
ee6dfa9df2 南京二列监 2021-05-28 15:22:23 +08:00
fan
15e1868d6c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-28 14:08:24 +08:00
fan
e09d5f4aff 调整仿真开始显示暂停中 & 南京二列监 2021-05-28 14:07:28 +08:00
zyy
e6f3afd6a0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-28 13:08:17 +08:00
zyy
f9835862ce 调整侧防流程 2021-05-28 13:08:02 +08:00
fan
70ca57d26c 时刻表列车总览详览迁移 2021-05-28 11:00:26 +08:00
fan
af8a7758c2 Merge remote-tracking branch 'origin/test-nan02' into test 
# Conflicts:
#	src/jmapNew/theme/nanjing_02/menus/menuBar.vue
 2021-05-28 10:18:57 +08:00
fan
1b5da46e80 背投轨道总览详览调整 2021-05-28 10:10:54 +08:00
sunzhenyu
c2bda14c4f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-27 18:16:01 +08:00
sunzhenyu
d71c4d7d6d 增加大铁三维驾驶模块 2021-05-27 18:15:54 +08:00
joylink_cuiweidong
bb73608a1b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-27 17:28:36 +08:00
joylink_cuiweidong
8c232d2b13 大铁项目 代码调整 2021-05-27 17:27:50 +08:00
zyy
a46a2764a5 增加用户查询id列表 2021-05-27 17:19:05 +08:00
zyy
b2806165ef 调整信号机接近区段更新流程 2021-05-27 16:40:28 +08:00
zyy
672c95c6c6 调整信号接近区段 2021-05-27 16:10:58 +08:00
zyy
529839b3ac 调整进路更新，延续保护更新 2021-05-27 15:15:58 +08:00
zyy
3a06aae186 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-27 14:19:43 +08:00
zyy
e150fda807 调整延续保护 2021-05-27 14:19:28 +08:00
joylink_cuiweidong
aa9c961cb0 旧版仿真 增加 仿真订阅（/queue/simulation/{id}/state） 2021-05-27 13:56:17 +08:00
joylink_cuiweidong
796983e9e8 合并 设计平台菜单（pdf上传和编辑器） 2021-05-27 13:28:35 +08:00
fan
7412e01b32 代码暂提 2021-05-26 17:18:20 +08:00
zyy
2b338ba0de 调整进路预览 2021-05-26 17:03:38 +08:00
fan
ce1b6c5f8a meger 2021-05-26 15:48:55 +08:00
fan
46d74d3002 代码暂提 2021-05-26 15:46:29 +08:00
zyy
8b2f8c7bc1 Merge branch 'test-nan02' of https://git.code.tencent.com/lian-cbtc/jl-client into test-nan02 2021-05-26 14:43:51 +08:00
zyy
2d6f8ad984 增加车场弹窗 2021-05-26 14:43:34 +08:00
fan
86e2520b05 代码暂提 2021-05-26 14:04:36 +08:00
fan
16faefb526 线路配置添加 figuresOfTripNumber（车次号位数）&figuresOfServiceNumber（服务号位数） 2021-05-25 18:02:59 +08:00
fan
5188192736 BUG275 南京11站：车次号步进，在马群创建的车次步进到油坊桥的区段后，列车不显示 2021-05-25 17:53:23 +08:00
fan
c4894290f4 Merge branch 'test-nan02' of https://git.code.tencent.com/lian-cbtc/jl-client into test—nanjing02 2021-05-25 16:07:22 +08:00
fan
337ed03f78 哈尔滨问题调整 2021-05-25 16:05:45 +08:00
joylink_cuiweidong
45371fb2d3 修改canvasId 初始化位置 2021-05-25 09:32:11 +08:00
fan
9548e24464 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-24 15:53:50 +08:00
fan
49011b95e2 添加线路配置delayWhenCancelRouteWithAbnormalInterlock & 哈尔滨部分问题调整 2021-05-24 15:53:38 +08:00
fan
4796e7f648 代码暂提 2021-05-24 11:29:59 +08:00
sunzhenyu
e031986664 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-21 15:31:29 +08:00
sunzhenyu
351d268e52 三维课程增加场景id显示，修改提示窗下一步功能区分，修改事件驱动条件 2021-05-21 15:30:50 +08:00
joylink_cuiweidong
e17104f537 地图绘制 停站时间/运行等级 代码调整 2021-05-21 15:12:40 +08:00
joylink_cuiweidong
13af28467c 地图绘制 停站时间/运行等级 界面与接口代码调整 
生成联锁配置 删除 延续保护构建是否只考虑一个道岔计轴
生成联锁配置 新增 延续保护最小长度
 2021-05-21 15:02:28 +08:00
joylink_cuiweidong
4cefb0cfbe Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-21 11:34:28 +08:00
joylink_cuiweidong
bf8d0eb574 地图绘制 停站时间 界面与接口代码调整 2021-05-21 11:33:37 +08:00
fan
fbd700d52e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-21 10:01:54 +08:00
fan
2438b9f0a0 删除仿真、绘图、运行图编制的心跳检测 2021-05-21 10:01:45 +08:00
zyy
54ad4bf93b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-20 17:58:42 +08:00
zyy
55ee64479f 调整系统绘图模块新增 2021-05-20 17:58:23 +08:00
fan
e49840afc8 绑定数据编辑调整 2021-05-20 17:51:00 +08:00
fan
7a33bae3fe Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-20 17:39:32 +08:00
fan
4c948d91ff 绑定数据编辑调整 2021-05-20 17:38:55 +08:00
zyy
89b63e9709 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-20 17:13:19 +08:00
zyy
c4ec37a403 调整权限字段显示 2021-05-20 17:13:05 +08:00
sunzhenyu
f3c9bfdcb6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-20 17:06:35 +08:00
sunzhenyu
5392755eda 修改三维课程联控菜单位置，修改三维模型添加bug，修改移动模型指示器，修改操作切换，修改模型场景中显示移除逻辑，修改事件触发器逻辑 2021-05-20 17:06:28 +08:00
zyy
3a2baf8374 调整权限流程 2021-05-20 16:37:55 +08:00
zyy
24aefdebd4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-20 15:13:54 +08:00
zyy
be1106fc20 调整权限字段显示，地图绘制新增 2021-05-20 15:13:37 +08:00
fan
e212bd52e9 pdf上传检索调整 2021-05-20 15:06:14 +08:00
fan
5ee943a313 暂提 2021-05-20 11:04:21 +08:00
fan
db6e9503f3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test—nanjing02 2021-05-20 09:29:10 +08:00
zyy
fbb9365b62 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-19 18:14:44 +08:00
zyy
83561a2545 调整权限分发 2021-05-19 18:14:27 +08:00
fan
8db97250d8 暂提 2021-05-19 18:03:58 +08:00
fan
9b422cd3b9 南京二号线调整（未完） 2021-05-19 16:07:52 +08:00
fan
6b57369b8f 车站值班员名称显示调整&暂停前端仿真计时&仿真倍速管理员可见 2021-05-19 15:45:49 +08:00
zyy
4cd675cf67 增加系统预览绘制 2021-05-19 15:07:59 +08:00
joylink_cuiweidong
65daf903bf Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-19 09:44:05 +08:00
joylink_cuiweidong
17c4fdafa6 代码调整 2021-05-19 09:43:24 +08:00
fan
853e049cc5 哈尔滨运行图调整 2021-05-18 14:19:28 +08:00
joylink_cuiweidong
b87425f8c8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-18 10:49:20 +08:00
joylink_cuiweidong
622885d3d5 删除暂时没有用的npm 模块（lodash,mock） 
发布地图 地图分组代码调整
 2021-05-18 10:48:58 +08:00
fan
4b83445624 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-18 10:04:20 +08:00
fan
7af49deb90 综合演练添加车站值班员 2021-05-18 10:04:03 +08:00
joylink_cuiweidong
60aeeaedea 代码调整 2021-05-17 19:15:25 +08:00
joylink_cuiweidong
1ca70a08b8 代码调整 2021-05-17 19:07:24 +08:00
joylink_cuiweidong
6a07a81233 代码调整 2021-05-17 19:06:00 +08:00
joylink_cuiweidong
5a6fcc48eb 代码调整 2021-05-17 19:00:27 +08:00
joylink_cuiweidong
c0d2b19589 代码调整 2021-05-17 18:57:20 +08:00
joylink_cuiweidong
ada429fcde pdf上传 代码调整 2021-05-17 18:41:58 +08:00
joylink_cuiweidong
8033c42655 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-17 17:20:49 +08:00
joylink_cuiweidong
57feb88e6c pdf 上传 代码调整 2021-05-17 17:20:26 +08:00
fan
0a9c8665ff 代码调整 2021-05-17 16:37:56 +08:00
fan
5215d8ba2c merge 2021-05-17 13:37:03 +08:00
fan
bc2fa1fbae 代码调整 2021-05-17 13:35:49 +08:00
joylink_cuiweidong
3bbfae4082 pdf上传 代码调整 2021-05-17 10:42:13 +08:00
joylink_cuiweidong
290542ee28 pdf上传代码调整 2021-05-17 09:51:06 +08:00
zyy
1dba8c2e9d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/utils/baseUrl.js
 2021-05-14 18:33:09 +08:00
zyy
54295fe452 增加pdf 上传 2021-05-14 18:31:46 +08:00
sunzhenyu
a8d89df500 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-14 18:09:24 +08:00
sunzhenyu
883c70bd30 增加三维课程角色选择，增加三维课程信息提示跳转部分 2021-05-14 18:09:18 +08:00
fan
69c6526516 Bug260 、Bug261、郑州共赢代码调整 2021-05-14 15:59:04 +08:00
fan
006b9762e1 merge 2021-05-14 15:07:00 +08:00
fan
ddfddfa292 代码调整 2021-05-14 15:05:57 +08:00
zyy
9bd90ce182 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-14 13:14:24 +08:00
zyy
af9eb2c8b6 增加文章编辑器 2021-05-14 13:14:08 +08:00
joylink_cuiweidong
d584e7ea7d 添加 图纸管理页面 2021-05-13 18:09:10 +08:00
joylink_cuiweidong
02241f455a 地图绘图 高级数据 代码调整 2021-05-13 14:19:58 +08:00
joylink_cuiweidong
61b982e9b6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-13 13:55:21 +08:00
joylink_cuiweidong
f4cd046f1a 大铁项目 根据车站值班员 显示绘图 2021-05-13 13:55:02 +08:00
fan
149d4cf995 Bug 206 语音训练结果在查询的时候，选择A用户，结果里出现了B用户的语音 2021-05-13 13:22:30 +08:00
fan
bf69914d21 代码问题调整 
(cherry picked from commit 7cd36b7446)
 2021-05-13 13:13:44 +08:00
sunzhenyu
c5a020e1a6 修改三维设备展示文本错别字 2021-05-12 10:37:39 +08:00
sunzhenyu
7b4d6a267e 修改三维设备手摇道岔文字描述 2021-05-11 16:11:15 +08:00
sunzhenyu
7b73ff0e69 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-11 15:59:44 +08:00
sunzhenyu
14d63ae42a 三维设备视图手摇道岔操作展示 2021-05-11 15:59:35 +08:00
fan
8cf5d36ce3 南京二号线调整 2021-05-11 15:36:11 +08:00
fan
c1d5b84e0b 添加一键校验发布地图 2021-05-10 15:44:34 +08:00
fan
9c7b6e4ab2 运行图解析调整 2021-05-10 15:08:58 +08:00
fan
4f07f16ecf 运行图解析调整 2021-05-10 14:40:37 +08:00
joylink_cuiweidong
d0ce678ca0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-10 13:50:55 +08:00
joylink_cuiweidong
cc259c8a15 哈尔滨项目运行图代码调整 2021-05-10 13:50:17 +08:00
fan
a9da38daf2 运行图解析调整 2021-05-10 09:13:22 +08:00
fan
b2892930ad 语音训练添加录音播放 2021-05-08 14:33:55 +08:00
fan
e597a3ae8f 添加站台紧急停车 2021-05-08 14:11:22 +08:00
fan
cfd6990189 场景语音训练调整 2021-05-06 16:22:10 +08:00
fan
6cb4ee9c27 场景语音训练调整 2021-05-06 16:15:09 +08:00
fan
0b78df8c9c 场景语音训练调整 2021-05-06 15:35:14 +08:00
fan
78c8b39edb 场景语音训练调整 2021-05-06 14:50:34 +08:00
fan
b4a0a42235 场景语音训练调整 2021-05-06 10:30:29 +08:00
fan
8dc44f11f8 场景语音训练调整 2021-05-06 09:54:51 +08:00
fan
21990ebf11 场景语音训练调整 2021-04-30 17:38:15 +08:00
fan
cc00e11304 场景语音训练调整 2021-04-30 17:34:37 +08:00
fan
d3238e77e2 场景语音训练调整 2021-04-30 16:50:04 +08:00
fan
21fe3c8b1e 语音训练调整 2021-04-30 16:35:28 +08:00
fan
f9d2d8a0ac 语音训练调整 2021-04-30 16:14:56 +08:00
sunzhenyu
861065e159 修改三维编辑器v-for key警告 2021-04-30 10:01:36 +08:00
sunzhenyu
528af2fea6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-29 17:56:01 +08:00
sunzhenyu
2f60a7a352 增加静态测试模型，修改三维课程播放器模型触发器模块，增加三维动画模块，修改课程信息模块 2021-04-29 17:55:55 +08:00
fan
0585502691 大铁线路操作调整 2021-04-29 15:50:15 +08:00
fan
acf4f6bea9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-29 13:25:58 +08:00
fan
ae5df5de5b 大铁线路操作调整 2021-04-29 13:25:48 +08:00
joylink_cuiweidong
87c86536df Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-29 11:02:37 +08:00
joylink_cuiweidong
9ce15c6d25 代码调整 2021-04-29 11:02:15 +08:00
fan
5ee38364a1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-29 10:35:44 +08:00
fan
ed7c4bb8f5 大铁线路操作调整 2021-04-29 10:35:34 +08:00
joylink_cuiweidong
330416f0e0 语音训练代码调整 2021-04-29 10:21:51 +08:00
fan
5678d8dfad 信号机坐标编辑显示 2021-04-28 18:46:04 +08:00
fan
edbd6d55cf 信号机坐标编辑显示 2021-04-28 17:14:48 +08:00
fan
823c30118c 大铁仿真操作调整 2021-04-28 16:58:29 +08:00
fan
83eddd42d3 大铁仿真操作调整 2021-04-27 15:52:39 +08:00
fan
c99194f84e 新版仿真订阅消息调整 2021-04-27 10:17:51 +08:00
fan
09781774c7 大铁线路操作调整 2021-04-26 17:59:23 +08:00
fan
d917ccce3d 大铁线路操作调整 2021-04-25 18:13:47 +08:00
fan
c22a40b6f0 BUG234 => 测试环境中苏电院教学管理页面显示问题 2021-04-25 14:54:05 +08:00
fan
2bd741d4ab 大铁操作调整 2021-04-25 10:09:43 +08:00
fan
13e0f107f0 后端状态转译 2021-04-23 17:43:45 +08:00
fan
87daa342d6 query newApi 判断调整 2021-04-23 15:14:10 +08:00
fan
c6f5f84d77 query测试 2021-04-23 15:01:04 +08:00
fan
bd2165ff35 大铁仿真调整 2021-04-23 14:11:29 +08:00
fan
6f06822793 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-23 09:01:26 +08:00
fan
7379945c42 大铁仿真调整 2021-04-23 09:01:12 +08:00
sunzhenyu
cf930c1e72 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-22 18:08:05 +08:00
sunzhenyu
e9b9345e95 增加三维课程播放器，增加第一人称控制碰撞检测，完善编辑器数据 2021-04-22 18:07:56 +08:00
joylink_cuiweidong
e1757e4114 代码调整 2021-04-22 11:30:07 +08:00
joylink_cuiweidong
7ef86d0517 代码调整 2021-04-22 10:52:48 +08:00
joylink_cuiweidong
40909b073e 代码调整 2021-04-21 17:55:41 +08:00
joylink_cuiweidong
5039c09c16 样式调整 2021-04-21 17:19:25 +08:00
joylink_cuiweidong
54ec91a835 添加 修改检查配置接口 2021-04-21 15:46:37 +08:00
joylink_cuiweidong
70e9ab6a87 代码调整 2021-04-21 15:25:08 +08:00
joylink_cuiweidong
62698088d8 代码调整 2021-04-21 15:19:32 +08:00
joylink_cuiweidong
97a07bb70e 大铁 进路删除 代码调整 2021-04-21 15:17:27 +08:00
joylink_cuiweidong
6fe2bf0aca 大铁 进路预览代码调整 2021-04-21 14:40:44 +08:00
joylink_cuiweidong
d13292b8f1 大铁线路 进路预览代码调整 2021-04-21 13:40:37 +08:00
joylink_cuiweidong
af13800539 大铁线路 进路添加代码调整 2021-04-21 09:20:48 +08:00
fan
3ba2f8ac5b merge 2021-04-20 17:29:32 +08:00
fan
0226042942 宁波三Bug调整 2021-04-20 17:25:27 +08:00
joylink_cuiweidong
1ffac1ba84 代码调整 2021-04-16 17:46:07 +08:00
joylink_cuiweidong
d1a177827d 大铁项目 添加进路 代码调整 2021-04-16 17:21:15 +08:00
joylink_cuiweidong
e554ff45b7 代码调整 2021-04-16 16:36:17 +08:00
joylink_cuiweidong
388f85c3db 代码调整 2021-04-16 16:26:58 +08:00
joylink_cuiweidong
a3dff96e73 大铁 项目 添加进路 代码调整 2021-04-16 15:59:08 +08:00
joylink_cuiweidong
3ba63c65ac Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-16 14:22:48 +08:00
joylink_cuiweidong
84169141ab 大铁 指示灯 代码调整 2021-04-16 14:22:29 +08:00
sunzhenyu
3440daf55e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-16 13:19:07 +08:00
sunzhenyu
72d0bb084f 修改三维单体设备信号机亮灯逻辑，修改三维课程编辑播放器 2021-04-16 13:18:59 +08:00
joylink_cuiweidong
0de0206192 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-16 09:48:35 +08:00
joylink_cuiweidong
91190c6dc3 代码调整 2021-04-16 09:48:03 +08:00
ival
14fd6c1a40 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-15 18:15:20 +08:00
ival
14f718ec1a 增加指示器显示 2021-04-15 18:15:12 +08:00
joylink_cuiweidong
b5b9b493e7 代码调整 2021-04-15 18:07:51 +08:00
joylink_cuiweidong
16294b6373 代码调整 2021-04-15 17:12:41 +08:00
joylink_cuiweidong
d3b240989b 代码调整 2021-04-15 16:15:18 +08:00
joylink_cuiweidong
bb928cb37b 代码调整 2021-04-15 15:55:30 +08:00
joylink_cuiweidong
4050ddf937 大铁进路添加 代码调整 2021-04-15 15:53:34 +08:00
joylink_cuiweidong
bebac3b8e5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-14 17:48:55 +08:00
joylink_cuiweidong
9233b651f6 代码调整 2021-04-14 17:48:28 +08:00
sunzhenyu
2412aac899 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-14 17:35:46 +08:00
sunzhenyu
63f935616d 修改三维课程编辑器事件和图片资源部分 2021-04-14 17:35:41 +08:00
joylink_cuiweidong
8d763d00e4 运行图编制代码调整 2021-04-14 16:43:09 +08:00
joylink_cuiweidong
1a7786dd14 运行图编制 代码调整 2021-04-14 15:30:52 +08:00
joylink_cuiweidong
63855ca1ff 运行图编制代码调整 2021-04-14 15:17:34 +08:00
joylink_cuiweidong
a1342ed2b6 运行图代码调整 2021-04-14 14:36:33 +08:00
joylink_cuiweidong
448832293b 运行图代码调整 2021-04-14 14:26:00 +08:00
joylink_cuiweidong
ae263b0dc7 运行图样式调整 2021-04-14 13:57:35 +08:00
sunzhenyu
c9b7d18e43 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-14 09:13:02 +08:00
sunzhenyu
f1ab1f9819 三维课程编辑测试展示(未完成) 2021-04-14 09:12:53 +08:00
fan
8575de2bd9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-13 18:09:52 +08:00
fan
0b5cc8e15d 信号按钮调整 2021-04-13 18:09:37 +08:00
ival
68cad1616a 删除无用代码 2021-04-13 15:48:01 +08:00
ival
584852038c 增加大铁仿真display 
# Conflicts:
#	src/iscs_new/plugins/shapeBuilder/entry.vue
 2021-04-13 15:47:49 +08:00
fan
8a363c068a 大铁调整 2021-04-13 14:10:20 +08:00
fan
75e7c00957 地图分组管理 2021-04-13 10:15:11 +08:00
fan
cbb02621d9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-12 18:19:58 +08:00
fan
8d5de4cc1a 地图分组管理 2021-04-12 18:09:49 +08:00
ival
dde06f834d 修改语言校验页面 2021-04-12 17:11:36 +08:00
fan
904d84e8ab 语音 2021-04-12 14:56:21 +08:00
sunzhenyu
f86c13ea86 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-09 18:21:45 +08:00
sunzhenyu
cea95f9d92 三维课程编辑器课程组件和数据结构修改，升级threejs版本 2021-04-09 18:21:24 +08:00
fan
7532c86e15 宁波三操作调整&导入运行图放开 2021-04-08 17:28:46 +08:00
joylink_cuiweidong
5f9e6fe882 运行图编制代码调整 2021-04-07 14:21:26 +08:00
fan
2d5b863231 iscs Button hideType 赋值调整 2021-04-07 09:27:31 +08:00
fan
9a84b61e5a ISCS调整 2021-04-06 17:48:33 +08:00
ival
a215004143 修改代码 2021-04-06 16:01:14 +08:00
sunzhenyu
fb00e1418e 修改三维课程存读 2021-04-02 18:05:19 +08:00
sunzhenyu
a9745eb709 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-02 15:49:32 +08:00
sunzhenyu
1cab2116d6 三维课程代码，修改课程组件间逻辑，修改课程数据结构。(未实装) 2021-04-02 15:49:24 +08:00
fan
fc861b1c70 组织管理调整 2021-04-02 09:58:45 +08:00
fan
baf424cfad Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-01 16:37:25 +08:00
fan
a5b3f9cf04 组织管理调整 2021-04-01 16:28:30 +08:00
joylink_cuiweidong
81ecf0ac20 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-01 10:59:05 +08:00
joylink_cuiweidong
fcf7d1b8ee 运行图代码调整 2021-04-01 10:58:41 +08:00
fan
f1824ad324 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-01 09:59:11 +08:00
fan
f327889bca 组织管理调整 2021-04-01 09:59:01 +08:00
joylink_cuiweidong
45c51157a1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-01 09:42:12 +08:00
joylink_cuiweidong
618d975d68 运行图编制 代码调整 2021-04-01 09:41:14 +08:00
fan
0253e6e590 组织管理调整 2021-03-31 18:27:29 +08:00
fan
887edee9e6 考试系统按钮位置调整 2021-03-31 09:35:51 +08:00
fan
30bf7487ae 试卷编辑调整 2021-03-31 09:31:50 +08:00
fan
076c7192ec 教学管理调整 2021-03-30 18:07:45 +08:00
fan
1d50b1582d BUG：208、209、210 2021-03-30 15:51:15 +08:00
fan
28d092401e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-30 15:23:48 +08:00
fan
d42579479b 教学管理问题调整 2021-03-30 15:23:37 +08:00
joylink_cuiweidong
0c407dbfa9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-30 14:59:09 +08:00
joylink_cuiweidong
b78454781b 运行图编制 添加任务/修改任务 代码调整 2021-03-30 14:58:51 +08:00
fan
51bce2825e 教学管理问题调整 2021-03-30 14:49:47 +08:00
fan
d8462bb404 教学管理问题调整 2021-03-30 14:31:25 +08:00
fan
692c9f0c03 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-30 10:41:48 +08:00
fan
894dc96ea5 教学管理问题调整 2021-03-30 10:41:27 +08:00
joylink_cuiweidong
770bdff791 代码调整 2021-03-30 09:59:51 +08:00
joylink_cuiweidong
65595cbe85 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-30 09:57:35 +08:00
joylink_cuiweidong
09b2923126 iscs 代码调整 2021-03-30 09:57:05 +08:00
fan
def94fee3e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-29 18:05:30 +08:00
fan
d0f756ed2f BUG202\200:成绩查询页面点击重置报错;删除课程的提示需要修改 2021-03-29 18:05:22 +08:00