joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity
8,112 Commits 20 Branches 0 Tags 448 MiB
b93af93af3
Commit Graph

5221 Commits

Author SHA1 Message Date
fan
b7a423fe4f baseUrl 2020-10-13 13:07:25 +08:00
joylink_cuiweidong
ac47e8c346 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-13 13:06:34 +08:00
joylink_cuiweidong
512973eb3a 剧本 添加 仿真角色 2020-10-13 13:06:17 +08:00
fan
29d642e09d 方向杆问题调整 2020-10-13 10:01:39 +08:00
fan
1b1b3fc221 故障调整 2020-10-12 20:13:42 +08:00
fan
443e3d7748 故障调整 2020-10-12 20:09:00 +08:00
fan
3708167c4b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-12 19:08:17 +08:00
fan
48b36d54f5 会话添加上级本门成员角色 2020-10-12 19:08:05 +08:00
sunzhenyu
c38a0acf91 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-12 18:59:46 +08:00
sunzhenyu
41b3c668bf 修改三维车站列车渲染bug，修改/cbtc/static路径 2020-10-12 18:59:37 +08:00
joylink_cuiweidong
24d93e9c64 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/iscs/shape/stateTable.js
 2020-10-12 18:35:00 +08:00
joylink_cuiweidong
63824fb35f 福州一号线 iscs 页面代码调整 2020-10-12 18:33:15 +08:00
fan
0715dcc3c7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-12 18:08:42 +08:00
fan
31e963474a baseUrl 2020-10-12 18:08:25 +08:00
fan
44d1a8459b 触发故障调整 2020-10-12 17:55:57 +08:00
lVAL
c14e0fc4c0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-12 17:55:44 +08:00
lVAL
43b837c7d4 添加风扇机 2020-10-12 17:55:28 +08:00
fan
d6d3b59cc9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-12 17:23:59 +08:00
fan
d99738c85e 方向杆调整 2020-10-12 17:23:49 +08:00
fan
a790971fb3 故障触发问题调整 2020-10-12 16:47:43 +08:00
zyy
52d4d16013 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-12 16:46:21 +08:00
zyy
f85edb85cd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-12 16:45:37 +08:00
zyy
e336410a58 调整图片 2020-10-12 16:45:24 +08:00
fan
537e03a5e7 故障触发问题调整 2020-10-12 16:33:59 +08:00
fan
17cd2bfcd7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-12 16:21:42 +08:00
fan
f1106541ae 故障触发问题调整&方向杆 2020-10-12 16:21:24 +08:00
fan
2fd024e73a 故障触发问题调整&方向杆 2020-10-12 16:01:12 +08:00
joylink_cuiweidong
936d01fdd1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-12 16:00:12 +08:00
joylink_cuiweidong
cee2b90048 竞赛 场景代码调整 2020-10-12 15:59:28 +08:00
fan
9e3b62b32f 故障触发问题调整 2020-10-12 15:50:11 +08:00
fan
875c8a021f 故障触发问题调整 2020-10-12 15:29:29 +08:00
fan
709ef4ddd0 故障触发问题调整 2020-10-12 15:25:55 +08:00
fan
da0276e0b8 故障触发问题调整 2020-10-12 15:22:39 +08:00
fan
5e69a04814 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-12 15:19:15 +08:00
fan
6b3a2b3875 故障触发问题调整 2020-10-12 15:19:03 +08:00
lVAL
24252fc5ff 添加活塞风井 2020-10-12 15:00:16 +08:00
lVAL
fae5fd0332 修改冲突 2020-10-12 14:33:22 +08:00
lVAL
dcd0c86998 修改代码-冲突 2020-10-12 14:32:30 +08:00
lVAL
d141ec87ed Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/iscs/shape/picture.js
#	src/views/iscs/iscsDraw/icscComponents/picture.vue
 2020-10-12 14:30:12 +08:00
lVAL
68f6cb5841 增加图片 2020-10-12 14:28:25 +08:00
fan
7b1864ce77 merge 2020-10-12 14:27:34 +08:00
joylink_cuiweidong
b64b6936f1 竞赛 实操场景代码调整 2020-10-12 14:26:57 +08:00
fan
4882234ccd 触发故障调整 2020-10-12 14:25:33 +08:00
joylink_cuiweidong
32239c7346 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-12 13:49:05 +08:00
joylink_cuiweidong
a081499bff 竞赛 实操代码调整 2020-10-12 13:47:58 +08:00
zyy
b3af89582d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/iscs/shape/picture.js
#	src/views/iscs/iscsDraw/icscComponents/picture.vue
 2020-10-12 13:05:57 +08:00
zyy
d27266ab7a 调整线段画法 2020-10-12 13:04:13 +08:00
lVAL
b3ba6a0d73 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-12 12:20:24 +08:00
lVAL
5893c6a2c1 增加图片 2020-10-12 12:20:07 +08:00
zyy
d05cb2e3bd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/views/iscs/iscsSystem/stationConfig/index.vue
 2020-10-12 09:27:53 +08:00
zyy
19bf12c627 调整页面 2020-10-12 09:26:14 +08:00
joylink_cuiweidong
a15c1ac3e3 代码调整 2020-10-10 19:47:50 +08:00
joylink_cuiweidong
70c713e736 代码调整 2020-10-10 19:44:58 +08:00
joylink_cuiweidong
4357b5dac2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-10 19:28:33 +08:00
joylink_cuiweidong
ae55d28a38 场景编辑代码调整 2020-10-10 19:28:15 +08:00
lVAL
a8c7e81890 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-10 18:40:19 +08:00
lVAL
5167486c74 增加图片资源，增加图片旋转功能 2020-10-10 18:39:56 +08:00
sunzhenyu
006f93f0d3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-10 18:22:40 +08:00
sunzhenyu
895aae1438 修改三维static配置地址，修改三维驾驶车厢内视角位置，修改切换列车屏蔽门三维动画状态，修改三维沙盘信号机道岔动画播放 2020-10-10 18:22:30 +08:00
fan
3191d3689f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-10 17:58:27 +08:00
fan
e2d27b49c7 方向杆问题调整 2020-10-10 17:58:14 +08:00
joylink_cuiweidong
c70af998d7 福州一号线 iscs 页面代码调整 2020-10-10 15:37:45 +08:00
joylink_cuiweidong
20be6012d8 福州一号线 iscs 界面代码调整 2020-10-10 15:03:05 +08:00
lVAL
b50f950b80 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-10 14:03:37 +08:00
lVAL
a3f19c2c46 修改代码 2020-10-10 14:03:21 +08:00
joylink_cuiweidong
d77563e17a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-10 13:17:34 +08:00
joylink_cuiweidong
48bc783755 福州线 iscs 界面代码调整 2020-10-10 13:17:16 +08:00
fan
3beefa0cfe Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-10 13:12:34 +08:00
fan
37a47e4c9c 绘图问题调整 2020-10-10 13:12:24 +08:00
lVAL
22b48e7e78 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-10 09:38:14 +08:00
lVAL
3ac15df91e 修改table的绘制表格的问题 2020-10-10 09:37:58 +08:00
fan
2db65c3dd0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-10 09:10:54 +08:00
fan
cd1f780dda 调整比例和画布计算顺序 2020-10-10 09:10:42 +08:00
joylink_cuiweidong
545dbe8e3c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-09 19:47:12 +08:00
joylink_cuiweidong
cbdd8eb810 竞赛平台 运营统计数据提交代码调整 2020-10-09 19:46:54 +08:00
fan
5fec834c3f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-09 17:27:57 +08:00
fan
77b1d7d5fb ibp调整&南铁院登录页 2020-10-09 17:27:46 +08:00
joylink_cuiweidong
fbb7784a5b 竞赛系统代码调整 竞赛场景编辑代码调整 2020-10-09 17:03:11 +08:00
joylink_cuiweidong
2ea45b05a4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-09 14:38:15 +08:00
joylink_cuiweidong
68921f80ff 竞赛系统 场景加载 已经开始演出接口代码调整 2020-10-09 14:37:59 +08:00
lVAL
dbdb3f7e51 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-09 13:16:49 +08:00
lVAL
d40821f404 增加部分图层 2020-10-09 13:16:34 +08:00
joylink_cuiweidong
03a3dd8b4e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-09 10:58:09 +08:00
joylink_cuiweidong
fa4ada05e4 场景编辑代码调整 2020-10-09 10:57:52 +08:00
lVAL
96d77eb652 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-09 10:25:32 +08:00
lVAL
c53219ea25 编排 iscs系统下 “环境与设备监控系统” 的菜单 2020-10-09 10:25:11 +08:00
sunzhenyu
077e470aaf 修改三维静态文件cbtc路径 2020-10-09 10:02:16 +08:00
joylink_cuiweidong
cb369c9113 竞赛场景代码调整 2020-09-30 18:36:05 +08:00
joylink_cuiweidong
9c8af370fa Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-30 18:17:33 +08:00
joylink_cuiweidong
9885c50891 竞赛 场景代码调整 2020-09-30 18:16:08 +08:00
sunzhenyu
2ea728751f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-30 18:06:28 +08:00
sunzhenyu
f23bf269a0 修改三维编辑器轨道停车点显示，修改三维列车救援vr操作台逻辑 2020-09-30 18:06:20 +08:00
lVAL
3e623fe0a2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-30 17:18:15 +08:00
lVAL
15a08feef8 补充优化键盘事件处理bug 2020-09-30 17:18:01 +08:00
joylink_cuiweidong
6a0fbe5dc5 福州一号线 iscs 系统代码调整 2020-09-30 16:57:38 +08:00
joylink_cuiweidong
ea8387bd23 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-30 15:59:33 +08:00
joylink_cuiweidong
63e2957216 调度电话 仿真初始化代码调整 2020-09-30 15:59:19 +08:00
fan
46dca0d34b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-30 15:22:47 +08:00
fan
7cc1adf4ab 线路添加配置 2020-09-30 15:22:36 +08:00
joylink_cuiweidong
3a0b561aa0 竞赛场景 运营统计代码调整 2020-09-30 15:19:02 +08:00
joylink_cuiweidong
97a58458b3 代码调整 2020-09-29 18:50:43 +08:00
joylink_cuiweidong
9f78bc530d 竞赛 会话代码调整 2020-09-29 18:44:04 +08:00
joylink_cuiweidong
773e61519d 调度电话代码调整 2020-09-29 17:46:42 +08:00
joylink_cuiweidong
e7cb90c1cb 调度电话代码调整 2020-09-29 15:57:50 +08:00
joylink_cuiweidong
a6458e1519 会话 全选车站代码调整 2020-09-29 13:30:12 +08:00
joylink_cuiweidong
a6bb1fb65a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-29 13:19:05 +08:00
joylink_cuiweidong
9141a6f92c 会话代码调整 3d挂载js路径修改 帮助文档路径修改 2020-09-29 13:18:31 +08:00
fan
f5a7b6220a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-29 09:40:51 +08:00
fan
3a99a68118 调整平台路径 2020-09-29 09:40:41 +08:00
joylink_cuiweidong
f39ee786b4 竞赛 场景代码调整 2020-09-29 09:31:29 +08:00
joylink_cuiweidong
dc930dae12 代码调整 2020-09-28 21:00:14 +08:00
joylink_cuiweidong
27d4c66c8c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-28 20:54:59 +08:00
joylink_cuiweidong
ca84d29af9 场景代码调整 2020-09-28 20:54:34 +08:00
fan
82c2502cc6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-28 16:32:47 +08:00
fan
4eab63d1f3 调整打包路径 2020-09-28 16:32:33 +08:00
joylink_cuiweidong
acc2a706ad Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-28 14:03:22 +08:00
joylink_cuiweidong
bca528df88 竞赛 理论考试代码调整 / 竞赛 场景更新代码调整 2020-09-28 14:02:04 +08:00
lVAL
d5c9706311 增加绘制园以及修改圆的最小半径值 2020-09-28 13:15:54 +08:00
lVAL
0e47dfcff1 适配图片APF 2020-09-27 16:12:25 +08:00
zyy
e4d673cdb0 调整层级 2020-09-27 14:44:59 +08:00
lVAL
e6074f491b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-27 14:29:45 +08:00
lVAL
7375020995 修改鼠标事件处理 2020-09-27 14:29:32 +08:00
zyy
18f370f36f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-27 13:41:41 +08:00
zyy
118f95efc4 调整ibp 触摸板 2020-09-27 13:41:25 +08:00
joylink_cuiweidong
c5fbc578db 竞赛 场景管理 创建的创建和查询接口代码调整 2020-09-27 11:22:48 +08:00
zyy
9c3158c080 Merge branch 'test' 
# Conflicts:
#	src/views/newMap/chatView/chatBox.vue
 2020-09-25 18:47:03 +08:00
zyy
13f4cccaae Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-25 18:42:26 +08:00
zyy
f8d3b70021 调整会话流程 2020-09-25 18:41:59 +08:00
fan
7a37e5cf5e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-25 18:20:07 +08:00
fan
a5c36b4fca 成员管理问题调整 2020-09-25 18:19:49 +08:00
sunzhenyu
99f7521952 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-25 18:11:38 +08:00
sunzhenyu
160d4f9d59 增加三维列车救援vr下操纵杆控制触发动画,增加三维编辑器区段平整功能 2020-09-25 18:09:13 +08:00
joylink_cuiweidong
2c27c5a62c 会话代码调整 2020-09-25 17:33:18 +08:00
joylink_cuiweidong
bc10b0cbb2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-25 17:15:40 +08:00
joylink_cuiweidong
7460428838 会话代码调整 2020-09-25 17:15:25 +08:00
zyy
4362038f13 调整综合监控元素绘制 2020-09-25 16:07:53 +08:00
zyy
bcdf1524cd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-25 15:23:06 +08:00
zyy
55910a826b 调整会话 2020-09-25 15:22:54 +08:00
joylink_cuiweidong
dd9ffdeb52 删除不必要的文件 2020-09-25 14:48:09 +08:00
joylink_cuiweidong
4dfb904133 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-25 14:47:13 +08:00
joylink_cuiweidong
2386f424d4 竞赛 理论考试 代码调整 2020-09-25 14:46:57 +08:00
zyy
a0adc641b2 增加iconfont图标导入，调整逻辑 2020-09-25 13:58:41 +08:00
zyy
7fb7c0a819 调整代码 2020-09-24 19:04:33 +08:00
zyy
88ec572564 调整车站值班员按钮 2020-09-24 18:34:25 +08:00
zyy
8a28526fe1 调整样式 2020-09-24 17:55:06 +08:00
zyy
a5b954c017 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-24 17:26:12 +08:00
zyy
aa34210cae 调整会话框流程 2020-09-24 17:25:52 +08:00
joylink_cuiweidong
83793d75ca Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-24 13:42:16 +08:00
joylink_cuiweidong
fcf01baa53 竞赛 理论考试 练习模式代码调整 2020-09-24 13:42:01 +08:00
zyy
c71d4beb39 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-24 13:40:24 +08:00
zyy
be565e3711 调整道岔逻辑 2020-09-24 13:40:09 +08:00
joylink_cuiweidong
7753f831f1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-23 18:44:24 +08:00
joylink_cuiweidong
d67aa6804f 竞赛 理论考试 代码调整 2020-09-23 18:44:00 +08:00
sunzhenyu
a3342d93ed Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-23 16:21:07 +08:00
sunzhenyu
5215064faa 增加三维vr列车抢修测试界面，修改三维哈尔滨本地文件列车 2020-09-23 16:20:50 +08:00
zyy
5109f7b558 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-23 10:38:35 +08:00
zyy
21f5208c21 调整综合监控 2020-09-23 10:38:22 +08:00
joylink_cuiweidong
dc8ae0bbfe iscs 绘图调整 2020-09-23 10:22:52 +08:00
joylink_cuiweidong
1faf2cbf91 代码调整 2020-09-22 18:47:34 +08:00
joylink_cuiweidong
465391b20e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-22 18:46:12 +08:00
zyy
0ed3d83273 调整表格配置 2020-09-22 18:45:20 +08:00
joylink_cuiweidong
d56e713232 iscs 系统代码调整 2020-09-22 18:45:00 +08:00
zyy
d93cbc4beb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-22 18:03:58 +08:00
zyy
2ef9409527 增加图片 2020-09-22 18:03:46 +08:00
joylink_cuiweidong
5d0f5ad4fd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-22 17:51:32 +08:00
joylink_cuiweidong
f26726055c iscs 绘图代码调整 2020-09-22 17:51:15 +08:00
zyy
0a01ea04c6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-22 17:12:39 +08:00
zyy
57de1331e2 调整福州一号线综合监控配置 2020-09-22 17:12:28 +08:00
fan
7b766e2a47 理论题库导入 2020-09-22 16:56:32 +08:00
fan
4a0509546f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-22 16:45:31 +08:00
fan
21d2a9953f 理论题库导入 2020-09-22 16:45:19 +08:00
fan
53d7586313 理论题库导入 2020-09-22 16:45:03 +08:00
joylink_cuiweidong
0c81fb8208 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-22 15:26:00 +08:00
joylink_cuiweidong
f2bbefc27e iscs 三角形绘图元素添加 2020-09-22 15:25:33 +08:00
sunzhenyu
7d31d198f0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-22 15:17:06 +08:00
sunzhenyu
89fd0ec052 修改三维cctv移动鼠标卡顿，改用主线程渲染人物动画 2020-09-22 15:16:53 +08:00
joylink_cuiweidong
1e8577cefd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-22 11:31:35 +08:00
joylink_cuiweidong
d346ec8f2e iscs 系统代码调整 2020-09-22 11:31:18 +08:00
fan
8f3f722d4a sics文字矩形组合元素添加 2020-09-22 11:28:28 +08:00
fan
6a68147700 去除创建会话提示 2020-09-22 09:52:48 +08:00
fan
e4be43ad37 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-22 09:51:22 +08:00
fan
87bee8bcb5 iscs调整&去除创建会话提示 2020-09-22 09:51:01 +08:00
joylink_cuiweidong
e56731421f Merge remote-tracking branch 'remotes/origin/test' 2020-09-21 18:55:51 +08:00
joylink_cuiweidong
af7b9c5545 iscs系统页面代码调整 2020-09-21 18:55:23 +08:00
zyy
a620e029e0 调整绘图配置 2020-09-21 18:14:17 +08:00
zyy
212138f370 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-21 18:05:36 +08:00
zyy
dd99815868 福州一号线绘图配置 2020-09-21 18:05:25 +08:00
fan
893ecd7ff4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-21 17:39:18 +08:00
fan
8199d383fb iscs调整 2020-09-21 17:39:06 +08:00
joylink_cuiweidong
3bc037678d Merge remote-tracking branch 'remotes/origin/test' 2020-09-21 16:28:17 +08:00
joylink_cuiweidong
e094134960 剧本代码调整 2020-09-21 16:24:17 +08:00
joylink_cuiweidong
9e46bcdf37 Merge branch 'master' of https://git.code.tencent.com/lian-cbtc/jl-client 
# Conflicts:
#	src/views/newMap/newMapdraft/mapoperate/switch/create.vue
 2020-09-21 16:20:34 +08:00
joylink_cuiweidong
0945448549 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-21 16:00:41 +08:00
joylink_cuiweidong
0b380b3b0f 福州线路iscs系统 样式调整 2020-09-21 16:00:24 +08:00
fan
99894a1443 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-21 14:29:23 +08:00
fan
bf4ce9d247 iscs调整 2020-09-21 14:29:02 +08:00
zyy
179ea283b7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-21 14:24:04 +08:00
zyy
165cef3f69 调整文件路径 2020-09-21 14:23:51 +08:00
joylink_cuiweidong
a93adc7094 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-21 14:20:46 +08:00
joylink_cuiweidong
047c9aa127 剧本 代码调整 2020-09-21 14:20:33 +08:00
zyy
1636659889 增加综合监控配置文件 2020-09-21 14:11:02 +08:00
joylink_cuiweidong
2a4d7d750a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-21 13:38:53 +08:00
joylink_cuiweidong
91e34add37 剧本代码调整 2020-09-21 13:38:37 +08:00
fan
0a33127068 iscs调整 2020-09-21 13:20:30 +08:00
joylink_cuiweidong
aaead41423 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-21 10:54:02 +08:00
joylink_cuiweidong
a22715ab23 剧本会话代码调整 2020-09-21 10:53:45 +08:00
fan
1c5f972e74 调整iscs 2020-09-21 10:26:34 +08:00
fan
39a1acd081 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-21 10:17:47 +08:00
fan
05b879f63d 综合演练ibp按钮显示调整 2020-09-21 10:17:37 +08:00
fan
942cbe72a1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-18 18:30:26 +08:00
fan
4eafbd72ea iscs调整&宁波道岔取消故障失表取消动画 2020-09-18 18:30:14 +08:00
sunzhenyu
b9247b1bb1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-18 18:29:08 +08:00
sunzhenyu
60554583d1 修改三维驾驶列车模型距离，三维编辑器增加车站坐标校准，增加站台停车点显示 2020-09-18 18:29:02 +08:00
joylink_cuiweidong
f6f1d45fe5 竞赛 剧本代码调整 2020-09-18 18:18:02 +08:00
joylink_cuiweidong
ee61b0615b 剧本修改代码调整（添加满分时长、及格时长、零分时长字段） 2020-09-18 17:04:35 +08:00
joylink_cuiweidong
41548dd32f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/views/newMap/displayNew/dispatherContest/index.vue
 2020-09-18 16:05:07 +08:00
joylink_cuiweidong
6cad4eabdb 竞赛系统 剧本加载逻辑调整 2020-09-18 16:02:22 +08:00
fan
0d31203b74 ibp盘状态处理&时间同步 2020-09-18 14:42:17 +08:00
fan
89fcb3fe2f iscs调整&ibp接口参数修改 2020-09-18 09:26:25 +08:00
fan
aa52945003 行调大赛 2020-09-17 18:30:31 +08:00
fan
639dc474a1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-17 18:25:52 +08:00
fan
f7e350ca95 行调大赛理论考试&福州Iscs 2020-09-17 18:25:37 +08:00
zyy
c2e3df8dbc 调整ibp按钮点击 2020-09-17 17:45:04 +08:00
fan
28e9bf2dae Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-17 15:37:01 +08:00
fan
588f77173a 行调大赛理论考试&福州Iscs 2020-09-17 15:36:46 +08:00
joylink_cuiweidong
5428f98843 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/views/jlmap3d/passflow/jl3dpassflow.vue
 2020-09-17 15:23:14 +08:00
joylink_cuiweidong
e93755a29f 哈尔滨 真实摄像头添加（暂时不能播放） 2020-09-17 15:19:00 +08:00
zyy
b6f2de4d0f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-17 13:31:26 +08:00
zyy
6eafb7883c 调整道岔绘制流程，ibp鼠标事件 2020-09-17 13:31:13 +08:00
fan
f586cced67 行调大赛理论考试 2020-09-17 09:50:52 +08:00
fan
7dc936a0ac Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-17 09:01:38 +08:00
fan
0abd0aaba5 福建综合监控 2020-09-17 09:01:22 +08:00
zyy
8c9f18f239 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-16 17:53:44 +08:00
zyy
4edcbdf929 调整ibp盘操作流程 2020-09-16 17:53:33 +08:00
sunzhenyu
22db894742 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-16 17:10:47 +08:00
sunzhenyu
86f49506cd 修改三维编辑器连接区段数据。增加三维编辑器邻接区段对齐功能，增加区段高低编辑功能。修改三维cctv配置 2020-09-16 17:10:37 +08:00
zyy
309296cb63 调整区段逻辑 2020-09-16 15:03:45 +08:00
zyy
24266de0f0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-16 14:26:17 +08:00
zyy
64c322751c 调整ibp盘流程 2020-09-16 14:26:04 +08:00
fan
8a52561c66 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-16 10:49:46 +08:00
fan
e5d83555af 添加大赛练习 2020-09-16 10:49:16 +08:00
zyy
4264996520 调整ibp数据，调整道岔生成逻辑 2020-09-16 10:10:13 +08:00
zyy
072a6282b0 调整ibp绘图流程 2020-09-14 10:59:02 +08:00
zyy
e2b212e277 调整字段 2020-09-11 18:23:12 +08:00
zyy
167e0c4ce0 调整流程 2020-09-11 18:22:18 +08:00
zyy
8b99254099 调整系统消息字段 2020-09-11 18:03:28 +08:00
zyy
33d5850ed4 新增系统信息逻辑 2020-09-11 18:02:57 +08:00
zyy
f1000a1528 调整道岔生成逻辑 2020-09-11 18:02:29 +08:00
fan
b5c5488ed5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-11 17:10:26 +08:00
fan
6401255a36 会话调整 2020-09-11 17:10:11 +08:00
zyy
f1f4c85405 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-11 16:55:48 +08:00
zyy
51a29de415 调整系统消息字段 2020-09-11 16:55:36 +08:00
joylink_cuiweidong
c13221c6a2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-11 16:36:30 +08:00
joylink_cuiweidong
e5a5c391f0 剧本编制代码调整 2020-09-11 16:36:13 +08:00
zyy
bdf348dbaa Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-11 16:07:33 +08:00
zyy
27a9a7a744 新增系统信息逻辑 2020-09-11 16:07:18 +08:00
joylink_cuiweidong
06796c439b 剧本编制 会话样式调整 2020-09-11 16:01:41 +08:00
fan
34fe136bcb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-11 15:52:26 +08:00
fan
2875444ed7 会话调整 2020-09-11 15:52:15 +08:00
joylink_cuiweidong
51ed3b83c5 剧本编制代码调整 2020-09-11 15:09:43 +08:00
sunzhenyu
d678d1369c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-11 13:52:27 +08:00
sunzhenyu
9254cb8cb6 修改初始化时站台轨顺序bug，修改加载哈尔滨bug 2020-09-11 13:52:17 +08:00
fan
5d7b1db6be 调整添加仿真成员管理 2020-09-11 13:35:08 +08:00
fan
e29bdb35e6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-11 13:23:44 +08:00
fan
3ca753a31b 调整会话和drts倒计时时间 2020-09-11 13:23:24 +08:00
zyy
e5687c13dd 调整道岔生成逻辑 2020-09-11 10:28:55 +08:00
zyy
9ca3612715 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-11 10:18:20 +08:00
zyy
50c9a4eabb 调整道岔生成 道岔区段问题 2020-09-11 10:18:07 +08:00
fan
3ca4cbbfce drts倒计时日期调整 2020-09-11 10:15:15 +08:00
fan
07c6d997e0 drts添加连接 2020-09-11 10:11:49 +08:00
fan
60bfa0504b 剧本加载重新获取运行数据&会话调整&drts添加连接 2020-09-11 10:08:25 +08:00
fan
7715271b0b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-11 09:27:06 +08:00
fan
f98242374b 会话调整 2020-09-11 09:26:51 +08:00
sunzhenyu
e8a007cfba Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-10 18:12:35 +08:00
sunzhenyu
7b65503938 修改编辑器兼容数据，适配西安一，成都一三，北京等数组自动初始化，修改三维页面加载方面区段和站台属性 2020-09-10 18:12:25 +08:00
fan
03d4a28ab6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-09 17:42:10 +08:00
fan
281bbc32f8 宁波三菜单调整&表单记录页数 2020-09-09 17:41:51 +08:00
zyy
620d7aba3c 调整目的码判断 2020-09-09 13:38:30 +08:00
zyy
3986185b1b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-09 11:25:43 +08:00
zyy
85f4a5e1b0 增加系统通知流程 2020-09-09 11:25:31 +08:00
fan
d5c3227909 调整加载动画 2020-09-09 11:22:56 +08:00
fan
4df950f495 调整加载动画 2020-09-09 10:42:05 +08:00
fan
ff4072c6da 调整加载动画 2020-09-09 10:28:56 +08:00
fan
cbb00efdcb 一键生成课程、试卷响应调整 2020-09-08 15:29:45 +08:00
fan
d3a7504c2a 一键生成课程、试卷参数调整 2020-09-08 14:20:01 +08:00
fan
ebcc73cb2d 宁波三号线菜单调整&增加一键生成课程、试卷 2020-09-08 14:14:20 +08:00
fan
4bfe76c9cb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-08 09:49:57 +08:00
fan
fadcb630ab 宁波三号线菜单调整&宁波分割符调整&教学系统班级显示调整 2020-09-08 09:49:49 +08:00
zyy
c3c5850bbf 调整仿真时间同步 2020-09-07 17:07:09 +08:00
fan
878b62e494 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-07 16:03:03 +08:00
fan
c521f39b2a 设备登录增加退出方式 2020-09-07 16:02:53 +08:00
zyy
074d4677fe 调整考试系统判断 2020-09-07 13:51:25 +08:00
zyy
518bf2eeac 调整西安二号线右键操作 2020-09-07 13:17:11 +08:00
zyy
bb3b202eb1 调整西安二号线列车操作 2020-09-07 11:28:12 +08:00
fan
b47b63305a 运行图预览调整 2020-09-04 18:04:32 +08:00
zyy
11d3c6d129 调整必须字段 2020-09-04 09:24:34 +08:00
zyy
6883fce3a7 调整配置 2020-09-03 16:21:19 +08:00
zyy
8c23957881 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-03 15:44:42 +08:00
zyy
2af510b991 调整目的码流程 2020-09-03 15:44:30 +08:00
fan
890fc5f851 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-03 14:44:28 +08:00
fan
5f0b8a05ac 运行图流程调整 2020-09-03 14:44:16 +08:00
zyy
ab538b9bb2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/jmapNew/theme/ningbo_03/menus/menuBar.vue
 2020-09-03 14:22:44 +08:00
zyy
31eb1f8446 调整目的码接口 2020-09-03 14:17:52 +08:00
joylink_cuiweidong
9a2e007d3f 福州一号线新版 扣车样式调整 站台操作调整 2020-09-03 11:14:51 +08:00
zyy
69388e4f91 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-02 17:11:23 +08:00
zyy
efcd46cf37 增加宁波三区段样式，增加目的码表单 2020-09-02 17:11:06 +08:00
fan
910517e076 剧本调整 2020-09-02 10:59:04 +08:00
joylink_cuiweidong
4789fa23de 代码调整 2020-09-02 09:48:30 +08:00
joylink_cuiweidong
4c6ab4f046 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-02 09:46:46 +08:00
joylink_cuiweidong
935588ab32 剧本预览代码调整 2020-09-02 09:46:17 +08:00
fan
86c1dff4be Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-02 09:17:50 +08:00
fan
ecbb6a964f 接收重置仿真信息时清除活动列车 2020-09-02 09:17:27 +08:00
joylink_cuiweidong
b42ffaa00f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-01 18:27:56 +08:00
joylink_cuiweidong
de8263e062 剧本编制代码优化调整 2020-09-01 18:27:36 +08:00
fan
15039440b7 运行图预览初始化动态数据和选中数据 2020-09-01 17:20:59 +08:00
fan
fcd2c41517 成员司机排序&福州新版折返策略教学调整 2020-09-01 17:11:09 +08:00
zyy
57cb96eb48 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/views/newMap/mapsystemNew/common/index.vue
 2020-09-01 15:11:59 +08:00
zyy
5590e43bd5 调整代码 2020-09-01 15:10:35 +08:00
fan
13764f98a7 修改会话问题 
(cherry picked from commit 716e7c2117)
 2020-09-01 11:22:01 +08:00
fan
46e6ec68d5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-31 18:32:56 +08:00
fan
1164be59a4 修改剧本id 2020-08-31 18:32:33 +08:00
joylink_cuiweidong
83a2cb21de 重置剧本代码调整 2020-08-31 16:51:36 +08:00
joylink_cuiweidong
9ef2ac1287 剧本代码调整 2020-08-31 16:37:45 +08:00
fan
972d5a33bb 响应式布局 2020-08-31 15:31:15 +08:00
fan
c44a081afa Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-31 13:27:38 +08:00
fan
8c07cf764a 代码调整 2020-08-31 13:27:27 +08:00
sunleking
9ca8f50dea 修改按钮文字描述 2020-08-31 11:16:18 +08:00
zyy
8e6280e542 调整格式 2020-08-31 10:34:51 +08:00
fan
e6f7ade236 调度大赛调整 2020-08-31 09:23:12 +08:00
fan
bf381cb697 调度大赛调整 2020-08-28 18:04:46 +08:00
fan
818010b18f 调度大赛调整 2020-08-28 17:57:42 +08:00
fan
ba505a899e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-28 16:58:33 +08:00
fan
a28f7a3975 调度大赛调整 2020-08-28 16:58:17 +08:00
joylink_cuiweidong
576c62bf4a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-28 16:52:33 +08:00
joylink_cuiweidong
d5dabca2c6 代码调整 
区段（parentCode）字段处理
 2020-08-28 16:52:19 +08:00
fan
56aefdb207 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-28 15:28:37 +08:00
fan
16a4b0fb84 调度大赛调整 2020-08-28 15:28:24 +08:00
joylink_cuiweidong
b4c5a29026 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-28 14:43:47 +08:00
joylink_cuiweidong
3ffffffe8d 宁波一号线实训调整 
剧本编制代码调整
 2020-08-28 14:43:30 +08:00
zyy
a5180c306c 调整运行图 2020-08-28 14:29:59 +08:00
zyy
152c472b69 调整考试流程 2020-08-28 13:29:45 +08:00
zyy
d991a65517 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-28 11:31:10 +08:00
zyy
1f8641e3ea 调整运行图 2020-08-28 11:30:55 +08:00
fan
0adf841597 行调大赛调整 2020-08-28 10:59:44 +08:00
fan
74a5459a32 调度大赛调整 2020-08-27 19:05:15 +08:00
fan
d4118c58a0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-27 19:02:00 +08:00
fan
f87506dfd9 调度大赛调整 2020-08-27 19:01:50 +08:00
joylink_cuiweidong
ea1f4c4dee 剧本预览代码调整 2020-08-27 18:46:00 +08:00
zyy
4ba9bcdc82 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-27 18:41:49 +08:00
zyy
ae9f9a962b 调整加载代码 2020-08-27 18:41:33 +08:00
fan
3c016a5c4b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-27 17:21:13 +08:00
fan
869981f606 调度大赛调整 2020-08-27 17:21:01 +08:00
zyy
a34d3eb9ef Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-27 17:04:47 +08:00
zyy
47a9d56d3b 删除配置 2020-08-27 17:04:21 +08:00
joylink_cuiweidong
6ac28534ea Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-27 17:03:24 +08:00
joylink_cuiweidong
c2989a1548 剧本代码调整 2020-08-27 17:03:10 +08:00
zyy
dde1f6e1a6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-27 16:43:51 +08:00
zyy
ad29ed8890 调整考试系统加载流程 2020-08-27 16:43:37 +08:00
joylink_cuiweidong
1e844407c0 仿真目录结构调整 2020-08-27 14:02:27 +08:00
zyy
06699507e4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-27 13:13:29 +08:00
zyy
8a3287ca22 删除多余代码注释 2020-08-27 13:13:15 +08:00
joylink_cuiweidong
d33b645c69 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-27 13:12:54 +08:00
joylink_cuiweidong
92219adba0 剧本录制预览代码调整 2020-08-27 13:12:36 +08:00
fan
0a90249b37 调度大赛调整 2020-08-27 11:33:37 +08:00
zyy
c2f549523a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-27 09:56:15 +08:00
zyy
699053f46f 调整西安运行图流程 2020-08-27 09:56:00 +08:00
joylink_cuiweidong
7e80bb0ccb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-26 18:42:17 +08:00
joylink_cuiweidong
df2f5705c4 剧本提示代码调整 2020-08-26 18:42:00 +08:00
zyy
bbae7bfb1b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-26 17:44:17 +08:00
zyy
fc14cc41a7 调整发布地图导出，调整大屏流程 2020-08-26 17:44:01 +08:00
fan
242840f244 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-26 17:43:45 +08:00
fan
e43d91cad1 调整ibp盘显示位置 2020-08-26 17:43:34 +08:00
fan
154ec2767a 调整会话窗口按demoButton层级问题 2020-08-26 17:27:02 +08:00
joylink_cuiweidong
f2df9fb453 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-26 17:25:43 +08:00
joylink_cuiweidong
43fe4d728a 剧本提示代码调整 2020-08-26 17:25:18 +08:00
fan
08a33ae6aa 项目登录虚拟ibp调整 2020-08-26 17:09:55 +08:00
fan
0c97289ff1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-26 16:00:22 +08:00
fan
1ac01f4900 项目登录虚拟ibp调整 2020-08-26 16:00:05 +08:00
joylink_cuiweidong
fe5dd8861a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-26 15:28:46 +08:00
joylink_cuiweidong
c2a868714d 剧本提示代码调整 2020-08-26 15:28:32 +08:00
fan
73c3bd7a78 调整菜单样式 2020-08-26 15:16:47 +08:00
fan
0bac7098d3 调度大赛项目退出时清理仿真 2020-08-26 14:41:24 +08:00
fan
7ebbadca81 merge 2020-08-26 14:10:11 +08:00
fan
8d35c1353f 调度实训平台问题调整 2020-08-26 14:08:50 +08:00
sunzhenyu
22fa381707 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-26 13:54:55 +08:00
sunzhenyu
1a76506f9b 增加列车驾驶其他车辆，增加综合演练第三人称观看视角，修改三维编辑器部分区段生成bug 2020-08-26 13:54:44 +08:00
fan
c1f139e9a8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-26 13:34:08 +08:00
joylink_cuiweidong
e1390a8670 代码调整 2020-08-26 13:26:21 +08:00
fan
a702740f48 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-26 13:25:45 +08:00
fan
8f0f93f75d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-26 13:25:33 +08:00
fan
731c532989 调度实训平台 2020-08-26 13:25:22 +08:00
joylink_cuiweidong
cf50463b5e 代码调整 2020-08-26 13:23:25 +08:00
joylink_cuiweidong
b652897678 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-26 13:22:02 +08:00
joylink_cuiweidong
2fad6e8306 调度实训竞赛代码调整 2020-08-26 13:21:47 +08:00
fan
9fcb1cd9bb 代码调整 2020-08-25 18:50:42 +08:00
joylink_cuiweidong
367b947a94 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-25 16:54:31 +08:00
joylink_cuiweidong
a9fd33c413 哈尔滨线路实训操作调整 2020-08-25 16:54:16 +08:00
zyy
ccc57042a7 调整地图绘制弹窗加载 2020-08-25 16:52:52 +08:00
joylink_cuiweidong
2320ae42a9 剧本预览代码调整 2020-08-25 14:17:04 +08:00
joylink_cuiweidong
17d3be79cf 剧本编制代码调整 2020-08-25 13:44:18 +08:00
joylink_cuiweidong
65a10b26af 哈尔滨线路 实训操作调整 
剧本录制页面聊天代码调整
 2020-08-25 13:15:32 +08:00
joylink_cuiweidong
e4a13de455 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-24 16:11:50 +08:00
joylink_cuiweidong
e6193e3469 哈尔滨线路实训操作代码调整 2020-08-24 16:11:31 +08:00
zyy
b262288524 增加西安二号线折返策略配置，增加联锁配置 2020-08-24 11:30:57 +08:00
zyy
f8d3ffa91d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-21 16:38:35 +08:00
zyy
e86c0b9c45 调整发布地图导入流程 2020-08-21 16:38:22 +08:00
joylink_cuiweidong
c3675a0bd4 剧本仿真代码调整 2020-08-21 15:41:46 +08:00
joylink_cuiweidong
43207730bf 剧本仿真代码调整 2020-08-21 14:55:28 +08:00
joylink_cuiweidong
e699efc06f 剧本录制预览代码调整 2020-08-21 14:16:44 +08:00
joylink_cuiweidong
5dcf14c81f 代码调整 2020-08-20 20:39:38 +08:00
joylink_cuiweidong
66587a17fb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-20 20:28:12 +08:00
joylink_cuiweidong
171353a4d3 仿真 剧本代码调整 2020-08-20 20:27:19 +08:00
fan
a44132056c 地图绘制添加防淹门 2020-08-20 13:17:58 +08:00
fan
1afb1f3a09 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-19 16:39:19 +08:00
zyy
2e6d45baab 调整宁波三号线配置 2020-08-19 15:50:33 +08:00
fan
d92a86f146 代码调整 2020-08-19 14:11:58 +08:00
fan
830a648be9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-19 09:03:43 +08:00
fan
96346ccf68 代码调整 2020-08-19 09:03:27 +08:00
joylink_cuiweidong
8ac2bcf0db Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-18 18:37:54 +08:00
joylink_cuiweidong
5e5f322c3b 剧本预览 剧本编制代码调整 2020-08-18 18:37:38 +08:00
zyy
901af70400 调整线路右键操作 2020-08-18 16:41:19 +08:00
joylink_cuiweidong
33acf41a94 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-18 16:32:01 +08:00
joylink_cuiweidong
74d7b6695c 剧本预览代码优化 2020-08-18 16:29:23 +08:00
zyy
c448e2e1ab Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-18 16:02:35 +08:00
zyy
899facde01 调整发布地图导出名称，注释区段流程 2020-08-18 16:02:22 +08:00
joylink_cuiweidong
e2d19c2698 剧本录制代码调整 2020-08-18 15:40:01 +08:00
joylink_cuiweidong
c5a63cd1c1 代码调整 2020-08-17 19:11:59 +08:00
joylink_cuiweidong
cb916647c5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-17 18:48:46 +08:00
joylink_cuiweidong
c7bd321446 剧本录制代码调整 2020-08-17 18:47:38 +08:00
fan
19b4b48c3f merge 2020-08-17 18:16:31 +08:00
fan
6008dfc143 运行图调整 2020-08-17 18:12:51 +08:00
zyy
98e78b3532 调整发布地图 导入 导出逻辑及请求配置 2020-08-17 17:35:00 +08:00
zyy
d4219d81f7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-17 14:46:58 +08:00
zyy
9f22395605 删除多余右键操作组件，调整发布状态 2020-08-17 14:46:48 +08:00
joylink_cuiweidong
c8ecd5bcb5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/views/newMap/displayNew/menuSchema.vue
 2020-08-17 13:28:15 +08:00
joylink_cuiweidong
9080e14e2a 剧本预览编制代码调整 2020-08-17 13:21:27 +08:00
fan
a6aac4397d 运行图编辑=》修改名称后工具栏列表不刷新调整 2020-08-17 09:17:07 +08:00
fan
fe0fcec173 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-14 18:30:15 +08:00
fan
44e05a0875 哈尔滨设备编辑运行图 2020-08-14 18:30:04 +08:00
sunzhenyu
83e442f170 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-14 18:05:38 +08:00
sunzhenyu
02faa078af 删除console 2020-08-14 18:05:28 +08:00
joylink_cuiweidong
c10588289a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-14 17:52:37 +08:00
joylink_cuiweidong
8692fdfd1b 综合演练仿真菜单层级调整 2020-08-14 17:52:14 +08:00
sunzhenyu
a992090e12 修改mmi界面 2020-08-14 17:39:04 +08:00
sunzhenyu
23adbbfd0d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-14 16:58:58 +08:00
sunzhenyu
9258d5ab3b 修改三维驾驶紧急停车 2020-08-14 16:58:50 +08:00
zyy
f2a2adc698 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-14 16:02:16 +08:00
zyy
179ad8fa1d 调整信号机字段调整 2020-08-14 16:02:01 +08:00
joylink_cuiweidong
06c5546a6f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-14 14:33:38 +08:00
joylink_cuiweidong
e5d2c71232 实训平台 左侧地图列表 点击展开代码调整 2020-08-14 14:33:19 +08:00
zyy
3d4230e78d 调整佛山线路错误提示，增加联锁配置字段 2020-08-14 14:32:14 +08:00
fan
9405b19195 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-14 11:18:46 +08:00
fan
f6fed39c4e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test——new 2020-08-14 10:56:36 +08:00
fan
b17c9c1c4c 添加线路配置guideNeedRouteSettingFirst 2020-08-14 10:56:11 +08:00
fan
150f047552 设备登录添加实训考试运行图编辑 2020-08-14 10:55:32 +08:00
fan
67cf89120f 添加线路配置guideNeedRouteSettingFirst 2020-08-14 10:54:28 +08:00
joylink_cuiweidong
3f11212183 剧本录制默认行调操作 2020-08-14 10:29:33 +08:00
joylink_cuiweidong
21401af2b3 代码调整 2020-08-13 18:31:23 +08:00
joylink_cuiweidong
ddabadba45 剧本仿真代码调整 2020-08-13 18:30:03 +08:00
joylink_cuiweidong
e3a76025e4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-13 18:08:16 +08:00
joylink_cuiweidong
75a240d66b 剧本预览代码调整 2020-08-13 18:07:43 +08:00
sunzhenyu
debd9f54d0 修改三维沙盘哈尔滨静态文件，修改elmentui站台列表bug,修改影藏列车信息bug 2020-08-13 17:30:07 +08:00
sunzhenyu
41319d9543 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-13 16:51:01 +08:00
sunzhenyu
58366e737b 修改三维通号车站值班员钩锁 2020-08-13 16:50:54 +08:00
joylink_cuiweidong
0ed57e5488 剧本编制代码调整 2020-08-13 16:45:27 +08:00
joylink_cuiweidong
64a335cc05 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-13 16:19:14 +08:00
joylink_cuiweidong
cd877b8800 剧本编制代码调整 2020-08-13 16:18:19 +08:00
sunzhenyu
165a84da5a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-13 15:55:33 +08:00
sunzhenyu
5b4db675a8 修改三维通号进入的界面，修改三维vr维修Gui 2020-08-13 15:55:25 +08:00
joylink_cuiweidong
6a4cc3a2bc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-13 13:05:34 +08:00
joylink_cuiweidong
af49d04f12 代码调整 2020-08-13 13:03:37 +08:00
fan
f22518f224 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-13 11:23:31 +08:00
fan
cc0803630c 设备跳转运行图等（未完） 2020-08-13 11:23:07 +08:00
joylink_cuiweidong
9c5a8238de Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-13 10:47:19 +08:00
joylink_cuiweidong
60b07ef132 剧本编制控制权转移代码还原 2020-08-13 10:46:26 +08:00
fan
a97c1fcb74 iscs工作站仿真取消订阅问题调整 2020-08-13 09:40:40 +08:00
fan
066340930f 退出iscs工作站清理仿真 2020-08-13 09:22:31 +08:00
fan
f4f1b8792d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-13 09:07:54 +08:00
fan
2c2d704ee7 运行图预览重复数据调整 2020-08-13 09:07:42 +08:00
zyy
54bef31576 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-12 18:26:40 +08:00
zyy
36a0b1dd93 调整代码 2020-08-12 18:26:27 +08:00
joylink_cuiweidong
c3c65fba5c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-12 17:34:55 +08:00
joylink_cuiweidong
8fd00b3493 剧本录制控制权转移代码调整 2020-08-12 17:34:37 +08:00
fan
fbda89c39e iscs调整 2020-08-12 15:19:38 +08:00
fan
0348d143b5 合并代码 2020-08-12 11:04:04 +08:00
fan
30e30d5ef3 佛山线路问题调整&iscs样式调整 2020-08-12 11:02:47 +08:00
zyy
3731a56a78 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-11 15:46:26 +08:00
zyy
09b151e830 调整地图绘制流程 2020-08-11 15:46:15 +08:00
fan
6f4b6f0c3a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-11 14:34:27 +08:00
fan
8687650e41 ibp系统调整&发布地图管理调整 2020-08-11 14:34:17 +08:00
joylink_cuiweidong
c82edc8516 地图绘图代码调整 2020-08-11 14:17:00 +08:00
joylink_cuiweidong
be112d3b96 代码调整 2020-08-11 13:34:55 +08:00
joylink_cuiweidong
b0f238c655 地图绘制代码调整 2020-08-11 13:13:38 +08:00
joylink_cuiweidong
15ecca61a7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-11 10:57:41 +08:00
joylink_cuiweidong
740757896b 地图绘制代码调整 2020-08-11 10:57:20 +08:00
fan
e40032a24e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-11 09:21:43 +08:00
fan
775847029a 模板运行图添加仿真数据校验（接口未加） 2020-08-11 09:21:31 +08:00
zyy
05d650efa6 删除注释 2020-08-11 09:11:38 +08:00
zyy
0f4fa8feab 修改代码 2020-08-10 18:38:16 +08:00
fan
870ee5130f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-10 17:40:33 +08:00
fan
a0bd7a309d 整合申请管理 2020-08-10 17:40:17 +08:00
joylink_cuiweidong
d03532ecea 剧本预览和加载剧本 添加指令提示 2020-08-10 16:29:32 +08:00
joylink_cuiweidong
76bf1706ab Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-10 15:55:01 +08:00
joylink_cuiweidong
11dc3abf42 剧本编制代码调整（剧本编制对应的会话逻辑调整） 2020-08-10 15:54:38 +08:00
zyy
a4beb31ee6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-10 13:02:11 +08:00
zyy
fda63a7ca6 调整多余注释 2020-08-10 13:01:59 +08:00
joylink_cuiweidong
4b11c2e28f 剧本编制代码调整 2020-08-10 09:47:01 +08:00
joylink_cuiweidong
69e224be35 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-07 19:03:20 +08:00
joylink_cuiweidong
3c301b93ce 剧本编制 添加指令 代码 2020-08-07 19:02:59 +08:00
fan
a5ee8ebed2 问题调整 2020-08-07 18:28:40 +08:00
fan
115f5a539f 有扣车跳停显示状态时调整菜单位置 2020-08-07 14:09:00 +08:00
fan
dcfd07c267 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-07 13:59:29 +08:00
fan
76512af530 运行图预览数据调整 2020-08-07 13:59:19 +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
be5f817f03 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-07 11:28:59 +08:00
fan
ea5cb27128 运行图预览调整 2020-08-07 11:28:50 +08:00
zyy
1f2f7bcf89 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-07 11:10:04 +08:00
zyy
4a1d3d3863 增加车站批量设置，调整车站绘图逻辑 2020-08-07 11:09:49 +08:00
fan
cf503299fd 保留stations数据不清除 2020-08-07 10:29:18 +08:00
fan
d449dece06 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-07 10:15:53 +08:00
fan
8e73c01b3f 成都一列车样式调整 2020-08-07 10:15:39 +08:00
zyy
bf5aa5e1c7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-07 09:59:29 +08:00
zyy
8c0612fb60 增加车站绘图字段 2020-08-07 09:59:16 +08:00
fan
2668456ffd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-07 09:44:12 +08:00
fan
276babf477 再次进入综合仿真点击操作无效 2020-08-07 09:44:03 +08:00
joylink_cuiweidong
849770ab0e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-06 19:34:46 +08:00
joylink_cuiweidong
abb0143988 控制权转移代码调整 2020-08-06 19:34:13 +08:00
fan
a3f39b3c2f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-06 16:55:15 +08:00
fan
9615f33d88 伸展样式调整 2020-08-06 16:54:53 +08:00
zyy
0e9b731e93 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-06 15:08:07 +08:00
zyy
cde3b39753 调整地图绘制流程，调整信号机 2020-08-06 15:07:50 +08:00
fan
492c79ffb9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-06 15:02:46 +08:00
fan
e3e62f85f9 佛山目的地码显示长度调整&联锁配置添加参数generateFls 2020-08-06 15:02:22 +08:00
zyy
aa63af422b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/views/newMap/newMapdraft/mapoperate/signal/index.vue
 2020-08-06 11:18:48 +08:00
zyy
7ddbe10832 增加信号机批量操作 2020-08-06 11:15:46 +08:00
joylink_cuiweidong
1a844d20e7 地图绘制信号机添加字段（不生成进路的信号机终端） 2020-08-06 10:55:38 +08:00
fan
aea8dc7eca 清理多余状态 2020-08-05 15:12:40 +08:00
fan
d9e6258e1e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-05 13:17:16 +08:00
fan
2f5421605e 运行图加载设置最大宽高 2020-08-05 13:16:58 +08:00
joylink_cuiweidong
4a8d6fabe3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-05 13:04:12 +08:00
joylink_cuiweidong
96f6d5030b 哈尔滨一号线 自动触发进路 绘图代码调整 2020-08-05 13:03:53 +08:00
fan
1314ae64b6 调整参数名=》 是否自动折返始端 2020-08-05 11:23:48 +08:00
fan
6214acf235 信号机添加参数routeEnd&融屏测试 2020-08-05 10:57:58 +08:00
fan
49bf6943aa 调整运行图预览按钮&删除无用console 2020-08-05 09:36:13 +08:00
fan
f1622afc0f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_new 2020-08-05 09:05:41 +08:00
fan
9cc130e737 仿真状态处理暂存 2020-08-05 09:05:26 +08:00
joylink_cuiweidong
946d212bb9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-04 18:48:14 +08:00
joylink_cuiweidong
2f6d444cf9 运行图代码调整 2020-08-04 18:47:57 +08:00
zyy
ee7ca07731 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-04 17:31:20 +08:00
zyy
6dbac54d1f 调整地图绘制相关流程 2020-08-04 17:31:07 +08:00
joylink_cuiweidong
1f6fdb5341 派班计划代码调整 2020-08-04 16:27:23 +08:00
joylink_cuiweidong
e8c3cbfe3c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-04 15:29:24 +08:00
joylink_cuiweidong
73fe03432b 派班计划代码调整（更改排班计划预览接口） 2020-08-04 15:29:10 +08:00
fan
b5352ef82d 调整设备配置psdCode展示 2020-08-04 14:47:47 +08:00
fan
8ed963fddb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_new 2020-08-04 14:18:05 +08:00
fan
fb64429ee8 调整综合仿真开始状态管理 2020-08-04 14:17:47 +08:00
joylink_cuiweidong
01701479fd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-04 14:02:54 +08:00
joylink_cuiweidong
af0068c972 地图绘制代码调整 
剧本录制代码调整
 2020-08-04 14:02:10 +08:00
fan
d95595ca0a 关联登录设备循环检测异常是循环获取二位码 2020-08-04 13:42:57 +08:00
fan
a385aa72c9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_new 2020-08-04 13:30:52 +08:00
fan
8096076be3 电子沙盘界面添加退出和消息监听 2020-08-04 13:30:42 +08:00
zyy
1392503b9f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-04 13:00:55 +08:00
zyy
3f0123a472 调整地图绘制区段修改逻辑 2020-08-04 13:00:42 +08:00
sunzhenyu
4aa95a4bd6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-04 11:11:18 +08:00
sunzhenyu
36d19545f8 修改三维沙盘初始视角，修改车站按钮样式 2020-08-04 11:11:13 +08:00
joylink_cuiweidong
ba7a2b6e38 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-04 11:09:18 +08:00
joylink_cuiweidong
a4f727be0d 派班计划代码调整（新增排班计划预览） 2020-08-04 11:09:00 +08:00
zyy
402a4f48b8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-04 10:49:33 +08:00
zyy
a8cb84176e 调整大屏逻辑 2020-08-04 10:49:22 +08:00
fan
9a4591effd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_new 2020-08-04 10:42:40 +08:00
fan
394fa0ec18 添加电子沙盘设备 2020-08-04 10:42:04 +08:00
joylink_cuiweidong
118e7a6bce 仿真聊天代码调整 2020-08-04 10:24:45 +08:00
fan
f645433696 调整运行图加载方式 2020-08-04 10:03:06 +08:00
fan
313a99260c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_new 2020-08-04 09:40:39 +08:00
fan
6c02fe9b75 撤销调整运行图加载方式 2020-08-04 09:40:20 +08:00
joylink_cuiweidong
1413a6a636 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-03 19:22:12 +08:00
joylink_cuiweidong
da39b8a1b4 哈尔滨一号线 教研机 切换 通号 层级调整 2020-08-03 19:21:56 +08:00
fan
f89d29ad59 调整司机角色在添加仿真成员是未过滤 2020-08-03 19:00:42 +08:00
fan
fc64c99c8a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_new 2020-08-03 18:48:47 +08:00
fan
cb7b03adbe 加载运行图数据失败调整 2020-08-03 18:45:24 +08:00
zyy
4954e5e344 删除注释 2020-08-03 17:42:42 +08:00
zyy
584fbad941 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-03 17:30:17 +08:00
zyy
d98e933e79 调整地图绘制样式 2020-08-03 17:30:01 +08:00
joylink_cuiweidong
a554912c09 哈尔滨一号线教研机 行调切通号 按钮显示调整 2020-08-03 17:28:46 +08:00
joylink_cuiweidong
baf0fe4900 故障操作切换代码调整 2020-08-03 16:59:23 +08:00
fan
3c622b6fb5 调整仿真仿真状态 2020-08-03 16:55:05 +08:00
fan
82bfb02b97 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_new 2020-08-03 16:20:23 +08:00
fan
f23a3a8112 同步按计划行车时间 2020-08-03 16:20:14 +08:00
zyy
057071769f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-03 15:32:20 +08:00
zyy
8422889940 调整大屏列表逻辑 2020-08-03 15:31:53 +08:00
fan
42d850de66 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_new 2020-08-03 15:27:26 +08:00
joylink_cuiweidong
753f7db809 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-03 15:27:20 +08:00
fan
8b5e94755c 加载运行图数据失表问题修复&添加新角色同步公共会话成员 2020-08-03 15:27:14 +08:00
joylink_cuiweidong
5c8ca28b52 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-03 15:25:31 +08:00
joylink_cuiweidong
e7ba329194 哈尔滨一号线 菜单隐藏 代码调整 2020-08-03 15:25:12 +08:00
zyy
c9fc984bc9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-03 15:23:00 +08:00
zyy
60986fbfeb 大屏修改 2020-08-03 15:22:46 +08:00
sunleking
9250606950 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-03 14:30:39 +08:00
sunleking
33ff32222d 修改三维通号和驾驶界面样式 2020-08-03 14:30:31 +08:00
zyy
f0c623e743 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-03 14:13:09 +08:00
zyy
31be09323b 调整综合演练顶部菜单判断，增加哈尔滨项目 行调设备登陆显示指令模式 2020-08-03 14:12:56 +08:00
joylink_cuiweidong
c309859c2b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-03 13:27:56 +08:00
joylink_cuiweidong
ca987254c7 新版地图仿真时间问题调整 2020-08-03 13:27:17 +08:00
zyy
5b92e9125d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-03 10:55:59 +08:00
zyy
1ade7ba9b8 调整样式 2020-08-03 10:55:43 +08:00
joylink_cuiweidong
f0d0c96f44 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-03 10:54:01 +08:00
joylink_cuiweidong
56b6c422f9 新版地图课程考试计时代码调整 2020-08-03 10:53:44 +08:00
fan
1235126ac3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_new 2020-08-03 10:30:36 +08:00
fan
278741e686 清除调用原有mutation-type 2020-08-03 10:30:28 +08:00
zyy
317ea995e7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-03 10:16:23 +08:00
zyy
7ff4872a33 调整大屏遮罩宽度 2020-08-03 10:16:10 +08:00
fan
94f70eea65 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_new 2020-08-03 10:02:24 +08:00
fan
d1a5669999 运行图预览初始化调整 2020-08-03 10:02:12 +08:00
zyy
b1fb2a12dc 调整样式 2020-08-03 09:53:34 +08:00
joylink_cuiweidong
f8c542354c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-03 09:19:01 +08:00
joylink_cuiweidong
d397f437fd 剧本录制文件位置调整 2020-08-03 09:18:27 +08:00
fan
517270b2f2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_new 2020-07-31 18:57:46 +08:00
fan
3215bec260 运行图调整 2020-07-31 18:57:27 +08:00
zyy
176de3219f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-31 18:49:51 +08:00
zyy
fb9e8f0325 调整地图样式及加载逻辑 2020-07-31 18:49:35 +08:00
joylink_cuiweidong
88b03d240b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-31 17:30:43 +08:00
joylink_cuiweidong
5bb59c855e 佛山控制权转移代码调整 2020-07-31 17:30:26 +08:00
sunzhenyu
988f38fbb3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-31 16:42:34 +08:00
sunzhenyu
44710199b7 修改三维行车初始绑定列车 2020-07-31 16:42:25 +08:00
zyy
e2c32f2e68 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-31 16:22:43 +08:00
zyy
70114a0014 调整宁波线路操作 2020-07-31 16:22:29 +08:00
joylink_cuiweidong
350bfab719 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-31 16:20:30 +08:00
joylink_cuiweidong
cb6d891d2b 代码调整 2020-07-31 16:20:07 +08:00
fan
b82f701e67 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_new 2020-07-31 16:15:33 +08:00
fan
7be510605f 取消综合仿真观众暂不关闭三维驾驶 2020-07-31 16:14:33 +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
sunzhenyu
764a6139ea Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-31 15:58:38 +08:00
sunzhenyu
7b3ff46cff 修改三维驾驶关车门判断 2020-07-31 15:58:33 +08:00
fan
06ed0a6f76 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_new 2020-07-31 15:53:36 +08:00
fan
deb60acd14 绘图调整兼容数据&综合仿真观众咱不关闭三维驾驶&设备配置规整 2020-07-31 15:53:25 +08:00
sunzhenyu
3ca561a6cd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-31 15:48:13 +08:00
sunzhenyu
d5c73e9331 修改三维驾驶hmi数据更新，修改驾驶面板绑定列车 2020-07-31 15:48:04 +08:00
zyy
e480de2dc3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-31 15:24:58 +08:00
zyy
d15328de57 调整地图绘制流程 2020-07-31 15:24:44 +08:00
fan
65d25678db plc网关配置调整&考试试卷问题调整 2020-07-31 10:37:50 +08:00
zyy
f1d72d0968 调整综合演练流程 2020-07-30 18:42:41 +08:00
zyy
a7144dd4da Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-30 17:49:34 +08:00
zyy
e4c20b1bf8 调整老版地图绘制文件位置 2020-07-30 17:49:20 +08:00
joylink_cuiweidong
8663a4fba0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-30 16:45:22 +08:00
joylink_cuiweidong
c2c3fc0b22 运行图加载根据车次号 运行图颜色代码调整 2020-07-30 16:44:41 +08:00
fan
0a7d3d97bd 调整剧本会话@ 2020-07-30 16:33:08 +08:00
fan
71d3ff5d87 调整驾驶终端进入跳转 2020-07-30 15:58:28 +08:00
joylink_cuiweidong
50f4b1a0f7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-30 15:38:47 +08:00
joylink_cuiweidong
0da1fc09e8 运行图加载根据车次号 运行图颜色代码调整 2020-07-30 15:37:49 +08:00
zyy
c85139fe48 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-30 15:32:54 +08:00
zyy
48491044ce 调整列表样式 2020-07-30 15:32:39 +08:00
sunzhenyu
3990b41cf3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-30 15:12:23 +08:00
zyy
1ed90362c0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-30 15:10:26 +08:00
sunzhenyu
b8b3292e37 merge 2020-07-30 15:10:17 +08:00
zyy
a6feabd406 调整地图绘制逻辑 2020-07-30 15:10:10 +08:00
sunzhenyu
ef09632c8b 新增三维通号VR测试场景 2020-07-30 15:08:17 +08:00
fan
955ad3a89d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-30 13:46:55 +08:00
fan
c15860b104 代码调整 2020-07-30 13:43:00 +08:00
joylink_cuiweidong
2408797a04 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-30 11:09:25 +08:00
joylink_cuiweidong
31a2854a15 运行图预览运行列车颜色代码调整 2020-07-30 11:08:59 +08:00
fan
c741783ea0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-29 18:27:19 +08:00
fan
95e4479d04 考试设备定位调整 2020-07-29 18:26:58 +08:00
zyy
841946ce29 调整按钮样式 2020-07-29 17:41:19 +08:00
zyy
0110502711 删除多余注释 2020-07-29 16:59:57 +08:00
fan
2648ed6a4a 仿真会话调整 2020-07-29 16:24:51 +08:00
zyy
e6551dd4a0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-29 16:15:53 +08:00
zyy
480d98deb9 调整成员聊天样式 2020-07-29 16:15:39 +08:00
fan
33a8a17bc3 综合仿真按钮调整 2020-07-29 15:42:10 +08:00
fan
add4a4dc8b 仿真右下侧按钮调整 2020-07-29 14:40:16 +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
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
zyy
d1362aa923 调整样式按钮位置 2020-07-29 13:52:34 +08:00
zyy
244e8975f3 调整样式 2020-07-29 13:41:29 +08:00
zyy
c2b17d3615 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-29 13:23:35 +08:00
zyy
c3e7f8227a 调整区段字段显示，调整功能按钮样式 2020-07-29 13:23:25 +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
zyy
d91467db70 调整地图加载功能栏样式 2020-07-29 10:27:02 +08:00
zyy
ac7424785a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/views/newMap/jointTrainingNew/menuDemon.vue
 2020-07-29 09:32:16 +08:00
zyy
1ce9303bcb 调整哈尔滨显示左下角菜单栏 2020-07-29 09:31:08 +08:00
fan
32a8daff56 merge 2020-07-28 18:30:44 +08:00
fan
f13ba95407 宁波菜单回车快捷键（区段、信号机、车站）&设备登录综合演练不显示cctv视图设备视图三维视图&会话切换公共调整 2020-07-28 18:28:31 +08:00
zyy
6ca803d06d 调整车站颜色，功能栏宽度判断 2020-07-28 17:55:07 +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
fan
0ad13f9fe8 宁波菜单弹框回车快捷键 2020-07-28 16:28:55 +08:00
joylink_cuiweidong
99f324adf7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-28 15:24:53 +08:00
joylink_cuiweidong
b1549145e0 宁波线路仿真隐藏车次窗 2020-07-28 15:24:32 +08:00
zyy
2fd8c44f85 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-28 14:44:52 +08:00
zyy
9f53e6e5f0 调整综合演练按钮显示逻辑，调整聊天窗口逻辑 2020-07-28 14:44:37 +08:00
fan
0405d3e61e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-28 14:11:32 +08:00
fan
594087489a 调整角色切换bug&通号界面添加成员管理&仿真按钮offset位置修复 2020-07-28 14:11:17 +08:00
joylink_cuiweidong
66b9d7f85a 剧本录制代码调整 2020-07-28 13:56:36 +08:00
joylink_cuiweidong
41aadd30cb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-28 13:03:25 +08:00
joylink_cuiweidong
e5af672515 地图绘图代码调整 2020-07-28 13:03:03 +08:00