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

3136 Commits

Author SHA1 Message Date
fan
337ed03f78 哈尔滨问题调整 2021-05-25 16:05:45 +08:00
fan
a42e3ecafc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-25 13:18:19 +08:00
fan
3ea6c67b0f 哈尔滨问题调整 2021-05-25 13:17:55 +08:00
joylink_cuiweidong
60fce71f8a 西安三号线 鼠标右键无法出现菜单快速切换车站 处理 2021-05-25 10:36:20 +08:00
joylink_cuiweidong
8abbe2e05a 修改西安三号线问题 道岔失表不能设置定位或反位失表，只能设置成道岔定反位都失表 2021-05-25 09:48:54 +08:00
fan
6ec48dab9d BUG273 设置故障时，点击故障列表后，直接点击关闭按钮，故障列表还会显示 2021-05-24 17:41:54 +08:00
fan
8c1e968213 BUG269 哈尔滨：报警信息缺少故障描述 2021-05-24 17:01:10 +08:00
fan
640793241a BUG270 问题调整 2021-05-24 16:08:52 +08:00
fan
49011b95e2 添加线路配置delayWhenCancelRouteWithAbnormalInterlock & 哈尔滨部分问题调整 2021-05-24 15:53:38 +08:00
fan
4796e7f648 代码暂提 2021-05-24 11:29:59 +08:00
fan
22cfed1774 暂提 2021-05-21 09:42:03 +08:00
zyy
55ee64479f 调整系统绘图模块新增 2021-05-20 17:58:23 +08:00
zyy
c4ec37a403 调整权限字段显示 2021-05-20 17:13:05 +08:00
zyy
9789fb4d91 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-20 16:38:08 +08:00
zyy
3a2baf8374 调整权限流程 2021-05-20 16:37:55 +08:00
fan
3ac0069577 暂提 2021-05-20 15:53:21 +08:00
fan
1b62198d55 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-20 15:40:10 +08:00
fan
0b716d7bc3 pad检索调整 2021-05-20 15:39:44 +08:00
fan
32ef41b405 暂提 2021-05-20 15:18:02 +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
6590c10ab7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-20 15:06:24 +08:00
fan
e212bd52e9 pdf上传检索调整 2021-05-20 15:06:14 +08:00
joylink_cuiweidong
7094b1d497 南京二号线 列车详览页面 代码调整 2021-05-20 15:05:57 +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
joylink_cuiweidong
beb086e57f 南京二号线 列车总览页面 代码调整 2021-05-20 09:20:31 +08:00
joylink_cuiweidong
f20793ec0d 代码调整 2021-05-19 18:11:32 +08:00
fan
8db97250d8 暂提 2021-05-19 18:03:58 +08:00
joylink_cuiweidong
7cac00b163 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-19 16:46:29 +08:00
joylink_cuiweidong
e6e09d24fb 代码调整 2021-05-19 16:46:07 +08:00
fan
9b422cd3b9 南京二号线调整（未完） 2021-05-19 16:07:52 +08:00
zyy
267dc4d878 删除多余配置 2021-05-19 15:20:46 +08:00
zyy
4cd675cf67 增加系统预览绘制 2021-05-19 15:07:59 +08:00
zyy
850897bd4f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-19 10:22:53 +08:00
zyy
c281a51424 调整流程 2021-05-19 10:22:39 +08:00
fan
be74067c7e 轨道详览 2021-05-18 17:49:08 +08:00
fan
f1d41844dc 南京二列车操作报错提示 & BUG267 2021-05-18 13:47:22 +08:00
fan
df68e9a969 tro 轨道总览 2021-05-18 13:36:06 +08:00
zyy
6ba7b730a5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-17 18:16:38 +08:00
zyy
9a2785f126 调整南京二号线 行调操作---> ibp局部控制盘、车站、轨道 2021-05-17 18:16:22 +08:00
fan
4384e36314 BUG266 南京11站：建议修改车次号输入框只能输入7个数字，车组号6个数字 2021-05-17 18:03:44 +08:00
fan
d00f74e190 大铁线路图纸检索 2021-05-17 17:29:33 +08:00
fan
0a9c8665ff 代码调整 2021-05-17 16:37:56 +08:00
fan
9554643f05 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-17 16:14:17 +08:00
fan
02eaa33fec 背投调整 2021-05-17 16:14:00 +08:00
zyy
17f25b1e0b 处理冲突文件 
#    src/jmapNew/theme/nanjing_02/menus/menuBar.vue
 2021-05-17 15:58:57 +08:00
zyy
050d5854d1 增加南京区段操作流程，请求暂未调整 2021-05-17 15:57:07 +08:00
fan
5c5a1db13d Bug262 福州一：紧急停车状态表示有问题 2021-05-17 15:52:26 +08:00
fan
122ca9ec6b 列车操作调整 2021-05-17 15:13:26 +08:00
fan
dfc5d50fbe ATS显示调整 2021-05-17 14:39:16 +08:00
fan
bc2fa1fbae 代码调整 2021-05-17 13:35:49 +08:00
fan
01fdc0ef22 加载时刻表 2021-05-14 18:08:12 +08:00
fan
666e85dec6 车次号步进 2021-05-14 16:49:27 +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
f4cd046f1a 大铁项目 根据车站值班员 显示绘图 2021-05-13 13:55:02 +08:00
joylink_cuiweidong
d52a5837b4 宁波三 列车绘图代码调整 2021-05-12 14:17:14 +08:00
fan
8cf5d36ce3 南京二号线调整 2021-05-11 15:36:11 +08:00
fan
4f07f16ecf 运行图解析调整 2021-05-10 14:40:37 +08:00
fan
a9da38daf2 运行图解析调整 2021-05-10 09:13:22 +08:00
fan
be3ea8384a 添加站台紧急停车 2021-05-08 13:31:19 +08:00
fan
67f1076dec 故障调整 2021-05-08 09:22:16 +08:00
fan
181caff10c 哈尔滨添加故障操作 2021-05-07 16:16:36 +08:00
fan
49d19a7d14 大铁去掉mBar 2021-05-06 16:25:13 +08:00
fan
6cb4ee9c27 场景语音训练调整 2021-05-06 16:15:09 +08:00
fan
8087d87b22 大铁线路操作调整 
(cherry picked from commit 0a0917dd32)
 2021-04-30 10:24:18 +08:00
fan
2849342be6 大铁线路操作调整 2021-04-29 16:26:08 +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
823c30118c 大铁仿真操作调整 2021-04-28 16:58:29 +08:00
fan
6ec82c158f 大铁仿真操作调整 2021-04-28 13:36:58 +08:00
fan
2d044a6810 大铁仿真操作调整 2021-04-28 09:01:27 +08:00
fan
83eddd42d3 大铁仿真操作调整 2021-04-27 15:52:39 +08:00
fan
b107ae58d6 大铁仿真操作调整 2021-04-27 14:40:17 +08:00
fan
19e3bb91d0 大铁仿真操作调整 2021-04-27 13:24:33 +08:00
fan
fad65a0d66 大铁仿真操作调整 2021-04-27 13:02:38 +08:00
fan
09781774c7 大铁线路操作调整 2021-04-26 17:59:23 +08:00
fan
cd84fbb4cd 大铁线路操作调整 2021-04-26 16:00:39 +08:00
fan
bb973a23d2 大铁线路操作调整 2021-04-26 13:39:19 +08:00
fan
d917ccce3d 大铁线路操作调整 2021-04-25 18:13:47 +08:00
fan
2bd741d4ab 大铁操作调整 2021-04-25 10:09:43 +08:00
fan
b26d17f607 信号机状态调整 2021-04-23 18:11:07 +08:00
fan
bd2165ff35 大铁仿真调整 2021-04-23 14:11:29 +08:00
fan
4fcaffae50 大铁仿真调整 2021-04-23 10:24:05 +08:00
fan
7379945c42 大铁仿真调整 2021-04-23 09:01:12 +08:00
fan
16fb67127b 信号按钮名称显示调整 2021-04-21 10:44:15 +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
852d53f4a4 代码调整 2021-04-19 17:54:13 +08:00
joylink_cuiweidong
dfb80a8eb2 代码调整 2021-04-19 09:31:07 +08:00
joylink_cuiweidong
48c91eb1a9 信号机按钮绘图代码调整 2021-04-16 18:06:12 +08:00
fan
937689b177 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-16 16:51:58 +08:00
fan
0fc9c03d2b 宁波三信号右键菜单 2021-04-16 16:51:42 +08:00
joylink_cuiweidong
84169141ab 大铁 指示灯 代码调整 2021-04-16 14:22:29 +08:00
joylink_cuiweidong
ad03a0a2bf 信号机代码调整 2021-04-16 10:56:36 +08:00
ival
14f718ec1a 增加指示器显示 2021-04-15 18:15:12 +08:00
fan
3508380dd1 宁波三信号右键按钮 2021-04-15 17:51:23 +08:00
ival
b75483ded0 删除无用打印 2021-04-15 16:30:28 +08:00
ival
d903ce7fb7 增加区段的脱轨其设备 2021-04-15 16:26:12 +08:00
ival
86ad53cfe9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-14 13:55:30 +08:00
ival
22ddd9f722 修改代码 2021-04-14 13:55:16 +08:00
joylink_cuiweidong
eadb7a5748 大铁线路 车站绘图元素添加 2021-04-14 10:24:57 +08:00
joylink_cuiweidong
6b4bdbc8fd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-13 18:24:59 +08:00
joylink_cuiweidong
ea834dc86a 大铁项目 区段状态代码调整 2021-04-13 18:24:41 +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
821d0b28e2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-13 17:37:48 +08:00
ival
693938a367 调整 打铁 道岔状态皮肤配置 2021-04-13 17:37:40 +08:00
joylink_cuiweidong
bc83661f1f 大铁线路 区段状态代码调整 2021-04-13 17:23:12 +08:00
joylink_cuiweidong
58d7f9233e 大铁 区段状态代码调整 2021-04-13 17:06:13 +08:00
joylink_cuiweidong
de4691da44 代码调整 2021-04-13 15:40:35 +08:00
fan
8a363c068a 大铁调整 2021-04-13 14:10:20 +08:00
fan
0bb06fd142 大铁调整 2021-04-13 13:52:39 +08:00
fan
34859f8f51 大铁调整 2021-04-13 13:50:24 +08:00
fan
0adef8a9c9 宁波三调整 2021-04-13 13:43:56 +08:00
fan
22c6924db8 宁波三操作调整 2021-04-12 18:58:40 +08:00
fan
5fbe0161ac 宁波三操作调整 2021-04-12 18:55:26 +08:00
fan
7901886d3b 宁波三操作调整 2021-04-12 18:19:52 +08:00
fan
5ebfa5ce38 宁波三号线操作调整 2021-04-12 13:29:26 +08:00
fan
51d2d32979 宁波三号线操作调整 2021-04-09 17:49:46 +08:00
fan
8e9afa9c9b 宁波三号线操作调整 2021-04-09 13:18:51 +08:00
fan
c58609528a 导入运行图调整 2021-04-08 17:55:35 +08:00
fan
7532c86e15 宁波三操作调整&导入运行图放开 2021-04-08 17:28:46 +08:00
fan
f5e00dd717 宁波三列车操作调整 2021-04-07 17:14:54 +08:00
fan
17995e2f40 取消mfa等故障状态add 2021-04-06 15:05:54 +08:00
fan
924e6154a3 南京十一站屏蔽门开启影响站停时间显示调整 2021-04-06 09:43:45 +08:00
joylink_cuiweidong
f8bebd192e 南京二号线 封锁岔心 状态代码跳转 2021-04-01 17:31:19 +08:00
joylink_cuiweidong
0fb623ef59 运行图编制 折返数据解析 代码调整 2021-03-30 11:26:25 +08:00
ival
7625666431 调整成都01，显示车站为等间距 2021-03-19 17:14:14 +08:00
ival
12f6bae8e5 解决冲突 2021-03-19 10:52:57 +08:00
ival
a1b6201f9b 新增文件 2021-03-19 10:11:33 +08:00
ival
d03315f8fd 重构运行图解析代码逻辑 2021-03-19 10:10:51 +08:00
ival
e183f40611 提交代码 2021-03-17 13:35:15 +08:00
ival
94bb1a0395 修改运行图代码代码 2021-03-17 10:15:21 +08:00
ival
13f3302cfc 修改新版运行图显示的问题 2021-03-15 17:32:12 +08:00
joylink_cuiweidong
8c05faab0a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-12 13:45:47 +08:00
joylink_cuiweidong
866b661c4f 南京二号线 岔心 绘图 代码调整 2021-03-12 13:45:14 +08:00
ival
ef0915ea98 线路：宁波3 
问题：调整实训流程
 2021-03-12 11:31:11 +08:00
ival
62c0bd160f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-11 18:31:01 +08:00
ival
50c206cad3 调整宁波3道岔封锁实训 2021-03-11 18:30:43 +08:00
fan
757c5d62df Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-11 18:11:27 +08:00
fan
330e15c993 南京二号线menuBar放开 2021-03-11 18:11:08 +08:00
ival
8481e2d927 删除宁波3 无用文件 2021-03-11 15:35:41 +08:00
ival
1a1745d49c 增加宁波3 状态逻辑判断 2021-03-11 15:33:43 +08:00
ival
13c1cc6819 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-11 15:27:38 +08:00
ival
0f0b95cafb 增加 宁波3 menuBar operation定义 
修改加载当日运行图界面没有显示运行图名称的问题
 2021-03-11 15:27:30 +08:00
joylink_cuiweidong
29a4dfac76 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-11 15:01:28 +08:00
joylink_cuiweidong
05ff67f546 南京二号线 岔心 通信车占用状态/非通信车占用状态 代码调整 2021-03-11 15:00:52 +08:00
ival
414bd05d0c 优化实训过程中，点击空白menuBar被关掉的问题 2021-03-11 13:44:40 +08:00
fan
8631b66be9 岔芯预复位报错调整 2021-03-11 09:17:57 +08:00
ival
1ee6c29666 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-10 17:44:30 +08:00
ival
cfe979fce4 线路：宁波3 
问题：调整页面样式
 2021-03-10 17:40:43 +08:00
fan
56c6cebbfe Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-10 17:18:51 +08:00
fan
d9d2e9b6cd 道岔计轴添加关联岔芯参数&宁波三排列进路到 2021-03-10 17:18:35 +08:00
joylink_cuiweidong
c986e22d53 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/jmapNew/theme/ningbo_03/menus/menuBar.vue
 2021-03-10 16:50:43 +08:00
ival
9991bf605d 增加确实窗口 2021-03-10 16:48:57 +08:00
joylink_cuiweidong
e8c7fbdfff Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/jmapNew/theme/ningbo_03/menus/menuBar.vue
#	src/jmapNew/theme/ningbo_03/menus/menuDialog/signalCanBlock.vue
 2021-03-10 16:48:26 +08:00
joylink_cuiweidong
96eef9053e 宁波三号线 菜单操作 代码调整 2021-03-10 16:39:53 +08:00
ival
3759386e1f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-10 15:09:24 +08:00
ival
90bdb12e57 线路：宁波3 
问题：优化初始化操作的事件模型
 2021-03-10 15:09:15 +08:00
fan
0b361fd0fc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-10 13:19:39 +08:00
fan
f9c9e25d08 登录路径错误调整 2021-03-10 10:31:16 +08:00
joylink_cuiweidong
4edb42bbbc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-10 10:25:39 +08:00
joylink_cuiweidong
2146b28b9a 宁波三号线 运行线 代码调整 2021-03-10 10:25:05 +08:00
ival
1aa009075f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-09 18:37:31 +08:00
ival
0c98c06440 线路：宁波3 
任务：修改带初始化的界面操作
 2021-03-09 18:37:20 +08:00
fan
b2bb43b47f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-09 15:47:15 +08:00
fan
c9f656c4a7 西安一实训调整 2021-03-09 15:46:54 +08:00
ival
c28be4acd7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-09 14:57:24 +08:00
ival
605280e7d5 1.宁波3号线 操作修正 
2.运行图编辑修改数据计算错误的问题
 2021-03-09 14:57:14 +08:00
fan
f2a7955bf3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-09 14:44:16 +08:00
fan
fd49034b57 南京十一站调整&添加线路配置switchTurnOperationCanRecoverSplitFault 2021-03-09 14:43:40 +08:00
joylink_cuiweidong
5352671383 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/views/planMonitor/editTool/menus/addTask.vue
 2021-03-09 10:34:16 +08:00
ival
b1552ccba5 Merge remote-tracking branch 'remotes/origin/test-tj' into test 
# Conflicts:
#	src/jmapNew/theme/ningbo_03/menus/menuBar.vue
#	src/jmapNew/theme/ningbo_03/menus/menuDialog/signalCanBlock.vue
#	src/jmapNew/theme/ningbo_03/menus/menuDialog/signalGuide.vue
 2021-03-09 10:17:25 +08:00
ival
8febc0c1d1 线路：宁波3 
问题：操作方式调整
 2021-03-09 10:14:16 +08:00
ival
d993771f72 线路：南京2 
问题：修改岔区设限报错问题，以及点击设置store值得优化
 2021-03-09 09:24:08 +08:00
ival
1e881ad0db 线路：南京2 
问题：修改岔区设限报错问题，以及点击设置store值得优化
 2021-03-09 09:20:25 +08:00
fan
ee6d3b41b1 实训调整 2021-03-08 18:03:33 +08:00
fan
48e26565df Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-08 16:20:42 +08:00
fan
a6d81b5e3a 实训调整&ibp图片更换 2021-03-08 16:20:29 +08:00
joylink_cuiweidong
142168fd14 宁波三号线 信号机操作代码调整 2021-03-08 13:49:14 +08:00
joylink_cuiweidong
03cab67c62 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-08 13:13:30 +08:00
joylink_cuiweidong
58c9ac7df7 宁波三号线 信号机 引导 操作代码调整 2021-03-08 13:13:06 +08:00
ival
12b804e110 Merge remote-tracking branch 'remotes/origin/test-tj' into test 2021-03-08 13:05:11 +08:00
ival
788ddfc228 线路：通用menuBar 
问题：点击空白关闭多级菜单时，所有层级都关闭。
 2021-03-08 09:42:02 +08:00
ival
faaded9b1e 线路：通用menuBar 
问题：点击空白关闭多级菜单时，所有层级都关闭。
 2021-03-08 09:41:07 +08:00
ival
c4af252a3e 线路：福州 
问题：修改福州信号关灯操作中，没有关闭一次弹窗的问题
 2021-03-08 09:27:02 +08:00
ival
11df0526b0 线路：福州 
问题：修改福州信号关灯操作中，没有关闭一次弹窗的问题
 2021-03-08 09:17:18 +08:00
joylink_cuiweidong
c841a6457c 宁波三号线 代码调整 2021-03-05 18:03:16 +08:00
ival
d5c29af3fb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-05 17:54:34 +08:00
ival
4ca2403d36 问题：修改弹窗问题 2021-03-05 17:53:19 +08:00
ival
07eaf3d8d4 问题：修改弹窗问题 2021-03-05 17:47:30 +08:00
ival
2fe27a3c47 问题：运行图编辑问题 
1：交路设置 ，转换轨<——>折返轨    或者   折返轨 <——>折返轨
2：高亮问题处理
 2021-03-04 13:45:25 +08:00
fan
7572e39664 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-04 10:26:18 +08:00
fan
d0c129b56b 宁波一区域选择退出添加 2021-03-04 10:25:54 +08:00
joylink_cuiweidong
bf52e1ace9 西安三号线 顶部菜单样式调整 2021-03-03 17:53:54 +08:00
joylink_cuiweidong
11c2c816b3 福州一号线 顶部菜单 弹窗样式调整 
西安三号线 顶部菜单 代码调整
 2021-03-03 17:29:33 +08:00
joylink_cuiweidong
52e589466f 宁波三号线 运行线 操作 代码调整 2021-03-03 16:15:02 +08:00
joylink_cuiweidong
759d62b52a 西安二号线 下令停车 取消停车命令添加 列车绘图状态调整 2021-03-02 18:50:58 +08:00
joylink_cuiweidong
cc946c8333 代码调整 2021-03-02 16:02:00 +08:00
joylink_cuiweidong
398e813490 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-02 15:47:12 +08:00
joylink_cuiweidong
972ab3006d 宁波三号线 运行线 绘图与操作页面 代码调整 2021-03-02 15:45:48 +08:00
ival
a75c603f21 线路：成都3 
问题：取消引导或进路没有生成实训的问题
 2021-03-02 15:28:07 +08:00
ival
e48543d5ee 线路：西安2 
问题：
1.扣车和跳停互斥的问题；
2.为获取控制权时，没有限制排列进路的问题
3.修改车站AU/MN LA 的绘图处理
 2021-03-02 15:06:40 +08:00
ival
ab9a11ef60 线路：西安2 
问题：修改优先折法为侧线优先
 2021-03-02 09:17:35 +08:00
joylink_cuiweidong
2294791148 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-01 18:39:09 +08:00
joylink_cuiweidong
bfb6d12426 宁波三号线 顶部菜单 代码调整 2021-03-01 18:38:50 +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
26cb70e009 顶部菜单组件 代码封装 2021-03-01 16:35:57 +08:00
ival
eac7f13784 修改南京2，操作车站的部分问题 2021-03-01 10:29:39 +08:00
lVAL
1580a89770 线路：宁波一，南京2 
问题：
a.南京2现地实训进入后，视图有的站没有拆分成两列
b.修改宁波一，设置通过dialog的title提示
c.恢复showStationContent函数的加入位置
d.删除代码中的一些无用注释代码
 2021-02-26 16:23:16 +08:00
lVAL
ab61ee94df 线路：成都3 
问题：增加“取消引导”实训
 2021-02-26 11:01:07 +08:00
lVAL
fa8766a2af 线路：宁波1 
问题：增加计轴复位的实训配置，由于现有的配置无法实现实训，增加配置并注释说明
 2021-02-25 18:27:00 +08:00
lVAL
ad1c0d4c5c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-25 18:03:27 +08:00
lVAL
c608b8ae89 线路：宁波1 
问题：增加宁波线缺失的实训
 2021-02-25 18:03:16 +08:00
joylink_cuiweidong
5e74ecd66d 成都三号线 顶部菜单 代码调整 2021-02-25 15:41:03 +08:00
lVAL
81514db725 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-25 15:02:16 +08:00
lVAL
a482e3a866 线路：西安2 
问题：核对和修改西安2号线实训以及操作存在的问题
 2021-02-25 15:02:01 +08:00
joylink_cuiweidong
d5fb5bc94b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-25 14:27:48 +08:00
joylink_cuiweidong
fd26d2dd77 福州一号线 顶部菜单代码调整 2021-02-25 14:27:32 +08:00
lVAL
2994b833fa Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-25 13:40:34 +08:00
lVAL
7df00e6d64 线路：福州 
问题：福州线路双灯引导后的始端信号机为一红一黄，前状态未处理。
 2021-02-25 13:40:23 +08:00
joylink_cuiweidong
40e26a2165 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-25 13:15:33 +08:00
joylink_cuiweidong
7d5fb87dc5 宁波一号线 菜单代码调整 2021-02-25 13:14:55 +08:00
lVAL
52b1a87e9c 线路：成都3 
问题：现地第一次加载，引导按钮没有显示的问题
 2021-02-25 11:18:59 +08:00
lVAL
981e8a83d5 线路：成都3 
问题：人解实训问题修改
 2021-02-25 09:25:02 +08:00
lVAL
979d38053f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-24 18:53:07 +08:00
lVAL
461d64afe1 线路：南京2，哈尔滨 
问题：
1.绘制哈尔滨传输信号机
2.处理传输信号机的逻辑处理问题
 2021-02-24 18:52:38 +08:00
joylink_cuiweidong
7da97340b6 宁波三号线 控制权转换 代码调整 2021-02-24 18:11:50 +08:00
joylink_cuiweidong
06a87aaaea 宁波三号线 删除不需要的文件 2021-02-24 15:16:55 +08:00
joylink_cuiweidong
c40fae43ad 宁波三号线 控制权转移 代码调整 2021-02-24 14:57:23 +08:00
joylink_cuiweidong
70d440b2b6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-24 10:43:32 +08:00
joylink_cuiweidong
b47cff956a 宁波三号线 控制权转移 代码调整 2021-02-24 10:43:07 +08:00
fan
68cbbbab99 宁波一：区域选择限制控制权 2021-02-24 10:21:29 +08:00
fan
0ac7e5f8b5 成都工业登录页面调整 2021-02-24 09:44:43 +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
180ee94bde Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-23 18:12:31 +08:00
joylink_cuiweidong
908cf9dddf 宁波三号线 控制权 状态调整 2021-02-23 18:12:12 +08:00
lVAL
460b48cd7e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-23 18:11:11 +08:00
lVAL
52b12d3442 线路：成都3 
问题：引导信号机排列进路和未排列进路情况下执行指令的问题
 2021-02-23 18:10:59 +08:00
joylink_cuiweidong
5bbfaec42e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-23 17:46:08 +08:00
joylink_cuiweidong
93b7e782d4 宁波三号线控制权 状态 代码调整 2021-02-23 17:45:54 +08:00
lVAL
1c67b07706 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-23 16:57:51 +08:00
lVAL
d77b866da4 线路：成都3 
问题：人解进路
 2021-02-23 16:57:40 +08:00
joylink_cuiweidong
6bcdc9993d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/jmapNew/shape/Station/index.js
 2021-02-23 16:39:48 +08:00
joylink_cuiweidong
2ffc9e0781 宁波三号线 控制权状态 代码处理 2021-02-23 16:37:42 +08:00
lVAL
d7d3fee044 线路：成都3，佛山1，西安2 
问题：
a.成都3实训描述问题
b.佛山引导实训不提示的问题
c.西安2引导实训不生成的问题
 2021-02-23 16:32:42 +08:00
lVAL
cb8d4f9f03 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-23 14:54:24 +08:00
lVAL
a8a3a8a5cc 线路：南京2，宁波1，宁波3 
问题：增加引导的实训
 2021-02-23 14:54:14 +08:00
fan
1eb5dd05c3 问题调整 2021-02-23 14:20:05 +08:00
fan
195de40008 车站计轴复位状态调整 2021-02-23 13:34:42 +08:00
lVAL
420f67693d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-23 12:17:04 +08:00
lVAL
cf912b7834 线路：宁波3 
问题：增加设置跳停的操作
 2021-02-23 12:16:54 +08:00
joylink_cuiweidong
f0a3e0005d 删除 宁波三号线 暂时不用的文件 2021-02-23 09:27:50 +08:00
joylink_cuiweidong
914b710e43 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-23 09:18:03 +08:00
joylink_cuiweidong
b1353c6d69 宁波三号线 控制权转移 下放控制 收回控制 代码调整 2021-02-23 09:17:44 +08:00
lVAL
0f492cfbe2 修改配置描述 2021-02-23 08:59:39 +08:00
lVAL
e52242773c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-22 18:56:49 +08:00
lVAL
dafe484a0a 修改为人解列车进路 2021-02-22 18:56:39 +08:00
fan
a432cfc632 实训调整 2021-02-22 18:51:24 +08:00
fan
33c76f6098 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-22 18:48:31 +08:00
fan
8adadc5858 区域控制权在实训中不生效 2021-02-22 18:48:24 +08:00
lVAL
867d09cd4a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-22 18:47:00 +08:00
lVAL
7110d2f06f 修改菜单列表 2021-02-22 18:46:52 +08:00
joylink_cuiweidong
dbf1006f8a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-22 18:38:55 +08:00
joylink_cuiweidong
1a0e2a1c84 宁波三号线 控制权转移 下放站控 请求区域控制 代码调整 2021-02-22 18:38:38 +08:00
lVAL
23385f1718 修改实训名称 2021-02-22 18:38:24 +08:00
lVAL
20ba9fbc15 优化代码 没有参数e 报错的问题 2021-02-22 18:13:55 +08:00
lVAL
e5cba385b1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-22 17:50:54 +08:00
lVAL
08de82a230 线路：宁波1 
问题：站台部分操作完成后，深蓝色高亮未清除干净
 2021-02-22 17:49:55 +08:00
fan
6f91ee4b28 区域控制权在实训中不生效 2021-02-22 17:17:54 +08:00
fan
6501a68a1c merge 2021-02-22 16:43:01 +08:00
fan
04efafeb5c 宁波一 根据区域选择控制权 限制菜单 2021-02-22 16:41:30 +08:00
lVAL
07b38833fd 线路：宁波1 
问题：mouseEvent.mouseout 报错问题
 2021-02-22 16:34:56 +08:00
lVAL
609d34b8fb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-22 16:29:55 +08:00
lVAL
f016e0f6bf 线路：宁波1 
问题：设置道岔操作时，岔芯蓝色高亮设置
 2021-02-22 16:29:45 +08:00
fan
33dc1ea677 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-22 16:17:04 +08:00
fan
63a37caed3 宁波一 区域选择 2021-02-22 16:16:54 +08:00
lVAL
b804f78dae Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-22 10:56:57 +08:00
lVAL
9b42af2dd6 优化提示问题 2021-02-22 10:56:50 +08:00
fan
e6814f4def merge 2021-02-22 10:31:30 +08:00
fan
dc3e3d7b7e 宁波一 计轴复位按钮操作 2021-02-22 10:27:32 +08:00
joylink_cuiweidong
61be91ed77 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-22 10:15:11 +08:00
joylink_cuiweidong
4b8782cf05 代码调整 2021-02-22 10:15:01 +08:00
joylink_cuiweidong
1d41095b46 运行图 转换函数代码调整 
宁波三号线 控制权转移 请求区域控制代码调整
 2021-02-22 10:13:14 +08:00
lVAL
48b1bc9ae4 线路：宁波1 
问题：
1.优化区域选择，点击应用后关闭弹窗；
2.修改控制模式的文字状态不发生变化。
 2021-02-22 09:19:20 +08:00
lVAL
6d7abac8d8 线路： 北京1 宁波1 
问题： 关于选择设备后，两次操作第二次操作中有时候无故高亮消失的问题
 2021-02-20 18:23:26 +08:00
lVAL
faf2bc09a1 线路：宁波1 
问题：修改代码中组件名称重复导致的错误
 2021-02-20 17:24:49 +08:00
lVAL
a4b55d303b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-20 17:14:59 +08:00
lVAL
36364f9f26 线路：宁波1 
问题：道岔和区段 选择设备后高亮在菜单出来后消失的问题
 2021-02-20 17:14:52 +08:00
fan
efcb9ff262 冲掉代码回补 2021-02-20 17:13:27 +08:00
fan
2e385e7fe2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-20 17:11:02 +08:00
fan
fdf63db248 车站计轴复位（未完） 2021-02-20 17:10:10 +08:00
lVAL
17057cc014 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/jmapNew/config/skinCode/ningbo_01.js
 2021-02-20 17:03:45 +08:00