Commit Graph

897 Commits

Author SHA1 Message Date
zyy
0e36937718 添加区段操作 2020-08-12 10:02:19 +08:00
zyy
2d5f4520d4 增加佛山线路 强制取消扣车 2020-08-12 09:50:10 +08:00
joylink_cuiweidong
95a4bf40e9 宁波一号线 佛山有轨电车 控制权转移代码调整 2020-08-10 18:23:14 +08:00
joylink_cuiweidong
fd6360611b 福州一号线,西安三号线控制权转移代码调整 2020-08-07 18:20:45 +08:00
joylink_cuiweidong
c4c1f79258 控制权转移代码调整 2020-08-07 17:33:12 +08:00
joylink_cuiweidong
1895dc42b0 西安三号线控制权转移代码调整 2020-08-07 17:13:12 +08:00
joylink_cuiweidong
fda52feb52 代码调整 2020-08-07 14:12:32 +08:00
joylink_cuiweidong
cc6bbe8073 北京一号线 成都线路 佛山有轨电车 福州一号线 哈尔滨一号线 控制权转移代码调整 2020-08-07 14:00:32 +08:00
joylink_cuiweidong
e2a7f160cb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/jmapNew/shape/Station/index.js
2020-08-07 13:23:08 +08:00
joylink_cuiweidong
e08dcd9c8d 宁波一号线控制权转移代码调整
综合演练页面 后退退出房间
2020-08-07 13:17:09 +08:00
fan
ea5cb27128 运行图预览调整 2020-08-07 11:28:50 +08:00
joylink_cuiweidong
abb0143988 控制权转移代码调整 2020-08-06 19:34:13 +08:00
joylink_cuiweidong
026a8d9a7f 仿真左上角菜单样式调整 2020-08-06 13:21:55 +08:00
fan
aea8dc7eca 清理多余状态 2020-08-05 15:12:40 +08:00
zyy
e852eb95db 调整流程 2020-08-05 13:14:30 +08:00
zyy
8bdf189e9c 调整哈尔滨操作 2020-08-05 10:27:55 +08:00
zyy
bd8054bef8 删除注释 2020-08-03 19:01:16 +08:00
zyy
86197114a1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-03 19:00:04 +08:00
zyy
9aee216961 调整哈尔滨操作判断 2020-08-03 18:59:48 +08:00
joylink_cuiweidong
dbc017763a 宁波线控制权转移代码调整 2020-08-03 18:52:39 +08:00
zyy
31be09323b 调整综合演练顶部菜单判断,增加哈尔滨项目 行调设备登陆显示指令模式 2020-08-03 14:12:56 +08:00
joylink_cuiweidong
5bb59c855e 佛山控制权转移代码调整 2020-07-31 17:30:26 +08:00
joylink_cuiweidong
48cd28bd88 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-31 16:03:48 +08:00
joylink_cuiweidong
ff912ff0f5 宁波一号线 运行图预览加点选 2020-07-31 16:03:32 +08:00
zyy
a011ab03f8 增加宁波指令 2020-07-31 15:27:37 +08:00
joylink_cuiweidong
329b3efef3 宁波一号线 站遥控 控制权转移代码调整 2020-07-30 18:59:48 +08:00
joylink_cuiweidong
c2c3fc0b22 运行图加载根据车次号 运行图颜色代码调整 2020-07-30 16:44:41 +08:00
zyy
33969bd5e8 调整哈尔滨站台操作 2020-07-30 10:03:00 +08:00
zyy
ef1fd94643 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-29 17:41:32 +08:00
zyy
841946ce29 调整按钮样式 2020-07-29 17:41:19 +08:00
joylink_cuiweidong
7e920993f4 宁波一号线控制权转换代码调整 2020-07-29 17:19:14 +08:00
joylink_cuiweidong
b9f8e1d3ca Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-29 16:02:32 +08:00
joylink_cuiweidong
2ba34b5d0b 宁波一号线控制权转换代码调整 2020-07-29 16:02:14 +08:00
fan
7403c53baa merge 2020-07-29 14:16:32 +08:00
fan
fff5acab5d 创建考试调整&路由replace调整 2020-07-29 14:14:34 +08:00
joylink_cuiweidong
40a7170f69 西安三号线宁波一号线 控制权菜单显示代码调整 2020-07-29 14:10:44 +08:00
joylink_cuiweidong
7ad5e06a07 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/jmapNew/theme/ningbo_01/menus/passiveDialog/control.vue
2020-07-29 13:59:48 +08:00
joylink_cuiweidong
c3e6cf2b56 代码调整 2020-07-29 13:56:50 +08:00
fan
a18c84f684 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-29 11:14:57 +08:00
fan
24e3a606fa 调整会话按钮名称&宁波一剩余菜单回车快捷键 2020-07-29 11:14:45 +08:00
joylink_cuiweidong
a13b21613f 宁波一号线 键盘操作调整(回车事件) 2020-07-29 10:39:58 +08:00
joylink_cuiweidong
ed4b5047bd 代码调整 2020-07-28 18:47:05 +08:00
joylink_cuiweidong
c0e3df14bc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-28 18:30:10 +08:00
fan
32a8daff56 merge 2020-07-28 18:30:44 +08:00
joylink_cuiweidong
9cc57c0a44 宁波一号线 键盘操作调整(回车事件) 2020-07-28 18:29:56 +08:00
fan
f13ba95407 宁波菜单回车快捷键(区段、信号机、车站)&设备登录综合演练不显示cctv视图设备视图三维视图&会话切换公共调整 2020-07-28 18:28:31 +08:00
zyy
ac43981c7d 调整哈尔滨车站操作 2020-07-28 16:59:32 +08:00
zyy
73f3cb0d0d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-28 16:41:36 +08:00
zyy
eec51e7cfd 调整哈尔滨车站操作 2020-07-28 16:41:21 +08:00
fan
10918d1f06 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-28 16:29:06 +08:00