Commit Graph

13230 Commits

Author SHA1 Message Date
joylink_cuiweidong
22257e8578 bug 修复 【大铁标准站】封锁按钮点击报错,无法使用 2023-01-17 17:05:50 +08:00
dong
fcadfcca38 初始化后调度命令清空 2023-01-17 16:49:16 +08:00
dong
0a8e08dc65 代码调整 2023-01-17 16:35:42 +08:00
dong
5b56dfe579 代码调整 2023-01-17 16:19:54 +08:00
dong
725373a564 进路序列管理窗口;占线板调整 2023-01-17 16:08:01 +08:00
joylink_cuiweidong
ad0ac9b277 bug修复 【ID1000402】 【运行图编制】缺少测试运行功能 2023-01-17 15:59:13 +08:00
joylink_cuiweidong
93a7c42748 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2023-01-17 14:01:00 +08:00
joylink_cuiweidong
de8ea66ebd 代码调整 2023-01-17 14:00:39 +08:00
dong
58c1526633 清除阶段计划 2023-01-17 13:52:52 +08:00
dong
4cb891b22c 占线板代码调整 2023-01-17 13:18:14 +08:00
joylink_cuiweidong
ca6e14eadc Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2023-01-17 13:08:04 +08:00
joylink_cuiweidong
250d678df7 bug修复【ID1000425】 【大铁标准站】点击关闭报错 2023-01-17 13:07:48 +08:00
dong
77e05da3f6 修改占线板无反应 2023-01-17 11:02:49 +08:00
joylink_cuiweidong
4ae18d502c 代码调整 2023-01-17 09:44:29 +08:00
joylink_cuiweidong
a08bce7316 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2023-01-16 18:22:52 +08:00
joylink_cuiweidong
413ac96e01 bug修复【运行图编制】缺少测试运行功能 (部分) 2023-01-16 18:22:40 +08:00
dong
2bec6887f6 Merge remote-tracking branch 'remotes/origin/test_dispaly' into test 2023-01-16 17:58:42 +08:00
dong
94620bbe41 刷新教学管理当前路由标识 2023-01-16 17:57:58 +08:00
dong
fdc546ef95 修改角色是站长无薄册客户端问题 2023-01-16 17:34:34 +08:00
dong
d671daa67d Merge remote-tracking branch 'remotes/origin/test_dispaly' into test 2023-01-16 15:51:16 +08:00
dong
9edb17f44c 车辆段调度取消右键显示 2023-01-16 15:50:07 +08:00
dong
9fe37f4c64 Merge remote-tracking branch 'remotes/origin/test_dispaly' into test 2023-01-16 14:18:39 +08:00
dong
126b37c205 处理车辆段调度无法排列进路,按钮钮封无反应问题 2023-01-16 14:15:10 +08:00
fan
88c85f4e49 北京折返策略参数调整 2023-01-16 13:24:51 +08:00
fan
7fae657468 BUG:【南京二号线】轨道总览显示不对 2023-01-16 10:50:23 +08:00
fan
807220e7b5 仿真状态订阅放在mounted 2023-01-16 10:45:20 +08:00
fan
a67d2abf65 北京一号线查看站台信息结束后清除数据 2023-01-16 10:30:46 +08:00
fan
35fce14a31 北京一号线折返策略
(cherry picked from commit 910e0c5712)
2023-01-16 10:10:48 +08:00
fan
74db54e2de 北京一号线折返策略
(cherry picked from commit 910e0c5712)
2023-01-16 10:09:09 +08:00
fan
1ae99e90d6 Merge remote-tracking branch 'origin/test_dispaly' into test 2023-01-13 18:50:26 +08:00
fan
c22c93bba4 drts国赛项目三方跳转退出处理 2023-01-13 18:49:57 +08:00
fan
9700682a26 Merge remote-tracking branch 'origin/test_dispaly' into test 2023-01-13 18:48:10 +08:00
fan
da4e5911fd thirdJump 中路由跳转换成replace 2023-01-13 18:47:45 +08:00
fan
aee86e8024 Merge remote-tracking branch 'origin/test_dispaly' into test 2023-01-13 18:12:59 +08:00
fan
ab55f2b1ad Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1 2023-01-13 18:10:57 +08:00
joylink_cuiweidong
0c7f55c911 bug 修复 【大铁标准站】大铁车务终端的操作:总取消、信号重开、总人解等报错 2023-01-13 16:53:51 +08:00
fan
2af7b5cc16 成工业iframe嵌入退出调整 2023-01-13 16:48:41 +08:00
dong
36adbaeda1 Merge remote-tracking branch 'remotes/origin/test_dispaly' into test 2023-01-13 16:07:33 +08:00
dong
b0d80ac49e 添加权限分发到组织和项目 2023-01-13 15:54:06 +08:00
joylink_cuiweidong
9c3cdd31d5 bug 修复 【佛山有轨电车仿真线路】区段操作有两个权限取消限速 2023-01-13 15:45:01 +08:00
fan
dca3d00d50 修复:哈尔滨在正式不显示下面button组件 2023-01-13 14:28:34 +08:00
dong
e28b1f3337 Merge remote-tracking branch 'remotes/origin/test_dispaly' into test 2023-01-13 13:15:38 +08:00
fan
3054160b14 Merge remote-tracking branch 'origin/test_dispaly' into test
# Conflicts:
#	src/views/newMap/displayNew/demonMenu.vue
#	src/views/newMap/displayNew/dispatherContest/index.vue
#	src/views/newMap/displayNew/index.vue
#	src/views/newMap/displayNew/menuSchema.vue
#	src/views/newMap/jointTrainingNew/index.vue
2023-01-13 13:10:52 +08:00
dong
816c0d01f5 调度命令socket调整 2023-01-13 11:28:12 +08:00
dong
4778a3c909 代码调整 2023-01-13 11:16:25 +08:00
fan
c3c29d6724 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1 2023-01-13 10:36:49 +08:00
fan
2c68be07a3 调整: 路票簿册客户端显示条件修改 2023-01-13 10:36:30 +08:00
dong
2da7b23638 代码调整 2023-01-13 10:25:48 +08:00
fan
211ea96d07 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1 2023-01-13 10:11:22 +08:00
fan
164d34ad09 Bug:【大铁标准站】综合演练时,路票无法给与别的车站 2023-01-13 10:11:13 +08:00