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

886 Commits

Author SHA1 Message Date
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
zyy
1744ea1262 调整信号机高亮配置 2020-08-17 13:25:36 +08:00
zyy
a1856ca710 调整延时保护计时位置 2020-08-14 13:17:29 +08:00
zyy
3132b982fb 调整延时保护计时逻辑 2020-08-14 10:49:11 +08:00
zyy
86d6cf7a14 调整区段延时解锁流程 2020-08-13 19:27:02 +08:00
zyy
36a0b1dd93 调整代码 2020-08-12 18:26:27 +08:00
zyy
a2f9e18847 调整地图导出流程 2020-08-10 18:37:34 +08:00
zyy
fda63a7ca6 调整多余注释 2020-08-10 13:01:59 +08:00
zyy
4a1d3d3863 增加车站批量设置，调整车站绘图逻辑 2020-08-07 11:09:49 +08:00
zyy
cde3b39753 调整地图绘制流程，调整信号机 2020-08-06 15:07:50 +08:00
zyy
7ddbe10832 增加信号机批量操作 2020-08-06 11:15:46 +08:00
zyy
33b9618b77 调整地图绘制类型显示 2020-08-05 14:28:55 +08:00
joylink_cuiweidong
96f6d5030b 哈尔滨一号线 自动触发进路 绘图代码调整 2020-08-05 13:03:53 +08:00
zyy
6dbac54d1f 调整地图绘制相关流程 2020-08-04 17:31:07 +08:00
zyy
0f03eee53f 调整宁波道岔状态 2020-08-03 15:56:56 +08:00
zyy
70114a0014 调整宁波线路操作 2020-07-31 16:22:29 +08:00
zyy
33969bd5e8 调整哈尔滨站台操作 2020-07-30 10:03:00 +08:00
zyy
6ca803d06d 调整车站颜色，功能栏宽度判断 2020-07-28 17:55:07 +08:00
zyy
ac43981c7d 调整哈尔滨车站操作 2020-07-28 16:59:32 +08:00
zyy
eec51e7cfd 调整哈尔滨车站操作 2020-07-28 16:41:21 +08:00
joylink_cuiweidong
d5215a3c1c 哈尔滨线路 停站时间状态绘图调整 2020-07-24 15:23:55 +08:00
joylink_cuiweidong
196a611d70 仿真聊天代码调整 2020-07-24 10:35:05 +08:00
fan
14d787ea9c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-23 17:57:43 +08:00
fan
a9233a082e 代码调整 2020-07-23 17:57:35 +08:00
zyy
9ec64f1eeb 调整加载方式及判断 2020-07-23 17:09:29 +08:00
zyy
11c021feb8 调整屏蔽门绘图 2020-07-23 13:16:45 +08:00
zyy
e9b8e6e1b9 调整哈尔滨线路屏蔽门样式 2020-07-23 10:32:58 +08:00
zyy
dd22ce9940 调整西安线路故障模式操作 2020-07-22 11:23:02 +08:00
zyy
4bb41700bc 列车提示信息调整，哈尔滨线路操作 2020-07-21 13:37:59 +08:00
zyy
04f1205e56 调整上行是否向右地图字段 2020-07-17 18:28:38 +08:00
zyy
a1cbcff9ea 调整道岔绘图，右键操作 2020-07-15 13:31:07 +08:00
zyy
40fea0108f 宁波线路道岔封锁显示调整 2020-07-14 18:19:19 +08:00
zyy
172623c0f1 调整宁波线路道岔失表显示 2020-07-14 18:14:39 +08:00
zyy
7263bb669d 删除socket提示信息 2020-07-10 11:26:15 +08:00
zyy
348b07afa4 调整大屏系统列车显示问题 2020-07-10 10:52:31 +08:00
zyy
1847267bef 调整列车大屏状态修改 2020-07-09 19:07:57 +08:00
zyy
6112d720be 调整贵州项目大屏配置 2020-07-08 10:33:15 +08:00
joylink_cuiweidong
92da104ad0 zc故障灯状态修改 2020-07-07 10:00:55 +08:00
zyy
6be93b39ba Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-06 17:02:31 +08:00
zyy
2c5c30216f 调整大屏预览流程，增加大屏分屏配置 2020-07-06 17:02:13 +08:00
joylink_cuiweidong
9d85fa7eca 信号机绘图代码调整 2020-07-03 18:14:24 +08:00
fan
8fa62ec9ce Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-03 13:55:20 +08:00
fan
0a594f5e09 屏蔽门故障打开 2020-07-03 13:55:04 +08:00
joylink_cuiweidong
41cc1af21a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-03 11:27:29 +08:00
joylink_cuiweidong
ec1c5a9bbb 信号机故障 绘图代码调整 2020-07-03 11:27:01 +08:00
fan
aa66cbb277 列车驾驶模式显示调整 2020-07-03 11:02:35 +08:00
zyy
3b39a9a04b 调整区段字段，控制权操作 2020-07-02 18:47:39 +08:00
zyy
901dad45ee 调整宁波线路区段计算提示位置逻辑 2020-07-02 09:35:41 +08:00
zyy
e3ee44aae7 调整道岔失表状态，成都3号线实操定义 2020-06-28 13:27:10 +08:00
zyy
e4b730f300 调整配置 2020-06-24 15:43:58 +08:00
fan
d5cd233e98 调整故障操作 2020-06-24 09:24:54 +08:00
fan
0ae6ec9237 调整登录状态检测&删除冗余配置 2020-06-23 16:21:54 +08:00
zyy
143325e6f6 调整西安一三线路 导航名称显示流程 2020-06-23 13:52:34 +08:00
zyy
81cde0b3d5 调整默认值 2020-06-23 09:40:15 +08:00
zyy
4e36c7b456 调整默认配置 2020-06-23 09:26:58 +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
zyy
656cbb3b7b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-12 13:19:39 +08:00
zyy
e01277ba64 调整车站 控制模式配置 2020-06-12 13:19:26 +08:00
joylink_cuiweidong
22756f15ca Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-12 13:16:23 +08:00
fan
2c8c8117b2 老版本福州列车目的地码调整 2020-06-12 13:16:21 +08:00
joylink_cuiweidong
0ead3ea016 列车的提示框停稳状态调整 2020-06-12 13:16:03 +08:00
fan
429fe6d6a7 跳停上下行取值调整&列车识别号显示调整 2020-06-12 10:51:06 +08:00
zyy
3e9835ff15 调整字段显示 2020-06-11 17:06:29 +08:00
zyy
24acb1ba86 调整配置，增加综合监控数据 2020-06-11 14:48:40 +08:00
zyy
ce87a96db3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/jmapNew/map.js
 2020-06-10 17:04:12 +08:00
zyy
75e9db45fa 调整右键菜单 2020-06-10 17:02:39 +08:00
fan
9b489d088b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-10 16:57:04 +08:00
fan
139066d66f 综合演练非管理员同步计时&综合演练切大屏&iscs机电时间表管理 2020-06-10 16:56:52 +08:00
joylink_cuiweidong
c73769f90d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-10 13:24:27 +08:00
joylink_cuiweidong
b169bb1e20 佛山有轨电车指令代码调整 2020-06-10 13:24:12 +08:00
zyy
e4ec3dfbde 调整佛山线路 站台操作 2020-06-10 11:18:50 +08:00
joylink_cuiweidong
eecc022ae5 佛山线路 菜单栏 增加显示功能 
列车提示代码调整
 2020-06-08 10:46:01 +08:00
fan
b47d5a0f57 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-05 10:50:16 +08:00
fan
ec6ebe78e5 列车显示调整 2020-06-05 10:50:05 +08:00
zyy
30d76e763e 调整折返按钮 状态返回处理 2020-06-05 10:14:12 +08:00
zyy
4a03d8613b 调整车站折返策略 2020-06-04 17:58:42 +08:00
zyy
5a9a837e02 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/iscs/constant/iscsData.js
#	src/utils/baseUrl.js
#	src/views/iscs/iscsDraw/iscsBasOperate/index.vue
 2020-06-04 17:32:45 +08:00
zyy
9be9c9a313 增加西安 三号线设置折返策略元素 2020-06-04 17:29:18 +08:00
fan
cc696b6d14 道岔故障报警灯闪烁 2020-06-04 11:32:49 +08:00
fan
a46db80649 调整逻辑数据未初始化 2020-06-03 16:46:37 +08:00
zyy
d592e381ab Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-03 10:12:50 +08:00
zyy
631fba04bb 调整道岔佛山线路显示， 综合监控元素添加 2020-06-03 10:12:36 +08:00
fan
186fe3e35a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-03 09:13:45 +08:00
fan
f31cba56f3 哈尔滨虚拟信号机关闭调整 2020-06-03 09:13:20 +08:00
zyy
4f4be3b33a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/iscs/constant/iscsData.js
 2020-06-02 18:11:52 +08:00
zyy
ad3694c7f5 调整综合监控模型，调整信号机自动触发显示，综合监控数据保存 2020-06-02 18:05:35 +08:00
fan
c1d88ab3e9 iscs调整&列车调整 2020-06-02 17:50:56 +08:00
zyy
14e8dfe547 调整道岔组件 2020-06-01 10:27:34 +08:00
fan
fb40db0ad8 裁判搜索条件调整 2020-05-29 18:24:51 +08:00
fan
eff6615407 西安一三号线道岔失表表示灯状态&裁判分数展示调整 2020-05-29 17:55:22 +08:00
fan
303632ad20 西安一三号线道岔失表表示灯状态 2020-05-29 17:32:20 +08:00
fan
a4924383fa Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-29 16:58:11 +08:00
fan
95e4f4c938 西安一三号线道岔失表调整&iscs调整 2020-05-29 16:57:21 +08:00
zyy
16ebf3e013 调整竞赛结果流程，列车放大流程 2020-05-29 16:55:25 +08:00
zyy
55f57e2135 调整保存字段 2020-05-28 15:02:15 +08:00
zyy
df4dc3eea9 调整供电线路保存，福州皮肤配置文件调整 2020-05-28 14:39:06 +08:00
fan
ce05df581a 列车显示调整（列车类型>大小交路回库） 2020-05-28 09:07:29 +08:00
zyy
b7d4eb7bda 调整区段绘图元素层级，调整字段显示 2020-05-27 10:36:40 +08:00
fan
7587475f38 调整列车操作&调整列车在人工车和头码车下的详情显示 2020-05-26 16:17:16 +08:00
fan
f27c766b9b 列车调整 2020-05-26 09:21:48 +08:00
zyy
f06419e963 调整裁判平台进入仿真操作 2020-05-25 16:38:03 +08:00
zyy
fb6ba36680 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-25 15:06:47 +08:00
zyy
1ae2793221 调整绘图界面字体皮肤配置 2020-05-25 15:06:34 +08:00
fan
8621198acf 调整信号机菜单显示&修改列车识别号调整 2020-05-25 14:06:16 +08:00
fan
c74eaaaab6 人工车头码车显示调整 2020-05-25 11:00:10 +08:00
fan
d54db9bfe2 西安三号线调整 2020-05-22 20:32:19 +08:00
fan
4d29da9228 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-22 18:42:55 +08:00
fan
bb37c6ebbb 西安三号线调整 2020-05-22 18:41:23 +08:00
joylink_cuiweidong
867de81209 代码调整 2020-05-22 18:28:55 +08:00
fan
32eb7faada 西安线路调整 2020-05-22 14:47:19 +08:00
fan
f875cd69c3 大小交路回库颜色 2020-05-22 13:05:08 +08:00
fan
98f60b6d94 调整虚拟信号机侧向开放显示 2020-05-21 17:15:17 +08:00
fan
a861e4908f 哈尔滨虚拟信号机调整 2020-05-21 16:53:39 +08:00
fan
19bd41b214 调整hydIcon路径 2020-05-21 10:02:13 +08:00
fan
650b0c00ee 调整列车早晚点显示 2020-05-21 09:31:16 +08:00
fan
9e8f4a48f4 调整站台扣车显示 2020-05-20 18:11:39 +08:00
fan
ddee6156f7 竞赛管理显示地址 2020-05-20 17:44:47 +08:00
fan
f93f432d7e ARB故障状态&哈尔滨列车早晚点时间 2020-05-20 17:08:21 +08:00
fan
e3034f630e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-20 14:46:39 +08:00
fan
b137adbd69 哈尔滨地图问题调整&竞赛管理 2020-05-20 14:46:26 +08:00
joylink_cuiweidong
ca7e92f6a1 剧本编制代码调整 2020-05-20 10:28:16 +08:00
joylink_cuiweidong
a51ae0aa30 西安二号线 列车正占用的区段，计轴标示也会显示为红色 代码调整 2020-05-19 18:54:51 +08:00
fan
45422c8cd2 信号机批量设置引导信号&虚拟信号机旋转 2020-05-19 15:44:01 +08:00
joylink_cuiweidong
a1097088ea Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-19 09:45:31 +08:00
joylink_cuiweidong
08991c8694 剧本代码调整 2020-05-19 09:45:15 +08:00
zyy
b8bf51fc82 优化地图绘制 2020-05-18 17:08:21 +08:00
fan
c27204aeb7 信号机添加非空校验 2020-05-15 14:18:17 +08:00
fan
b7e8409b1a 西安二号线信号机内三角进路排列后显示样式调整 2020-05-15 13:56:19 +08:00
fan
396dd0d899 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-14 18:55:12 +08:00
fan
71682d00a5 区段计轴调整 2020-05-14 18:54:53 +08:00
zyy
e3d773dfbe Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-14 17:48:17 +08:00
zyy
b975c1746b 调整西安三号线与一号线列车移入提示信息 2020-05-14 17:48:01 +08:00
fan
8ffd499c51 信号机调整 2020-05-14 17:37:46 +08:00
fan
027fe43467 删除日志，信号机调整 2020-05-14 17:24:35 +08:00
fan
b3743326bc 西安二号线信号机调整逻辑点灯 2020-05-14 16:04:23 +08:00
fan
6eb6cd5340 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-14 15:37:37 +08:00
fan
f8a6908d8c 西安二号线调整 2020-05-14 15:37:18 +08:00
joylink_cuiweidong
77a8fd7c41 西安二号线 列车在站台停车时，站台框也显示为绿色 2020-05-14 15:32:51 +08:00
fan
f95d5e46d7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-14 11:03:33 +08:00
fan
8335ee1259 调整列车详情显示和路由课程创建角色处理 2020-05-14 11:03:24 +08:00
zyy
ba1365b951 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-14 11:00:27 +08:00
zyy
2de0a0fc5b 调整区段鼠标移入元素绘制 2020-05-14 11:00:09 +08:00
joylink_cuiweidong
8fd1014203 西安二号线 车次窗显示车次号颜色为黑色 
列车车次号线显示为五位
实际列车到站开门的过程中列车方向图标不消失 调整
 2020-05-14 10:22:13 +08:00
zyy
ecf563e8de 调整大屏系统保存 2020-05-13 16:29:10 +08:00
zyy
cd229f7f81 调整地图大屏编辑，宁波线路道岔操作 2020-05-13 15:31:12 +08:00
zyy
dd6030d346 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-12 16:45:59 +08:00
zyy
ecec0ec1e0 调整西安一号鼠标移入样式 2020-05-12 16:45:45 +08:00
fan
a707d142be 逻辑区段生成调整 2020-05-12 13:57:33 +08:00
zyy
68e63ee5ef 调整地图绘制报错 2020-05-11 17:36:21 +08:00
zyy
a65390f7d6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-11 15:29:37 +08:00
zyy
811ec26af1 调整大屏显示 2020-05-11 15:29:25 +08:00
fan
115f1da928 批量生成区段逻辑始终端偏移量 2020-05-11 13:25:09 +08:00
joylink_zyy
9c2a65dda6 调整区段创建判断 2020-05-10 21:17:17 +08:00
joylink_zyy
15b7996cb6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-10 20:43:43 +08:00
joylink_zyy
c65edfc06d 调整区段绘图逻辑 2020-05-10 20:43:37 +08:00
joylink_fanyuhong
292d6d1327 列车调整 2020-05-10 16:51:28 +08:00
joylink_fanyuhong
b732a00eb0 列车删除日志 2020-05-10 16:03:45 +08:00
joylink_fanyuhong
bf3af7cd65 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-10 16:01:05 +08:00
joylink_fanyuhong
a64373e9b7 列车调整 2020-05-10 16:00:55 +08:00
joylink_zyy
fa70eb85ca 注释iscs事件 2020-05-10 15:58:08 +08:00
fan
0386d1f9b4 删除打印日志 2020-05-09 15:36:48 +08:00
zyy
bb7556a876 调整宁波线路操作失败提示 2020-05-09 14:16:09 +08:00
fan
84e212c48b 站台站台轨位置校验&站台属性是否显示不生效修改&站台中站台轨属性不可修改&tab页懒加载导致的数据未展示问题调整 2020-05-08 18:52:46 +08:00
zyy
1e7e17c709 调整西安一号线行调右键操作 2020-05-08 16:12:03 +08:00
zyy
85324dee05 调整西安一号线信号机操作 2020-05-07 16:14:39 +08:00
zyy
515880d1c9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-06 13:11:52 +08:00
zyy
adf2627fec 调整西安二号线鼠标移入 2020-05-06 13:11:37 +08:00
fan
6eb648199e 西安二信号机操作问题修改 2020-04-30 18:25:21 +08:00
fan
276620a25e 西安二信号机调整 2020-04-30 17:40:25 +08:00
fan
15104970bc 西安二信号机调整&线路配置添加参数 2020-04-30 16:19:33 +08:00
fan
4797aa046f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-30 13:19:46 +08:00
fan
e348262118 西安二号线信号机操作调整 2020-04-30 13:19:33 +08:00
zyy
eb6cd7ce2d 调整道岔使能发送流程，及绘图 2020-04-30 11:28:56 +08:00
fan
f3ab2337e8 西安二号线信号封锁调整（未完） 2020-04-30 08:54:17 +08:00
fan
1c8929cb08 绘图区段添加firstTurnBack&线路配置添加generateCycle&西安二操作调整 2020-04-29 17:25:30 +08:00
fan
ec7be523ba 西安二信号机操作调整 2020-04-29 15:24:17 +08:00
fan
7e790a3bdb 鼠标样式调整 2020-04-29 14:05:50 +08:00
fan
7d3a6ddafa 西安二号线信号机操作调整 2020-04-29 11:36:16 +08:00
fan
5d2fff66a8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-27 19:02:20 +08:00
fan
e39a7eadb9 西安二号线操作调整&&绘图数据调整 2020-04-27 19:02:07 +08:00
zyy
9427cc5759 调整西安二号线右键菜单显示 2020-04-27 18:33:29 +08:00
fan
a1d0c3e7d0 西安二号线绘图调整 2020-04-26 17:16:20 +08:00
fan
f1fac79770 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-26 16:24:49 +08:00
fan
695ea67e27 西安二号线绘图调整&西安二号线站台操作调整&派班计划冲突显示调整 2020-04-26 16:24:34 +08:00
joylink_cuiweidong
7d5605d170 西安二号线 绘图 站台添加模式筛选标识 2020-04-24 18:23:17 +08:00
fan
26f59a4e4e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-23 18:36:47 +08:00
fan
9c07e3968d 代码调整 2020-04-23 18:35:27 +08:00
zyy
4d288556b0 调整绘图界面，调整实训平台鼠标隐藏bug 2020-04-23 17:11:51 +08:00
fan
06b9fda264 西安一三按计划折返 2020-04-22 18:24:28 +08:00
fan
8c122f93d4 运行图加载调整&绘图设备道岔故障&佛山区段颜色 2020-04-22 17:12:29 +08:00
zyy
4610882f5f 调整列车方向显示 2020-04-21 17:00:19 +08:00
fan
7c55c19933 交路区段区别显示&故障状态组调整 2020-04-20 17:10:50 +08:00
zyy
85189c240f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-20 15:12:14 +08:00
zyy
a49a3bfaaf 调整西安二号线数据及皮肤配置 2020-04-20 15:12:01 +08:00
joylink_cuiweidong
074f6d647a 西安二号线站台 紧急停车状态 绘图调整 2020-04-20 10:12:17 +08:00
joylink_cuiweidong
de0b7ae931 西安二号线 绘图紧急停车状态代码调整 2020-04-17 18:42:58 +08:00
joylink_cuiweidong
70a8ec07f6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-17 16:39:55 +08:00
joylink_cuiweidong
211db36aca 西安二号线绘图 站台 扣车 代码调整 2020-04-17 16:39:42 +08:00
fan
c13624b60a 西安二号线调整 2020-04-17 15:59:50 +08:00
fan
07711a5bda Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-17 13:32:18 +08:00
fan
a4097e1f32 西安二号线调整 2020-04-17 13:30:59 +08:00
joylink_cuiweidong
467e8671fd 西安二号线屏蔽门绘图调整 2020-04-17 13:30:18 +08:00
fan
aae2a734ed Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-16 09:03:22 +08:00
fan
8e5a79626a 西安二号线调整 2020-04-16 09:01:52 +08:00
zyy
83f63b5c70 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-15 14:19:37 +08:00
zyy
0091a593e5 调整福州线路顶部栏显示名称字段 2020-04-15 14:19:22 +08:00
fan
8cd740402f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-15 14:14:32 +08:00
fan
a1869a531f 集中站分隔调整&线路管理配置调整 2020-04-15 14:13:08 +08:00
zyy
6cb2939631 调整西安二号线道岔状态显示 2020-04-15 11:17:19 +08:00
fan
e9ee5112d4 佛山皮肤调整 2020-04-15 09:33:21 +08:00
fan
2613b68413 佛山列车显示调整&西安二号线集中站分割符 2020-04-14 18:51:09 +08:00
fan
61c2260d93 西安二号线调整 2020-04-14 15:45:13 +08:00
fan
b7e6b9a8c1 佛山运行图导入上行时间调整&西安二号线车站调整 2020-04-13 18:30:21 +08:00
fan
20491dac81 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-13 17:13:52 +08:00
fan
f91c8e37d2 佛山运行图导入参数调整&西安二号线车站调整 2020-04-13 17:12:33 +08:00
joylink_cuiweidong
ccf028e5bb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-13 13:08:30 +08:00
joylink_cuiweidong
e083015580 西安二号线 屏蔽门和站台的状态代码调整 2020-04-13 13:08:17 +08:00
fan
472dd1b62a 佛山运行图导入校验调整&西安二号线车站调整 2020-04-13 10:43:02 +08:00
fan
b0797644f9 实训课程编辑调整&线二号线调整 2020-04-10 17:50:26 +08:00
fan
11586aef30 哈尔滨现地显示BUG调整&西安二号线皮肤调整 2020-04-10 16:45:41 +08:00
zyy
ced7cb91b6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-09 17:37:41 +08:00
zyy
289f1dbff0 调整现地列车显示 2020-04-09 17:37:27 +08:00
joylink_cuiweidong
1897a79a72 西安二号线 屏蔽门绘图代码调整 2020-04-09 17:27:10 +08:00
zyy
da62178c72 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-09 17:03:35 +08:00
zyy
8026e14da8 调整道岔重置，调整宁波定义 2020-04-09 17:03:22 +08:00
joylink_cuiweidong
45e6a12825 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-09 16:32:15 +08:00
joylink_cuiweidong
5a8f4e0fe6 西安二号线 屏蔽门绘图代码调整 2020-04-09 16:31:53 +08:00
fan
f2ba430cc5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-09 14:49:06 +08:00
fan
50579656eb 进路控制信号机按消息批次处理&西安二计轴调整&&实训管理老地图处理（未完） 2020-04-09 14:47:44 +08:00
joylink_cuiweidong
1f4d8ae061 西安二号线 站台绘图调整 2020-04-09 13:01:48 +08:00
fan
630ccfd016 信号机调整 2020-04-08 18:38:08 +08:00
fan
2e1b356da9 调整区段限速判断 2020-04-08 16:21:08 +08:00
zyy
85eef4b8f9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-08 14:14:04 +08:00
zyy
425b7d3869 Merge branch 'master' into test 2020-04-08 14:12:58 +08:00
fan
f495a2d560 实训占位符调整&皮肤调整 2020-04-08 14:06:45 +08:00
fan
b089aa6651 实训占位符调整&皮肤调整 2020-04-08 13:23:19 +08:00
joylink_cuiweidong
778d74ecd5 北京一号线现地 道岔 站台实训操作步骤代码调整 2020-04-07 17:19:28 +08:00
zyy
1f6b627768 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-07 13:38:28 +08:00
zyy
aa06844b18 地图绘制信号机增加偏移量字段 2020-04-07 13:37:17 +08:00
fan
6498f68295 宁波实训调整 2020-04-07 13:09:34 +08:00
zyy
747595e8e8 Merge branch 'test' 2020-04-02 11:25:57 +08:00
fan
1017058855 站台状态显示位置调整 2020-04-02 09:48:55 +08:00
fan
9d02306fda Merge remote-tracking branch 'origin/test' 
# Conflicts:
#	src/views/newMap/newMapdraft/mapoperate/section/index.vue
 2020-04-01 18:00:58 +08:00
fan
fe8caec435 列车方向箭头调整 2020-04-01 14:01:31 +08:00
fan
225a739f60 打包本地项目不进行cdn加载 2020-04-01 13:47:29 +08:00
zyy
4ef3c69f9f 调整显示内容 判断 2020-03-31 15:34:55 +08:00
joylink_cuiweidong
8c2f1cf729 新剧本 仿真类型切换代码调整 2020-03-30 17:39:00 +08:00
zyy
1e2a015955 调整区段实际长度逻辑 2020-03-30 17:07:51 +08:00
joylink_cuiweidong
68f77a25b6 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-30 16:16:29 +08:00
joylink_cuiweidong
8f6f033870 剧本仿真切换仿真类型代码调整 2020-03-30 16:16:11 +08:00
zyy
af6eb5917f Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-30 16:15:50 +08:00
zyy
0c56d049ec 调整哈尔滨现地实训操作步骤 2020-03-30 16:15:35 +08:00
fan
779b958613 站台调整 2020-03-30 15:27:13 +08:00
fan
643c12335c Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev_stand 
# Conflicts:
#	src/utils/baseUrl.js
 2020-03-30 14:26:27 +08:00
fan
e82e77a507 站台调整 2020-03-30 14:22:57 +08:00
fan
8f69177fe1 暂存 2020-03-30 09:47:26 +08:00
zyy
c5dbd2b141 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 
# Conflicts:
#	src/utils/baseUrl.js
 2020-03-27 18:20:28 +08:00
zyy
47519b7040 调整道岔生成默认状态，调整道岔皮肤配置 2020-03-27 18:19:40 +08:00
fan
6ef1fc2013 实训调整 2020-03-27 18:14:46 +08:00
fan
c30eae5b1e Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-27 17:26:39 +08:00
fan
19b945962b 站台调整 2020-03-27 17:26:17 +08:00
zyy
7380953642 增加宁波线路实训操作 2020-03-27 13:45:36 +08:00
fan
5c7394454d 调整 2020-03-27 11:35:46 +08:00
fan
723f8ff3e8 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-27 10:18:58 +08:00
fan
1adc50b2d1 站台调整 2020-03-27 10:17:24 +08:00
zyy
d92813ed72 调整道岔定位绘图 2020-03-27 10:02:41 +08:00
fan
ead5bd01e6 站台调整 2020-03-26 15:04:52 +08:00
fan
aadbe543a5 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-26 09:44:27 +08:00
joylink_cuiweidong
8c01b4129f 列车绘图代码调整 2020-03-25 18:34:43 +08:00
zyy
a2875baa19 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-25 18:26:30 +08:00
zyy
41100ac9bf 调整宁波线路 道岔 封锁 单锁状态 2020-03-25 18:26:19 +08:00
fan
5bcb42e0f2 宁波调整 2020-03-25 17:32:57 +08:00
joylink_cuiweidong
ad4de2cd45 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-25 17:16:16 +08:00
joylink_cuiweidong
ef33f0f628 宁波一号线 增加列车移入显示边框 2020-03-25 17:15:16 +08:00
fan
1210496ecb Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-25 15:24:08 +08:00
fan
9d38968751 佛山样式调整&&宁波显示调整 2020-03-25 15:22:52 +08:00
joylink_cuiweidong
81b2e420d8 宁波线 
添加信号机人解进路功能
信号机右键菜单 设置进路改为排列进路
列车鼠标悬停显示信息去掉
佛山线 现地
信号机操作调整
 2020-03-25 15:19:39 +08:00
joylink_cuiweidong
089b8960b9 佛山线路现地界面调整 2020-03-24 18:01:10 +08:00
fan
70b75e354c 状态灯调整 2020-03-24 16:50:09 +08:00
fan
652aa43a2a Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-24 16:37:26 +08:00
fan
1e72a8cff3 状态灯调整 2020-03-24 16:35:09 +08:00
zyy
98158fdb86 删除默认状态 2020-03-24 15:10:31 +08:00
zyy
a22ec53e39 调整佛山线路信号机，站台状态 2020-03-24 15:09:25 +08:00