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

2412 Commits

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