Commit Graph

130 Commits

Author SHA1 Message Date
zyy
dd22ce9940 调整西安线路故障模式操作 2020-07-22 11:23:02 +08:00
zyy
7bd6013565 增加指令字典 复制操作 2020-07-20 10:47:27 +08:00
zyy
e0f7175923 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-17 18:28:56 +08:00
zyy
04f1205e56 调整上行是否向右地图字段 2020-07-17 18:28:38 +08:00
joylink_cuiweidong
da2fa63253 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-17 10:52:35 +08:00
joylink_cuiweidong
70b1dd7815 列车通信故障/ 取消故障操作调整 2020-07-17 10:51:45 +08:00
zyy
6042d58262 调整列车发送指令流程 2020-07-17 10:22:47 +08:00
zyy
b37fbdd967 调整西安线路列车操作 2020-07-16 13:35:54 +08:00
zyy
a1cbcff9ea 调整道岔绘图,右键操作 2020-07-15 13:31:07 +08:00
joylink_cuiweidong
d2f653bc54 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/jmapNew/theme/fuzhou_01/menus/menuTrain.vue
#	src/jmapNew/theme/haerbin_01/menus/menuTrain.vue
#	src/jmapNew/theme/xian_01/menus/menuTrain.vue
#	src/jmapNew/theme/xian_02/menus/menuTrain.vue
2020-07-13 18:59:56 +08:00
joylink_cuiweidong
fe5787b3ce 新增 确认列车行驶之前方站台 进路闭塞法行车 指令 2020-07-13 18:54:42 +08:00
zyy
1c15fdbdd9 增加所有线路列车故障模式 2020-07-13 17:27:33 +08:00
fan
b10f08df67 设备登录调整&成员管理调整 2020-07-10 18:30:37 +08:00
joylink_cuiweidong
5f1a5b3092 西安线路和宁波一号线添加动手zc故障 2020-07-06 17:49:17 +08:00
zyy
f91fc75528 调整西安线路进路状态 2020-07-03 11:11:57 +08:00
joylink_cuiweidong
e66723adff 右键操作折返策略代码调整
地图绘图转化函数调整
2020-07-01 14:22:06 +08:00
fan
3f80fc1d0e 公共菜单提取 2020-06-29 14:25:35 +08:00
fan
1fc6bd7058 控制权转移调整 2020-06-28 14:50:09 +08:00
joylink_cuiweidong
97320237c3 西安三号线道岔添加 道岔钩锁操作 2020-06-24 18:38:46 +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
fan
2399be67d0 宁波道岔失表增加表示红色矩形 2020-06-24 16:19:47 +08:00
fan
9a620f8629 西安三道岔设置故障&iscs调整(未完) 2020-06-24 13:27:58 +08:00
fan
0128576386 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-24 09:25:04 +08:00
fan
d5cd233e98 调整故障操作 2020-06-24 09:24:54 +08:00
joylink_cuiweidong
9e3ee28611 车站右键操作代码调整 2020-06-23 17:15: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
2462ba7413 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-23 13:58:20 +08:00
joylink_cuiweidong
83c348ef55 删除多余文件 2020-06-23 13:58:03 +08:00
zyy
143325e6f6 调整西安一三线路 导航名称显示流程 2020-06-23 13:52:34 +08:00
joylink_cuiweidong
c463f8ef69 宁波一号线哈尔滨一号线操作代码调整 2020-06-19 18:32:31 +08:00
joylink_cuiweidong
8c7a5e7796 右键操作代码整理 2020-06-19 17:03:39 +08:00
joylink_cuiweidong
ee12c33025 西安一号线右键操作代码调整 2020-06-19 16:13:21 +08:00
joylink_cuiweidong
5b5949b23d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-19 15:34:35 +08:00
joylink_cuiweidong
dd9959b2f4 右键菜单代码调整 2020-06-19 15:34:20 +08:00
fan
a1c3935ba7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-19 15:19:40 +08:00
fan
75116c32da 控制模式实操调整&sock降至1.0.0 2020-06-19 15:19:28 +08:00
joylink_cuiweidong
b34a9fdf25 右键菜单代码整理 2020-06-19 14:08:52 +08:00
joylink_cuiweidong
aa632c457d 西安一号线 操作代码整理 2020-06-18 18:00:17 +08:00
fan
cf961927db Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-18 17:30:00 +08:00
fan
b8dfa50306 调整西安三号箱操作定义 2020-06-18 17:29:46 +08:00
zyy
5bb54b07cd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/jmapNew/theme/xian_01/menus/dialog/routeDetail.vue
#	src/jmapNew/theme/xian_01/menus/dialog/routeHandControl.vue
#	src/jmapNew/theme/xian_01/menus/menuSignal.vue
2020-06-18 14:59:43 +08:00
zyy
97b0a3f9eb 调整公共提示路径,删除多余文件 2020-06-18 14:57:32 +08:00
fan
08a3bbaa7c 合并代码 2020-06-18 14:49:14 +08:00
joylink_cuiweidong
350043c3d2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-18 11:25:01 +08:00
joylink_cuiweidong
acd3b0f87e 信号机进路代码整理 2020-06-18 11:24:42 +08:00
zyy
cfa6445b02 调整区段组件 2020-06-18 11:01:33 +08:00
fan
39bc38701e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-18 10:05:20 +08:00
fan
f892440294 调整操作定义 2020-06-18 10:05:12 +08:00