Commit Graph

775 Commits

Author SHA1 Message Date
zyy
901fa60bc4 调整道岔生成流程 2020-12-18 15:37:35 +08:00
fan
2ddc94f7aa 南京二号线皮肤调整 2020-12-18 13:10:55 +08:00
zyy
54cf4b3f97 调整哈尔滨鼠标事件 2020-12-17 13:59:08 +08:00
fan
68a0eadf9b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-16 16:05:55 +08:00
fan
7eec38fe65 车次窗前端状态重建后保留 2020-12-16 16:05:33 +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
fan
3c6047d4ad 打包调整 2020-12-15 11:18:15 +08:00
fan
383287fe56 新窗口ibp展示添加退出按钮 2020-12-14 15:51:14 +08:00
fan
62cba757e6 绘图预览界面 现地行调显示调整 & ibp从发布地图创建调整 & 贵装备信息导入调整 2020-12-14 15:22:47 +08:00
fan
97241040f6 调整宁波三号线站台样式 2020-12-11 16:38:13 +08:00
fan
f8876c452e Text调整 2020-12-11 16:33:51 +08:00
fan
f9d8bda8b0 宁波三号线延续保护添加箭头 2020-12-11 13:19:34 +08:00
joylink_cuiweidong
1b0ab87020 车站绘图代码调整(去除公里标名称必填)
文字绘图代码调整(调整文字字体,与车站名称字体一致)
2020-12-10 18:33:18 +08:00
fan
80ebd84062 宁波三号线调整 2020-12-10 17:34:13 +08:00
zyy
1a093e6594 调整交控皮肤显示条件,增加自动折返进路显示 2020-12-09 17:08:36 +08:00
joylink_cuiweidong
1389c3dfb9 代码调整 2020-12-09 11:21:30 +08:00
joylink_cuiweidong
108ec9ef83 西安二号线列车 三角形位置绘图调整 2020-12-09 10:56:24 +08:00
fan
8f7caf199c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-08 18:44:06 +08:00
fan
a9b94c8e5d 国赛界面去掉截止日期&拦截器提示登出修复&宁波三号线 2020-12-08 18:43:55 +08:00
zyy
5feb81e1c1 调整计轴区段显示 2020-12-08 15:42:35 +08:00
zyy
d6dccd10d7 调整车站隐藏流程 2020-12-08 09:52:07 +08:00
zyy
84d140b639 调整车站绘制流程 2020-12-07 16:34:57 +08:00
zyy
6b53bc55d6 调整删除区段关联车次窗 2020-12-07 16:10:03 +08:00
fan
d8f8acfe02 单位调整&哈尔滨区段限速调整 2020-12-02 14:22:26 +08:00
joylink_cuiweidong
941f57e02c 代码调整 2020-12-01 17:20:44 +08:00
joylink_cuiweidong
e1ab504ddb 屏蔽门绘图调整 2020-11-26 11:15:25 +08:00
joylink_cuiweidong
275b44e056 北交大 客流仿真 提示添加 2020-11-24 18:07:09 +08:00
joylink_cuiweidong
872824dff1 绘图代码调整 2020-11-24 16:53:13 +08:00
joylink_cuiweidong
c32dc326c4 北交大 客流站场仿真页面 订阅顺序调整 图例调整 2020-11-20 17:37:17 +08:00
joylink_cuiweidong
504f23e84f 代码调整 2020-11-20 15:36:28 +08:00
joylink_cuiweidong
fece30a51d 北交大 客流站场仿真界面 代码调整 2020-11-20 14:53:50 +08:00
joylink_cuiweidong
1010df5613 北交大 客流站场仿真界面 代码调整 2020-11-20 14:21:57 +08:00
joylink_cuiweidong
e3b4e46f2e 车站绘图代码调整 2020-11-16 10:08:37 +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
joylink_cuiweidong
f62fc8bbb3 指令字典生成 代码调整 2020-11-10 11:07:20 +08:00
lVAL
779f76d4ec 1.优化修改data中的model属性,其他计算data中设别列表没有更新的问题
2.修改激活状态点击修改后,未重置激活态的问题。
2020-11-09 13:01:00 +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
30c71d02fb 供电线故障代码调整 2020-11-02 18:51:53 +08:00
fan
96ecadce56 实训问题调整 2020-11-02 16:32:08 +08:00
fan
9ace3fc66f 绘图问题调整 2020-11-02 14:03:13 +08:00
fan
36d6a7d81c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-28 18:19:46 +08:00
zyy
a0ce657912 调整列车显示 2020-10-28 16:54:57 +08:00
fan
3dcf6edde0 国赛皮肤调整 2020-10-28 16:32:45 +08:00
joylink_cuiweidong
17e08686c6 站台绘图代码调整 2020-10-27 15:11:06 +08:00
fan
d72e8baab6 竞赛皮肤调整 2020-10-26 15:16:48 +08:00
fan
2e0c08089c 理论题导入调整&&福州一新版调整&&国赛添加取消限速操作 2020-10-23 15:13:18 +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
c2f350a0c2 国赛皮肤调整 2020-10-22 14:07:18 +08:00
fan
7613a38be1 国赛皮肤调整 2020-10-22 13:40:56 +08:00
fan
acd75346b9 道岔定位失表反位失表调整 2020-10-20 17:49:46 +08:00
fan
4265ed0092 设备管理配置调整 2020-10-20 17:16:41 +08:00
joylink_cuiweidong
f02a55724b 代码调整 2020-10-14 16:19:52 +08:00
fan
61fe081713 方向杆调整 2020-10-14 13:29:31 +08:00
fan
05740d7d57 方向杆问题调整 2020-10-13 09:36:48 +08:00
fan
44d1a8459b 触发故障调整 2020-10-12 17:55:57 +08:00
fan
d99738c85e 方向杆调整 2020-10-12 17:23:49 +08:00
fan
537e03a5e7 故障触发问题调整 2020-10-12 16:33:59 +08:00
fan
9e3b62b32f 故障触发问题调整 2020-10-12 15:50:11 +08:00
fan
6b3a2b3875 故障触发问题调整 2020-10-12 15:19:03 +08:00
fan
e2d27b49c7 方向杆问题调整 2020-10-10 17:58:14 +08:00
zyy
be565e3711 调整道岔逻辑 2020-09-24 13:40:09 +08:00
fan
4eafbd72ea iscs调整&宁波道岔取消故障失表取消动画 2020-09-18 18:30:14 +08:00
zyy
e66a5a5687 调整道岔绘制逻辑 2020-09-18 11:08:17 +08:00
zyy
c2e3df8dbc 调整ibp按钮点击 2020-09-17 17:45:04 +08:00
zyy
e98b53d8ad 调整ibp鼠标逻辑 2020-09-17 16:33:22 +08:00
zyy
3ce1418f89 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-16 10:10:27 +08:00
zyy
4264996520 调整ibp数据,调整道岔生成逻辑 2020-09-16 10:10:13 +08:00
joylink_cuiweidong
0f5099221f 站台绘图代码调整 2020-09-15 18:28:32 +08:00
joylink_cuiweidong
10cae34098 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-15 17:48:24 +08:00
joylink_cuiweidong
ca45d2ab98 代码调整 2020-09-15 17:48:08 +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
619474b651 屏蔽门 绘图状态代码调整 2020-09-15 17:13:36 +08:00
joylink_cuiweidong
ce2d07ea20 站台 屏蔽门 绘图代码调整 2020-09-15 17:08:28 +08:00
joylink_cuiweidong
feff7d50cc 屏蔽门 状态代码调整 2020-09-11 17:07:45 +08:00
joylink_cuiweidong
b35bb2e6fc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-11 14:14:08 +08:00
joylink_cuiweidong
2c74a91e2d 屏蔽门 绘图代码调整 2020-09-11 14:13:29 +08:00
zyy
50c9a4eabb 调整道岔生成 道岔区段问题 2020-09-11 10:18:07 +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
zyy
fa70285ef9 调整西安二号线列车右键操作栏 2020-09-09 09:39:23 +08:00
zyy
7d826a4d59 调整鼠标事件 2020-09-08 15:39:23 +08:00
zyy
f548a7495a 调整车站点击 2020-09-08 14:26:49 +08:00
zyy
2d461041ca 调整状态 2020-09-08 13:15:09 +08:00
zyy
49d791428d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-08 11:19:19 +08:00
zyy
b8cfb1900e 调整道岔绘图状态 2020-09-08 11:19:06 +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
d19ac59839 调整哈尔滨道岔状态显示 2020-09-07 17:47:04 +08:00
zyy
eafc37ce7c 调整流程 2020-09-07 16:40:50 +08:00
zyy
bb3b202eb1 调整西安二号线列车操作 2020-09-07 11:28:12 +08:00
joylink_cuiweidong
3b8c4852c3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-04 18:22:59 +08:00
joylink_cuiweidong
0d6ed19f4a 道岔绘图代码调整 2020-09-04 18:22:41 +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
zyy
2b548186c3 调整道岔绘制流程 2020-09-04 10:44:17 +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
1427b42d25 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-02 18:00:08 +08:00
joylink_cuiweidong
6680ea03cf 道岔绘图调整(除了哈尔滨线路外,其余线路反位不显示岔芯 直角梯形D) 2020-09-02 17:59:50 +08:00
zyy
69388e4f91 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-02 17:11:23 +08:00
zyy
efcd46cf37 增加宁波三区段样式,增加目的码表单 2020-09-02 17:11:06 +08:00
joylink_cuiweidong
2010edad72 宁波一号线站台设置停站时间操作代码调整 2020-09-02 14:33:41 +08:00
fan
0d026649f3 删除日志 2020-09-02 09:23:27 +08:00
zyy
a3489f0942 调整区段显示及优化 2020-09-01 18:09:25 +08:00
zyy
57cb96eb48 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/views/newMap/mapsystemNew/common/index.vue
2020-09-01 15:11:59 +08:00
zyy
5590e43bd5 调整代码 2020-09-01 15:10:35 +08:00
joylink_cuiweidong
3ff902ee14 区段鼠标事件调整 2020-08-31 13:41:33 +08:00
zyy
778387a0e9 调整扣车流程, 状态 2020-08-31 10:11:02 +08:00
zyy
adb62a3209 增加列车右键操作,调整配置 2020-08-28 17:22:12 +08:00
fan
7a7ae9591a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-26 18:24:58 +08:00
fan
f3e6291582 区段切除报错调整 2020-08-26 18:24:14 +08:00
zyy
fc14cc41a7 调整发布地图导出,调整大屏流程 2020-08-26 17:44:01 +08:00
zyy
23b024dff4 调整折返策略状态显示 2020-08-24 17:21:12 +08:00
zyy
7942f339ac 调整折返模式 状态显示 2020-08-24 13:31:47 +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
af132ae2dd 宁波三号线菜单调整 2020-08-20 15:42:47 +08:00
fan
862262a6c4 merge 2020-08-20 13:19:14 +08:00
fan
a44132056c 地图绘制添加防淹门 2020-08-20 13:17:58 +08:00
zyy
e6fb5c0f17 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-20 09:32:34 +08:00
zyy
8f6388e1c2 调整多余输出 2020-08-20 09:32:22 +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
899facde01 调整发布地图导出名称,注释区段流程 2020-08-18 16:02:22 +08:00
zyy
a2dc987445 调整区段检测 2020-08-18 14:07:29 +08:00
zyy
e383ab201d 调整哈尔滨线路延续保护计时,增加配置项 2020-08-17 16:48:19 +08:00
zyy
f98faaab8c 删除输出 2020-08-17 13:26:44 +08:00