Commit Graph

308 Commits

Author SHA1 Message Date
sunzhenyu
160d4f9d59 增加三维列车救援vr下操纵杆控制触发动画,增加三维编辑器区段平整功能 2020-09-25 18:09:13 +08:00
sunzhenyu
5215064faa 增加三维vr列车抢修测试界面,修改三维哈尔滨本地文件列车 2020-09-23 16:20:50 +08:00
sunzhenyu
89fd0ec052 修改三维cctv移动鼠标卡顿,改用主线程渲染人物动画 2020-09-22 15:16:53 +08:00
sunzhenyu
60554583d1 修改三维驾驶列车模型距离,三维编辑器增加车站坐标校准,增加站台停车点显示 2020-09-18 18:29:02 +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
sunzhenyu
86f49506cd 修改三维编辑器连接区段数据。增加三维编辑器邻接区段对齐功能,增加区段高低编辑功能。修改三维cctv配置 2020-09-16 17:10:37 +08:00
sunzhenyu
9254cb8cb6 修改初始化时站台轨顺序bug,修改加载哈尔滨bug 2020-09-11 13:52:17 +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
d5c3227909 调整加载动画 2020-09-09 11:22:56 +08:00
fan
8c07cf764a 代码调整 2020-08-31 13:27:27 +08:00
sunzhenyu
1a76506f9b 增加列车驾驶其他车辆,增加综合演练第三人称观看视角,修改三维编辑器部分区段生成bug 2020-08-26 13:54:44 +08:00
sunzhenyu
02faa078af 删除console 2020-08-14 18:05:28 +08:00
sunzhenyu
a992090e12 修改mmi界面 2020-08-14 17:39:04 +08:00
sunzhenyu
9258d5ab3b 修改三维驾驶紧急停车 2020-08-14 16:58:50 +08:00
sunzhenyu
debd9f54d0 修改三维沙盘哈尔滨静态文件,修改elmentui站台列表bug,修改影藏列车信息bug 2020-08-13 17:30:07 +08:00
sunzhenyu
58366e737b 修改三维通号车站值班员钩锁 2020-08-13 16:50:54 +08:00
sunzhenyu
5b4db675a8 修改三维通号进入的界面,修改三维vr维修Gui 2020-08-13 15:55:25 +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
sunzhenyu
36d19545f8 修改三维沙盘初始视角,修改车站按钮样式 2020-08-04 11:11:13 +08:00
joylink_cuiweidong
da39b8a1b4 哈尔滨一号线 教研机 切换 通号 层级调整 2020-08-03 19:21:56 +08:00
joylink_cuiweidong
a554912c09 哈尔滨一号线教研机 行调切通号 按钮显示调整 2020-08-03 17:28:46 +08:00
sunleking
33ff32222d 修改三维通号和驾驶界面样式 2020-08-03 14:30:31 +08:00
sunzhenyu
44710199b7 修改三维行车初始绑定列车 2020-07-31 16:42:25 +08:00
sunzhenyu
7b3ff46cff 修改三维驾驶关车门判断 2020-07-31 15:58:33 +08:00
sunzhenyu
d5c73e9331 修改三维驾驶hmi数据更新,修改驾驶面板绑定列车 2020-07-31 15:48:04 +08:00
zyy
e4c20b1bf8 调整老版地图绘制文件位置 2020-07-30 17:49:20 +08:00
sunzhenyu
b8b3292e37 merge 2020-07-30 15:10:17 +08:00
sunzhenyu
ef09632c8b 新增三维通号VR测试场景 2020-07-30 15:08:17 +08:00
fan
594087489a 调整角色切换bug&通号界面添加成员管理&仿真按钮offset位置修复 2020-07-28 14:11:17 +08:00
sunzhenyu
a292a4a6d2 修改三维无用注释 2020-07-21 17:30:36 +08:00
sunzhenyu
8ce7e33c5e 删除三维无用console,修改cctv寻路obj路径 2020-07-21 14:59:17 +08:00
sunzhenyu
24794006f5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-20 17:32:28 +08:00
sunzhenyu
ac0efbd97b 修改三维编辑器模型配置,修改三维的沙盘,驾驶,cctv,单体设备,通号维修模型加载,贴图加载的问题 2020-07-20 17:32:16 +08:00
joylink_cuiweidong
2e91788a78 退出登陆 关闭socket连接调整 2020-07-16 13:33:45 +08:00
joylink_cuiweidong
a5df03f7c7 退出登陆 断开socket连接 2020-07-16 13:22:33 +08:00
sunzhenyu
54a773aa84 修改录制三维驾驶托管模块 2020-07-14 15:03:31 +08:00
sunzhenyu
f1cab6fba3 test 2020-07-14 09:24:58 +08:00
sunzhenyu
e95d97136a 三维编辑器存读数据测试 2020-07-10 18:13:09 +08:00
sunzhenyu
4dfe9d661b 修改录制三维驾驶托管逻辑 2020-07-10 17:15:57 +08:00
sunzhenyu
eada9df066 修改录制三维状态 2020-07-10 16:42:12 +08:00
sunzhenyu
8b3b151b95 修改三维驾驶录制获取驾驶员托管状态接口 2020-07-10 14:47:52 +08:00
sunzhenyu
8f8192a8f7 修改综合演练三维退出重定向 2020-07-10 11:32:26 +08:00
sunzhenyu
3e84301b42 修改综合演练切换带三维界面的处理 2020-07-10 10:27:49 +08:00
sunzhenyu
ccd14e903d 三维编辑器修改 2020-07-10 09:17:00 +08:00
sunzhenyu
f424184363 修改录制界面三维驾驶初始车辆显示 2020-07-09 16:39:58 +08:00
sunzhenyu
df3b8eebd7 修改综合演练三维驾驶退出 2020-07-09 16:03:33 +08:00
sunzhenyu
27d4c93775 修改三维编辑器 2020-07-09 15:46:12 +08:00
sunzhenyu
eff2657d08 修改综合演练屏蔽门直接显示 2020-07-08 17:24:38 +08:00
sunzhenyu
2cbe94a16d 修改cctv无贴图配置 2020-07-08 14:04:14 +08:00
sunzhenyu
7d8f4e6de2 修改三维设备在设备管理中显示样式 2020-07-08 13:28:06 +08:00
sunzhenyu
3161e256b8 修改设备界面query 2020-07-08 13:19:40 +08:00
sunzhenyu
9c0df60188 三维编辑器修改,三维cctv仿真结束登出 2020-07-08 10:21:14 +08:00
sunzhenyu
2282376acf 修改通号三维bug 2020-07-03 16:29:07 +08:00
sunzhenyu
0b08bfae9f 综合演练三维通号增加设备间,三维编辑器资源管理链接配置 2020-07-03 13:49:05 +08:00
sunzhenyu
c34aa9d223 增加三维资源模型上传页面 2020-07-02 15:33:35 +08:00
sunzhenyu
49cd3fee81 修改通号设备故障名称显示 2020-07-01 12:11:19 +08:00
sunzhenyu
01351fb34a test 2020-06-23 10:07:52 +08:00
sunzhenyu
45c96bd76f 修改三维驾驶录制界面中托管按钮 2020-06-19 11:23:47 +08:00
sunzhenyu
2a50dd1be2 修改三维驾驶刷新重连列车bug 2020-06-19 09:56:40 +08:00
sunzhenyu
8b2c0cc00a 修改三维驾驶通信接口改post 2020-06-18 18:40:47 +08:00
sunzhenyu
b70feae183 增加三维驾驶超速报警和牵引状态mmi显示,增加剧本设计中三维驾驶 2020-06-17 18:16:49 +08:00
sunzhenyu
71a0faa648 三维cctv站台名站台标方向添加 2020-06-17 13:32:14 +08:00
sunzhenyu
e415dc28c0 修改三维驾驶mmi车门显示和控制面板关门灯 2020-06-16 18:18:47 +08:00
sunzhenyu
33343f6447 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-16 13:17:30 +08:00
sunzhenyu
a2c2a963a4 增加三维驾驶关车门亮灯,修改三维道岔转辙机动画速度,修改三维仿真驾驶中车站模型增加图片资源 2020-06-16 13:17:11 +08:00
fan
3f978a2aa8 竞业达页面调整 2020-06-15 13:03:24 +08:00
sunzhenyu
52437f157f 修改三维驾驶换端车门动画变化bug 2020-06-11 10:48:04 +08:00
sunzhenyu
365cd7de44 增加列车开关门操作 2020-06-10 16:30:23 +08:00
sunzhenyu
6cae01f373 增加三维驾驶换端操作,修改三维cctv中前往站台找不到路径点bug,增加综合演练车站cctv 2020-06-08 18:22:12 +08:00
sunzhenyu
4f6e4ff2fc 修改三维驾驶列车排序,修改三维驾驶面板图标刷新,完善三维cctv的乘客上下车,优化ai逻辑,修改进出站闸机逻辑。修改三维编辑器站台内外侧属性赋值。修改通号三维设备初次加载面板bug 2020-06-05 18:56:42 +08:00
sunzhenyu
7562b932fe 修改驾驶按钮逻辑,三维cctv增加列车进出站 2020-06-03 18:32:46 +08:00
sunzhenyu
9ca15d9146 修改三维cctv视角 2020-06-02 16:58:45 +08:00
sunzhenyu
f4d41eb0de 修改通号模型信息显示功能 2020-06-02 16:57:38 +08:00
sunzhenyu
041528ebaa 修改三维cctv中路径 2020-06-01 15:43:40 +08:00
sunzhenyu
e7224548b8 修改旧数据三维通信bug,cctv三维逻辑修改 2020-06-01 12:29:30 +08:00
sunzhenyu
fe5bfa50e0 三维cctv修改 2020-05-28 13:39:41 +08:00
sunzhenyu
080d670c7d 综合演练三维通号原型 2020-05-22 15:56:40 +08:00
sunzhenyu
e0fd1ece86 修改车站贴图,修改驾驶提示 2020-05-21 16:48:59 +08:00
sunzhenyu
01f90f6a2d 隐藏三维站台 2020-05-20 10:50:13 +08:00
sunzhenyu
6a25030a53 修改三维数据 2020-05-19 16:49:56 +08:00
sunzhenyu
92eed74c94 修改老数据地图三维设备显示交互功能 2020-05-13 14:34:17 +08:00
sunzhenyu
1d3c00502a 三维设备展示页面转辙机界面样式逻辑修改 2020-05-12 18:34:09 +08:00
sunzhenyu
c8544909f7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-11 10:14:04 +08:00
sunzhenyu
275e4bab27 修改三维设备页面道岔转辙机 2020-05-11 10:13:54 +08:00
joylink_fanyuhong
390af69821 接口注释 2020-05-10 21:52:13 +08:00
sunzhenyu
eed9189d7a 继电器逻辑修改 2020-05-08 18:06:33 +08:00
sunzhenyu
3d6612cfbd 升级三维继电器动画模块 2020-04-30 18:19:32 +08:00
sunzhenyu
8f15f049f1 修改三维动画播放器重复更新bug,增加宁波线路三维背景,修改三维仿真行车逻辑改为后台数据控制 2020-04-24 18:00:12 +08:00
fan
5f4a211bf2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-21 18:45:05 +08:00
fan
0e1d3dc811 运行图加载调整 2020-04-21 18:43:54 +08:00
sunzhenyu
0ea6430617 修改三维驾驶操作面板,整合实用按钮,修改背景 2020-04-21 18:31:33 +08:00
sunzhenyu
2b0ee65a67 新数据三维区段模型自动生成修改,哈尔滨背景模型修改 2020-04-10 18:55:06 +08:00
sunzhenyu
ee0b0ba391 添加三维驾驶界面mmi站台,安全距离,行车登记,驾驶模式显示视图 2020-04-10 16:13:36 +08:00
sunzhenyu
bbd3a078c5 修改jl3dpassflow文件冲突 2020-04-01 18:46:58 +08:00
sunzhenyu
f31f048846 merge 2020-04-01 16:54:01 +08:00
fan
8f30d436ee 调整绘图&三维跳转页面icon 2020-04-01 16:24:03 +08:00
sunzhenyu
d7fd261c07 修改三维客流视图画面 2020-04-01 16:03:09 +08:00
sunzhenyu
ec0f59682b merge 2020-03-31 18:45:00 +08:00
sunzhenyu
3bbd28c17b 限制只有新数据有驾驶面板 2020-03-31 18:42:38 +08:00
sunzhenyu
d4f7da9c8b 添加驾驶操作面板,三维模型资源改本地 2020-03-31 18:30:15 +08:00
fan
63c73ab78c Merge remote-tracking branch 'origin/dev' into test
# Conflicts:
#	src/views/jlmap3d/simulation/jl3dsimulation.vue
2020-03-31 11:14:33 +08:00
fan
ab4928d924 差异化打包调整&哈尔滨登录页 2020-03-30 13:07:11 +08:00
sunzhenyu
b8d4cbcaba 将三维沙盘中设备信息按钮隐藏 2020-03-27 11:04:25 +08:00
sunzhenyu
0b6415b162 修改三维设备视图,修改站台模型贴图,修改客流量加载页面 2020-03-20 17:00:12 +08:00
sunzhenyu
2e0b0913d6 修改设计平台三维数据发布 2020-03-16 18:47:55 +08:00
sunzhenyu
d3d1909a82 新数据三维仿真优化 2020-03-10 18:57:13 +08:00
sunleking
7eda57b08c 三维客流模拟加入监控多视角,拆分模型加载 2020-02-20 18:00:27 +08:00
sunleking
61394c4b39 增加三维客流量模块,目前完成了基础的行走状态控制流程 2020-02-14 18:22:11 +08:00
sunzhenyu
ceb9b06c2f 修改重复创建三维行车bug,去除继电器网格,新数据测试 2020-01-19 18:09:34 +08:00
sunzhenyu
d32820e1b4 修改三维背景bug,修改继电器模型和显示,继电器地址,修改三维地图站台偏差 2020-01-16 17:04:16 +08:00
sunzhenyu
e19e44835f 修改背景自适应,修改三维地图编辑逻辑存读以及三维沙盘加载 2020-01-14 16:09:08 +08:00
sunzhenyu
7acd86d332 修改继电器显示逻辑 2020-01-07 10:51:19 +08:00
sunzhenyu
60e1750611 增加继电器数量 2020-01-07 10:41:21 +08:00
sunzhenyu
f1f21006fe 修改继电器通信,修改新数据三维化部分操作 2020-01-07 09:27:41 +08:00
sunzhenyu
76379f12cc 继电器通信,修改继电器逻辑,继电器模型动画更替,修改设备信号灯逻辑,修改设备道岔初始化bug 2019-12-26 10:41:07 +08:00
sunzhenyu
e8cc316e82 增加继电器部件显示 2019-12-13 15:57:38 +08:00
sunzhenyu
a9a62b924f 添加继电器界面动画,修改继电器显示模式 2019-12-13 09:14:28 +08:00
sunzhenyu
5992e1a0ae 修改三维模块名称,升级threejs版本 2019-12-11 10:47:24 +08:00
sunzhenyu
a6c9db1904 修改仿真驾驶添加模型错误,修改沙盘漫游动画轨迹,修改沙盘图标显示,清除不使用的天空盒文件 2019-12-06 18:04:15 +08:00
sunzhenyu
7831bce219 添加仿真设备视图 2019-12-05 16:04:36 +08:00
sunzhenyu
c35a5af565 修改沙盘渲染方式,修改图标名称 2019-12-03 14:19:22 +08:00
sunzhenyu
6f081ca234 修改沙盘行车逻辑,增加站台模型,修改webworker通信,优化通信判断 2019-12-03 13:48:15 +08:00
sunzhenyu
f7b909f85d 修改连接 2019-11-15 17:24:13 +08:00
sunzhenyu
3138187c07 减少合并三维行车判断逻辑,分拆三维行车数据对象 2019-11-15 16:47:34 +08:00
sunzhenyu
3d9a458d42 修改三维数据接口,修改渲染范围 2019-10-31 13:26:40 +08:00
sunzhenyu
300aa624df 更换threejs到109版本,修改路劲弧度,修改渲染注册,测试光效 2019-10-25 18:42:56 +08:00
sunzhenyu
a7e7988754 修复路径判断 2019-10-18 15:29:17 +08:00
sunzhenyu
f847629b92 修改文字显示,行车路径,行车计算 2019-10-17 18:48:36 +08:00
sunzhenyu
b32b03bc81 修改link为主轨迹运行 2019-10-12 16:36:51 +08:00
sunzhenyu
2551a4d595 Merge branch 'dev' into 3dtest 2019-09-29 16:13:21 +08:00
sunzhenyu
f5c362ff0b Merge branch 'dev' of git.cloud.tencent.com:joylink/jl-nclient into dev 2019-09-25 14:55:34 +08:00
sunzhenyu
4faceb5bd0 修改样式 2019-09-25 14:55:29 +08:00
sunzhenyu
af17dbece4 新数据存读 2019-09-25 14:49:25 +08:00
joylink_cuiweidong
0e7fdb354c 国际化调整 2019-09-19 13:19:35 +08:00
sunzhenyu
71a33b5042 merge 2019-09-19 09:25:04 +08:00
sunzhenyu
183f972884 pull 2019-09-17 13:16:49 +08:00
sunzhenyu
b8afc684a3 pull 2019-09-17 10:51:38 +08:00
fan
9c5f1f7633 国际化调整 2019-09-11 13:20:03 +08:00
sunzhenyu
1af9b755d7 t :Merge branch 'test' into dev 2019-09-03 16:56:20 +08:00
sunzhenyu
3d977cc124 pull 2019-09-03 16:50:15 +08:00
sunzhenyu
6fc5f991ef 区分cctv和正常镜头渲染,减少通信驱动的循环体,减少循环遍历的数据中内容,修改场景背景 2019-09-03 16:45:56 +08:00
sunzhenyu
1fb6353f98 增加测试版车载cctv 2019-08-20 18:30:17 +08:00
sunzhenyu
d5aa08dd72 Merge branch 'dev' of git.cloud.tencent.com:joylink/jl-nclient into dev 2019-08-16 18:38:44 +08:00
sunzhenyu
ab23d7932a 修改mmi接收操作模拟器消息 2019-08-16 18:38:35 +08:00
zyy
b84b6ea500 desc: 修改地图编辑页面逻辑 2019-08-16 15:12:03 +08:00
ival
87e35cb38d 同步master代码以及修改交路的问题 2019-08-14 16:37:17 +08:00
ival
3bb449080f Merge remote-tracking branch 'remotes/origin/master' into dev
# Conflicts:
#	src/i18n/langs/zh/tip.js
#	src/jlmap3d/jl3ddrive/jl3ddrive.js
#	src/views/components/pay/index.vue
#	src/views/demonstration/detail/index.vue
#	src/views/display/index.vue
#	src/views/exam/detail/courseDetail.vue
#	src/views/exam/detail/examDetail.vue
#	src/views/exam/detail/questionDetail.vue
#	src/views/jlmap3d/drive/jl3ddrive.vue
#	src/views/jlmap3d/simulation/jl3dsimulation.vue
#	src/views/jointTraining/index.vue
#	src/views/map/mapdraft/mapedit/automaticoperate/preview.vue
#	src/views/map/mapdraft/mapedit/mapoperate/link.vue
#	src/views/map/mapdraft/mapedit/mapoperate/section.vue
#	src/views/map/mapdraft/mapedit/mapoperate/signal.vue
#	src/views/map/mapdraft/mapedit/mapoperate/station.vue
#	src/views/map/mapdraft/mapedit/mapoperate/stationcontrol.vue
#	src/views/map/mapdraft/mapedit/mapoperate/stationstand.vue
#	src/views/map/mapdraft/mapedit/mapoperate/stoppoint.vue
#	src/views/map/mapdraft/mapedit/mapoperate/switch.vue
#	src/views/map/mapdraft/mapedit/pathoperate/pathRoute.vue
#	src/views/map/mapdraft/mapedit/routeoperate/detail.vue
#	src/views/map/mapdraft/mapedit/routeoperate/preview.vue
#	src/views/map/mapdraft/mapedit/routeoperate/related.vue
#	src/views/map/mapdraft/mapedit/routeoperate/route.vue
#	src/views/map/mapdraft/mapmanage/operateMenu.vue
#	src/views/map/product/draft.vue
#	src/views/map/product/list.vue
#	src/views/map/skinStyle/draft.vue
#	src/views/map/skinStyle/index.vue
#	src/views/planMonitor/detail.vue
#	src/views/planMonitor/editTool/index.vue
#	src/views/planMonitor/editTool/menus/modifyingStationIntervalTime.vue
#	src/views/planMonitor/editTool/schedule.vue
#	src/views/teach/detail/index.vue
#	src/views/teach/practical/index.vue
2019-08-14 15:57:52 +08:00
ival
6343a79f81 修改接口 2019-08-14 14:01:28 +08:00
ival
78a805cd2f 修改皮肤skinStyle为skinCode 2019-08-14 09:35:38 +08:00
sunzhenyu
39002937e1 调整文件结构 2019-08-13 16:23:46 +08:00
sunzhenyu
74527e79fe 修改三维view文件结构 2019-08-12 18:37:43 +08:00
sunzhenyu
de7ee56d77 删除不用资源 2019-08-12 13:42:53 +08:00
sunzhenyu
9f9236361a 修改threejs挂载 2019-08-08 10:52:06 +08:00
sunzhenyu
5899fe1347 修改界面自适应 2019-08-07 11:28:46 +08:00
ival
9f5130a4f2 代码移植 2019-07-26 13:32:43 +08:00