dong
|
a7616055dc
|
修改从车务终端切到联锁界面后无法操作增加列车问题
|
2023-02-20 15:01:22 +08:00 |
|
dong
|
cf5e633187
|
代码调整
|
2023-02-20 14:19:12 +08:00 |
|
fan
|
dd0fd19720
|
Merge remote-tracking branch 'origin/test_dispaly' into test
|
2023-02-18 12:21:23 +08:00 |
|
fan
|
640b609831
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2023-02-18 12:18:25 +08:00 |
|
fan
|
de7623b475
|
发布报错调整
|
2023-02-18 12:18:09 +08:00 |
|
dong
|
35cd45786f
|
代码调整
|
2023-02-17 18:15:55 +08:00 |
|
fan
|
85ca94a66a
|
Merge remote-tracking branch 'origin/test_dispaly' into test
|
2023-02-17 18:15:07 +08:00 |
|
dong
|
960e16dfa2
|
代码调整
|
2023-02-17 18:05:16 +08:00 |
|
dong
|
8b38960f14
|
代码调整
|
2023-02-17 17:58:59 +08:00 |
|
fan
|
d4ce77e8bc
|
撤销：重复修改 权限分发到指定用户页面
|
2023-02-17 16:37:20 +08:00 |
|
fan
|
b07d540134
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2023-02-17 16:18:08 +08:00 |
|
fan
|
6ae073a557
|
调整：权限分发到指定用户添加账户查询条件
|
2023-02-17 16:18:00 +08:00 |
|
dong
|
4005b3783d
|
修改权限分发到指定用户弹窗和账号管理界面一致
|
2023-02-17 16:14:25 +08:00 |
|
fan
|
fd87f62c25
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2023-02-17 15:59:50 +08:00 |
|
fan
|
39f2019251
|
调整：仿真退出未重置activeTrainList
|
2023-02-17 15:59:40 +08:00 |
|
dong
|
25fcd0d671
|
代码调整
|
2023-02-17 15:49:44 +08:00 |
|
dong
|
fcb9ce5e08
|
模式转换功能调整
|
2023-02-17 15:01:59 +08:00 |
|
dong
|
2c41be9df5
|
代码调整
|
2023-02-17 11:23:02 +08:00 |
|
fan
|
7cfa33ecc0
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2023-02-17 10:36:53 +08:00 |
|
fan
|
73514ebc1f
|
Bug:参演角色重复问题修复
|
2023-02-17 10:36:22 +08:00 |
|
dong
|
abdfcaef41
|
调整模式转换
|
2023-02-17 09:51:09 +08:00 |
|
fan
|
f38fb8891a
|
调整：驾驶至目的地添加清除操作
|
2023-02-16 17:28:17 +08:00 |
|
fan
|
0c6ef6e834
|
调整：删除触发故障操作
|
2023-02-16 17:27:01 +08:00 |
|
fan
|
fc36b56ef7
|
调整：实训增加立即执行操作(判断逻辑调整)
|
2023-02-16 14:02:27 +08:00 |
|
fan
|
90c74ee23c
|
调整：实训增加立即执行操作
|
2023-02-16 13:17:25 +08:00 |
|
fan
|
3dc5c22bf0
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2023-02-16 10:36:46 +08:00 |
|
fan
|
9e066023e7
|
调整：场景实训参演角色可编辑
|
2023-02-16 10:36:34 +08:00 |
|
dong
|
cdd5b07d9b
|
代码调整
|
2023-02-16 10:05:48 +08:00 |
|
joylink_cuiweidong
|
be3ca9fbf4
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
# Conflicts:
# src/jmapNew/theme/datie_02/menus/menuButtonCtc.vue
|
2023-02-15 18:26:50 +08:00 |
|
joylink_cuiweidong
|
2d8d1d3c11
|
代码调整
|
2023-02-15 18:25:09 +08:00 |
|
fan
|
00a1137a9a
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2023-02-15 16:38:15 +08:00 |
|
fan
|
57bb7acc60
|
线路功能增加背景图片
|
2023-02-15 16:38:00 +08:00 |
|
dong
|
97c5ebfcaf
|
代码调整
|
2023-02-15 15:43:45 +08:00 |
|
dong
|
baa1df1bbb
|
添加状态选择
|
2023-02-15 15:32:42 +08:00 |
|
fan
|
1d428805f3
|
泰国项目新增列车沙盘控制
|
2023-02-15 11:08:49 +08:00 |
|
fan
|
ab6c05b03e
|
调整：考试实训已做题目 区别显示
|
2023-02-15 10:36:39 +08:00 |
|
fan
|
9dc9be66f7
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2023-02-14 17:32:15 +08:00 |
|
fan
|
f6040af47b
|
应急调度指挥项目列车计算位置调整
|
2023-02-14 17:31:53 +08:00 |
|
joylink_cuiweidong
|
90e0084247
|
代码调整
|
2023-02-14 17:09:17 +08:00 |
|
fan
|
c44983c4a5
|
BUG:会话框滚动条计算调整
|
2023-02-14 15:23:10 +08:00 |
|
fan
|
b02267b9c7
|
代码删除
|
2023-02-14 14:55:55 +08:00 |
|
fan
|
01aebf47f3
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2023-02-14 14:48:25 +08:00 |
|
fan
|
bcec47c0c6
|
大铁CTC点击已办理引导总锁按钮执行取消引导总锁
|
2023-02-14 14:48:04 +08:00 |
|
joylink_cuiweidong
|
7c0508048a
|
大铁线路 分路不良 输入密码操作 代码调整
|
2023-02-13 17:54:48 +08:00 |
|
joylink_cuiweidong
|
b483d739cb
|
代码调整
|
2023-02-13 16:12:45 +08:00 |
|
joylink_cuiweidong
|
bd3352cd8b
|
代码调整
|
2023-02-13 16:07:31 +08:00 |
|
joylink_cuiweidong
|
7fd32ec138
|
代码调整
|
2023-02-13 16:00:01 +08:00 |
|
joylink_cuiweidong
|
ffbc056569
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2023-02-13 15:56:59 +08:00 |
|
joylink_cuiweidong
|
bd43b7c511
|
代码调整
|
2023-02-13 15:54:45 +08:00 |
|
fan
|
a91188d655
|
BUG:应急调度指挥列车缩放调整
|
2023-02-13 15:36:45 +08:00 |
|
fan
|
5c53092511
|
调整：实训步骤记录增加数据校验
|
2023-02-13 15:18:37 +08:00 |
|
fan
|
176068f6c8
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2023-02-13 14:34:53 +08:00 |
|
fan
|
e76dd0777a
|
BUG：【考试】场景实训做了一步后点击结束，再交卷，没有分数，并且这道题显示未做状态
|
2023-02-13 14:34:38 +08:00 |
|
dong
|
e7c7e23602
|
代码调整
|
2023-02-13 14:16:20 +08:00 |
|
fan
|
f4180c579c
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2023-02-13 14:09:04 +08:00 |
|
fan
|
5452d49b05
|
调整：联动道岔判断增加限制条件
|
2023-02-13 14:08:46 +08:00 |
|
dong
|
8a8e47e1eb
|
薄册代码调整
|
2023-02-13 13:45:28 +08:00 |
|
joylink_cuiweidong
|
ab2a68865d
|
司机 ATS客户端 添加列车指令
|
2023-02-13 11:32:00 +08:00 |
|
fan
|
8d6b60ba5d
|
BUG：考试加载实训区分场景实训处理
|
2023-02-13 11:28:38 +08:00 |
|
|
|
57d5bb0674
|
Merge remote-tracking branch 'origin/test_dispaly' into test
|
2023-02-13 10:59:06 +08:00 |
|
joylink_cuiweidong
|
27a99a7013
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2023-02-13 10:58:50 +08:00 |
|
joylink_cuiweidong
|
595dcf0374
|
大铁线路 分路不良 输入密码操作
|
2023-02-13 10:58:33 +08:00 |
|
fan
|
296594bc8e
|
调整：校验实训联动道岔判断调整
|
2023-02-10 17:09:40 +08:00 |
|
fan
|
09f27b7bfa
|
调整：实训记录提交过滤非本人步骤
|
2023-02-10 16:07:35 +08:00 |
|
fan
|
f1cbec026e
|
调整：考试规则场景实训扮演角色显示调整
|
2023-02-10 15:19:22 +08:00 |
|
fan
|
66f51b024f
|
调整：引导总锁鼠标移除样式调整
|
2023-02-10 15:04:50 +08:00 |
|
fan
|
707702d231
|
试卷规则扮演角色disabled调整
|
2023-02-10 14:13:49 +08:00 |
|
fan
|
60d1868850
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2023-02-10 13:41:20 +08:00 |
|
fan
|
be8154db27
|
BUG: 【考试管理】试卷定义时，选择场景实训需要改成不随机出题，直接展示该线路下所有场景以供选择，并在此可以定义场景的角色（只能选一个），考试时用户不需要选择角色，直接开始考试
|
2023-02-10 13:41:04 +08:00 |
|
joylink_cuiweidong
|
c071b6a98d
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2023-02-10 11:09:26 +08:00 |
|
joylink_cuiweidong
|
7a04b580b8
|
添加 电力工务 角色
|
2023-02-10 11:09:10 +08:00 |
|
dong
|
36b4d0382a
|
处理大铁CTC仿真成员删除无反应问题
|
2023-02-10 10:13:08 +08:00 |
|
fan
|
80687fd3f0
|
BUG: 如果是文本会话消息没有audioPath时跳过自动播放
|
2023-02-10 10:04:05 +08:00 |
|
fan
|
4323ed274e
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2023-02-10 09:42:11 +08:00 |
|
dong
|
7e7bb8ded9
|
添加学生时增加手机号参数
|
2023-02-09 18:36:15 +08:00 |
|
joylink_cuiweidong
|
bfd75b723b
|
代码调整
|
2023-02-09 18:11:52 +08:00 |
|
joylink_cuiweidong
|
fded75dd85
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2023-02-09 18:09:26 +08:00 |
|
joylink_cuiweidong
|
ac8ab5a6cc
|
司机添加ATS客户端
|
2023-02-09 18:09:11 +08:00 |
|
dong
|
22e9d81183
|
取消场景定位
|
2023-02-09 16:16:03 +08:00 |
|
dong
|
ef55fb847d
|
代码调整
|
2023-02-09 15:03:08 +08:00 |
|
fan
|
ba0007807b
|
调整：考试试题提交接口参数调整
|
2023-02-09 14:59:45 +08:00 |
|
dong
|
85bc2e7fd1
|
代码调整
|
2023-02-09 11:46:37 +08:00 |
|
fan
|
51b85082dd
|
调整：簿册查询不录制操作
|
2023-02-09 11:03:34 +08:00 |
|
fan
|
9ef0780377
|
优化:实训评分规则总分自动统计
|
2023-02-09 10:34:04 +08:00 |
|
fan
|
7fc9e0fab4
|
优化:实训评分规则提示脱离文本
|
2023-02-09 10:14:56 +08:00 |
|
fan
|
ac05654672
|
BUG:实训未结束时点击了理论题，然后再点击实训题无法打开实训组件
|
2023-02-09 09:40:18 +08:00 |
|
fan
|
eb17b90d82
|
仿真=》权限 去除剩余数量一栏
|
2023-02-09 09:34:46 +08:00 |
|
fan
|
eb8bc61b90
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2023-02-09 09:28:46 +08:00 |
|
fan
|
06214aa258
|
大铁CTC引导总锁
|
2023-02-09 09:28:32 +08:00 |
|
joylink_cuiweidong
|
2cf1412706
|
代码调整
|
2023-02-08 18:17:21 +08:00 |
|
joylink_cuiweidong
|
c448e8c9f3
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2023-02-08 17:43:31 +08:00 |
|
joylink_cuiweidong
|
150ede0cb9
|
代码调整
|
2023-02-08 17:43:09 +08:00 |
|
dong
|
0583f03479
|
代码调整
|
2023-02-08 16:31:59 +08:00 |
|
joylink_cuiweidong
|
362caf8ef1
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2023-02-08 15:20:08 +08:00 |
|
joylink_cuiweidong
|
52970e9e9a
|
【仿真功能】iscs界面，屏蔽门系统切换车站时以前是有订阅的，现在没了
|
2023-02-08 15:19:48 +08:00 |
|
fan
|
cdd3ee9cc4
|
实训考试成绩调整
|
2023-02-08 13:28:31 +08:00 |
|
fan
|
ce95ce4868
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2023-02-08 13:13:19 +08:00 |
|
fan
|
70277b3f24
|
实训成绩调整
|
2023-02-08 13:12:47 +08:00 |
|
dong
|
967c3e8a01
|
代码调整
|
2023-02-08 11:13:43 +08:00 |
|
joylink_cuiweidong
|
b94a5d4842
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2023-02-08 11:03:32 +08:00 |
|
joylink_cuiweidong
|
87c157a885
|
代码调整
|
2023-02-08 11:03:01 +08:00 |
|
dong
|
5a6106e8a1
|
代码调整
|
2023-02-08 10:59:38 +08:00 |
|
dong
|
18ebca3ee6
|
代码调整
|
2023-02-08 09:33:45 +08:00 |
|
dong
|
3569a90a9a
|
薄册--防洪安全上岗签到表
|
2023-02-07 18:27:16 +08:00 |
|
joylink_cuiweidong
|
5fbf197be4
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2023-02-07 18:19:22 +08:00 |
|
joylink_cuiweidong
|
f579d37e79
|
CTC客户端的分路不良 代码调整
|
2023-02-07 18:18:50 +08:00 |
|
fan
|
96eb526713
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2023-02-07 18:00:59 +08:00 |
|
fan
|
d1611f900f
|
ibp,psl增加操作
|
2023-02-07 18:00:49 +08:00 |
|
fan
|
de7ee599f5
|
ibp,psl增加操作
|
2023-02-07 18:00:41 +08:00 |
|
joylink_cuiweidong
|
c81190b284
|
代码调整
|
2023-02-07 16:45:34 +08:00 |
|
joylink_cuiweidong
|
31f0b61e68
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2023-02-07 15:58:34 +08:00 |
|
joylink_cuiweidong
|
06c2d12354
|
CTC客户端的分路不良
|
2023-02-07 15:58:20 +08:00 |
|
dong
|
9361a11268
|
非正常情况接发列车关键环节控制表--实训操作记录
|
2023-02-07 13:38:08 +08:00 |
|
fan
|
ed1ca1287b
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2023-02-07 13:17:46 +08:00 |
|
fan
|
6fa8220235
|
ctc按钮调整
|
2023-02-07 13:17:21 +08:00 |
|
joylink_cuiweidong
|
31c09eea8e
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2023-02-06 18:09:21 +08:00 |
|
joylink_cuiweidong
|
d42612d6fa
|
代码调整
|
2023-02-06 18:09:04 +08:00 |
|
fan
|
527298f2cf
|
大铁菜单调整
|
2023-02-06 17:47:36 +08:00 |
|
joylink_cuiweidong
|
d162b96472
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2023-02-06 16:38:04 +08:00 |
|
joylink_cuiweidong
|
41d2c9d4d7
|
行车设备检查登记簿 代码调整
|
2023-02-06 16:37:47 +08:00 |
|
fan
|
33554fd4fb
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2023-02-06 16:11:28 +08:00 |
|
fan
|
7d765854e3
|
试卷实训调整
|
2023-02-06 16:11:13 +08:00 |
|
fan
|
745c3cfec9
|
相对运行方向 增加clearable
|
2023-02-06 16:07:58 +08:00 |
|
dong
|
be2bf8065d
|
代码调整
|
2023-02-06 14:34:42 +08:00 |
|
joylink_cuiweidong
|
9fd5ff89a4
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2023-02-06 14:22:52 +08:00 |
|
joylink_cuiweidong
|
5fc1b0c1e4
|
大铁联锁终端上的道岔、信号机上的右键操作去掉
|
2023-02-06 14:22:32 +08:00 |
|
fan
|
639607e72a
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2023-02-06 14:15:38 +08:00 |
|
fan
|
68feb49b9e
|
X引导总锁调整
|
2023-02-06 14:15:15 +08:00 |
|
dong
|
bbbcf633b9
|
添加薄册--非正常情况接发列车关键环节控制表
|
2023-02-06 13:57:31 +08:00 |
|
fan
|
8023359880
|
实训调整
|
2023-02-06 10:41:22 +08:00 |
|
fan
|
6f50c20d19
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2023-02-03 18:29:23 +08:00 |
|
fan
|
a9717d7eff
|
考试实训调整
|
2023-02-03 18:29:14 +08:00 |
|
joylink_cuiweidong
|
376e08eab9
|
添加 行车设备施工登记簿 防洪安全上岗签到表 页面
|
2023-02-03 17:56:04 +08:00 |
|
fan
|
e4a614f917
|
调整 黄金糕
|
2023-02-03 17:48:32 +08:00 |
|
dong
|
0222c60b1f
|
薄册增加tab项
|
2023-02-03 10:14:25 +08:00 |
|
dong
|
c127e36b07
|
代码调整
|
2023-02-03 09:38:14 +08:00 |
|
dong
|
0b9b2a14e1
|
添加调度命令无线受令功能
|
2023-02-02 18:09:54 +08:00 |
|
joylink_cuiweidong
|
2aae79d71e
|
【仿真功能】iscs界面，屏蔽门系统切换车站时以前是有订阅的，现在没了
|
2023-02-02 17:22:14 +08:00 |
|
joylink_cuiweidong
|
9759cb7cc1
|
【项目设备登录】泰国大铁线路的教员机，无法登录
|
2023-02-02 13:16:22 +08:00 |
|
joylink_cuiweidong
|
9639e870d0
|
【仿真功能】故障模式下的驾驶功能调用的接口不对
|
2023-01-31 17:22:34 +08:00 |
|
joylink_cuiweidong
|
9968af2ecd
|
代码调整
|
2023-01-31 15:24:36 +08:00 |
|
joylink_cuiweidong
|
7ed113aebb
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2023-01-31 14:19:36 +08:00 |
|
joylink_cuiweidong
|
47b5d939e3
|
bug修复【系统功能】项目设备管理页面的项目数据来源不对，这里项目应该通过查询而来，当前看着还是用的以前的枚举
|
2023-01-31 14:19:16 +08:00 |
|
dong
|
0f83df0dfc
|
代码调整
|
2023-01-31 11:10:59 +08:00 |
|
fan
|
6da9d76334
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2023-01-31 09:57:54 +08:00 |
|
fan
|
7f7fb6c8a7
|
考试接口参数变更
|
2023-01-31 09:57:11 +08:00 |
|
dong
|
9020db03a1
|
代码调整
|
2023-01-31 09:43:31 +08:00 |
|
dong
|
5f92af684f
|
终端菜单垂直拖拽
|
2023-01-30 17:52:26 +08:00 |
|
fan
|
728d4a1500
|
考试调整
|
2023-01-30 10:11:19 +08:00 |
|
fan
|
215e0a9ec6
|
【标准一号线】控制模式转换，车站应只有转为站控和强制站控操作，行调应该只有转为中控操作
|
2023-01-30 09:44:47 +08:00 |
|
fan
|
9e4b499399
|
考试点击实训参数调整
|
2023-01-30 09:41:23 +08:00 |
|
fan
|
4fbc4900e3
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2023-01-29 18:13:55 +08:00 |
|
fan
|
b225ee5c4c
|
【线路功能】线路功能的仿真客户端是否可修改成可配置，因为有的线路某些客户端没有数据无法使用，例如佛山线没有数字沙盘、IBP盘等
|
2023-01-29 18:13:37 +08:00 |
|
dong
|
55d6c6de91
|
修改引导总锁参数集中站code错误问题
|
2023-01-29 16:44:40 +08:00 |
|
fan
|
5d560ad800
|
【大铁标准站】场景实训将信号员角色放出来
|
2023-01-29 10:05:23 +08:00 |
|
fan
|
bab270626d
|
【大铁标准站】车务终端点两次站间透明会出现列车车次窗偏移
|
2023-01-28 18:04:47 +08:00 |
|
fan
|
d2b5080b6c
|
【大铁标准站】切换调度角色后，之前的会话消息看不到了
|
2023-01-28 15:39:15 +08:00 |
|
fan
|
06e2e32150
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2023-01-28 15:07:41 +08:00 |
|
fan
|
3be9bc566c
|
【大铁标准站】实训设计时，先编制一个场景添加列车，保存背景，切换到路票，返回列表新建一个场景，点击编制，切换到联锁界面，新建的场景会自动出现列车
|
2023-01-28 15:07:27 +08:00 |
|
joylink_cuiweidong
|
53031c3d11
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2023-01-28 14:31:44 +08:00 |
|
joylink_cuiweidong
|
52b9a47ef9
|
道岔生成代码调整
|
2023-01-28 14:31:16 +08:00 |
|
fan
|
9c9ccdbfc7
|
路票填写存值错误
|
2023-01-28 10:59:01 +08:00 |
|
fan
|
3c7c4c3dfa
|
路票填写传值错误调整
|
2023-01-28 10:38:01 +08:00 |
|
fan
|
b27783f7f6
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2023-01-28 09:51:51 +08:00 |
|
fan
|
6e68fde534
|
客户端创建调整
|
2023-01-28 09:51:34 +08:00 |
|
dong
|
61d9307195
|
大铁显示司机视角客户端
|
2023-01-18 16:50:42 +08:00 |
|
dong
|
1127412fbb
|
车务终端界面初始列车右键不显示菜单问题
|
2023-01-18 15:56:22 +08:00 |
|
dong
|
1751a9a4db
|
薄册输入记录错误问题
|
2023-01-18 14:47:08 +08:00 |
|
dong
|
2102d820f0
|
列车右键菜单显示项
|
2023-01-18 14:05:41 +08:00 |
|
dong
|
0343792daf
|
路票调整
|
2023-01-18 13:53:13 +08:00 |
|
dong
|
e46442cb56
|
路票不能给予司机问题
|
2023-01-18 13:24:28 +08:00 |
|
joylink_cuiweidong
|
83505d9a73
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2023-01-18 11:06:15 +08:00 |
|
joylink_cuiweidong
|
ad518bd988
|
bug修复 【大铁标准线】聊天室样式错乱
|
2023-01-18 11:05:58 +08:00 |
|
dong
|
401f3b5668
|
进路序列管理窗口控制
|
2023-01-18 10:00:33 +08:00 |
|
dong
|
f61f80d5c2
|
占线板序号
|
2023-01-18 09:44:02 +08:00 |
|
dong
|
d921acf107
|
调度命令调整
|
2023-01-17 18:27:18 +08:00 |
|
fan
|
6d9ae082ec
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2023-01-17 17:40:36 +08:00 |
|
fan
|
c488486e6c
|
【大铁标准站】场景实训编制填写路票或者许可证、簿册无法生成操作
|
2023-01-17 17:40:07 +08:00 |
|
joylink_cuiweidong
|
d5312a7f2e
|
代码调整
|
2023-01-17 17:12:12 +08:00 |
|
joylink_cuiweidong
|
83b1a5427b
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2023-01-17 17:06:09 +08:00 |
|
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 |
|
joylink_cuiweidong
|
8eff828381
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2023-01-13 09:48:19 +08:00 |
|
joylink_cuiweidong
|
50b0358541
|
bug修复 【大铁标准站】车务终端点击信号机按钮报错，无法排列进路
|
2023-01-13 09:47:52 +08:00 |
|
fan
|
48cdf34b32
|
Bug:【大铁标准站】车站路票功能无法使用
|
2023-01-13 09:20:36 +08:00 |
|
fan
|
3e6d8941c1
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2023-01-13 09:12:08 +08:00 |
|
fan
|
759154757b
|
旧代码删除
|
2023-01-13 09:09:25 +08:00 |
|
joylink_cuiweidong
|
49fb5e5643
|
bug修改 【大铁标准站】工具里列车固定径路无法打开
|
2023-01-12 18:15:01 +08:00 |
|
joylink_cuiweidong
|
873af94199
|
bug调整 【大铁线路】调度台和综合演练一直加载，刷新后可以进去，但是再次进入又一直加载了
|
2023-01-12 17:50:20 +08:00 |
|
joylink_cuiweidong
|
97c7f73c3c
|
代码调整
|
2023-01-12 10:58:45 +08:00 |
|
fan
|
c3db4d4c22
|
Merge remote-tracking branch 'origin/test_dispaly' into test
|
2023-01-11 17:48:50 +08:00 |
|
fan
|
62adae7f00
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2023-01-11 17:45:51 +08:00 |
|
fan
|
fed3a0430e
|
仿真退出跳转调整
|
2023-01-11 17:45:33 +08:00 |
|
joylink_cuiweidong
|
f22fac82a0
|
代码调整
|
2023-01-11 17:22:12 +08:00 |
|
joylink_cuiweidong
|
eb9829234d
|
代码调整
|
2023-01-11 17:06:29 +08:00 |
|
dong
|
03afd57f78
|
实训管理界面添加分页
|
2023-01-11 16:10:25 +08:00 |
|
fan
|
bf1f420423
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2023-01-11 14:20:45 +08:00 |
|
fan
|
082bf8cd65
|
应急调度指挥调整
|
2023-01-11 14:20:27 +08:00 |
|
dong
|
f06a5c09ea
|
代码调整
|
2023-01-11 13:35:50 +08:00 |
|
fan
|
b1fadb3671
|
成员管理 信号楼调整
|
2023-01-11 11:00:02 +08:00 |
|
fan
|
58bcd7223d
|
Merge remote-tracking branch 'origin/test_dispaly' into test
# Conflicts:
# src/utils/baseUrl.js
# src/views/login/index.vue
# src/views/newMap/displayBaSiDi/index.vue
# src/views/newMap/displayCity/demonMenu.vue
# src/views/newMap/displayCity/index.vue
|
2023-01-10 18:00:10 +08:00 |
|
fan
|
de3d60a21e
|
大铁线路 变更客户端名称 联锁操作终端
|
2023-01-10 17:31:16 +08:00 |
|
