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 |
|
|
032ec93af4
|
Merge remote-tracking branch 'origin/test'
|
2021-01-12 23:46:38 +08:00 |
|
|
2d154f1611
|
设备登录行值显示
|
2021-01-12 23:46:07 +08:00 |
|
|
8eb293f074
|
Merge remote-tracking branch 'origin/test'
|
2021-01-12 23:14:34 +08:00 |
|
|
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 |
|