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

6397 Commits

Author SHA1 Message Date
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