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

7535 Commits

Author SHA1 Message Date
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
505a2d0770 修改链接地址为测试 2020-10-12 14:48:57 +08:00
lVAL
fae5fd0332 修改冲突 2020-10-12 14:33:22 +08:00
lVAL
dcd0c86998 修改代码-冲突 2020-10-12 14:32:30 +08:00
lVAL
b3c5f74c01 修改图片 2020-10-12 14:31:32 +08:00
lVAL
54925a77b6 修改冲突 2020-10-12 14:30:41 +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
34fa34ba61 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-12 09:28:18 +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
sunzhenyu
7d1a852322 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-12 09:27:07 +08:00
sunzhenyu
330efdc434 隐藏三维轨迹线 2020-10-12 09:26:58 +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
4ada7f987a ibp盘问题调整 2020-10-10 18:05:34 +08:00
fan
aa00f27ecc ibp盘问题调整 2020-10-10 18:02:00 +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
218901d806 调整设计平台登录路径 2020-10-10 09:30:45 +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
c701ca11b2 哈尔滨一号线 行调仿真添加道岔的解封和单解操作 2020-10-09 11:30:57 +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
40753ee679 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-30 15:19:20 +08:00
joylink_cuiweidong
3a0b561aa0 竞赛场景 运营统计代码调整 2020-09-30 15:19:02 +08:00
lVAL
24326c4808 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-30 14:57:19 +08:00
lVAL
65c8aeffa5 删除打印 2020-09-30 14:57:08 +08:00
lVAL
ff3aa9bc45 补充修改card 复制粘贴的问题 2020-09-30 14:56:37 +08:00
fan
0b4d9b6483 调整平台路径 2020-09-30 11:17:55 +08:00
fan
817121f7ae Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-30 10:32:52 +08:00
fan
185b942a46 调整平台路径 2020-09-30 10:32:43 +08:00
joylink_cuiweidong
082144ee01 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-30 10:16:51 +08:00
joylink_cuiweidong
fc00a6c56f 哈尔滨线路 引导进路命令代码调整 2020-09-30 10:16:15 +08:00
lVAL
d331d4d2ca Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-30 09:54:38 +08:00
lVAL
1f14423567 修改 绘制card复制粘贴的bug 2020-09-30 09:54:26 +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
1f20911475 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-28 13:16:19 +08:00
lVAL
d5c9706311 增加绘制园以及修改圆的最小半径值 2020-09-28 13:15:54 +08:00
fan
d087505fea Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-28 09:42:34 +08:00
fan
abc2ef4e62 问题数据兼容调整 2020-09-28 09:42:20 +08:00
lVAL
00d4976f66 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-27 16:12:35 +08:00
lVAL
0e47dfcff1 适配图片APF 2020-09-27 16:12:25 +08:00
zyy
9d2836cf64 调整层级 2020-09-27 15:40:23 +08:00
zyy
bae0a26c64 调整层级 2020-09-27 14:45:15 +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
fa6f9d00f9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-25 16:08:07 +08:00
zyy
4362038f13 调整综合监控元素绘制 2020-09-25 16:07:53 +08:00
joylink_cuiweidong
c1e1409119 宁波一号线 实训操作定义调整 2020-09-25 16:03:43 +08:00
joylink_cuiweidong
0f188a6dab Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-25 15:23:39 +08:00
joylink_cuiweidong
69e935f559 宁波线进路 实训定义代码调整 2020-09-25 15:23:23 +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
0202d20591 修改三维cctv速度 2020-09-23 16:39:16 +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
6b585fbca6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-18 14:42:27 +08:00
fan
0d31203b74 ibp盘状态处理&时间同步 2020-09-18 14:42:17 +08:00
zyy
733503afe6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-18 11:08:30 +08:00
zyy
e66a5a5687 调整道岔绘制逻辑 2020-09-18 11:08:17 +08:00
sunzhenyu
af322ec7aa Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-18 09:26:50 +08:00
sunzhenyu
a37a3214f8 修改三维通号读取新数据bug 2020-09-18 09:26:44 +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
sunzhenyu
c7e0380510 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-17 18:12:42 +08:00
sunzhenyu
d409476963 增加三维沙盘行车高度行驶数据更新，修改三维设备站台贴图获取，修改三维编辑器区段连接获取 2020-09-17 18:12:37 +08:00
zyy
c2e3df8dbc 调整ibp按钮点击 2020-09-17 17:45:04 +08:00
zyy
3134142ab3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-17 16:33:33 +08:00
zyy
e98b53d8ad 调整ibp鼠标逻辑 2020-09-17 16:33:22 +08:00
sunzhenyu
465248872f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-17 15:41:02 +08:00
sunzhenyu
308007c6b1 修改三维cctv初始化渲染大小 2020-09-17 15:40:55 +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
3ce1418f89 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-16 10:10:27 +08:00
zyy
4264996520 调整ibp数据，调整道岔生成逻辑 2020-09-16 10:10:13 +08:00
joylink_cuiweidong
0f5099221f 站台绘图代码调整 2020-09-15 18:28:32 +08:00
joylink_cuiweidong
10cae34098 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-15 17:48:24 +08:00
joylink_cuiweidong
ca45d2ab98 代码调整 2020-09-15 17:48:08 +08:00
zyy
fdaf3eaa1e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-15 17:41:10 +08:00
zyy
4b2939ff0a 调整区段配置 2020-09-15 17:40:57 +08:00
joylink_cuiweidong
619474b651 屏蔽门 绘图状态代码调整 2020-09-15 17:13:36 +08:00
joylink_cuiweidong
0b4fa8f3e0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-15 17:09:07 +08:00
joylink_cuiweidong
ce2d07ea20 站台 屏蔽门 绘图代码调整 2020-09-15 17:08:28 +08:00
fan
b44e193bcf Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-14 18:35:06 +08:00
fan
b7a02f45c1 宁波三菜单 2020-09-14 18:34:56 +08:00
zyy
072a6282b0 调整ibp绘图流程 2020-09-14 10:59:02 +08:00
zyy
81ec8fd6a7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-11 18:23:24 +08:00
zyy
e2b212e277 调整字段 2020-09-11 18:23:12 +08:00
zyy
167e0c4ce0 调整流程 2020-09-11 18:22:18 +08:00
sunzhenyu
307ec30eab Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-11 18:14:26 +08:00
sunzhenyu
70b08584a2 修改三维编辑器加载上下站台排序 2020-09-11 18:14:22 +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
40b12de294 会话调整 2020-09-11 17:57:48 +08:00
fan
e5c9936f6c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-11 17:10:53 +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
joylink_cuiweidong
e541e19fa2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-11 17:08:01 +08:00
joylink_cuiweidong
feff7d50cc 屏蔽门 状态代码调整 2020-09-11 17:07:45 +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
joylink_cuiweidong
b35bb2e6fc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-11 14:14:08 +08:00
joylink_cuiweidong
2c74a91e2d 屏蔽门 绘图代码调整 2020-09-11 14:13:29 +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
fan
06ecb8dd1a 宁波三菜单调整 2020-09-09 14:45:38 +08:00
zyy
273d3073de Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-09 14:36:01 +08:00
zyy
d6fba202b4 字段调整 2020-09-09 14:35:48 +08:00
joylink_cuiweidong
5aa9d94071 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/jmapNew/shape/Switch/index.js
 2020-09-09 14:02:15 +08:00
joylink_cuiweidong
ccf2228eeb 站台 绘图代码调整 2020-09-09 13:55:42 +08:00
zyy
620d7aba3c 调整目的码判断 2020-09-09 13:38:30 +08:00
zyy
d01f367e73 调整右键操作显示 2020-09-09 13:25:34 +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
201252dbf9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-09 10:29:06 +08:00
fan
ff4072c6da 调整加载动画 2020-09-09 10:28:56 +08:00
zyy
83b1d16773 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-09 09:40:01 +08:00
zyy
fa70285ef9 调整西安二号线列车右键操作栏 2020-09-09 09:39:23 +08:00
fan
5ceaaed517 调整加载动画 2020-09-08 16:57:48 +08:00
fan
3a25327100 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-08 16:41:47 +08:00
fan
9d42aac8fa 调整宁波三菜单&调整加载动画 2020-09-08 16:41:38 +08:00
zyy
f9e8e10458 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-08 15:39:33 +08:00
zyy
7d826a4d59 调整鼠标事件 2020-09-08 15:39:23 +08:00
fan
c432c2f614 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-08 15:29:54 +08:00
fan
cbb00efdcb 一键生成课程、试卷响应调整 2020-09-08 15:29:45 +08:00
zyy
5ff71d3820 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-08 14:26:59 +08:00
zyy
f548a7495a 调整车站点击 2020-09-08 14:26:49 +08:00
fan
d3a7504c2a 一键生成课程、试卷参数调整 2020-09-08 14:20:01 +08:00
fan
dfb3fcac38 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-08 14:14:38 +08:00
fan
ebcc73cb2d 宁波三号线菜单调整&增加一键生成课程、试卷 2020-09-08 14:14:20 +08:00
zyy
2d461041ca 调整状态 2020-09-08 13:15:09 +08:00
zyy
49d791428d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-08 11:19:19 +08:00
zyy
b8cfb1900e 调整道岔绘图状态 2020-09-08 11:19:06 +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
d19ac59839 调整哈尔滨道岔状态显示 2020-09-07 17:47:04 +08:00
zyy
c3c5850bbf 调整仿真时间同步 2020-09-07 17:07:09 +08:00
zyy
b943ef0e55 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-07 16:41:07 +08:00
zyy
eafc37ce7c 调整流程 2020-09-07 16:40:50 +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
7f07fe898b 调整发送指令参数 2020-09-07 14:17:41 +08:00
zyy
7f434b2828 调整西安二号线列车右键显示 2020-09-07 14:04:44 +08:00
zyy
cd0128e940 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-07 13:51:36 +08:00
zyy
074d4677fe 调整考试系统判断 2020-09-07 13:51:25 +08:00
fan
b9747d1fa7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-07 13:22:03 +08:00
fan
40d33fb87b 控制项目展示loading 2020-09-07 13:21:45 +08:00
zyy
518bf2eeac 调整西安二号线右键操作 2020-09-07 13:17:11 +08:00
zyy
18c74bb3ca Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-07 11:28:25 +08:00
zyy
bb3b202eb1 调整西安二号线列车操作 2020-09-07 11:28:12 +08:00
fan
4f1a2f03cb 哈尔滨盈达科技项目页添加 2020-09-07 11:08:26 +08:00
fan
8ea94587ec Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-07 09:09:14 +08:00
fan
5e791b4314 loading动图调整 2020-09-07 09:09:04 +08:00
fan
f33a793435 路由跳转loading 2020-09-07 09:06:28 +08:00
joylink_cuiweidong
3b8c4852c3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-04 18:22:59 +08:00
joylink_cuiweidong
0d6ed19f4a 道岔绘图代码调整 2020-09-04 18:22:41 +08:00
fan
b47b63305a 运行图预览调整 2020-09-04 18:04:32 +08:00
fan
5af9956f5b 佛山修改列车识别好调整 2020-09-04 17:57:37 +08:00
fan
dc085df977 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-04 17:21:46 +08:00
fan
f33fb7ee91 绘图数据处理调整&佛山修改列车识别好调整 2020-09-04 17:21:34 +08:00
zyy
7db89b8351 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-04 10:44:28 +08:00
zyy
2b548186c3 调整道岔绘制流程 2020-09-04 10:44:17 +08:00
joylink_cuiweidong
7df77d2639 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-04 10:38:54 +08:00
joylink_cuiweidong
d328a11569 西安三号线 福州一号线新版 地图配置文件调整 2020-09-04 10:38:36 +08:00
zyy
a8bcc13e4c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-04 09:24:47 +08:00
zyy
11d3c6d129 调整必须字段 2020-09-04 09:24:34 +08:00
joylink_cuiweidong
b6c39918e0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-03 18:17:40 +08:00
joylink_cuiweidong
679d714b29 道岔绘图代码调整 2020-09-03 18:17:15 +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
joylink_cuiweidong
7044642105 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-02 18:41:09 +08:00
joylink_cuiweidong
2ed40ee117 宁波一号线实训操作代码调整 2020-09-02 18:40:51 +08:00
fan
d40491fb41 merge 2020-09-02 18:06:48 +08:00
fan
3445f98618 宁波三号线菜单调整 2020-09-02 18:02:50 +08:00
joylink_cuiweidong
1427b42d25 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-02 18:00:08 +08:00
joylink_cuiweidong
6680ea03cf 道岔绘图调整（除了哈尔滨线路外，其余线路反位不显示岔芯 直角梯形D） 2020-09-02 17:59:50 +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
joylink_cuiweidong
647897b2c4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-02 14:33:58 +08:00
joylink_cuiweidong
2010edad72 宁波一号线站台设置停站时间操作代码调整 2020-09-02 14:33:41 +08:00
fan
910517e076 剧本调整 2020-09-02 10:59:04 +08:00
fan
5f04b0e25b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-02 10:18:28 +08:00
fan
c9bab84c50 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-02 10:18:06 +08:00
fan
dda0a719ba 宁波三菜单调整 2020-09-02 10:17:58 +08:00
joylink_cuiweidong
61d9f294d8 哈尔滨线路代码调整 2020-09-02 10:15:50 +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
0d026649f3 删除日志 2020-09-02 09:23:27 +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
zyy
c93cff772d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-01 18:09:38 +08:00
zyy
a3489f0942 调整区段显示及优化 2020-09-01 18:09:25 +08:00
fan
15039440b7 运行图预览初始化动态数据和选中数据 2020-09-01 17:20:59 +08:00
fan
a5cbbcb3af Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-01 17:11:24 +08:00
fan
fcd2c41517 成员司机排序&福州新版折返策略教学调整 2020-09-01 17:11:09 +08:00
joylink_cuiweidong
bcc92b6672 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-01 16:45:39 +08:00
joylink_cuiweidong
8a4d98612e 哈尔滨线路实训代码调整 2020-09-01 16:45:23 +08:00
sunzhenyu
55ea7ec549 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-01 15:22:25 +08:00
sunzhenyu
e57a70df9e 修改三维vr道岔模型动画导航bug 2020-09-01 15:22:19 +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
sunzhenyu
b87220ec8c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-01 13:18:20 +08:00
sunzhenyu
7e7a76ae6a 修改三维通号订阅关闭 2020-09-01 13:18:12 +08:00
fan
73224c25c2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-01 11:22:08 +08:00
fan
13764f98a7 修改会话问题 
(cherry picked from commit 716e7c2117)
 2020-09-01 11:22:01 +08:00
sunzhenyu
5e39f3e2fa Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-01 11:17:36 +08:00
sunzhenyu
4a1e3d0aa7 修改三维电子沙盘内外侧站台数据不全bug，修改外车站台漫游 2020-09-01 11:17:29 +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
joylink_cuiweidong
c76205790a 宁波一号线实训操作代码调整 2020-08-31 15:58:55 +08:00
fan
972d5a33bb 响应式布局 2020-08-31 15:31:15 +08:00
fan
71e4a8862b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-31 14:15:10 +08:00
fan
d8c4bee674 考试加载进度条恢复 2020-08-31 14:14:45 +08:00
joylink_cuiweidong
3ff902ee14 区段鼠标事件调整 2020-08-31 13:41:33 +08:00
fan
246568175f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-31 13:28:32 +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
zyy
00ebcd739e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-31 13:25:41 +08:00
zyy
41fe728af4 调整运行图显示 2020-08-31 13:25:26 +08:00
sunleking
9ca8f50dea 修改按钮文字描述 2020-08-31 11:16:18 +08:00
zyy
d579dc7a73 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-31 10:35:07 +08:00
zyy
8e6280e542 调整格式 2020-08-31 10:34:51 +08:00
joylink_cuiweidong
2637b952f3 代码调整 2020-08-31 10:31:36 +08:00
joylink_cuiweidong
b98039d5fd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-31 10:13:39 +08:00
joylink_cuiweidong
8027bc90ae 宁波福州佛山默认不显示道岔区段的名称调整 2020-08-31 10:13:26 +08:00
zyy
bdbb99a1fb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-31 10:11:20 +08:00
zyy
778387a0e9 调整扣车流程, 状态 2020-08-31 10:11:02 +08:00
fan
e6f7ade236 调度大赛调整 2020-08-31 09:23:12 +08:00
fan
bf381cb697 调度大赛调整 2020-08-28 18:04:46 +08:00
fan
589513759f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-28 17:57:56 +08:00
fan
818010b18f 调度大赛调整 2020-08-28 17:57:42 +08:00
zyy
d2b75185fc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-28 17:47:30 +08:00
zyy
ae02d527c9 调整福州线路新版操作 2020-08-28 17:47:17 +08:00
sunzhenyu
4668783e72 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-28 17:27:00 +08:00
sunzhenyu
ed00bc646b 修复三维驾驶切车后未复位模型 2020-08-28 17:26:51 +08:00
zyy
5dcfee72d6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-28 17:22:26 +08:00
zyy
adb62a3209 增加列车右键操作，调整配置 2020-08-28 17:22:12 +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
sunzhenyu
79af11beb6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-28 14:42:12 +08:00
sunzhenyu
7b6281ab42 修改第三人称观看vr初始视角，修改三维驾驶webworker中解析字符串 2020-08-28 14:42:04 +08:00
zyy
a5180c306c 调整运行图 2020-08-28 14:29:59 +08:00
zyy
a12939ded9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-28 13:29:57 +08:00
zyy
152c472b69 调整考试流程 2020-08-28 13:29:45 +08:00
fan
4c8e447d59 运行图参数调整 2020-08-28 13:16:14 +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
f3e65258d9 行调大赛调整 2020-08-28 11:04:12 +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
sunzhenyu
70cf60d9a6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-27 17:13:42 +08:00
sunzhenyu
0a9c9737d2 修改通号第三人称视角人物移动，vr行车过程增加列车声音 2020-08-27 17:13:35 +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
fan
deded7ed6e 宁波三号线菜单调整 2020-08-27 16:48:03 +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
fan
9dc290a550 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-27 10:45:54 +08:00
fan
f2469920fe 菜单配置调整 2020-08-27 10:45:43 +08:00
fan
a01267abe1 区段切除报错调整 2020-08-27 10:45:06 +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
fan
7a7ae9591a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-26 18:24:58 +08:00
fan
f3e6291582 区段切除报错调整 2020-08-26 18:24:14 +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
8605503321 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-26 14:11:46 +08:00
fan
7ebbadca81 merge 2020-08-26 14:10:11 +08:00
fan
8d35c1353f 调度实训平台问题调整 2020-08-26 14:08:50 +08:00
sunzhenyu
c73fe7f3c6 修改资源地址 2020-08-26 14:06:57 +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
fan
932360dd88 merge 2020-08-25 17:10:08 +08:00
fan
f611f5057d 西安二菜单调整 2020-08-25 17:02:48 +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
4de5947d34 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-25 16:53:12 +08:00
zyy
ccc57042a7 调整地图绘制弹窗加载 2020-08-25 16:52:52 +08:00
joylink_cuiweidong
1668b25337 哈尔滨线路实训操作代码调整 2020-08-25 16:38:08 +08:00
joylink_cuiweidong
f2957c370c 哈尔滨线路实训操作代码调整 2020-08-25 15:09:04 +08:00
joylink_cuiweidong
2dad56ac07 哈尔滨线路实训操作调整 2020-08-25 15:01:47 +08:00
joylink_cuiweidong
5549b7bc9f 哈尔滨线路实训操作代码调整 2020-08-25 14:49:19 +08:00
joylink_cuiweidong
92ba51a548 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-25 14:17:44 +08:00
joylink_cuiweidong
2320ae42a9 剧本预览代码调整 2020-08-25 14:17:04 +08:00
zyy
69f7b9deca Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-25 13:51:42 +08:00