Commit Graph

104 Commits

Author SHA1 Message Date
fan
9637c7edc6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-28 14:50:22 +08:00
fan
1fc6bd7058 控制权转移调整 2020-06-28 14:50:09 +08:00
zyy
621a077e86 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-28 13:27:24 +08:00
zyy
e3ee44aae7 调整道岔失表状态,成都3号线实操定义 2020-06-28 13:27:10 +08:00
fan
fd2347e4e7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-28 11:01:34 +08:00
fan
618419e4ba 佛山信号机操作调整 2020-06-28 11:01:13 +08:00
zyy
b5a22e2dd1 调整佛山实训定义操作配置 2020-06-24 18:39:49 +08:00
zyy
678f0ba839 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-24 17:37:24 +08:00
zyy
c570e418e1 调整佛山操作定义,调整个人信息 2020-06-24 17:37:09 +08:00
joylink_cuiweidong
f3859ba247 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-24 16:22:18 +08:00
joylink_cuiweidong
73b2da9421 右键操作取消故障代码调整 2020-06-24 16:21:56 +08:00
zyy
3bd16e211f 调整佛山新路操作定义配置 2020-06-24 16:04:05 +08:00
zyy
3b330a0932 调整佛山线路实训定义,删除区段定义 2020-06-24 14:06:17 +08:00
fan
e67f98e9a0 合并代码 2020-06-23 15:26:26 +08:00
fan
a2664eb5dc 登录调整&综合演练调整&菜单调整 2020-06-23 15:18:44 +08:00
joylink_cuiweidong
9752bd4244 佛山右键操作代码调整 2020-06-23 13:27:46 +08:00
zyy
5334049fcc 提取公共函数组件 删除线路多余配置 2020-06-19 14:16:21 +08:00
zyy
97b0a3f9eb 调整公共提示路径,删除多余文件 2020-06-18 14:57:32 +08:00
zyy
e439eb6048 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-18 11:01:49 +08:00
zyy
cfa6445b02 调整区段组件 2020-06-18 11:01:33 +08:00
joylink_cuiweidong
f3022a6bf7 信号机操作代码整理 2020-06-18 10:22:07 +08:00
joylink_cuiweidong
b0e5d7a6b6 信号机操作代码整理 2020-06-18 09:46:29 +08:00
zyy
b39f278a5d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-17 17:48:33 +08:00
zyy
c35ceb948c 道岔公共组件提取 2020-06-17 17:48:19 +08:00
joylink_cuiweidong
1886663445 宁波一号线,北京一号线,佛山有轨电车操作代码调整 2020-06-17 17:08:34 +08:00
zyy
ba8f138de3 提取信号机通用组件 2020-06-17 15:24:16 +08:00
joylink_cuiweidong
4fb17151df 佛山有轨电车操作代码调整 2020-06-17 09:01:18 +08:00
zyy
207cd06cd9 删除佛山线路配置 2020-06-12 13:42:33 +08:00
fan
429fe6d6a7 跳停上下行取值调整&列车识别号显示调整 2020-06-12 10:51:06 +08:00
joylink_cuiweidong
dda8f39adf 新版地图右键操作 弹窗代码调整 2020-06-11 13:29:06 +08:00
fan
3352b94149 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-10 17:58:35 +08:00
fan
1d2619cd28 menu-bar显示条件调整 2020-06-10 17:58:20 +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
joylink_cuiweidong
c953d98ffa 佛山线路 现地信号机 操作调整 2020-06-10 14:37:43 +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
zyy
c8bf7c80ef Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-09 18:41:08 +08:00
zyy
62ede6fec7 增加佛山线路现地操作,调整状态字段 2020-06-09 18:40:48 +08:00
joylink_cuiweidong
174c15bafc 佛山线路添加 设置临时限速 2020-06-09 18:30:00 +08:00
joylink_cuiweidong
cc3fe9353f 佛山有轨电车 宁波一号线 全线扣车代码调整 2020-06-09 17:53:54 +08:00
joylink_cuiweidong
3c3a355fb6 道岔单解操作代码调整 2020-06-09 14:29:36 +08:00
joylink_cuiweidong
5bc3bfc8dd 操作指令代码调整 2020-06-09 14:09:15 +08:00
joylink_cuiweidong
eecc022ae5 佛山线路 菜单栏 增加显示功能
列车提示代码调整
2020-06-08 10:46:01 +08:00
joylink_cuiweidong
38b7580f79 佛山线路 道岔在单锁的状态时,使用道岔单解的功能,未起到双确认调整
停站时间没有具体停站多少时间调整
2020-06-05 18:48:07 +08:00
fan
90d80897c6 佛山控制模式转换调整 2020-06-04 16:44:04 +08:00
fan
87c2cc1ae9 佛山控制模式转换 2020-06-04 16:19:37 +08:00
joylink_cuiweidong
c3736a02c8 北京/佛山/哈尔滨 现地 左下角 聊天信息窗口遮盖问题处理 2020-06-03 10:43:41 +08:00
fan
80d016a2b5 公共菜单调整 2020-05-28 16:40:52 +08:00