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 |
|