Commit Graph

512 Commits

Author SHA1 Message Date
fan
29c8e5b4b9 暂提 2021-01-15 11:21:11 +08:00
lVAL
ec30635c02 修改应答器图层以及回车修改属性的问题 2021-01-15 10:59:58 +08:00
fan
15928a6248 道岔封锁状态调整 2021-01-15 09:42:19 +08:00
fan
ab804e3b95 南京二号线状态调整 道岔长闪 2021-01-14 16:26:04 +08:00
fan
ec87dc8eaf Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-14 14:43:03 +08:00
fan
9c7c0f674e 南京二号线状态调整 2021-01-14 14:42:53 +08:00
joylink_cuiweidong
845f10caf6 岔心绘图代码调整
bug调整:新建完一个信号机 三个状态不发生改变
2021-01-14 13:04:04 +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
7599458c8f 岔心 元素绘图代码调整 2021-01-13 17:01:53 +08:00
lVAL
fd3f82e7ba 修改炼精二号线 逻辑区段名称大小 2021-01-13 14:18:48 +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
8c261bb3a6 优化应答器 状态处理功能 2021-01-12 11:00: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
fan
9a74d3ee39 成绩导出调整 2021-01-11 17:51:54 +08:00
lVAL
f5cfb5f787 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/jmapNew/config/skinCode/xian_01.js
2021-01-07 15:16:34 +08:00
lVAL
1a0612020e 增加,信号机灯丝故障处理 2021-01-07 15:15:54 +08:00
joylink_cuiweidong
c266442842 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-06 18:15:34 +08:00
fan
e94ffd235a 故障模式快捷键&ISCS返回(退出)调整 2021-01-06 18:17:40 +08:00
joylink_cuiweidong
558ea5cc95 代码调整 2021-01-06 18:15:14 +08:00
joylink_cuiweidong
a024699e8f 西安二号线 控制模式 绘图调整 2020-12-31 18:02:55 +08:00
fan
730b673da2 泰雷兹屏蔽门 2020-12-30 11:15:05 +08:00
fan
72db8b3e94 紧急停车状态调整 2020-12-29 11:04:01 +08:00
joylink_cuiweidong
8b04f92d7a 成都的三号线 信号封锁状态 绘图代码调整 2020-12-23 10:23:29 +08:00
fan
1bc7da3c53 哈尔滨 联锁机故障&重启令解 2020-12-21 16:09:43 +08:00
joylink_cuiweidong
76167c0acb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-21 11:01:49 +08:00
joylink_cuiweidong
ffa572eb24 南铁院16站线路(西门子) 线路配置与绘图 代码调整 2020-12-21 11:01:33 +08:00
fan
9d74937073 宁波二号线样式调整 2020-12-21 09:25:17 +08:00
joylink_cuiweidong
465e6a5d08 南京二号线 区段绘图 调整 2020-12-18 16:28:42 +08:00
joylink_cuiweidong
c8487b6e60 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-18 16:12:53 +08:00
joylink_cuiweidong
a3e8c7cecc 南京一号线 线路 样式调整 2020-12-18 16:12:39 +08:00
fan
2ddc94f7aa 南京二号线皮肤调整 2020-12-18 13:10:55 +08:00
joylink_cuiweidong
213d14b212 新增南京二号线 线路配置文件 2020-12-18 09:30:18 +08:00
fan
80ebd84062 宁波三号线调整 2020-12-10 17:34:13 +08:00
fan
c297594128 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-10 10:33:02 +08:00
fan
c118fccd3f 宁波三号线操作调整 2020-12-10 10:01:51 +08:00
zyy
1a093e6594 调整交控皮肤显示条件,增加自动折返进路显示 2020-12-09 17:08:36 +08:00
fan
a9b94c8e5d 国赛界面去掉截止日期&拦截器提示登出修复&宁波三号线 2020-12-08 18:43:55 +08:00
joylink_cuiweidong
b51ebde280 北交大客流仿真系统代码调整 2020-12-02 17:45:19 +08:00
joylink_cuiweidong
84d7d145c2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-02 14:25:40 +08:00
joylink_cuiweidong
caeb8aa457 福州一号线新版 配置文件调整 2020-12-02 14:25:20 +08:00
fan
d8f8acfe02 单位调整&哈尔滨区段限速调整 2020-12-02 14:22:26 +08:00
fan
4ac37c5d18 单位调整 2020-12-01 18:50:23 +08:00
joylink_cuiweidong
1010df5613 北交大 客流站场仿真界面 代码调整 2020-11-20 14:21:57 +08:00
joylink_cuiweidong
34db1f439f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/utils/baseUrl.js
2020-11-13 10:23:25 +08:00
joylink_cuiweidong
f4c88f7939 车站绘图代码调整 2020-11-13 10:21:36 +08:00
fan
b597d4efea 列车重叠调整 2020-11-13 10:13:05 +08:00
fan
08a306f373 剧本条件调整 2020-11-04 16:41:01 +08:00
joylink_cuiweidong
6fbfa0dc1a 各线路站台配置文件扣车参数调整
哈尔滨线路 站台 添加 扣车/越站 设置按钮
竞赛实操 场景排序
竞赛页面 添加场景11 操作按钮
2020-11-03 16:06:11 +08:00
joylink_cuiweidong
fb09155f34 接触网 绘图状态代码调整 2020-11-03 09:55:11 +08:00
joylink_cuiweidong
b26f3044dc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-02 16:12:29 +08:00
joylink_cuiweidong
50ffb22566 考试系统 教学系统 试题提示栏 拖拽样式调整 2020-11-02 16:12:10 +08:00
fan
9ace3fc66f 绘图问题调整 2020-11-02 14:03:13 +08:00
zyy
a0ce657912 调整列车显示 2020-10-28 16:54:57 +08:00
joylink_cuiweidong
405915c56f 接口文件整理 2020-10-27 16:23:37 +08:00
fan
d72e8baab6 竞赛皮肤调整 2020-10-26 15:16:48 +08:00
fan
bc669b98f8 延续保护调整 2020-10-26 11:28:37 +08:00
zyy
98c4d1e2b8 调整国赛列车显示 2020-10-26 11:05:36 +08:00
fan
6210911b2a 皮肤显示调整 2020-10-23 16:35:27 +08:00
fan
1fce4cb363 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-22 16:47:29 +08:00
fan
dc7cf80222 国赛皮肤调整 2020-10-22 16:47:18 +08:00
joylink_cuiweidong
3d3fc84041 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-22 16:39:55 +08:00
joylink_cuiweidong
751ebe5a16 竞赛线路 列车样式调整 2020-10-22 16:39:34 +08:00
fan
700a37d312 国赛皮肤调整&接触网调整 2020-10-22 16:26:03 +08:00
fan
6ce8978b8b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-22 14:25:26 +08:00
joylink_cuiweidong
c89c2f2e11 代码调整 2020-10-22 14:22:21 +08:00
fan
c2f350a0c2 国赛皮肤调整 2020-10-22 14:07:18 +08:00
fan
7613a38be1 国赛皮肤调整 2020-10-22 13:40:56 +08:00
fan
e2d27b49c7 方向杆问题调整 2020-10-10 17:58:14 +08:00
zyy
be565e3711 调整道岔逻辑 2020-09-24 13:40:09 +08:00
zyy
e98b53d8ad 调整ibp鼠标逻辑 2020-09-17 16:33:22 +08:00
zyy
6eafb7883c 调整道岔绘制流程,ibp鼠标事件 2020-09-17 13:31:13 +08:00
zyy
fdaf3eaa1e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-15 17:41:10 +08:00
zyy
4b2939ff0a 调整区段配置 2020-09-15 17:40:57 +08:00
joylink_cuiweidong
ce2d07ea20 站台 屏蔽门 绘图代码调整 2020-09-15 17:08:28 +08:00
joylink_cuiweidong
2c74a91e2d 屏蔽门 绘图代码调整 2020-09-11 14:13:29 +08:00
joylink_cuiweidong
5aa9d94071 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/jmapNew/shape/Switch/index.js
2020-09-09 14:02:15 +08:00
joylink_cuiweidong
ccf2228eeb 站台 绘图代码调整 2020-09-09 13:55:42 +08:00
fan
4bfe76c9cb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-08 09:49:57 +08:00
fan
fadcb630ab 宁波三号线菜单调整&宁波分割符调整&教学系统班级显示调整 2020-09-08 09:49:49 +08:00
zyy
eafc37ce7c 调整流程 2020-09-07 16:40:50 +08:00
fan
dc085df977 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-04 17:21:46 +08:00
fan
f33fb7ee91 绘图数据处理调整&佛山修改列车识别好调整 2020-09-04 17:21:34 +08:00
joylink_cuiweidong
d328a11569 西安三号线 福州一号线新版 地图配置文件调整 2020-09-04 10:38:36 +08:00
joylink_cuiweidong
679d714b29 道岔绘图代码调整 2020-09-03 18:17:15 +08:00
joylink_cuiweidong
9a2e007d3f 福州一号线新版 扣车样式调整 站台操作调整 2020-09-03 11:14:51 +08:00
joylink_cuiweidong
2010edad72 宁波一号线站台设置停站时间操作代码调整 2020-09-02 14:33:41 +08:00
zyy
adb62a3209 增加列车右键操作,调整配置 2020-08-28 17:22:12 +08:00
zyy
b262288524 增加西安二号线折返策略配置,增加联锁配置 2020-08-24 11:30:57 +08:00
fan
5df9b4aa6f 宁波三号线进路样式调整 2020-08-21 14:14:26 +08:00
zyy
d026ce783f 调整车站配置 2020-08-20 16:43:35 +08:00
zyy
33e773a940 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-20 16:02:32 +08:00
zyy
41b9adcc28 调整宁波三号线列车配置 2020-08-20 16:02:21 +08:00
fan
a44132056c 地图绘制添加防淹门 2020-08-20 13:17:58 +08:00
fan
d729e84615 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-19 18:27:45 +08:00
fan
d1cff9ff94 宁波三号线站台样式调整 2020-08-19 18:27:36 +08:00
joylink_cuiweidong
9d0fe20a88 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-19 17:21:35 +08:00
joylink_cuiweidong
b3b37fd19f 宁波三号线 信号机绘图代码调整 2020-08-19 17:21:19 +08:00
fan
3520e53679 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-19 17:14:37 +08:00
fan
509b92c71a 宁波三号线样式调整 2020-08-19 17:14:27 +08:00
zyy
87275e3021 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-19 16:45:16 +08:00
zyy
db065dc76a 调整宁波三号线 道岔样式 2020-08-19 16:45:05 +08:00
fan
1afb1f3a09 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-19 16:39:19 +08:00
fan
94fbb77912 宁波三号线区段调整 2020-08-19 16:39:09 +08:00
zyy
2e6d45baab 调整宁波三号线配置 2020-08-19 15:50:33 +08:00
zyy
280b766d91 增加宁波三号线配置 2020-08-19 14:06:01 +08:00
zyy
70945cbbc1 调整区段配置 2020-08-19 13:43:13 +08:00
zyy
e383ab201d 调整哈尔滨线路延续保护计时,增加配置项 2020-08-17 16:48:19 +08:00
joylink_cuiweidong
1f0aaffe6f 佛山有轨电车信号机优化(全线信号机设置成图样类型) 2020-08-12 10:02:56 +08:00
zyy
fda63a7ca6 调整多余注释 2020-08-10 13:01:59 +08:00
fan
8e73c01b3f 成都一列车样式调整 2020-08-07 10:15:39 +08:00
fan
e3e62f85f9 佛山目的地码显示长度调整&联锁配置添加参数generateFls 2020-08-06 15:02:22 +08:00
joylink_cuiweidong
96f6d5030b 哈尔滨一号线 自动触发进路 绘图代码调整 2020-08-05 13:03:53 +08:00
zyy
6dbac54d1f 调整地图绘制相关流程 2020-08-04 17:31:07 +08:00
zyy
70114a0014 调整宁波线路操作 2020-07-31 16:22:29 +08:00
zyy
33969bd5e8 调整哈尔滨站台操作 2020-07-30 10:03:00 +08:00
zyy
eec51e7cfd 调整哈尔滨车站操作 2020-07-28 16:41:21 +08:00
zyy
a8d584ae89 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-27 13:15:12 +08:00
zyy
2c39916217 调整运行图预览逻辑 2020-07-27 13:15:01 +08:00
fan
a5a55af5ef 加载仿真计划失表取消loading状态&暂撤销宁波一计轴故障修改 2020-07-27 10:00:08 +08:00
fan
95d754d57c 调整宁波线计轴故障为粉色光带 2020-07-27 09:12:08 +08:00
joylink_cuiweidong
f06a025792 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-24 15:24:45 +08:00
joylink_cuiweidong
d5215a3c1c 哈尔滨线路 停站时间状态绘图调整 2020-07-24 15:23:55 +08:00
fan
d4da17ae09 调整哈尔滨成都一故障样式&哈尔滨现地切换显示 2020-07-24 14:20:38 +08:00
joylink_cuiweidong
6210df54de 代码调整 2020-07-23 16:42:39 +08:00
joylink_cuiweidong
478a8f0ba4 宁波线的列车,RM模式的时候,前面的箭头设置为灰色 2020-07-23 13:38:31 +08:00
fan
c97291e225 北京皮肤调整 2020-07-21 11:20:05 +08:00
fan
bbadc59bf1 宁波皮肤调整 2020-07-21 11:19:06 +08:00
zyy
172623c0f1 调整宁波线路道岔失表显示 2020-07-14 18:14:39 +08:00
joylink_cuiweidong
92da104ad0 zc故障灯状态修改 2020-07-07 10:00:55 +08:00
joylink_cuiweidong
ec1c5a9bbb 信号机故障 绘图代码调整 2020-07-03 11:27:01 +08:00
zyy
e3ee44aae7 调整道岔失表状态,成都3号线实操定义 2020-06-28 13:27:10 +08:00
fan
2399be67d0 宁波道岔失表增加表示红色矩形 2020-06-24 16:19:47 +08:00
fan
0ae6ec9237 调整登录状态检测&删除冗余配置 2020-06-23 16:21:54 +08:00
zyy
58ab773ec9 删除多余配置 2020-06-22 13:49:42 +08:00
joylink_cuiweidong
4b7c7f3f84 绘图代码调整 2020-06-18 16:58:21 +08:00
fan
89ae6e8c0f 列车整理 2020-06-17 13:35:21 +08:00
fan
6cc44b5528 合并代码 2020-06-16 18:38:21 +08:00
fan
3b171130f9 福州列车显示调整&表单组件button增加loading 2020-06-16 18:36:18 +08:00
zyy
7f242ba443 调整综合监控绘图元素, 调整按图折返配置 2020-06-16 16:39:07 +08:00
zyy
f62de1971f 增加宁波线路 站后折返皮肤配置 2020-06-16 15:01:29 +08:00
zyy
10502988a4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-16 14:45:50 +08:00
zyy
dfdbddad2b 调整综合监控数据,调整地图绘制功能按钮显示状态逻辑判断 2020-06-16 14:45:34 +08:00
fan
5292afe4dd 宁波一号线人工车头码车显示&哈尔滨title+V1.0&福州道岔操作调整(未完) 2020-06-16 13:56:33 +08:00
fan
f60e69f8ff 福州车站站台操作&西安车站站台操作调整 2020-06-15 18:00:24 +08:00
fan
2f51f2362b 调整西安列车车头三角宽度 2020-06-15 10:41:27 +08:00
fan
71a99f225c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-12 14:34:29 +08:00
fan
2e44c69429 老版本福州列车目的地码调整 2020-06-12 14:34:18 +08:00