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

2988 Commits

Author SHA1 Message Date
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
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
8bf3d38f95 显示配置调整 2021-09-08 10:30:04 +08:00
fan
5e5474aee9 显示配置调整 2021-09-06 17:49:44 +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
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
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
joylink_cuiweidong
88c327698f 地图绘制 添加 信号机设备里 信号机型号（signalModel） 字段 
更改 进路编辑里 信号是否开放绿灯字段 为 信号显示（aspect） 字段
 2021-08-27 10:17:13 +08:00
zyy
178e2aa4a9 调整运行图加载优化 2021-08-25 11:09:38 +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
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
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
fan
69e0e54c6c 保存延续保护和进路 2021-08-03 14:58:13 +08:00
joylink_cuiweidong
ab96efb1c6 地图绘制 现地配置 增加 可切换显示的车站 字段 2021-07-29 11:08:36 +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
fan
d2357e0797 一键生成集中站现地配置 2021-07-15 10:50:29 +08:00
fan
3bb9c2a8d4 调整集中站设备显示 2021-07-14 09:32:12 +08:00
fan
79a85639fc 非管理员开放倍速功能（5倍速） 2021-07-12 10:38:39 +08:00
joylink_cuiweidong
a39996e457 福州一号线 运行图 加线抽线 
去除 西安三 运行图 加线抽线
 2021-07-02 16:45:51 +08:00
joylink_cuiweidong
4e2b07829c 西安三号线 运行图 加线抽线功能 添加 2021-07-02 13:44:21 +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
a8f4b06fbf 删除runPlan 弃用代码 2021-07-01 09:42:13 +08:00
fan
bcf9cc1d7f 左键点击关闭车次窗 2021-06-30 14:55:28 +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
fan
e1b5c43fb7 zc设备数据添加noService属性 2021-06-24 13:54:44 +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
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
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
joylink_cuiweidong
6128cc8d50 地图发布 添加描述字段 
发布地图 发布历史展示描述字段
 2021-06-16 11:15:31 +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
bea9855e79 地图绘制 地图列表代码bug处理 2021-06-11 15:36:23 +08:00
yuan
a4e6119c4b 应答器批量创建增加区段偏移值 2021-06-10 15:46:20 +08:00
yuan
4bd21b30c5 地图编辑-应答器-批量创建 页面修改 2021-06-10 10:01:34 +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
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
0d27da9d3b 南京二号线列监调整--暂提 2021-06-03 09:47:40 +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
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
fan
aec02b7752 南京二行调调整 2021-05-31 14:15:09 +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
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
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
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
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
4796e7f648 代码暂提 2021-05-24 11:29:59 +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
55ee64479f 调整系统绘图模块新增 2021-05-20 17:58:23 +08:00
zyy
c4ec37a403 调整权限字段显示 2021-05-20 17:13:05 +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
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
fan
853e049cc5 哈尔滨运行图调整 2021-05-18 14:19:28 +08:00
fan
7af49deb90 综合演练添加车站值班员 2021-05-18 10:04:03 +08:00
fan
0a9c8665ff 代码调整 2021-05-17 16:37:56 +08:00
fan
bc2fa1fbae 代码调整 2021-05-17 13:35:49 +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
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
bf69914d21 代码问题调整 
(cherry picked from commit 7cd36b7446)
 2021-05-13 13:13:44 +08:00
fan
9c7b6e4ab2 运行图解析调整 2021-05-10 15:08:58 +08:00
fan
a9da38daf2 运行图解析调整 2021-05-10 09:13:22 +08:00
fan
0b78df8c9c 场景语音训练调整 2021-05-06 15:35:14 +08:00
fan
f9d2d8a0ac 语音训练调整 2021-04-30 16:14:56 +08:00
fan
0585502691 大铁线路操作调整 2021-04-29 15:50:15 +08:00
fan
ae5df5de5b 大铁线路操作调整 2021-04-29 13:25:48 +08:00
fan
ed7c4bb8f5 大铁线路操作调整 2021-04-29 10:35:34 +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
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
7379945c42 大铁仿真调整 2021-04-23 09:01:12 +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
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
84169141ab 大铁 指示灯 代码调整 2021-04-16 14:22:29 +08:00
ival
14f718ec1a 增加指示器显示 2021-04-15 18:15:12 +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
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
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
a5b3f9cf04 组织管理调整 2021-04-01 16:28:30 +08:00
fan
0253e6e590 组织管理调整 2021-03-31 18:27:29 +08:00
fan
887edee9e6 考试系统按钮位置调整 2021-03-31 09:35:51 +08:00
fan
64a673419b 考试调整 2021-03-29 15:01:43 +08:00
joylink_cuiweidong
b383815100 地图绘制 交路预览 显示代码调整 2021-03-22 16:04:33 +08:00
joylink_cuiweidong
7e80c71fef 代码调整 2021-03-22 15:49:14 +08:00
joylink_cuiweidong
9b4309d0c1 代码调整 2021-03-22 14:38:19 +08:00
joylink_cuiweidong
2dae1bc8d8 代码调整 2021-03-22 14:30:21 +08:00
joylink_cuiweidong
26b72f9228 代码调整 2021-03-22 13:20:51 +08:00
ival
d7e068c79d 修改引入文件路径问题 2021-03-19 11:02:40 +08:00
ival
12f6bae8e5 解决冲突 2021-03-19 10:52:57 +08:00
ival
1b2abcffb3 Merge branch 'test-ival' into test 
# Conflicts:
#	src/permission.js
#	src/views/demo/index.vue
#	src/views/newMap/displayNew/demoTraining/index.vue
#	src/views/newMap/displayNew/lesson/index.vue
 2021-03-19 10:15:43 +08:00
ival
d03315f8fd 重构运行图解析代码逻辑 2021-03-19 10:10:51 +08:00
joylink_cuiweidong
b0a04a9dec Merge remote-tracking branch 'remotes/origin/test_newRunplan' into test 2021-03-18 15:02:03 +08:00
fan
700928ed22 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-18 11:21:17 +08:00
fan
23d8feb8b7 按钮顺序调整 2021-03-18 11:21:00 +08:00
joylink_cuiweidong
816fa77d79 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-18 11:13:01 +08:00
joylink_cuiweidong
5336a1899e demo 修改 2021-03-18 11:12:31 +08:00
fan
52898a24ac 仿真按钮样式调整 2021-03-18 09:35:45 +08:00
ival
b4bf5114c6 demo 2021-03-17 18:07:49 +08:00
ival
43b6ebaa37 demo 2021-03-17 18:06:45 +08:00
ival
520c95a00c 增加demo 2021-03-17 17:51:22 +08:00
ival
666ad3f7d9 增加demo 2021-03-17 17:50:17 +08:00
ival
e183f40611 提交代码 2021-03-17 13:35:15 +08:00
joylink_cuiweidong
f21d270cf5 地图数据 交路预览页面调整 2021-03-17 09:33:19 +08:00
walker-sheng
37e98a7d57 89版本问题 2021-03-13 00:20:59 +08:00
walker-sheng
b92c8cafdc Revert "清除chrome89版本 windowopen 的noopener参数打不开的问题" 
This reverts commit 2e442e6e8c.

# Conflicts:
#	src/views/newMap/displayNew/menuSchema.vue
#	src/views/newMap/jlmapNew/index.vue
 2021-03-13 00:15:32 +08:00
sunleking
7fa30c1a30 merge 2021-03-13 00:13:08 +08:00
sunleking
2e442e6e8c 清除chrome89版本 windowopen 的noopener参数打不开的问题 2021-03-13 00:10:55 +08:00
sunzhenyu
1de6eda1a6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-11 17:11:03 +08:00
sunzhenyu
9434928436 新版三维车站客流管理代码修改(未实装) 2021-03-11 17:10:50 +08:00
ival
dc8c74632d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-11 09:22:41 +08:00
ival
3fff0da60d 修改 数据库名称 为后端baseUrl的域名关键字 2021-03-11 09:22:30 +08:00
fan
659054f1fa 岔芯添加parentCode 2021-03-10 19:03:04 +08:00
fan
605d60b06c 岔芯添加parentCode 2021-03-10 18:14:12 +08:00
fan
b05ab63bc6 关联岔芯参数可删除 2021-03-10 17:28:09 +08:00
fan
d9d2e9b6cd 道岔计轴添加关联岔芯参数&宁波三排列进路到 2021-03-10 17:18:35 +08:00
fan
0bf5e348a0 岔芯不生成车次窗 2021-03-10 13:19:17 +08:00
ival
d993771f72 线路：南京2 
问题：修改岔区设限报错问题，以及点击设置store值得优化
 2021-03-09 09:24:08 +08:00
fan
a6d81b5e3a 实训调整&ibp图片更换 2021-03-08 16:20:29 +08:00
joylink_cuiweidong
ed791a0a2f 地图绘图 目的地码 添加起始区段的字段 2021-03-03 13:21:41 +08:00
ival
ab9a11ef60 线路：西安2 
问题：修改优先折法为侧线优先
 2021-03-02 09:17:35 +08:00
ival
e983194879 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-01 18:36:45 +08:00
ival
5278c2308a 线路：宁波1号线 
问题：调试 全线取消限速、设置电灯实训过程
 2021-03-01 18:36:33 +08:00
joylink_cuiweidong
561e6633c0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-01 14:19:33 +08:00
joylink_cuiweidong
92cc3d60c0 地图绘图 信号机添加 不生成进路 字段 2021-03-01 14:18:49 +08:00
lVAL
1580a89770 线路：宁波一，南京2 
问题：
a.南京2现地实训进入后，视图有的站没有拆分成两列
b.修改宁波一，设置通过dialog的title提示
c.恢复showStationContent函数的加入位置
d.删除代码中的一些无用注释代码
 2021-02-26 16:23:16 +08:00
joylink_cuiweidong
40b2dceaf9 代码调整 2021-02-25 16:16:43 +08:00
joylink_cuiweidong
279cbc7133 地图绘图数据 目的地码 代码调整 2021-02-25 15:19:22 +08:00
lVAL
52b1a87e9c 线路：成都3 
问题：现地第一次加载，引导按钮没有显示的问题
 2021-02-25 11:18:59 +08:00
fan
4b0320061e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-23 18:17:23 +08:00
fan
f0cd6ff07c 问题调整 2021-02-23 18:17:15 +08:00
joylink_cuiweidong
908cf9dddf 宁波三号线 控制权 状态调整 2021-02-23 18:12:12 +08:00
fan
dc3e3d7b7e 宁波一 计轴复位按钮操作 2021-02-22 10:27:32 +08:00
joylink_cuiweidong
466d57b4be Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-20 15:05:36 +08:00
joylink_cuiweidong
858c7dd7a7 宁波三号线（泰雷兹线路） 系统扣车设置/取消 操作添加 2021-02-20 15:03:44 +08:00
fan
7483b1be46 调整综合演练现地设备显示 2021-02-20 13:28:11 +08:00
fan
37d44bf6d2 现地 设备显示调整 2021-02-20 10:42:25 +08:00
joylink_cuiweidong
7d3dfc2d31 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-19 13:28:53 +08:00
joylink_cuiweidong
414aa1a3ca 地图绘制 列车数据模型更改 2021-02-19 13:28:19 +08:00
lVAL
2aff2be8b4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-19 09:26:36 +08:00
lVAL
1030f13d37 修改宁波3号线，二次确认 锁闭标题问题； 
修改西安2号线，定操、反操实训第一步描述错误。
 2021-02-19 09:26:26 +08:00
fan
731c8e7fc3 宁波一 设置/取消强制点灯 2021-02-18 15:38:20 +08:00
joylink_cuiweidong
70556faea6 北交大 客流系统 代码调整 2021-02-05 17:29:25 +08:00
joylink_cuiweidong
7a949cd5e2 北交大 客流系统 大客流策略 代码调整 2021-02-05 17:23:09 +08:00
joylink_cuiweidong
f94f3deadf Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-05 17:06:18 +08:00
joylink_cuiweidong
a429f53015 北交大 客流系统 大客流策略 页面代码调整 2021-02-05 17:05:42 +08:00
fan
f3ec3a1476 南京二号线折行显示调整 2021-02-05 15:12:57 +08:00
fan
88683b3763 代码调整 2021-02-05 09:19:18 +08:00
joylink_cuiweidong
3233ce39f0 北交大 客流代码调整 2021-02-04 18:34:31 +08:00
joylink_cuiweidong
e0f2d0a288 北交大 客流 代码调整 2021-02-04 18:30:02 +08:00
joylink_cuiweidong
68d2ecd6db Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-04 17:18:25 +08:00
joylink_cuiweidong
61fb768bdc 北交大客流项目 大客流策略 2021-02-04 17:17:45 +08:00
sunzhenyu
8cb4ef4bdc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-04 11:03:57 +08:00
sunzhenyu
67d8c9467c 修改三维客流订阅连接，增加三维车站管理界面 2021-02-04 11:03:48 +08:00
joylink_cuiweidong
2de373dd24 北交大 客流系统 退出系统 关闭其他窗口 2021-02-03 15:44:18 +08:00
joylink_cuiweidong
3a91ccfa0a 北交大 客流策略 代码调整 2021-02-03 14:08:58 +08:00
joylink_cuiweidong
acbbf14d1c 北交大 代码调整 2021-02-03 13:45:11 +08:00
joylink_cuiweidong
2968b1ddfb 北交大客流策略 添加 2021-02-03 13:40:11 +08:00
joylink_cuiweidong
eeb7e3afad Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/jmapNew/theme/ningbo_03/menus/menuDialog/initializeSignalCanBlock.vue
#	src/jmapNew/theme/ningbo_03/menus/menuDialog/signalBlock.vue
#	src/jmapNew/theme/ningbo_03/menus/menuDialog/stationControl.vue
#	src/jmapNew/theme/ningbo_03/menus/menuDialog/switchActive.vue
#	src/jmapNew/theme/ningbo_03/menus/menuDialog/switchBlock.vue
 2021-02-02 18:16:51 +08:00
joylink_cuiweidong
c149f33a99 删除无用的代码 2021-02-02 18:06:02 +08:00
fan
8aaaf9f9df 国赛提交试卷后初始化结果 2021-02-02 17:23:29 +08:00
fan
c7e0bdc1e7 国赛理论测试显示结果调整 2021-02-02 17:03:39 +08:00
fan
7d60412e96 国赛试题调整 2021-02-02 16:34:55 +08:00
lVAL
7b11378443 修改 宁波 selected报错问题 2021-02-02 09:41:35 +08:00
lVAL
f0e3ee1f49 线路：南京2 
问题：修改现地 强制站控，交出控制权，接受控制的实训流程。
 2021-02-01 13:43:48 +08:00
fan
22ac51f595 国赛购买调整描述 2021-01-29 16:20:18 +08:00
fan
216e8f0f19 国赛购买调整 2021-01-29 16:15:24 +08:00
fan
c53000186a 调整国赛购买位置 2021-01-29 15:28:51 +08:00
fan
e77ce189d1 放开国赛购买注释 2021-01-29 15:09:12 +08:00
joylink_cuiweidong
3175321085 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-29 11:24:07 +08:00
joylink_cuiweidong
2e3d576614 生成联锁添加配置项：信号机接近区段不跨过前方同向信号机 2021-01-29 11:23:01 +08:00
lVAL
4d3d92e18b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-29 09:46:05 +08:00
lVAL
e28047773d 线路：福州1 
问题：设置运行等级实训提示运行时间未提示的问题
 2021-01-29 09:45:43 +08:00
fan
012fdd117f 注释国赛系统购买 2021-01-28 20:05:45 +08:00
fan
f4e3deaabc 仿真异常不清除订阅 2021-01-28 18:54:48 +08:00
fan
5bf8ffe9ac BUG 149:浙大网新：现地仿真系统中车站切换显示有误; 2021-01-28 18:22:13 +08:00
fan
3f70632b84 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-28 17:47:56 +08:00
fan
b1d944c52f 国赛购买成功调整 2021-01-28 17:47:43 +08:00
lVAL
6a033b2a9d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-28 16:28:14 +08:00
lVAL
590fb34edf 修改 宁波线操作 2021-01-28 16:27:44 +08:00
fan
18dee86d9c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-28 16:20:30 +08:00
fan
f07981ce64 国赛购买权限 --暂提 2021-01-28 16:20:18 +08:00
sunzhenyu
84e77d7fbc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-28 16:10:45 +08:00
sunzhenyu
e45e933436 修改三维驾驶中cctv视角按钮 2021-01-28 16:10:36 +08:00
fan
87ca64e33b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-28 10:30:08 +08:00
fan
9c341fed70 退出仿真时清除requestList请求栈堆数据 2021-01-28 10:29:38 +08:00
lVAL
369c5446cc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/jmapNew/theme/nanjing_02/menus/menuButton.vue
 2021-01-27 18:39:11 +08:00
lVAL
ba5de90773 配置 南京2实训 2021-01-27 18:32:16 +08:00
joylink_cuiweidong
8f82b0fdd5 北交大客流 车站人数代码调整 
地图绘图代码调整
 2021-01-27 15:39:53 +08:00
lVAL
ad0590dfe4 修改南京2 登录密码为1 以及限制普通站不能登录 2021-01-27 09:27:44 +08:00
lVAL
be6610a850 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-26 17:45:39 +08:00
lVAL
4efca07ac8 配置 宁波3 设置跳停和取消跳停配置 2021-01-26 17:45:24 +08:00
fan
98488d3095 BUG 106:浙大网新线路点击剧本加载再退出后，车站切换框显示无数据 2021-01-26 17:13:00 +08:00
fan
abed3ef7c1 BUG108: 浙大网新仿真：道岔单解时出现字母“E”后，右键点击出现“使能”，此时不点击使能，而点击空白处，再点击字母E，没有反应，并且初始化后E还在闪烁 && 南京二排列进路后封锁区段显示调整 2021-01-26 16:19:29 +08:00
fan
76f0fa96ab Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-25 17:21:40 +08:00
fan
4fb1cd1bed 南京二号线行值折行显示 2021-01-25 17:21:24 +08:00
lVAL
32304d294e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-25 15:46:29 +08:00
lVAL
b5788f01d4 增加 现地车站登录功能 2021-01-25 15:46:18 +08:00
joylink_cuiweidong
e49cce6b8a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-25 13:51:23 +08:00
joylink_cuiweidong
d3546c5de2 岔心鼠标事件 绘图代码调整 2021-01-25 13:48:37 +08:00
fan
3b6563351b 运行图层级调整 2021-01-25 10:30:43 +08:00
joylink_cuiweidong
8eee00f454 代码调整 2021-01-22 19:18:16 +08:00
fan
c80e08292c 调整实际长度 小数计算 2021-01-22 14:51:37 +08:00
fan
420163ec07 逻辑区段实际长度设置调整&实训平台二级主页 2021-01-22 14:47:49 +08:00
fan
4a0c7e1e95 逻辑区段实际长度设置调整 2021-01-22 13:59:32 +08:00
fan
258796555e 车队进路调整 2021-01-21 19:11:50 +08:00
lVAL
f0829b768b 增加佛州线实训配置 2021-01-21 10:42:17 +08:00
fan
295ddee738 调整showMode初始值 2021-01-20 16:47:20 +08:00
joylink_cuiweidong
88234d9154 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-20 16:20:58 +08:00
joylink_cuiweidong
fe81a31883 佛山有轨电车 线路 暂时隐藏 iscs ibp 数据 2021-01-20 16:20:20 +08:00
fan
25b6ad4ca8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-20 15:53:23 +08:00
fan
34aca8de12 现地行调条件显示调整 2021-01-20 15:53:13 +08:00
joylink_cuiweidong
c8c4264be9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-20 15:32:08 +08:00
joylink_cuiweidong
057d7a7d75 北交大项目 运行图预览打不开 bug 处理 2021-01-20 15:31:41 +08:00
fan
330f58eba4 右键选择 进路快捷操作盘 2021-01-20 13:50:37 +08:00
fan
49405666df 传输信号机参数调整 2021-01-19 11:18:24 +08:00
fan
145259d3b5 传输信号机 && 佛山进路预览调整 2021-01-19 11:09:53 +08:00
lVAL
aed7f034b1 南京2车站操作设备并且状态刷新后，页面操作菜单disabled刷新问题 2021-01-18 17:32:20 +08:00
lVAL
198602923c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-18 15:49:00 +08:00
lVAL
7d61451fa9 修改 应答器 创建的几个优化问题，以及南京线路中心左键弹窗，右键不弹 2021-01-18 15:48:05 +08:00
fan
5f3300e889 信号机添加所属车站&批量设置 2021-01-18 15:41:28 +08:00
fan
f60054ccad 现地切行调后 车站显示问题调整 2021-01-18 11:29:03 +08:00
lVAL
dd7f4d2aeb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-15 17:23:37 +08:00
lVAL
0ee148437b 增加应答器 创建时必须选择信号机以及校验 2021-01-15 17:23:27 +08:00
joylink_cuiweidong
f61df9b1e8 岔心状态 绘图代码调整 2021-01-15 17:17:17 +08:00
joylink_cuiweidong
39da2a712d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-15 16:44:55 +08:00
joylink_cuiweidong
9aef723b3f bug修改： 
逻辑区段修改 导致逻辑区段起终点坐标出现错误问题
逻辑区段修改坐标 导致相邻物理区段坐标出现问题
功能：
增加线路配置：信号封锁下进路是否可以办理
 2021-01-15 16:44:22 +08:00
lVAL
c63d475d57 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-15 15:11:24 +08:00
lVAL
3c37037558 增加应答器关联信号机，以及绘图信号机，区段激活选择 2021-01-15 15:11:13 +08:00
joylink_cuiweidong
0f4f6ef5f2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-15 13:27:09 +08:00
joylink_cuiweidong
53b51a7b63 道岔 生成逻辑代码调整 2021-01-15 13:26:42 +08:00
lVAL
ec30635c02 修改应答器图层以及回车修改属性的问题 2021-01-15 10:59:58 +08:00
joylink_cuiweidong
4e28468ad9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-15 10:33:15 +08:00
joylink_cuiweidong
a86c76422f 岔心绘图代码调整 
区段绘图（左右关联区段 关系）调整
 2021-01-15 10:32:57 +08:00
lVAL
48955258ea 修改应答器 绘制card css 2021-01-15 09:54:56 +08:00
lVAL
c6c59f48b7 修改代码 2021-01-15 09:53:37 +08:00
lVAL
284899599c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/jmapNew/theme/nanjing_02/menus/menuButton.vue
 2021-01-14 18:38:29 +08:00
lVAL
b5c2202114 增加 南京线增加参数选择的步骤功能 2021-01-14 18:37:31 +08:00
joylink_cuiweidong
28babc78f9 岔心 绘图调整 2021-01-14 16:03:48 +08:00
joylink_cuiweidong
cadda00719 区段 物理区段 实际长度修改 bug调整 2021-01-14 14:58:42 +08:00
joylink_cuiweidong
845f10caf6 岔心绘图代码调整 
bug调整：新建完一个信号机 三个状态不发生改变
 2021-01-14 13:04:04 +08:00
joylink_cuiweidong
becb6a03df 岔心代码调整 2021-01-13 18:33:07 +08:00
lVAL
9f4155b70d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-13 17:45:49 +08:00
lVAL
15f94a7d1d 优化 应答器创建 选择关联区段类型 以及优化绘制显示位置 2021-01-13 17:45:38 +08:00
joylink_cuiweidong
752b4e9a26 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/jmapNew/config/skinCode/nanjing_02.js
#	src/jmapNew/utils/parser.js
 2021-01-13 17:43:15 +08:00
joylink_cuiweidong
99644039d3 新建车站以后 无法点击其他的东西 bug 调整 2021-01-13 17:34:57 +08:00
joylink_cuiweidong
ac6f3673d4 Merge branch 'master' of https://git.code.tencent.com/lian-cbtc/jl-client 2021-01-13 17:02:31 +08:00
joylink_cuiweidong
7599458c8f 岔心 元素绘图代码调整 2021-01-13 17:01:53 +08:00
lVAL
006d784178 修改应答器bug 2021-01-13 10:26:52 +08:00
thesai
032ec93af4 Merge remote-tracking branch 'origin/test' 2021-01-12 23:46:38 +08:00
thesai
2d154f1611 设备登录行值显示 2021-01-12 23:46:07 +08:00
thesai
8eb293f074 Merge remote-tracking branch 'origin/test' 2021-01-12 23:14:34 +08:00
thesai
4adc474b54 设备登录行值显示 2021-01-12 23:13:05 +08:00
joylink_cuiweidong
cb35140942 Merge remote-tracking branch 'remotes/origin/test' 2021-01-12 19:01:29 +08:00
fan
35790f6693 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-12 18:27:05 +08:00
fan
21e2455472 项目登录行调 运行图预览跳转新页面 2021-01-12 18:26:55 +08:00
sunzhenyu
646836ecb4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-12 17:58:12 +08:00
sunzhenyu
057a6e41f8 删除无用注释 2021-01-12 17:57:59 +08:00
sunzhenyu
d257bf254b 修改sdy行调沙盘，现地cctv 2021-01-12 17:57:04 +08:00
joylink_cuiweidong
1e2e8c2609 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/jmapNew/config/skinCode/nanjing_02.js
#	src/jmapNew/shape/Responder/index.js
 2021-01-12 17:27:25 +08:00
joylink_cuiweidong
85a88a9431 岔心 绘图代码调整 2021-01-12 17:25:32 +08:00
lVAL
64df012fc3 设置应答器 绘图显示 仿真不显示 2021-01-12 11:32:39 +08:00
joylink_cuiweidong
54a312c20f 岔心 地图绘图 代码调整 2021-01-12 10:11:16 +08:00
lVAL
7bacd3c49f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-12 10:07:50 +08:00
lVAL
9bd12bb82e 增加应答器配置 2021-01-12 10:07:31 +08:00
sunzhenyu
96e2179bd7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-11 15:55:57 +08:00
sunzhenyu
b2ab6d4fd1 修改综合演练中三维驾驶不显示选择司机 2021-01-11 15:55:48 +08:00
joylink_cuiweidong
e1af8e878e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-11 15:40:15 +08:00
joylink_cuiweidong
6ef0498ffd 添加 岔心 地图绘制页面 2021-01-11 15:39:06 +08:00
fan
b248e69ffe 导入学生信息添加校验&哈尔滨打包不再区分路由文件 2021-01-11 10:55:07 +08:00
zyy
bb22ed66ed 调整大屏预览显示流程 2021-01-08 16:50:50 +08:00
fan
4d3991f3e9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_lesson 2021-01-08 11:13:16 +08:00
fan
dfa815fe6d 课程创建迁移&调度电话调整 2021-01-08 11:12:58 +08:00
joylink_cuiweidong
4d8932e155 触发故障管理 布局代码调整 2021-01-07 11:13:03 +08:00
joylink_cuiweidong
5469afd2ec 调度电话 代码调整 
（现地工作站去掉 所有车站）
（呼叫 已经通话的人 会话逻辑处理）
 2021-01-07 10:31:26 +08:00
fan
e94ffd235a 故障模式快捷键&ISCS返回（退出）调整 2021-01-06 18:17:40 +08:00
fan
43f039e5c6 浙大网新 发送请求提示调整 2021-01-04 17:52:38 +08:00
lVAL
cfa739338b Merge branch 'master' of https://git.code.tencent.com/lian-cbtc/jl-client 2020-12-31 18:12:07 +08:00
fan
48b165e11c 国赛权限调整 2020-12-30 15:30:24 +08:00
joylink_cuiweidong
3329053207 仿真 综合演练 添加 联系方式 2020-12-29 16:15:10 +08:00
fan
56a47f48f9 Merge branch 'test' 2020-12-29 16:14:16 +08:00
sunzhenyu
f45262c245 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-29 11:07:41 +08:00
fan
855936a5db 调整功能按钮 2020-12-29 10:16:27 +08:00
fan
62f4695c50 Merge remote-tracking branch 'origin/test' 2020-12-29 10:08:38 +08:00
sunzhenyu
ec1f215104 merge 2020-12-29 10:00:44 +08:00
sunzhenyu
0eedf1bd6b merge 2020-12-29 10:00:29 +08:00
sunzhenyu
e857d580ac 修改客流车站模型 2020-12-29 09:59:43 +08:00
fan
8b2291e18b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-29 09:59:26 +08:00
fan
fda2e940a5 调整路径 2020-12-29 09:59:11 +08:00
lVAL
f97a98da21 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-28 16:59:57 +08:00
lVAL
44e42bf5e5 调整宁波3号线操作 2020-12-28 16:59:29 +08:00
fan
8028103feb 综合演练行调添加ISCS&ISCS列车时刻表&ISCS信号系统 2020-12-28 11:20:36 +08:00
fan
48e37e44f8 indexedDb调整 2020-12-24 15:33:06 +08:00
joylink_cuiweidong
623cbd2143 北交大 客流 代码调整 2020-12-22 18:42:27 +08:00
joylink_cuiweidong
d5fcc4bd36 北交大 客流数据 代码调整 2020-12-22 18:26:31 +08:00
fan
e38833b119 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-22 17:27:31 +08:00
fan
8b2cd16fe9 运行图调整 2020-12-22 17:27:04 +08:00
sunzhenyu
af7e9d8dbf Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-22 14:08:33 +08:00
sunzhenyu
e3b9c2f682 修改北交大客流人数颜色图示 2020-12-22 14:08:25 +08:00
fan
1bc7da3c53 哈尔滨 联锁机故障&重启令解 2020-12-21 16:09:43 +08:00
zyy
baffbf36c8 调整南京二号线线路点击选择 2020-12-20 10:55:34 +08:00
joylink_cuiweidong
ceb288d960 Merge remote-tracking branch 'remotes/origin/test' 2020-12-18 19:09:24 +08:00
zyy
2884d0f02c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-18 15:37:53 +08:00
zyy
901fa60bc4 调整道岔生成流程 2020-12-18 15:37:35 +08:00
fan
941e0a791a 留言板调整 2020-12-18 13:38:13 +08:00
joylink_fanyuhong
e534232f2d 留言板调整 
(cherry picked from commit 0dbc19027a)
 2020-12-18 09:18:43 +08:00
fan
5740b863b3 text、line、outFrame添加参数&报错提示调整 2020-12-18 09:17:18 +08:00
joylink_fanyuhong
0dbc19027a 留言板调整 2020-12-17 22:46:09 +08:00
joylink_fanyuhong
1e9bc8adb5 Merge remote-tracking branch 'origin/test' 2020-12-17 20:56:05 +08:00
fan
ca8da79986 merge 2020-12-17 13:20:47 +08:00
fan
855295ca75 通用ibp&留言板管理&贵装备课程发布调整 2020-12-17 13:19:12 +08:00
joylink_cuiweidong
fdfd54f452 北交大客流项目 代码调整 2020-12-17 09:59:06 +08:00
zyy
f7703476e8 Merge branch 'test' 2020-12-16 18:23:21 +08:00
zyy
34bff76eb5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-16 15:37:22 +08:00
zyy
c2f6c3461b 调整宁波三，增加字段 2020-12-16 15:37:09 +08:00
joylink_cuiweidong
90f0b4e918 运行图编制代码调整 2020-12-16 14:51:59 +08:00
fan
3aadd5d682 Merge remote-tracking branch 'origin/test' 2020-12-16 14:00:49 +08:00
fan
bd0aac34fe 综合演练现地显示调整 2020-12-16 13:25:55 +08:00
fan
d5b0508467 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-16 10:55:25 +08:00
fan
eebb034208 现地增加ibp& 现地切换值班员角色调整 2020-12-16 10:54:55 +08:00
joylink_cuiweidong
1715dcad32 北交大 客流数据代码调整 2020-12-16 10:18:58 +08:00
joylink_cuiweidong
525fc25469 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-16 09:42:15 +08:00
joylink_cuiweidong
0a5eb83904 代码调整 2020-12-16 09:41:53 +08:00
joylink_cuiweidong
3f7d5da3b1 代码调整 2020-12-16 09:40:37 +08:00
fan
1faa02cffa Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-15 18:16:04 +08:00
fan
19e9cb7948 缓存运行图数据 2020-12-15 18:15:48 +08:00
joylink_cuiweidong
1453d5538a 北交大客流仿真代码调整 2020-12-15 18:09:10 +08:00
joylink_cuiweidong
845b620e65 北交大仿真 切换客流数据调整 2020-12-15 16:20:11 +08:00
zyy
9e48ca39a8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-15 14:41:36 +08:00
zyy
249bef4802 调整道岔生成逻辑 2020-12-15 14:41:23 +08:00
joylink_cuiweidong
a45374acc3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-15 13:36:05 +08:00
joylink_cuiweidong
da59fdbed6 代码调整 2020-12-15 13:35:38 +08:00
fan
3c6047d4ad 打包调整 2020-12-15 11:18:15 +08:00
zyy
7ec4a2db59 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-15 11:10:19 +08:00
zyy
b85dcb41dc 调整道岔生成逻辑 2020-12-15 11:10:05 +08:00
fan
91197718c8 Merge branch 'test' 2020-12-14 18:41:55 +08:00
joylink_cuiweidong
c437ac62c1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-14 17:19:31 +08:00
joylink_cuiweidong
0ecea0aabc 地图绘制代码调整 2020-12-14 17:18:57 +08:00
zyy
e5a51e0d90 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/utils/baseUrl.js
 2020-12-14 17:07:15 +08:00
zyy
40687fcd5b 调整信号机批量设置偏移量 2020-12-14 17:06:23 +08:00
joylink_cuiweidong
1deaf4defc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-14 16:54:31 +08:00
joylink_cuiweidong
89b635e24a 地图绘制代码调整 2020-12-14 16:53:43 +08:00
fan
0364fa0f2d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-14 15:51:29 +08:00
fan
62cba757e6 绘图预览界面 现地行调显示调整 & ibp从发布地图创建调整 & 贵装备信息导入调整 2020-12-14 15:22:47 +08:00
zyy
02a6293d5d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-14 11:29:43 +08:00
zyy
0310ee6c57 调整地图流程 2020-12-14 11:29:26 +08:00
joylink_cuiweidong
c3fc4a1797 Merge remote-tracking branch 'remotes/origin/test' 2020-12-11 20:18:58 +08:00
joylink_cuiweidong
328805ba80 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-11 20:17:41 +08:00
joylink_cuiweidong
d8c6a8657b 哈尔滨运行图编制代码调整 2020-12-11 20:17:18 +08:00
fan
70e260cc4f 哈尔滨屏蔽门调整 2020-12-11 19:49:48 +08:00
fan
f9d8bda8b0 宁波三号线延续保护添加箭头 2020-12-11 13:19:34 +08:00
joylink_cuiweidong
1b0ab87020 车站绘图代码调整（去除公里标名称必填） 
文字绘图代码调整（调整文字字体，与车站名称字体一致）
 2020-12-10 18:33:18 +08:00
joylink_cuiweidong
9a7a69201a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-10 18:03:19 +08:00
joylink_cuiweidong
fd267160b1 信号机绘图代码调整（解决设置信号机归属联锁站bug） 
运行图编制代码调整
 2020-12-10 18:02:59 +08:00
fan
80ebd84062 宁波三号线调整 2020-12-10 17:34:13 +08:00
joylink_cuiweidong
a22445552a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-10 13:54:13 +08:00
joylink_cuiweidong
3f7eccdc2f 运行图编制代码调整 2020-12-10 13:53:34 +08:00
sunzhenyu
72abaf9643 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-10 11:29:23 +08:00
sunzhenyu
dae99ee4ad 修改综合演练三维驾驶初始样式 2020-12-10 11:29:12 +08:00
zyy
1a093e6594 调整交控皮肤显示条件，增加自动折返进路显示 2020-12-09 17:08:36 +08:00
zyy
4361d503f3 调整信号机联锁站设置搜索 2020-12-09 15:03:46 +08:00
zyy
7ce6cf6e8a 调整修改区段bug 2020-12-08 18:41:18 +08:00
zyy
9ede8ad97d 增加删除范围，调整退出仿真发送取消订阅 2020-12-08 13:56:36 +08:00
zyy
085990f755 增加站台紧急按钮批量删除，增加区段批量删除范围 2020-12-08 11:09:02 +08:00
zyy
4362eef88b 增加删除范围 2020-12-07 18:36:53 +08:00
zyy
ed93c3159e 删除元素补充 2020-12-07 18:19:31 +08:00
zyy
c97074f585 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-07 18:00:42 +08:00
zyy
b0234db4a2 调整道岔生成逻辑 2020-12-07 18:00:26 +08:00
sunzhenyu
ce7a3de96f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-07 17:14:15 +08:00
sunzhenyu
d973dbc46e 修改三维设备界面隐藏显示 2020-12-07 17:14:06 +08:00
zyy
6b53bc55d6 调整删除区段关联车次窗 2020-12-07 16:10:03 +08:00
zyy
6995a8a962 增加以区段为目标删除左右所有元素 2020-12-07 15:09:53 +08:00
zyy
cbe5307f98 Merge remote-tracking branch 'remotes/origin/test' 2020-12-06 21:56:35 +08:00
joylink_cuiweidong
cd39147257 实训平台代码调整 2020-12-04 18:10:07 +08:00
zyy
7054f6c1e6 增加运行图编辑 2020-12-04 17:10:03 +08:00