Compare commits

...

631 Commits

Author SHA1 Message Date
joylink_fanyuhong
99fc3ffcfb Merge remote-tracking branch 'origin/develop'
All checks were successful
master分支构建发布到公网服务器 / Build-Publish (push) Successful in 8m29s
2024-09-30 14:35:00 +08:00
joylink_fanyuhong
0d34d83747 现地工作站添加运行图加载 2024-09-30 14:33:11 +08:00
joylink_fanyuhong
4e37183818 Merge remote-tracking branch 'origin/develop'
All checks were successful
master分支构建发布到公网服务器 / Build-Publish (push) Successful in 6m37s
2024-09-30 09:32:05 +08:00
joylink_fanyuhong
92c66ab4d6 画面管理处理设备map为空 2024-09-29 14:11:41 +08:00
joylink_fanyuhong
5a7c5fdbeb 成都三号线折返进路办理调整 2024-09-29 14:11:09 +08:00
joylink_fanyuhong
ae826ac205 成都三号线折返进路排列调整 2024-09-27 11:03:20 +08:00
joylink_fanyuhong
84b9f52c8f 信号重启逻辑判断调整 2024-09-26 19:34:02 +08:00
joylink_fanyuhong
526fd047e7 成都三设备样式调整 2024-09-26 18:12:26 +08:00
joylink_fanyuhong
529c122278 成都三号线添加站后折返操作 2024-09-26 17:54:59 +08:00
joylink_fanyuhong
5b1362f94b 成都三号线现地仿真操作控制权判断调整 2024-09-26 16:10:09 +08:00
joylink_fanyuhong
2d1da55ffc 草稿地图成员一键生成添加派班员 2024-09-26 15:15:44 +08:00
joylink_fanyuhong
97e121a65a 成都三号线连锁控调整 2024-09-26 13:42:03 +08:00
joylink_fanyuhong
327533c003 Merge remote-tracking branch 'origin/develop'
All checks were successful
master分支构建发布到公网服务器 / Build-Publish (push) Successful in 11m23s
2024-09-24 11:22:39 +08:00
joylink_fanyuhong
e9a71a1116 成都三号线调整 2024-09-24 11:22:16 +08:00
joylink_fanyuhong
8a80a7d732 Merge remote-tracking branch 'origin/develop'
All checks were successful
master分支构建发布到公网服务器 / Build-Publish (push) Successful in 8m31s
2024-09-24 11:11:40 +08:00
joylink_fanyuhong
cbdfc57243 成都三号线现地仿真无特殊操作调整 2024-09-24 10:59:08 +08:00
joylink_fanyuhong
8fbaa85b99 Merge remote-tracking branch 'origin/develop'
All checks were successful
master分支构建发布到公网服务器 / Build-Publish (push) Successful in 11m22s
2024-09-19 09:10:22 +08:00
joylink_fanyuhong
5c81fc4dcf 实训测验统计得分调整 2024-09-18 14:00:17 +08:00
joylink_fanyuhong
b0ef9e5242 实训总分统计调整 2024-09-18 13:30:36 +08:00
joylink_fanyuhong
f14d998f19 Merge remote-tracking branch 'origin/develop'
All checks were successful
master分支构建发布到公网服务器 / Build-Publish (push) Successful in 8m32s
2024-09-14 13:58:04 +08:00
joylink_fanyuhong
f2efa437df 实训消失问题调整2 2024-09-14 13:50:40 +08:00
joylink_fanyuhong
32430607dd 实训提示消失问题调整 2024-09-14 11:30:31 +08:00
joylink_fanyuhong
a1c8b4f662 Merge remote-tracking branch 'origin/develop'
All checks were successful
master分支构建发布到公网服务器 / Build-Publish (push) Successful in 9m44s
2024-09-13 09:27:49 +08:00
joylink_fanyuhong
954ee991fa 实训列表调整 2024-09-11 13:44:23 +08:00
joylink_fanyuhong
13f16e5570 f仿真重置后清楚区故解连续操作状态 2024-09-11 11:18:26 +08:00
joylink_fanyuhong
5470a32bb7 成工院大铁标准线实训测验模式结束后弹出的结果优化 2024-09-11 09:37:17 +08:00
joylink_fanyuhong
eff99d3609 成工院大铁标准站区故解连续操作问题 2024-09-10 16:21:03 +08:00
joylink_fanyuhong
60e7a09d69 Merge remote-tracking branch 'origin/develop'
All checks were successful
master分支构建发布到公网服务器 / Build-Publish (push) Successful in 9m4s
2024-09-10 12:01:42 +08:00
joylink_fanyuhong
45fbdf0dd7 设备柜 atp切除状态同步 2024-09-10 12:01:14 +08:00
joylink_fanyuhong
904434caf3 Merge remote-tracking branch 'origin/develop'
All checks were successful
master分支构建发布到公网服务器 / Build-Publish (push) Successful in 7m18s
2024-09-10 10:47:00 +08:00
joylink_fanyuhong
9045d2a118 司机驾驶切除ATP调整 2024-09-10 10:37:45 +08:00
joylink_fanyuhong
1f9541eb31 Merge branch 'develop'
All checks were successful
master分支构建发布到公网服务器 / Build-Publish (push) Successful in 13m8s
2024-08-20 17:13:02 +08:00
joylink_fanyuhong
10e27697fb 代码调整 2024-08-20 15:16:56 +08:00
joylink_fanyuhong
acf3109c0b 添加ats客户端 只能操作特殊操作 2024-08-20 15:13:45 +08:00
joylink_fanyuhong
a21524b839 Merge branch 'develop'
All checks were successful
master分支构建发布到公网服务器 / Build-Publish (push) Successful in 10m57s
2024-08-19 18:42:03 +08:00
joylink_fanyuhong
2b8116afd3 现地客户端列车显示问题调整 2024-08-16 23:09:34 +08:00
joylink_fanyuhong
478261512c Merge remote-tracking branch 'origin/develop'
All checks were successful
master分支构建发布到公网服务器 / Build-Publish (push) Successful in 7m48s
2024-08-16 09:59:38 +08:00
joylink_fanyuhong
f66844bc27 实训调整 2024-08-15 15:35:43 +08:00
joylink_fanyuhong
364bd1e539 tms订阅调整 2024-06-28 14:04:27 +08:00
joylink_fanyuhong
0c4c5bebb0 运行图编制问题调整 2024-06-24 19:40:07 +08:00
joylink_fanyuhong
22a2e11517 发布信息提示 2024-06-24 18:43:00 +08:00
joylink_fanyuhong
4841ebdda7 TMS切换客户端调整 2024-06-24 18:20:30 +08:00
joylink_fanyuhong
0147f270f2 Merge remote-tracking branch 'origin/develop'
All checks were successful
master分支构建发布到公网服务器 / Build-Publish (push) Successful in 7m6s
2024-06-18 15:56:31 +08:00
joylink_fanyuhong
916bc645ed 添加运行图测试客户端 2024-06-18 15:36:57 +08:00
joylink_fanyuhong
37e0779d23 成都工业学院第三方新开页面关闭调整 2024-06-04 11:42:34 +08:00
joylink_fanyuhong
081d5bf630 成都工业学院登录调整 2024-06-04 11:17:37 +08:00
joylink_zhaoerwei
27418dc041 Squashed commit of the following:
All checks were successful
master分支构建发布到公网服务器 / Build-Publish (push) Successful in 10m24s
commit 1b0ddc2740
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Mon May 27 17:39:39 2024 +0800

    Squashed commit of the following:

    commit cef55a4c6b
    Author: joylink_zhaoerwei <Bob_Engineer@163.com>
    Date:   Mon May 27 17:09:01 2024 +0800

        三维url调整

    commit 869c86b94d
    Author: joylink_zhaoerwei <Bob_Engineer@163.com>
    Date:   Mon May 27 16:57:01 2024 +0800

        更改三维地址

    commit dc2165733e
    Author: joylink_zhaoerwei <Bob_Engineer@163.com>
    Date:   Mon May 27 16:33:48 2024 +0800

        场景添加三维场景,实训中可根据url打开三维场景(待测试)

commit 7d774db362
Merge: b66515eba 0c5bba7c0
Author: joylink_fanyuhong <18706759286@163.com>
Date:   Tue May 21 16:48:35 2024 +0800

    Merge remote-tracking branch 'origin/develop' into local-test

commit 0c5bba7c0f
Author: joylink_fanyuhong <18706759286@163.com>
Date:   Tue May 21 16:47:37 2024 +0800

    传输信号机调整

commit ef9165faa4
Author: joylink_fanyuhong <18706759286@163.com>
Date:   Thu May 16 15:43:56 2024 +0800

    third

commit ae74123f18
Author: joylink_fanyuhong <18706759286@163.com>
Date:   Wed May 8 09:17:37 2024 +0800

    成都工学院第三方登录调整

commit b1baeaabcd
Author: joylink_fanyuhong <18706759286@163.com>
Date:   Tue May 7 15:46:29 2024 +0800

    成都工业学院第三方登录调整

commit b66515ebad
Merge: 5cf57c4d2 91a8410dc
Author: joylink_fanyuhong <18706759286@163.com>
Date:   Wed Apr 24 11:01:32 2024 +0800

    Merge remote-tracking branch 'origin/develop' into local-test

commit 91a8410dc2
Author: joylink_fanyuhong <18706759286@163.com>
Date:   Wed Apr 24 10:58:02 2024 +0800

    道岔名称背景颜色更换透明色

commit 5cf57c4d2f
Merge: 5ca4f2be8 c97def5fc
Author: joylink_fanyuhong <18706759286@163.com>
Date:   Mon Apr 22 17:16:40 2024 +0800

    Merge remote-tracking branch 'origin/develop' into local-test

commit 5ca4f2be8d
Merge: 66a376298 31376bc22
Author: joylink_fanyuhong <18706759286@163.com>
Date:   Mon Apr 22 16:10:23 2024 +0800

    Merge remote-tracking branch 'origin/develop' into local-test

commit 66a3762987
Merge: 9dab09e4d 5be2cea1c
Author: joylink_fanyuhong <18706759286@163.com>
Date:   Mon Apr 22 15:53:54 2024 +0800

    Merge remote-tracking branch 'origin/develop' into local-test

commit 9dab09e4d0
Merge: b8f90509e dda44c870
Author: joylink_fanyuhong <18706759286@163.com>
Date:   Mon Apr 22 09:33:42 2024 +0800

    Merge remote-tracking branch 'origin/develop' into local-test

commit b8f90509eb
Merge: 26d9cc892 5548806ea
Author: joylink_fanyuhong <18706759286@163.com>
Date:   Sun Apr 21 17:51:33 2024 +0800

    Merge remote-tracking branch 'origin/develop' into local-test

commit 26d9cc892f
Merge: ce8d3f453 3fc31777a
Author: joylink_fanyuhong <18706759286@163.com>
Date:   Fri Apr 19 22:27:07 2024 +0800

    Merge remote-tracking branch 'origin/develop' into local-test

commit ce8d3f4531
Author: fan <fanyuhong@joylink.club>
Date:   Fri Apr 19 22:25:43 2024 +0800

    iscs退出仿真调整&iscs绘制地图调整

commit 98662ec177
Author: fan <fanyuhong@joylink.club>
Date:   Fri Apr 19 18:25:09 2024 +0800

    实时广播问题调整&注释iscs信号系统&stationNav换成车站名称&iscs点击修改mode
2024-05-27 18:06:53 +08:00
joylink_zhaoerwei
cef55a4c6b 三维url调整 2024-05-27 17:09:01 +08:00
joylink_zhaoerwei
869c86b94d 更改三维地址 2024-05-27 16:57:01 +08:00
joylink_zhaoerwei
dc2165733e 场景添加三维场景,实训中可根据url打开三维场景(待测试) 2024-05-27 16:33:48 +08:00
joylink_fanyuhong
0c5bba7c0f 传输信号机调整 2024-05-21 16:47:37 +08:00
joylink_fanyuhong
ef9165faa4 third 2024-05-16 15:43:56 +08:00
joylink_fanyuhong
ae74123f18 成都工学院第三方登录调整 2024-05-08 09:17:37 +08:00
joylink_fanyuhong
b1baeaabcd 成都工业学院第三方登录调整 2024-05-07 15:46:29 +08:00
joylink_fanyuhong
91a8410dc2 道岔名称背景颜色更换透明色 2024-04-24 11:00:44 +08:00
joylink_fanyuhong
c97def5fca 没有综合演练不显示联机
All checks were successful
master分支构建发布到公网服务器 / Build-Publish (push) Successful in 7m34s
2024-04-22 17:15:20 +08:00
joylink_fanyuhong
31376bc221 道岔钩锁调整
All checks were successful
master分支构建发布到公网服务器 / Build-Publish (push) Successful in 7m29s
2024-04-22 16:09:03 +08:00
joylink_fanyuhong
5be2cea1ca 列车pis和站台pis调整
All checks were successful
master分支构建发布到公网服务器 / Build-Publish (push) Successful in 7m30s
2024-04-22 15:52:58 +08:00
joylink_fanyuhong
dda44c870f pa客户端车站选择禁用
All checks were successful
master分支构建发布到公网服务器 / Build-Publish (push) Successful in 6m54s
2024-04-22 09:31:41 +08:00
joylink_fanyuhong
5548806ea5 pa客户端调整&标准线未开放调整
All checks were successful
master分支构建发布到公网服务器 / Build-Publish (push) Successful in 8m54s
2024-04-21 17:49:03 +08:00
fan
3fc31777a2 iscs退出仿真调整&iscs绘制地图调整
All checks were successful
master分支构建发布到公网服务器 / Build-Publish (push) Successful in 14m22s
2024-04-19 22:26:30 +08:00
fan
d5eb68ea1c 实时广播问题调整&注释iscs信号系统&stationNav换成车站名称&iscs点击修改mode 2024-04-19 20:10:06 +08:00
fan
bd10b05228 iscs调整
All checks were successful
local-test分支构建发布到本地服务器 / Build-Publish (push) Successful in 8m28s
2024-04-17 17:08:47 +08:00
joylink_fanyuhong
2b13ff0a5a 提示调整 2024-04-11 19:19:19 +08:00
joylink_fanyuhong
5212b6417a 推出考试销毁提交事件 2024-04-11 19:04:50 +08:00
joylink_fanyuhong
5666af96cc createId为空删除参数 2024-04-11 18:17:14 +08:00
fan
6b3d83979d 接口调整 2024-04-11 11:45:51 +08:00
fan
a21e880a18 考试调整 2024-04-11 11:20:28 +08:00
fan
27129e8b21 试卷调整 2024-04-11 11:10:03 +08:00
fan
6c3b06c4a0 考试管理调整 2024-04-10 14:33:10 +08:00
joylink_fanyuhong
d1f8927355 南京二信号机故障调整again 2024-04-08 16:39:33 +08:00
joylink_fanyuhong
f1e6121a8f 南京二信号机故障调整&南京二进路排列方式调整 2024-04-08 16:05:24 +08:00
joylink_fanyuhong
8f14259db7 客户端调整
All checks were successful
local-test分支构建发布到本地服务器 / Build-Publish (push) Successful in 6m38s
master分支构建发布到公网服务器 / Build-Publish (push) Successful in 6m54s
2024-03-29 11:14:08 +08:00
joylink_fanyuhong
2c79bd847f subTypeParam参数调整 2024-03-27 13:38:05 +08:00
db8f007ca8 修改任务及步骤名称
All checks were successful
local-test分支构建发布到本地服务器 / Build-Publish (push) Successful in 8m29s
master分支构建发布到公网服务器 / Build-Publish (push) Successful in 7m29s
2024-03-26 19:44:28 +08:00
8d4e0d2a89 修改yaml格式错误(tab换成空格)
All checks were successful
local-test分支构建发布到本地服务器 / Build-Publish (push) Successful in 7m20s
2024-03-26 17:57:39 +08:00
abdce5a30d 修改工作流文件名
添加公网构建发布工作流
2024-03-26 17:31:03 +08:00
86aaa5d5b1 测试yarn build
local-test分支构建发布工作流
2024-03-26 17:13:36 +08:00
joylink_zhaoerwei
06aef16a5d Squashed commit of the following:
commit 6e6737a7c6
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Thu Mar 21 16:57:58 2024 +0800

    播放视频调整
2024-03-21 17:28:59 +08:00
joylink_fanyuhong
506fcd481b Merge remote-tracking branch 'origin/test' 2024-03-12 11:16:44 +08:00
joylink_fanyuhong
7971fce1b6 url调整 2024-03-12 11:16:26 +08:00
joylink_fanyuhong
fdaf9d81f8 Merge remote-tracking branch 'origin/test' 2024-03-12 10:34:45 +08:00
joylink_fanyuhong
29d5474e40 Merge branch 'master' of https://git.code.tencent.com/lian-cbtc/jl-client 2024-03-12 10:33:51 +08:00
joylink_fanyuhong
720546f99b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2024-03-12 10:31:36 +08:00
joylink_fanyuhong
21e5b5b659 对象校验调整&&客户端初始化调整 2024-03-12 10:31:16 +08:00
joylink_zhaoerwei
0b92511070 修改表格颜色 2024-03-12 09:52:57 +08:00
joylink_fanyuhong
b57ea909b4 pa调整 2024-03-12 09:18:34 +08:00
joylink_fanyuhong
991121f9d8 pa调整 2024-03-11 18:59:56 +08:00
joylink_fanyuhong
f134ea6b5f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2024-03-11 18:05:05 +08:00
joylink_fanyuhong
2b3b7c189d pa放开语音播放 2024-03-11 18:04:39 +08:00
joylink_zhaoerwei
51e700a2ad 视频播放调整 2024-03-11 17:30:28 +08:00
joylink_zhaoerwei
a763880dac 微调 2024-03-11 16:28:53 +08:00
joylink_zhaoerwei
f4e0552a61 场景视频的上传编辑与播放 2024-03-11 16:03:35 +08:00
joylink_fanyuhong
e9facb70f5 调整:新增pa客戶端 2024-03-11 15:45:29 +08:00
joylink_fanyuhong
71ed5445c3 调整:iscs进入加载动画出不来 2024-03-11 10:44:12 +08:00
joylink_fanyuhong
f0cea7706c 赛季内容编辑器调整 2024-03-11 09:57:48 +08:00
fan
8a15cd0d1c Merge remote-tracking branch 'origin/test' 2024-03-08 19:05:37 +08:00
fan
bb8678e486 多选调整 2024-03-08 19:04:19 +08:00
fan
aeb581dced Merge remote-tracking branch 'origin/test' 2024-03-08 15:46:16 +08:00
fan
ee36444dc7 多选提示调整 2024-03-08 15:41:48 +08:00
fan
5ea69acaf8 Merge remote-tracking branch 'origin/test' 2024-03-08 11:29:24 +08:00
fan
b2989b0eb5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2024-03-08 10:56:05 +08:00
fan
ceaf44950d 分值调整 2024-03-08 10:55:56 +08:00
fan
6dbe1dc14c Merge remote-tracking branch 'origin/test' 2024-03-08 09:33:28 +08:00
fan
7b07b17e13 Merge remote-tracking branch 'origin/test' 2024-03-08 09:33:09 +08:00
joylink_zhaoerwei
a1ed6248bf 更换试卷菜单组件 2024-03-07 20:31:30 +08:00
fan
c7a622eadf Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2024-03-07 18:00:44 +08:00
fan
2134f027e7 理论题调整 2024-03-07 18:00:34 +08:00
joylink_zhaoerwei
bb8e6938a6 微调 2024-03-07 17:12:06 +08:00
joylink_zhaoerwei
d17dc79e24 大赛第一个页面 2024-03-07 15:12:01 +08:00
fan
68584fd5fd 赛季内容编辑 2024-03-07 14:42:35 +08:00
fan
c3bb3266a4 任务树调整 2024-03-07 10:39:22 +08:00
fan
6501cb0d1b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2024-03-07 10:15:52 +08:00
fan
89c417ae41 发布至竞赛调整 2024-03-07 10:15:41 +08:00
fan
b0ad026724 仿真成员管理调整 2024-03-07 10:15:06 +08:00
joylink_zhaoerwei
db1c5070db 待调整,先可用 2024-03-07 08:43:53 +08:00
joylink_zhaoerwei
f220213f38 样式测试 2024-03-06 18:11:05 +08:00
fan
bb453012c8 Merge remote-tracking branch 'origin/test' 2024-03-06 09:41:39 +08:00
fan
e5c38220a2 实训调整 2024-03-06 09:40:47 +08:00
fan
cf94b2570d Merge remote-tracking branch 'origin/test' 2024-03-05 15:04:26 +08:00
fan
ce1be2d1c8 取消发送语音后处理实训步骤校验 2024-03-05 15:03:57 +08:00
fan
2ae715a936 Merge remote-tracking branch 'origin/test' 2024-03-05 13:53:17 +08:00
fan
3e5996aee4 Merge remote-tracking branch 'origin/test' 2024-03-05 13:52:28 +08:00
joylink_zhaoerwei
7de8989806 任务页修改 2024-03-05 13:44:35 +08:00
fan
bdec361003 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2024-03-05 13:38:12 +08:00
fan
7e7b238c34 加载场景判断调整 2024-03-05 13:38:00 +08:00
joylink_zhaoerwei
f06d766ffa 只显示有场景的得分 2024-03-05 10:17:14 +08:00
fan
4495db6d77 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2024-03-05 09:42:39 +08:00
fan
35c6d3e19f 分值显示调整 2024-03-05 09:42:25 +08:00
joylink_zhaoerwei
670e3c9b12 任务树加滚动条 2024-03-04 18:46:40 +08:00
joylink_zhaoerwei
47d6193733 展示任务树 2024-03-04 18:08:55 +08:00
fan
8cf496c2ae Merge remote-tracking branch 'origin/test' 2024-03-04 17:05:56 +08:00
fan
0444ef9c46 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2024-03-04 16:55:43 +08:00
fan
3d43eafa14 实训编制问题调整 2024-03-04 16:55:33 +08:00
joylink_zhaoerwei
a1383c9b7a 去掉报警 2024-03-04 16:44:33 +08:00
fan
5dab51356d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2024-03-04 16:00:19 +08:00
fan
f08d9e0e8e 竞赛流程调整 2024-03-04 15:59:58 +08:00
joylink_zhaoerwei
aaa0c83514 打分去掉总分 2024-03-04 14:42:09 +08:00
joylink_zhaoerwei
899df2a574 打分页面 2024-03-04 14:30:47 +08:00
fan
6181fda6c6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2024-03-04 14:26:56 +08:00
fan
303837765a 竞赛流程调整暂提 2024-03-04 14:26:45 +08:00
joylink_zhaoerwei
41e46a983e 增加竞赛开始接口 2024-03-04 12:15:57 +08:00
fan
31f1192de0 Merge remote-tracking branch 'origin/test' 2024-03-04 09:20:30 +08:00
joylink_zhaoerwei
c60127798c 试卷和任务增加pagesize=999 2024-03-04 09:13:31 +08:00
joylink_zhaoerwei
22457f7f49 模块名字微调 2024-03-01 17:04:18 +08:00
fan
e29dc3860e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2024-03-01 16:58:47 +08:00
fan
cf421fe32e 维护评分规则添加生成id 2024-03-01 16:58:30 +08:00
joylink_zhaoerwei
1c80c5f56a 微调 2024-03-01 16:46:25 +08:00
fan
ff33bec539 维护评分规则id1 2024-03-01 16:45:06 +08:00
fan
1aca5f00ab Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2024-03-01 16:44:20 +08:00
fan
18860dd3e5 维护评分规则id 2024-03-01 16:44:11 +08:00
joylink_zhaoerwei
e1bdbff6ac 微调 2024-03-01 16:29:17 +08:00
joylink_zhaoerwei
ccaefdeb5e 第一个页面调整 2024-03-01 16:20:10 +08:00
fan
7810cfc993 删除日志 2024-03-01 15:32:29 +08:00
fan
e6e2b7567f 评分规则0分不展示 2024-03-01 15:28:38 +08:00
fan
44361f14f6 loading位置调整 2024-03-01 15:25:30 +08:00
fan
a1f2fab981 评分规则调整1 2024-03-01 15:23:02 +08:00
fan
f5dcc979bf 评分规则调整 2024-03-01 15:21:32 +08:00
fan
01b95a3fd4 添加二次确认 2024-03-01 14:45:15 +08:00
fan
c1376ddf8f 大赛训练产品调整 2024-03-01 14:37:54 +08:00
fan
77713154d0 大赛训练产品调整暂提 2024-03-01 14:17:50 +08:00
fan
a69657c8e6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2024-03-01 13:53:30 +08:00
fan
8b92ce23e4 大赛训练产品调整暂提 2024-03-01 13:53:07 +08:00
joylink_zhaoerwei
e554cda023 增加打分结算路由 2024-03-01 13:18:44 +08:00
joylink_zhaoerwei
0478838734 微调 2024-03-01 11:11:17 +08:00
joylink_zhaoerwei
65b77a3b60 大赛训练第一个页面 2024-03-01 11:08:05 +08:00
joylink_zhaoerwei
a36b8e7c22 新建试卷去掉组别 2024-03-01 10:04:35 +08:00
joylink_zhaoerwei
c2885cb0cc 新建试卷去掉组别 2024-03-01 10:01:54 +08:00
fan
126507f87f 大赛训练产品调整暂提 2024-02-29 18:01:55 +08:00
fan
13aefab82b Merge remote-tracking branch 'origin/test' 2024-02-29 10:42:02 +08:00
fan
32866bab90 大赛训练产品调整暂提 2024-02-29 10:40:22 +08:00
fan
5016a5b175 大赛训练产品调整添加返回 2024-02-28 16:02:15 +08:00
fan
976292fc4c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2024-02-28 15:58:59 +08:00
fan
d105130eae 大赛训练产品调整new 2024-02-28 15:58:51 +08:00
joylink_zhaoerwei
2d856bc24e 仿真试卷页 2024-02-28 15:57:07 +08:00
fan
b1766b0ac5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2024-02-28 15:33:59 +08:00
fan
9e1d58f972 大赛训练产品调整 2024-02-28 15:33:41 +08:00
joylink_zhaoerwei
103a63494e 模块绑定评分表 2024-02-28 14:18:05 +08:00
joylink_zhaoerwei
dd4a338a4c 竞赛第一个页面壳提交 2024-02-28 13:24:13 +08:00
fan
fc554ce855 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2024-02-28 10:04:38 +08:00
fan
5ed4f1e3dc 大赛训练产品路由权限调整 2024-02-28 10:04:26 +08:00
joylink_zhaoerwei
2063900e40 任务选择的顺序 2024-02-27 18:18:01 +08:00
joylink_zhaoerwei
87a86e1de0 加分钟和阻止刷新 2024-02-27 16:52:49 +08:00
joylink_zhaoerwei
7cc8b14555 模块评分非必填 2024-02-27 15:46:03 +08:00
joylink_zhaoerwei
f47f504ada 去掉试卷是否支持拷贝 2024-02-27 15:34:59 +08:00
joylink_zhaoerwei
f42fc8a17c 任务和试卷调整 2024-02-27 14:48:44 +08:00
fan
6912d01d2c 233环境https=>http 2024-02-27 14:21:01 +08:00
fan
cc28f00377 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2024-02-27 11:13:01 +08:00
fan
dc68ba2397 竞赛产品调整暂提 2024-02-27 11:12:04 +08:00
joylink_zhaoerwei
2dd7c48786 微调 2024-02-27 10:08:56 +08:00
fan
508afb9954 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2024-02-27 08:46:32 +08:00
fan
2f767d7d31 规则详情注释场景相关内容 2024-02-27 08:46:07 +08:00
joylink_zhaoerwei
7c68ade822 竞赛任务和模块调整 2024-02-26 22:20:22 +08:00
fan
b0a93298cb 规则详情返回空值处理 2024-02-26 15:38:50 +08:00
joylink_fanyuhong
b0461baca0 竞赛调整 2024-02-23 17:02:02 +08:00
joylink_fanyuhong
0dd4837960 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2024-02-23 14:42:40 +08:00
joylink_fanyuhong
37d4739ea9 竞赛问题调整new 2024-02-23 14:42:24 +08:00
joylink_zhaoerwei
66bfacadb6 竞赛任务调整 2024-02-23 12:14:23 +08:00
joylink_fanyuhong
9949210f89 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2024-02-23 11:22:25 +08:00
joylink_fanyuhong
6071755a23 竞赛问题调整 2024-02-23 11:22:13 +08:00
joylink_zhaoerwei
de15e693e9 微调 2024-02-23 10:06:49 +08:00
joylink_zhaoerwei
fefbf3ce83 微调 2024-02-23 09:44:38 +08:00
joylink_zhaoerwei
ad8c8de231 微调,待测试接口 2024-02-22 17:56:55 +08:00
joylink_zhaoerwei
f908c8db04 去掉mock 2024-02-22 17:19:06 +08:00
joylink_zhaoerwei
9d2420920c 竞赛任务备用 2024-02-22 17:14:55 +08:00
joylink_fanyuhong
d77e872858 merge 2024-02-22 11:33:03 +08:00
joylink_fanyuhong
d9ba49392d 竞赛调整暂提 2024-02-22 11:10:39 +08:00
joylink_zhaoerwei
8c59b44de1 竞赛模块代码备用 2024-02-21 16:38:20 +08:00
joylink_zhaoerwei
e48289b953 试卷管理代码备用 2024-02-21 10:53:44 +08:00
joylink_zhaoerwei
757f661a22 竞赛任务api提交 2024-02-20 18:16:50 +08:00
joylink_fanyuhong
0be7c03f81 竞赛调整 2024-02-20 09:23:30 +08:00
joylink_fanyuhong
47c5168e4b Merge remote-tracking branch 'origin/test' 2024-02-19 13:28:54 +08:00
joylink_fanyuhong
5564e354b4 url调整 2024-02-19 13:23:20 +08:00
joylink_fanyuhong
c769dcf49a 3.233=>33.233 2024-02-19 11:04:05 +08:00
joylink_zhaoerwei
0585807c1e 增加竞赛相关数据管理路由 2024-01-31 16:22:03 +08:00
fan
4804cebfcd Merge remote-tracking branch 'origin/test' 2024-01-16 09:36:39 +08:00
fan
d8219cc2eb 联系方式展示调整 2024-01-16 09:35:55 +08:00
fan
5e38fa05e2 成都工学院第二个项目增加叶佳提供小车操作 2023-12-29 10:51:02 +08:00
fan
ab31f2cefa 语音前缀调整 2023-12-19 16:15:33 +08:00
fan
933a1367c4 还原pis语音播放 2023-12-19 15:40:26 +08:00
fan
28dc2c3739 设备配置关闭时清值 2023-12-19 13:09:56 +08:00
fan
1aaa427dac tms&pis可视化配置 2023-12-19 11:21:24 +08:00
fan
388f4593f1 浙大网新操作调整1207 2023-12-07 17:45:44 +08:00
fan
6e477bef89 浙大网新操作调整 2023-12-06 17:23:47 +08:00
fan
72f730aaa6 浙大网新操作调整
(cherry picked from commit 1ecab822f4)
2023-12-05 11:23:35 +08:00
fan
1ecab822f4 浙大网新操作调整 2023-12-05 10:34:14 +08:00
fan
a9f18f6d61 Merge remote-tracking branch 'origin/test' 2023-12-04 17:55:44 +08:00
fan
241dbcd36f 浙大网新操作调整(控制权操作) 2023-12-04 17:55:20 +08:00
fan
3cb71dce37 浙大网新操作调整(控制权显示&请求中控调整&列车停车) 2023-12-04 16:35:54 +08:00
fan
9d039b3f58 福州一号线新增列车故障操作停车 2023-12-04 10:32:09 +08:00
fan
bd310dbc28 实训管理和项目设备登录调整 2023-12-01 13:27:31 +08:00
fan
3fcf066e66 设备配置调整 2023-12-01 09:28:18 +08:00
fan
c33c50005c Merge remote-tracking branch 'origin/test' 2023-11-30 17:54:51 +08:00
Yuan
29197c56ee tms页面数据修改 2023-11-30 15:55:14 +08:00
fan
ef230ae278 运行环境标注 2023-11-30 14:13:42 +08:00
fan
90a87a73e1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2023-11-30 14:12:06 +08:00
fan
d89b457c78 运行环境标注 2023-11-30 14:11:45 +08:00
fan
111df40c91 运行环境标注 2023-11-30 14:11:31 +08:00
dong
6d2dd68108 语言来电铃声,语言其他BUG 2023-11-30 10:51:51 +08:00
fan
81c1806603 列车操作增加受电弓操作 2023-11-30 10:00:42 +08:00
fan
c0bf588334 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2023-11-30 09:41:55 +08:00
fan
cf2801288f 国赛校验失败不关闭dialog处理 2023-11-30 09:41:22 +08:00
dong
8e68e6e974 语音提示音改为之前电话铃声、语音播完再播另一个、其他语言问题 2023-11-29 17:24:46 +08:00
dong
a95c91f640 收到新消息添加铃声提醒、当前会话接收到新语音直接播放 2023-11-29 10:15:26 +08:00
fan
7094bca4f4 地车通信&受电弓操作 2023-11-24 16:29:22 +08:00
fan
ed9340f261 电力调度=》工电调度 2023-11-24 14:26:28 +08:00
fan
42cb54bf72 实训编制预览调整 2023-11-24 13:17:43 +08:00
fan
a981965452 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2023-11-23 14:26:21 +08:00
fan
bf54424109 调度大赛控制权调整 2023-11-23 14:25:56 +08:00
Yuan
05788794cd bugfix - 信号机站控操作 2023-11-22 17:14:57 +08:00
Yuan
c6c3a3a377 bugfix - 站台扣车操作菜单 2023-11-22 14:47:50 +08:00
Yuan
e29028ec0e bugfix - 站控信号机操作 2023-11-22 14:17:48 +08:00
Yuan
c513a3e80b bugfix - ZCControl高亮问题 2023-11-22 14:11:17 +08:00
Yuan
9b2db3957e 站控允许信号机操作 2023-11-22 13:28:50 +08:00
Yuan
c2298f9995 站控允许排列进路 2023-11-22 11:31:17 +08:00
fan
74bfcf49f1 成都工学院添加双icon(调换透明icon) 2023-11-16 15:14:21 +08:00
fan
56eea551fb Merge remote-tracking branch 'origin/test' 2023-11-16 15:08:19 +08:00
fan
19fde5c7fc 成都工学院添加双icon 2023-11-16 15:07:43 +08:00
fan
8a3670f51d 国赛列车操作调整 2023-11-15 15:04:35 +08:00
fan
5aefd0dea0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2023-11-13 17:24:46 +08:00
fan
af3b4b1d97 编辑设备配置NCC,OCC角色显示 2023-11-13 17:24:31 +08:00
Yuan
ad6d96890c tms页面放大 2023-11-13 10:38:30 +08:00
Yuan
8020075b98 tms页面微调 2023-11-10 17:22:37 +08:00
Yuan
dd4bbab000 tms 2023-11-10 10:55:42 +08:00
Yuan
907a88c6ea tms页面数据 2023-11-09 14:57:31 +08:00
fan
0b688dea64 tms客户端新增 2023-11-08 09:57:34 +08:00
Yuan
2bfdb557d1 tms页面 2023-11-07 17:24:15 +08:00
Yuan
f62f8ff273 Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into test 2023-11-03 17:37:57 +08:00
Yuan
ae9748a649 tms页面 2023-11-03 17:37:52 +08:00
fan
007548623d Revert "乘客信息发布系统拆分"
This reverts commit 4c67af284c.
2023-11-02 17:02:16 +08:00
fan
285b40091f 乘客信息发布系统拆分
(cherry picked from commit 4c67af284c)
2023-11-02 17:00:09 +08:00
fan
4c67af284c 乘客信息发布系统拆分 2023-11-02 16:59:37 +08:00
fan
684f32c481 Merge remote-tracking branch 'origin/test' 2023-10-31 17:51:57 +08:00
fan
597d4ea7d1 南京二ATP级别灯柱颜色修改&CR2操作完毕交互调整 2023-10-31 16:46:29 +08:00
fan
0867248df3 驾驶方式删除“无”&南京二增加NRM模式和停车 2023-10-30 17:13:35 +08:00
fan
313f716613 岔芯边缘道岔区段关联道岔导致报错调整 2023-10-30 16:26:58 +08:00
fan
c98c50f401 进路增加单列车进路属性&取消进路状态变化更新执行通知 2023-10-30 09:50:56 +08:00
fan
a5d260a340 加载备用车初始化调整 2023-10-26 16:23:33 +08:00
fan
4ba24892fc 南京二叶老师问题调整1 2023-10-26 15:40:25 +08:00
fan
1c76b26541 南京二叶老师问题调整 2023-10-26 13:10:49 +08:00
fan
2ef158851d Merge remote-tracking branch 'origin/test' 2023-10-25 14:05:58 +08:00
fan
e795ba1573 换端指令调整 2023-10-25 13:31:45 +08:00
fan
f9c47cbac6 Merge remote-tracking branch 'origin/test' 2023-10-25 10:36:11 +08:00
fan
efbd29a70a 南京二号线RM调整 2023-10-25 10:35:07 +08:00
fan
8fbddfe40d Merge remote-tracking branch 'origin/test' 2023-10-23 16:42:09 +08:00
fan
ca183eed7e 南京二号线哈尔滨线早晚点显示调整 2023-10-23 16:41:09 +08:00
fan
d9b03b30f6 仿真数据异常loading不关闭问题修复 2023-10-10 15:56:21 +08:00
910082305d Merge branch 'test'
# Conflicts:
#	src/views/newMap/display/terminals/index.vue
2023-09-27 18:11:19 +08:00
fan
16d9ee72bb 实训编制调整 2023-09-27 18:02:34 +08:00
fan
90d52176f2 添加仿真成员角色 2023-09-27 17:32:49 +08:00
fan
82e67c69e6 memberId丢失判定 2023-09-27 16:22:32 +08:00
fan
f01c445b25 实训问题修复
(cherry picked from commit 0598da9a2d)
2023-09-27 15:47:09 +08:00
fan
0598da9a2d 实训问题修复 2023-09-27 15:46:10 +08:00
fan
ac096dd663 Merge remote-tracking branch 'origin/test' 2023-09-20 14:51:28 +08:00
fan
fbdb48dc08 成都三号线现地仿真控制权切换问题调整 2023-09-20 14:51:03 +08:00
fan
2d7cdff431 错误数据跳过 2023-08-29 16:43:32 +08:00
fan
9b3cfdab78 运行图显示调整 2023-08-21 17:25:33 +08:00
fan
5efcec96ec bugfix:双击修改车次号 2023-08-18 13:50:35 +08:00
fan
2b035003e2 bugfix:打开运行图预览没有数据 2023-08-18 10:51:09 +08:00
fan
dd6f8bace4 列车操作速度显示调整 2023-08-17 13:21:53 +08:00
fan
cad848ce8e 自动运行 添加 2023-08-17 10:39:37 +08:00
fan
9bc7126509 登录路径处理调整 2023-08-16 17:50:39 +08:00
fan
b9830714c7 登录路径处理调整 2023-08-16 16:17:52 +08:00
fan
ae8c202dbe 南工院增加列车操作 2023-08-14 10:07:07 +08:00
fan
aea0436cbc 道岔生成逻辑调整 2023-08-09 17:05:03 +08:00
fan
acb8c3455f 车辆段放开故障操作 2023-07-28 11:11:06 +08:00
fan
52a5a78861 标准线调整 2023-07-13 10:46:07 +08:00
fan
e08677eabe 成员一键生成 2023-07-06 09:55:25 +08:00
fan
3dd44c3243 设备登录退出路径丢失调整 2023-07-05 10:56:02 +08:00
fan
ee58c53b83 Merge remote-tracking branch 'origin/test' 2023-06-12 10:13:52 +08:00
fan
0600abc0c9 实训室功能隐藏 2023-06-12 10:03:57 +08:00
fan
8e34a0f267 Merge remote-tracking branch 'origin/test' 2023-06-08 13:27:05 +08:00
fan
a8e2c9ef3b 注册找回账号手机号校验格式调整 2023-06-08 10:59:50 +08:00
fan
6b18628b7c Merge remote-tracking branch 'origin/test' 2023-06-07 18:01:28 +08:00
fan
d232546e8c 新增宁波一号线特殊线路 2023-06-07 09:38:15 +08:00
fan
f20378c4b4 福州一号线&宁波一号线新增列车连挂操作 2023-06-06 17:21:01 +08:00
fan
42779dc952 Merge remote-tracking branch 'origin/test' 2023-06-06 10:09:00 +08:00
fan
9aab60fe9c 区域选择未初始化控制人调整 2023-06-06 10:07:31 +08:00
fan
e1f35c56e9 项目配置添加删除logo功能 2023-06-06 09:53:50 +08:00
fan
92e3e5db31 福州一号线道岔失表调整 2023-06-05 14:23:07 +08:00
fan
228b4aadc3 列车操作调整 2023-06-02 17:32:58 +08:00
fan
0df4ffdcf6 登录调整 2023-06-02 16:54:05 +08:00
fan
b1c0ef11a8 设备登录配置调整&列车操作列车图标反转调整 2023-06-02 14:21:29 +08:00
fan
3855087abd Merge remote-tracking branch 'origin/test' 2023-06-01 18:15:18 +08:00
fan
928b380811 大铁线路二注释新建计划车&新增故障操作添加备用车 2023-06-01 15:43:46 +08:00
fan
06ec5fe8e1 项目登录客户端选择调整 2023-06-01 10:21:24 +08:00
fan
0f22d3c818 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2023-06-01 09:40:58 +08:00
fan
4471a3000c 设备登录query错误数据调整 2023-06-01 09:39:43 +08:00
dong
50cf3a826d 薄册输入时间日期实训调整 2023-05-31 17:39:02 +08:00
dong
61915cd583 实训编制时添加跳转到当前步骤功能 2023-05-31 14:22:05 +08:00
dong
252d3d69e4 会话群创建添加实训操作 2023-05-31 14:01:25 +08:00
fan
5ad0421991 增加错误日志 2023-05-31 10:24:16 +08:00
fan
228044b4c9 多人实训调整 2023-05-31 09:46:54 +08:00
fan
ca329a4db7 Merge remote-tracking branch 'origin/test' 2023-05-30 17:55:25 +08:00
fan
f13252ff27 34234124 2023-05-30 17:54:40 +08:00
fan
b863211cca Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2023-05-30 17:07:59 +08:00
fan
06c6cb26c6 应急调度按钮调整 2023-05-30 17:07:33 +08:00
fan
ad105021fd v-if=>v-show防止单客户端未切换错误 2023-05-30 16:52:52 +08:00
dong
b85f8a5011 IBP盘计轴预复位鼠标左键接口迟滞,保证实训操作顺序 2023-05-30 16:31:03 +08:00
fan
88d09f2645 设置限速灰显判断调整 2023-05-30 16:00:04 +08:00
fan
62e2c3978f 添加赛的专用配置 2023-05-30 15:41:07 +08:00
fan
d4f919b54a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2023-05-30 11:25:02 +08:00
fan
268febaf7f 宁波一号线道岔钩锁=》手摇道岔钩锁 2023-05-30 11:24:35 +08:00
fan
57f65d45e3 添加草稿ibp管理 2023-05-30 11:23:52 +08:00
dong
8449d731bd 新会话调整 2023-05-30 10:58:36 +08:00
fan
ac3457efbd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2023-05-30 10:21:21 +08:00
fan
b2ce52612f 宁波一密码添加提示 2023-05-30 10:20:36 +08:00
fan
177bb78883 宁波一号线计轴复位区段筛选调整&车站字体大小判断调整&注释宁波一号线车站上电解锁 2023-05-30 09:50:51 +08:00
dong
9d193dcd66 实训的导入和导出 2023-05-29 18:42:34 +08:00
fan
80007a7521 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2023-05-29 16:28:14 +08:00
fan
a5849d9dd1 宁波一号线连锁故障,上电解锁功能增加 2023-05-29 16:27:56 +08:00
dong
a54a4d0d3c 打开聊天弹窗去掉实训校验 2023-05-29 13:57:05 +08:00
dong
77f644fc28 代码调整 2023-05-29 10:58:53 +08:00
dong
ef3c56b696 仿真角色调整 2023-05-29 10:49:59 +08:00
fan
a519447c62 获取个人信息接口更换 2023-05-29 10:32:48 +08:00
fan
94fa725cc7 标准线福州一新增连锁故障&上电解锁 2023-05-29 10:24:49 +08:00
fan
e32d8f9b6b Merge remote-tracking branch 'origin/test' 2023-05-26 17:59:19 +08:00
fan
7ebc8dbf1e 第三方登录新窗口打开 2023-05-26 17:58:52 +08:00
fan
23975cd271 Merge remote-tracking branch 'origin/test' 2023-05-26 17:43:20 +08:00
fan
adf75ebc1a 继续仿真获取project错误 2023-05-26 17:42:54 +08:00
fan
f4e27a6e31 Merge remote-tracking branch 'origin/test' 2023-05-26 17:18:59 +08:00
fan
3d63abcdbd 第三方登录还原项目判断 2023-05-26 17:18:40 +08:00
fan
4424137da9 Merge remote-tracking branch 'origin/test' 2023-05-26 15:56:44 +08:00
fan
18b5780415 实训预览不在前端切换成员 2023-05-26 15:56:22 +08:00
fan
ac82fad041 Merge remote-tracking branch 'origin/test' 2023-05-26 15:34:23 +08:00
fan
edcdd8989f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2023-05-26 15:32:54 +08:00
fan
688c7c3315 版权展示调整 2023-05-26 15:31:11 +08:00
dong
501dd0b181 新会话调整 2023-05-26 13:50:52 +08:00
fan
6fd27205fa Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2023-05-26 09:48:50 +08:00
fan
2bd6088bd3 运行图编辑一直加载问题调整 2023-05-26 09:48:23 +08:00
dong
6d18d374a4 新会话调整 2023-05-25 15:09:02 +08:00
dong
94c8f30305 修改仿真重新进入后之前的角色没有清除 2023-05-25 14:23:56 +08:00
dong
8151a465ab 新会话在初始化后重新获取会话列表 2023-05-25 13:46:01 +08:00
dong
13b63988dd 仿真成员界面样式优化 2023-05-25 10:31:57 +08:00
fd5af534af Merge remote-tracking branch 'origin/test' 2023-05-24 19:19:48 +08:00
dong
9426ece04f 仿真角色统一 2023-05-24 18:34:38 +08:00
joylink_zhaoerwei
8256758a7a 微调--NCC消息判断 2023-05-24 18:21:49 +08:00
joylink_zhaoerwei
dd4f2a2fe6 微调 2023-05-24 17:46:01 +08:00
joylink_zhaoerwei
9cde1a5487 微调 2023-05-24 17:28:03 +08:00
joylink_zhaoerwei
82359d5a4c 微调 2023-05-24 17:04:45 +08:00
c90da32501 Merge remote-tracking branch 'origin/test' into test 2023-05-24 17:00:41 +08:00
f85fba0b5d 处理仿真销毁后创建者没有退出页面问题 -by fan 2023-05-24 17:00:27 +08:00
joylink_zhaoerwei
5874e8d81f 微调 2023-05-24 15:44:05 +08:00
joylink_zhaoerwei
82b4d671b2 告警分页 2023-05-24 15:15:35 +08:00
fan
79b8d24c6a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2023-05-24 14:25:53 +08:00
fan
e29700534a 派班工作站获取列车调整 2023-05-24 14:25:22 +08:00
joylink_zhaoerwei
1c31517588 微调 2023-05-24 14:00:51 +08:00
joylink_zhaoerwei
aa1e6ca4c7 微调 2023-05-24 13:56:43 +08:00
joylink_zhaoerwei
4e2a36bcb8 去分组 2023-05-24 13:52:07 +08:00
joylink_zhaoerwei
01471bba12 故障报警初提交 2023-05-24 11:25:54 +08:00
fan
fa6883fe8f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2023-05-24 11:13:19 +08:00
fan
bab7cd6c40 注释调整 2023-05-24 11:12:59 +08:00
fan
43db0d138f 项目配置完善全部迁移为配置项 2023-05-24 11:04:39 +08:00
dong
404d028585 新会话调整 2023-05-24 10:55:27 +08:00
dong
248f2a767a 新会话调整 2023-05-23 18:11:28 +08:00
dong
6c8ae4f763 角色信息调度名称修改 2023-05-23 17:38:23 +08:00
fan
341e0ff829 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2023-05-23 16:59:59 +08:00
fan
ca4c184e14 实训设计限制新标签页打开客户端 2023-05-23 16:59:43 +08:00
dong
f1a7f09cc7 添加角色OCC_DISPATCHER信息调度 2023-05-23 16:42:31 +08:00
dong
ac1ef8e5a8 线路数据管理-生成实训 2023-05-23 15:54:33 +08:00
fan
88b9ac889c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2023-05-23 15:50:56 +08:00
fan
9acd8a8eba 生成客户端调整+覆盖生成快捷方式 2023-05-23 15:50:40 +08:00
dong
fa906225a7 新会话调整 2023-05-23 15:02:26 +08:00
dong
642a09f80c 新会话优化调整 2023-05-23 14:13:02 +08:00
fan
21774b94a3 客户端跳转判断调整 2023-05-23 13:27:41 +08:00
fan
94a3693337 仿真状态判断调整 2023-05-23 11:27:36 +08:00
joylink_zhaoerwei
228c06e61d 微调 2023-05-22 17:55:41 +08:00
fan
1501a75ad3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2023-05-22 17:16:53 +08:00
fan
fb351cd75d 新增推出仿真成员处理 2023-05-22 17:16:38 +08:00
joylink_zhaoerwei
4449a25c5b 去除警告计数 2023-05-22 16:47:09 +08:00
dong
1ee0cad514 新会话调整 2023-05-22 16:43:49 +08:00
dong
0a2cdb3257 新会话调整 2023-05-22 16:35:20 +08:00
fan
83ee31034b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2023-05-22 16:07:08 +08:00
fan
ae3c2ea269 统计信息单位调整 2023-05-22 16:06:34 +08:00
dong
fe6a835873 新会话调整 2023-05-22 15:51:56 +08:00
dong
ae4e6b652c 私聊实训功能 2023-05-22 14:41:35 +08:00
fan
e30494d404 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2023-05-22 13:47:32 +08:00
fan
545440b7e7 统计信息调整 2023-05-22 13:47:09 +08:00
fan
06e4bb93c7 Revert "Revert "修改新会话实训问题""
This reverts commit 7fa5b1d62e.
2023-05-22 11:18:37 +08:00
fan
8a966ac5ae Revert "Revert "群消息已读""
This reverts commit 204aef15
2023-05-22 11:18:16 +08:00
fan
5eb2a3f80c Revert "Revert "NCC行调名称调整成NCC调度""
This reverts commit a7b0609389.
2023-05-22 11:18:02 +08:00
fan
e1bf3dbcea Revert "Revert "添加角色NCC行调""
This reverts commit 5c72107b
2023-05-22 11:16:59 +08:00
fan
67ea7ef5ae Revert "Revert "Squashed commit of the following:""
This reverts commit b6edc491
2023-05-22 11:16:27 +08:00
dong
77a80c2b2d 群邀请成员功能 2023-05-22 11:02:36 +08:00
dong
2635ea8c57 修改群主功能 2023-05-22 10:08:13 +08:00
dong
e6b1d2777a 添加私聊及成员查看 2023-05-22 09:43:36 +08:00
fan
144fecf31a 删除日志 2023-05-21 16:31:04 +08:00
fan
240f779afb 站遥控初始值调整 2023-05-21 16:30:43 +08:00
fan
c23bf6ba72 仿真倍速同步 2023-05-21 13:54:49 +08:00
fan
5e55daf3a4 北京佛山线路现地工作站操作新增控制器判断 2023-05-21 13:40:14 +08:00
fan
3fc6f13c6a Merge remote-tracking branch 'origin/test'
# Conflicts:
#	src/store/modules/map.js
#	src/views/newMap/display/index.vue
#	src/views/newMap/display/newChat/chatContent.vue
#	src/views/newMap/display/newChat/chatDialog.vue
#	src/views/newMap/display/newChat/editGroup.vue
#	src/views/newMap/newMapdraft/mapoperate/simulationMember/index.vue
#	src/views/organization/index.vue
#	src/views/publish/examRule/draft/editRule.vue
2023-05-20 18:13:52 +08:00
fan
bc6ad0226b 会话使用旧组件 2023-05-20 18:04:58 +08:00
fan
dea3207c22 删除日志 2023-05-20 17:59:37 +08:00
fan
6bc46647d7 删除日志 2023-05-20 17:50:32 +08:00
fan
f5a2ca8eaf 考试规则问题调整 2023-05-20 16:39:05 +08:00
fan
27a88795f7 考试时不显示实训模式 2023-05-20 16:12:13 +08:00
fan
516a3a4041 试卷考试添加倒计时,倒计时结束提交试卷&试卷规则调整 2023-05-20 16:10:54 +08:00
fan
2d1558b011 实训客户端切换调整 2023-05-20 13:57:10 +08:00
fan
d5e515fbfa 删除日志 2023-05-20 13:36:18 +08:00
dongq107
ce62a19aa0 到第三方登录页面时先删除之前的token 2023-05-18 15:12:31 +08:00
dongq107
d09e415720 第三方登录必需调接口 2023-05-18 14:12:51 +08:00
fan
47f55642e3 ncc报警客户端切换调整&角色变更客户端切换调整 2023-05-15 17:22:45 +08:00
fan
1bdc04fb8e 客户端生成问题调整 2023-05-15 16:41:33 +08:00
fan
25acb80335 socket提示调整 2023-05-15 16:41:15 +08:00
fan
87aeb03cb0 派班工作站客户端初始化异常调整 2023-05-15 14:05:01 +08:00
fan
ee04af801a 客户端调整 2023-05-15 13:24:50 +08:00
fan
89ab468d6b 注释部分无用代码 2023-05-15 11:02:30 +08:00
fan
ac9f364e39 模板线路功能注掉初始客户端 2023-05-15 10:28:08 +08:00
fan
4b3114c9b5 新窗口打开客户端跳转错误处理 2023-05-15 09:51:32 +08:00
fan
7aa44293f2 ncc客户端跳转调整 2023-05-12 16:30:13 +08:00
fan
0d323cac5f 教学管理图片更换 2023-05-12 16:29:51 +08:00
fan
38ee6fc4c6 初始无仿真角色且有初始客户端逻辑调整 2023-05-12 16:18:40 +08:00
fan
47d4af94ed 应急调度客户端逻辑生成调整&客户端切换调整 2023-05-12 15:57:40 +08:00
fan
c142102de1 Merge remote-tracking branch 'origin/test_client' into test 2023-05-12 13:55:06 +08:00
fan
9e8917ccc1 客户端调整 2023-05-12 13:48:18 +08:00
dong
80067ca6aa 新会话代码调整 2023-05-11 16:11:00 +08:00
fan
503c4c4ed3 扬工院教学管理隐藏班级管理 2023-05-11 15:22:37 +08:00
fan
86eff63658 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2023-05-11 15:21:55 +08:00
fan
d13dc9696e 扬工院教学管理隐藏班级管理 2023-05-11 15:21:46 +08:00
fan
a4525be99e 客户端调整 2023-05-11 15:13:39 +08:00
dong
564ca5a845 地图设计-会话群调整 2023-05-11 15:03:57 +08:00
dong
9b07bfacea 修改ningbo01列车信息 2023-05-10 17:39:57 +08:00
dong
2cddeac881 添加ningbo01列车信息 2023-05-10 14:51:44 +08:00
dong
4f7b04fde5 实训开始清理之前的操作记录 2023-05-10 11:07:05 +08:00
fan
5887fada7a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2023-05-09 17:08:13 +08:00
fan
0ce2ed98bd 宁波一报警信息 2023-05-09 17:08:02 +08:00
dong
4cae954cd8 修改beijing01实训时现地切换到行调时操作按钮未置空导致报错 2023-05-09 14:09:05 +08:00
dong
c065542c22 修改报警详细信息弹窗时间错误问题 2023-05-09 13:41:41 +08:00
fan
38e492bde7 宁波一列车车次窗操作调整 2023-05-09 13:37:51 +08:00
fan
0f15e2d41f 模板线路功能调整 2023-05-09 10:37:07 +08:00
dong
7f63638c0e 修改实训报错问题 2023-05-09 09:47:28 +08:00
fan
623f8968b7 ncc比例参数调整 2023-05-09 09:35:58 +08:00
Yuan
7ff9a044b8 bugfix - 试卷规则标签选项
(cherry picked from commit e3857a75d0)
2023-05-09 09:15:53 +08:00
dong
e66295f016 调整已加入仿真提示功能 2023-05-09 09:13:47 +08:00
dong
cda47e5b64 Squashed commit of the following:
commit 4af4e7ea9c440cdf1a7dba0f6ed6b4774910b2ee
Author: dong <58670809@qq.com>
Date:   Sat May 6 18:11:16 2023 +0800

    登录时判断用户已经加入的仿真
2023-05-09 09:13:43 +08:00
dong
06cab3d7fe 切换考试时实训模式弹窗关闭
(cherry picked from commit d0a6b8e951)
2023-05-09 09:13:38 +08:00
dong
1afb68818f 实训标签只可添加,不能删除
(cherry picked from commit dd45877e1c)
2023-05-09 09:13:31 +08:00
fff07141b6 修改错误的冲突合并 2023-05-06 19:00:17 +08:00
80178a80f6 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/jmapNew/painter.js
2023-05-06 18:37:26 +08:00
1d824c135e Merge remote-tracking branch 'origin/test_revert5.6' 2023-05-06 18:35:52 +08:00
Yuan
1318ecb97a Merge branch 'test_revert5.6' of git.code.tencent.com:lian-cbtc/jl-client into test_revert5.6 2023-05-06 18:03:37 +08:00
Yuan
e3857a75d0 bugfix - 试卷规则标签选项 2023-05-06 18:03:32 +08:00
joylink_zhaoerwei
f3ae97f7f8 故障提示NCC 2023-05-06 17:26:09 +08:00
Yuan
b472601fbc bugfix - 查看规则时标签字段未填充
(cherry picked from commit 2e51c9ee4c)
2023-05-06 16:31:37 +08:00
Yuan
2e51c9ee4c bugfix - 查看规则时标签字段未填充 2023-05-06 16:22:15 +08:00
dong
d0a6b8e951 切换考试时实训模式弹窗关闭 2023-05-06 16:17:38 +08:00
dong
dd45877e1c 实训标签只可添加,不能删除 2023-05-06 16:01:16 +08:00
joylink_zhaoerwei
1bca2be560 故障提示NCC 2023-05-06 15:38:28 +08:00
fan
b6edc4913b Revert "Squashed commit of the following:"
This reverts commit 77560336
2023-05-06 10:54:30 +08:00
fan
5c72107b90 Revert "添加角色NCC行调"
This reverts commit 6d848115b3.
2023-05-06 10:53:25 +08:00
fan
c4028ee8c6 Revert "会话群代码调整"
This reverts commit 79fbb8d071.
2023-05-06 10:53:15 +08:00
fan
a7b0609389 Revert "NCC行调名称调整成NCC调度"
This reverts commit fcae8539d9.
2023-05-06 10:53:02 +08:00
fan
204aef1583 Revert "群消息已读"
This reverts commit 0805383f
2023-05-06 10:52:15 +08:00
fan
c563fe8efa Revert "会话群代码调整"
This reverts commit 2d15eee9f8.
2023-05-06 10:49:24 +08:00
fan
1b1ddad29e Revert "修改语音最长秒数"
This reverts commit 20de76047b.
2023-05-06 10:49:05 +08:00
fan
7fa5b1d62e Revert "修改新会话实训问题"
This reverts commit eb4cd6ab4a.
2023-05-06 10:48:54 +08:00
fan
073e8bfc63 考试提交接口新增参数 2023-05-06 10:47:09 +08:00
fan
00b4b533a8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2023-05-05 16:54:19 +08:00
fan
7d0abef1e9 实训考试调整 2023-05-05 16:54:06 +08:00
dong
9776419202 修改实训标签添加权限判断 2023-05-05 16:35:05 +08:00
dong
9618acaa9d 实训管理添加修改实训标签功能 2023-05-05 16:04:02 +08:00
fan
e353289594 第三方登录增加组织选择 2023-05-05 09:33:54 +08:00
fan
eb579ee0a4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2023-05-05 09:33:03 +08:00
fan
e68bf8b9f8 第三方登录增加组织选择 2023-05-05 09:32:34 +08:00
joylink_zhaoerwei
91b1e8f5b3 多故障展示初稿 2023-05-04 17:39:29 +08:00
fan
bbf9e9ba0e socket重复订阅问题修复 2023-05-04 17:23:51 +08:00
fan
1c51094308 生成客户端逻辑调整 2023-05-04 16:54:45 +08:00
weizhihong
0395d6d470 【群组消息已读标识】 2023-05-04 11:22:27 +08:00
fan
be9d27d7a2 socket异常逻辑调整 2023-05-04 11:05:08 +08:00
dong
8ae41273d6 地图设计-客户端数据 2023-04-28 16:59:13 +08:00
joylink_zhaoerwei
6f8d198f4c 报警微调 2023-04-28 11:12:48 +08:00
fan
027f00da77 socket异常通知调整 2023-04-28 11:04:38 +08:00
fan
ce522b6570 增加列车接管 2023-04-28 11:04:26 +08:00
fan
e3e07dec1b socket错误通知 2023-04-28 09:48:59 +08:00
fan
00dbc6d288 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test1 2023-04-28 09:22:13 +08:00
fan
f5e1c370cc socket依赖调整 2023-04-28 09:21:59 +08:00
dong
eb4cd6ab4a 修改新会话实训问题 2023-04-27 15:40:04 +08:00
joylink_zhaoerwei
fefed61486 多故障备用 2023-04-27 14:09:06 +08:00
fan
210a7d0fdd 第三方登录页项目配置调整 2023-04-27 13:23:14 +08:00
fan
a373d21deb 线路数据设置归属项目管理项目数据通过接口查询 2023-04-27 13:23:07 +08:00
fan
fb6c187c21 第三方登录页项目配置调整 2023-04-27 13:21:50 +08:00
fan
fc64ef5f19 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2023-04-27 09:23:35 +08:00
fan
964ca665a4 线路数据设置归属项目管理项目数据通过接口查询 2023-04-27 09:23:21 +08:00
joylink_zhaoerwei
d73dea42ec 故障报警优化 2023-04-26 15:02:21 +08:00
joylink_zhaoerwei
071bfa90f7 故障报警初提交备用,待优化 2023-04-25 18:08:29 +08:00
dong
20de76047b 修改语音最长秒数 2023-04-25 17:41:08 +08:00
fan
cc3003dbb0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2023-04-25 17:39:34 +08:00
fan
a79668095c ncc逻辑调整 2023-04-25 17:39:24 +08:00
dong
7c46ad5c62 获取project为null时无法找到页面问题 2023-04-25 16:22:30 +08:00
dong
2d15eee9f8 会话群代码调整 2023-04-25 15:56:18 +08:00
dong
0805383fde 群消息已读 2023-04-25 15:19:30 +08:00
fan
034199ec23 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2023-04-25 13:56:24 +08:00
fan
1faf4fadc5 ncc客户端调整 2023-04-25 13:56:09 +08:00
dong
fcae8539d9 NCC行调名称调整成NCC调度 2023-04-25 10:25:56 +08:00
fan
a188121aac Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2023-04-25 09:42:48 +08:00
fan
7e8fb7cbd1 ncc列车颜色调整 2023-04-25 09:42:28 +08:00
dong
79fbb8d071 会话群代码调整 2023-04-24 18:27:36 +08:00
dong
6d848115b3 添加角色NCC行调 2023-04-24 16:10:50 +08:00
fan
5181b1e98a ncc显示配置 2023-04-24 15:43:04 +08:00
fan
68d0d9c83b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2023-04-24 14:33:33 +08:00
fan
e326a18d80 新增同站示意框 2023-04-24 14:32:40 +08:00
dong
775603368d Squashed commit of the following:
commit b5705b12c2
Author: dong <58670809@qq.com>
Date:   Mon Apr 24 13:19:45 2023 +0800

    代码调整

commit 196f8e5306
Author: dong <58670809@qq.com>
Date:   Mon Apr 24 10:42:18 2023 +0800

    线路设计-仿真成员-会话群名称显示调整

commit 4fe929cd37
Author: dong <58670809@qq.com>
Date:   Sun Apr 23 16:24:52 2023 +0800

    代码调整

commit 7dd973c13e
Author: dong <58670809@qq.com>
Date:   Sun Apr 23 15:58:34 2023 +0800

    会话群调整

commit 50e5e92a05
Author: dong <58670809@qq.com>
Date:   Sun Apr 23 15:43:17 2023 +0800

    会话群调整

commit 740e676971
Author: dong <58670809@qq.com>
Date:   Fri Apr 21 15:17:10 2023 +0800

    会话群调整

commit 6d4e28a0dc
Author: dong <58670809@qq.com>
Date:   Fri Apr 21 11:02:38 2023 +0800

    会话群调整

commit 2d2f3e9fdc
Author: dong <58670809@qq.com>
Date:   Fri Apr 21 10:12:14 2023 +0800

    会话群调整

commit 3b21f72e38
Author: dong <58670809@qq.com>
Date:   Fri Apr 21 09:37:56 2023 +0800

    会话群调整

commit baaa8e4bbb
Author: dong <58670809@qq.com>
Date:   Thu Apr 20 15:38:48 2023 +0800

    会话群调整

commit 53ef9b5930
Author: dong <58670809@qq.com>
Date:   Thu Apr 20 11:16:18 2023 +0800

    群组信息接口

commit df2cae5c2b
Author: dong <58670809@qq.com>
Date:   Thu Apr 20 10:57:56 2023 +0800

    Squashed commit of the following:

    commit d0722f229c376afa241441bc91d085f6c6f68d4e
    Author: dong <58670809@qq.com>
    Date:   Thu Apr 20 10:51:28 2023 +0800

        新会话群
2023-04-24 13:38:05 +08:00
fan
933ef9ed82 ncc代码调整4.24 2023-04-24 13:16:07 +08:00
fan
18f67436aa Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2023-04-23 18:15:36 +08:00
fan
42ef83d302 ncc代码调整4.23 2023-04-23 18:15:13 +08:00
fan
0cdaa7a6ed ncc代码调整 2023-04-21 17:46:58 +08:00
dong
f2039927db Squashed commit of the following:
commit d082dc2fbc
Author: dong <58670809@qq.com>
Date:   Wed Apr 19 10:41:17 2023 +0800

    修改收令单位不显示调度命令问题

commit c52925960c
Merge: a3bc0de08 1f5d891c5
Author: joylink_zhangsai <1021828630@qq.com>
Date:   Tue Apr 18 16:25:03 2023 +0800

    Merge remote-tracking branch 'origin/test' into test

commit a3bc0de08a
Author: joylink_zhangsai <1021828630@qq.com>
Date:   Tue Apr 18 16:24:34 2023 +0800

    处理列车异常显示问题 by fan

commit 1f5d891c55
Author: dong <58670809@qq.com>
Date:   Mon Apr 17 14:40:39 2023 +0800

    修改苏电院交控线路顶部菜单展开后没法收回去问题

commit 0d50ac586b
Author: dong <58670809@qq.com>
Date:   Mon Apr 17 13:26:39 2023 +0800

    修改弹窗没有高度问题

commit 73c9c0777e
Author: dong <58670809@qq.com>
Date:   Fri Apr 14 16:25:38 2023 +0800

    去掉实训管理查询项缓存
2023-04-19 10:42:38 +08:00
dong
c020d69150 Squashed commit of the following:
commit 1f5d891c55
Author: dong <58670809@qq.com>
Date:   Mon Apr 17 14:40:39 2023 +0800

    修改苏电院交控线路顶部菜单展开后没法收回去问题
2023-04-17 14:51:08 +08:00
dong
f27fd63e29 Squashed commit of the following:
commit 0d50ac586b
Author: dong <58670809@qq.com>
Date:   Mon Apr 17 13:26:39 2023 +0800

    修改弹窗没有高度问题
2023-04-17 13:28:06 +08:00
dong
857472ba72 Squashed commit of the following:
commit 73c9c0777e
Author: dong <58670809@qq.com>
Date:   Fri Apr 14 16:25:38 2023 +0800

    去掉实训管理查询项缓存
2023-04-14 16:26:57 +08:00
fan
1aca150711 Merge remote-tracking branch 'origin/test' 2023-04-14 13:09:38 +08:00
fan
8593174685 Merge remote-tracking branch 'origin/test' 2023-04-13 16:23:01 +08:00
dong
2bb8c6df92 Squashed commit of the following:
commit 30763300ac
Author: dong <58670809@qq.com>
Date:   Wed Apr 12 18:31:39 2023 +0800

    修改前端配置带id

commit cde33feb22
Author: fan <fanyuhong@joylink.club>
Date:   Wed Apr 12 18:07:47 2023 +0800

    宁波三进路选择表示样式不取消

commit 34a94e2c6d
Author: fan <fanyuhong@joylink.club>
Date:   Wed Apr 12 17:58:11 2023 +0800

    区域选择界面调整

commit 52af1d994b
Author: fan <fanyuhong@joylink.club>
Date:   Wed Apr 12 13:33:03 2023 +0800

    系统管理-教学考试数据管理

commit 6187b449c1
Author: dong <58670809@qq.com>
Date:   Fri Apr 7 15:22:33 2023 +0800

    代码调整

commit 074453ece7
Author: weizhihong <weizhihong@joylink.club>
Date:   Fri Mar 31 16:52:08 2023 +0800

    【删除注释】
2023-04-12 18:34:06 +08:00
dong
54fb5eb47a Squashed commit of the following:
commit 6187b449c1
Author: dong <58670809@qq.com>
Date:   Fri Apr 7 15:22:33 2023 +0800

    代码调整

commit 074453ece7
Author: weizhihong <weizhihong@joylink.club>
Date:   Fri Mar 31 16:52:08 2023 +0800

    【删除注释】
2023-04-07 15:27:22 +08:00
fan
95b6d019dd Merge remote-tracking branch 'origin/test' 2023-04-06 17:32:19 +08:00
fan
ed1c4c0e53 Merge remote-tracking branch 'origin/test' 2023-03-23 17:51:52 +08:00
fan
6fd16fcc95 三方跳转调整 2023-03-13 15:23:19 +08:00
fan
8ec88a84a2 Merge remote-tracking branch 'origin/test' 2023-03-10 09:37:53 +08:00
fan
8e7b653bd3 设备管理配置调整 2023-03-01 15:53:20 +08:00
fan
710dd576d4 Merge remote-tracking branch 'origin/test' 2023-02-18 12:21:53 +08:00
fan
3e3d3622dc Merge remote-tracking branch 'origin/test' 2023-02-17 18:17:00 +08:00
dong
916688b47c Merge remote-tracking branch 'remotes/origin/test' 2023-01-16 18:04:58 +08:00
dong
1c2912285b Merge remote-tracking branch 'remotes/origin/test' 2023-01-16 15:52:07 +08:00
dong
47e87c0457 Merge remote-tracking branch 'remotes/origin/test' 2023-01-16 14:20:18 +08:00
fan
910e0c5712 北京一号线折返策略 2023-01-16 10:08:07 +08:00
fan
00866bde38 Merge remote-tracking branch 'origin/test' 2023-01-13 18:50:42 +08:00
fan
da4020e8c6 Merge remote-tracking branch 'origin/test' 2023-01-13 18:48:27 +08:00
fan
bf1d744b34 Merge remote-tracking branch 'origin/test' 2023-01-13 18:14:05 +08:00
dong
c9dd8752c1 Merge remote-tracking branch 'remotes/origin/test' 2023-01-13 16:09:21 +08:00
dong
22064af280 Merge remote-tracking branch 'remotes/origin/test' 2023-01-13 13:30:50 +08:00
fan
d9a06f3f1e Merge remote-tracking branch 'origin/test' 2023-01-13 13:11:24 +08:00
fan
a03b16e60a Merge remote-tracking branch 'origin/test' 2023-01-11 17:49:25 +08:00
fan
6897cb6c0b Merge remote-tracking branch 'origin/test'
# Conflicts:
#	src/scripts/ProjectConfig.js
#	src/utils/baseUrl.js
#	src/views/login/index.vue
#	src/views/newMap/displayBaSiDi/index.vue
#	src/views/newMap/displayCity/demonMenu.vue
#	src/views/newMap/displayCity/index.vue
#	src/views/system/deviceManage/index.vue
#	src/views/trainingPlatform/demonList.vue
2023-01-10 18:01:34 +08:00
fan
082c075290 成都工业跳转调度大赛 2022-11-21 18:52:54 +08:00
joylink_fanyuhong
3a35705576 苏安院调整 2022-11-20 14:28:28 +08:00
fan
313c587314 三方跳转不设置子系统节点 2022-10-28 14:21:35 +08:00
fan
401e09cdee 代码调整 2022-10-27 18:45:09 +08:00
fan
b35ca66983 京津冀职业发展联盟 2022-10-27 17:53:58 +08:00
fan
24d64b91ac Merge remote-tracking branch 'origin/test'
# Conflicts:
#	src/views/newMap/mapDraftPicture/createPicture.vue
2022-10-08 18:44:43 +08:00
fan
c5d4e425e4 红河财经 隐藏案例 2022-09-08 09:46:32 +08:00
fan
f9f05f12fd 红河财经CCTV调整 2022-09-01 16:14:55 +08:00
fan
e47e38003e 大屏显示调整 2022-08-25 15:10:26 +08:00
fan
6802e297a8 Merge remote-tracking branch 'origin/test' 2022-08-24 18:03:36 +08:00
ef7c7601b8 Merge remote-tracking branch 'origin/test' 2022-08-04 21:09:33 +08:00
5dda532435 Merge remote-tracking branch 'origin/master' 2022-08-04 21:09:10 +08:00
76de50fc6a Merge remote-tracking branch 'origin/test'
# Conflicts:
#	src/jmapNew/theme/datie_02/menus/menuButton.vue
2022-08-04 21:08:53 +08:00
fan
ff9101233c Merge remote-tracking branch 'origin/test'
# Conflicts:
#	src/jmapNew/theme/datie_02/menus/menuButton.vue
2022-07-26 18:08:14 +08:00
44363cc3e8 Merge remote-tracking branch 'origin/test'
# Conflicts:
#	src/jmapNew/config/skinCode/datie_02.js
2022-07-21 18:09:03 +08:00
fan
577c1f7141 长兴技术=》长兴技师 2022-07-20 10:06:46 +08:00
Yuan
fa8f5dca6c Merge branch 'test' 2022-07-15 18:17:16 +08:00
fan
d2cf5489b3 Merge remote-tracking branch 'origin/test' 2022-07-14 18:15:52 +08:00
fan
1fe561222c Merge remote-tracking branch 'origin/test' 2022-07-05 18:03:57 +08:00
fan
3e60f4b8e1 Merge remote-tracking branch 'origin/test' 2022-06-27 18:08:41 +08:00
fan
131e70c729 子系统栏显示调整 2022-06-27 13:22:43 +08:00
fan
a8ce60f33e 子系统栏显示调整 2022-06-27 13:10:02 +08:00
fan
15cf33c850 Merge remote-tracking branch 'origin/test' 2022-06-21 13:22:00 +08:00
fan
d568be81ec Merge remote-tracking branch 'origin/test' 2022-06-20 17:47:12 +08:00
fan
0929b54f9d 实训双击问题调整 2022-06-06 16:51:06 +08:00
fan
215dab7074 Merge remote-tracking branch 'origin/test'
# Conflicts:
#	src/jmapNew/theme/datie_02/menus/menuTrain.vue
2022-05-30 17:44:09 +08:00
fan
013e667452 实训仿真结束 退出实训界面 2022-05-30 17:38:16 +08:00
b05cedd44c Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/jmapNew/config/skinCode/datie_02.js
#	src/jmapNew/theme/datie_02/menus/menuButton.vue
#	src/jmapNew/theme/datie_02/menus/menuTrain.vue
2022-05-20 18:24:36 +08:00
b73395f840 Merge remote-tracking branch 'origin/test'
# Conflicts:
#	src/jmapNew/config/skinCode/datie_02.js
#	src/jmapNew/constant/deviceRender.js
#	src/jmapNew/constant/deviceType.js
#	src/jmapNew/parser/parser-graph.js
#	src/jmapNew/shape/graph/SaidLamp/EPickOrDepartArrow.js
#	src/jmapNew/shape/graph/SaidLamp/index.js
#	src/jmapNew/shape/graph/SignalButton/index.js
#	src/jmapNew/shape/graph/Station/index.js
#	src/jmapNew/shape/graph/index.js
#	src/jmapNew/theme/datie_02/menus/dialog/childDialog/passwordInputBox.vue
#	src/jmapNew/theme/datie_02/menus/index.vue
#	src/jmapNew/theme/datie_02/menus/menuButton.vue
#	src/jmapNew/theme/datie_02/menus/menuSection.vue
#	src/jmapNew/theme/datie_02/menus/menuSignal.vue
#	src/jmapNew/theme/datie_02/menus/menuStation.vue
#	src/jmapNew/theme/datie_02/menus/menuStationStand.vue
#	src/jmapNew/theme/datie_02/menus/menuSwitch.vue
#	src/jmapNew/theme/datie_02/menus/menuTrain.vue
#	src/jmapNew/theme/factory.js
#	src/scripts/cmdPlugin/OperationHandler.js
#	src/views/newMap/newMapdraft/mapoperate/controlLamp.vue
#	src/views/newMap/newMapdraft/mapoperate/models.js
#	src/views/newMap/newMapdraft/mapoperate/signalButton.vue
2022-05-20 18:24:17 +08:00
joylink_cuiweidong
b9fa32a96a Merge remote-tracking branch 'remotes/origin/test'
# Conflicts:
#	src/jmapNew/config/skinCode/datie_02.js
#	src/jmapNew/constant/deviceRender.js
#	src/jmapNew/constant/deviceType.js
#	src/jmapNew/parser/parser-graph.js
#	src/jmapNew/shape/graph/SaidLamp/EPickOrDepartArrow.js
#	src/jmapNew/shape/graph/SaidLamp/index.js
#	src/jmapNew/shape/graph/SignalButton/index.js
#	src/jmapNew/shape/graph/Station/index.js
#	src/jmapNew/shape/graph/index.js
#	src/jmapNew/theme/datie_02/menus/dialog/childDialog/passwordInputBox.vue
#	src/jmapNew/theme/datie_02/menus/index.vue
#	src/jmapNew/theme/datie_02/menus/menuButton.vue
#	src/jmapNew/theme/datie_02/menus/menuSection.vue
#	src/jmapNew/theme/datie_02/menus/menuSignal.vue
#	src/jmapNew/theme/datie_02/menus/menuStation.vue
#	src/jmapNew/theme/datie_02/menus/menuStationStand.vue
#	src/jmapNew/theme/datie_02/menus/menuSwitch.vue
#	src/jmapNew/theme/datie_02/menus/menuTrain.vue
#	src/jmapNew/theme/factory.js
#	src/scripts/cmdPlugin/OperationHandler.js
#	src/views/newMap/newMapdraft/mapoperate/controlLamp.vue
#	src/views/newMap/newMapdraft/mapoperate/models.js
#	src/views/newMap/newMapdraft/mapoperate/signalButton.vue
2022-05-12 11:38:28 +08:00
0cb4088f6c Merge remote-tracking branch 'origin/master' 2022-05-12 11:08:12 +08:00
joylink_cuiweidong
7677fa4607 代码调整 2022-05-12 11:03:35 +08:00
joylink_cuiweidong
226744e7f7 代码调整 2022-05-12 11:01:33 +08:00
joylink_cuiweidong
ad47f33d16 代码调整 2022-05-12 11:01:31 +08:00
joylink_cuiweidong
bf1886a534 代码调整 2022-05-12 11:01:31 +08:00
joylink_cuiweidong
f61785fc5e 代码调整 2022-05-12 11:01:30 +08:00
joylink_cuiweidong
d82ab8f93c 代码调整 2022-05-12 11:01:29 +08:00
joylink_cuiweidong
62be008849 代码调整 2022-05-12 11:01:28 +08:00
joylink_cuiweidong
25c8ddd667 代码调整 2022-05-12 11:01:27 +08:00
joylink_cuiweidong
62e0f34ef6 代码调整 2022-05-12 10:58:58 +08:00
joylink_cuiweidong
03611598e1 成绩统计代码调整 2022-05-12 10:57:23 +08:00
joylink_cuiweidong
fc9c148753 学生统计信息代码调整 2022-05-12 10:56:12 +08:00
joylink_cuiweidong
87dc324d74 代码调整 2022-05-12 10:55:50 +08:00
joylink_cuiweidong
e5240b10ca 代码调整 2022-05-12 10:54:35 +08:00
joylink_cuiweidong
f876c33603 学生统计页面添加 2022-05-12 10:54:08 +08:00
joylink_cuiweidong
a56505a3d0 成绩统计 代码调整 2022-05-12 10:52:48 +08:00
joylink_cuiweidong
ecb4c2569e 学生单次考试成绩 页面添加 2022-05-12 10:50:33 +08:00
fan
6ed22109af 大铁线路调整2 2022-04-18 14:57:12 +08:00
fan
7fbe309f70 大铁线路调整 2022-04-15 16:49:11 +08:00
fan
c8ba0b63b7 Merge remote-tracking branch 'origin/test' 2022-03-25 14:00:34 +08:00
fan
3fdff6d329 Merge remote-tracking branch 'origin/test' 2022-03-15 10:06:37 +08:00
joylink_fanyuhong
38b1beeef5 iscs调整 2022-01-20 19:07:15 +08:00
joylink_fanyuhong
4431fe9dd4 Merge remote-tracking branch 'origin/test' 2022-01-20 18:02:40 +08:00
joylink_fanyuhong
5bf48a83f0 Merge remote-tracking branch 'origin/test'
# Conflicts:
#	.env.production
2022-01-05 17:58:55 +08:00
joylink_fanyuhong
204995be22 Merge remote-tracking branch 'origin/test' 2021-12-29 14:04:20 +08:00
joylink_fanyuhong
958a469ba7 ip调整 2021-12-29 10:21:08 +08:00
joylink_fanyuhong
c1698252aa 正式ip调整 2021-12-29 10:04:07 +08:00
000cbada55 Merge remote-tracking branch 'origin/test' 2021-10-26 18:48:57 +08:00
763 changed files with 44469 additions and 13722 deletions

9
.env.sai Normal file
View File

@ -0,0 +1,9 @@
# just a flag
NODE_ENV = 'production'
VUE_APP_PRO = 'common'
# base api
# VUE_APP_BASE_API = 'http://160.20.60.15:9000'
# VUE_APP_VOICE_API = 'http://160.20.60.15/oss/joylink'
# VUE_APP_UPLOAD_API = 'http://160.20.60.15'
# VUE_APP_BASE_SITE='http://160.20.60.15'

View File

@ -0,0 +1,52 @@
---
name: local-test分支构建发布到本地服务器
run-name: ${{ gitea.actor }} is testing out Gitea Actions
on:
push:
branches:
- local-test
jobs:
Build-Publish:
runs-on: joylink-local233
steps:
- name: 检出代码
uses: https://gitea.joylink.club/actions/checkout@v4
with:
submodules: recursive
- name: 设置node环境
uses: https://gitea.joylink.club/actions/local-setup-node@v0.1.1
with:
version: v14.21.3
cache: yarn
cache-dependency-path: yarn.lock
- name: 安装yarn,并build
run: |
node -v
npm config set registry https://registry.npmmirror.com
npm install --global yarn
yarn config set registry https://registry.npmmirror.com
yarn
yarn run buildas local-test
tar czvf ./dist-local-test.tar.gz ./dist
- name: 打包发送到服务器
uses: https://gitea.joylink.club/appleboy/scp-action@v0.1.7
with:
host: ${{ secrets.LOCAL_233_SSH_HOST }}
username: ${{ secrets.LOCAL_233_SSH_USER }}
password: ${{ secrets.LOCAL_233_SSH_PASSWORD }}
port: ${{ secrets.LOCAL_233_SSH_PORT }}
source: ./dist-local-test.tar.gz
target: /home/minio/oss/rt-sim-training-client
overwrite: true
- name: SSH连接并解压发布
uses: https://gitea.joylink.club/appleboy/ssh-action@v1.0.3
with:
host: ${{ secrets.LOCAL_233_SSH_HOST }}
port: ${{ secrets.LOCAL_233_SSH_PORT }}
username: ${{ secrets.LOCAL_233_SSH_USER }}
password: ${{ secrets.LOCAL_233_SSH_PASSWORD }}
script: |
cd /home/minio/oss/rt-sim-training-client
rm -rf /usr/local/joylink/client/cbtc
mkdir -p /usr/local/joylink/client
tar xz --strip 2 -C /usr/local/joylink/client -f dist-local-test.tar.gz

View File

@ -0,0 +1,52 @@
name: master分支构建发布到公网服务器
run-name: ${{ gitea.actor }} is testing out Gitea Actions
on:
push:
branches:
- master
jobs:
Build-Publish:
runs-on: joylink-local233
steps:
- name: 检出代码
uses: https://gitea.joylink.club/actions/checkout@v4
with:
submodules: recursive
- name: 设置node环境
uses: https://gitea.joylink.club/actions/local-setup-node@v0.1.1
with:
version: 'v14.21.3'
cache: 'yarn'
cache-dependency-path: 'yarn.lock'
- name: 安装yarn,并build
run: |
node -v
npm config set registry https://registry.npmmirror.com
npm install --global yarn
yarn config set registry https://registry.npmmirror.com
yarn
yarn run build
tar czvf ./dist-master.tar.gz ./dist
- name: 打包发送到服务器
uses: https://gitea.joylink.club/appleboy/scp-action@v0.1.7
with:
host: ${{ secrets.PUB1_DOMAIN_SSH_HOST }}
port: ${{ secrets.PUB1_DOMAIN_SSH_PORT }}
username: ${{ secrets.PUB1_DOMAIN_SSH_USER }}
password: ${{ secrets.PUB1_DOMAIN_SSH_PASSWORD }}
source: ./dist-master.tar.gz
target: /mnt/data/published/rt-sim-training-client
overwrite: true
- name: SSH连接并解压发布
uses: https://gitea.joylink.club/appleboy/ssh-action@v1.0.3
with:
host: ${{ secrets.PUB1_DOMAIN_SSH_HOST }}
port: ${{ secrets.PUB1_DOMAIN_SSH_PORT }}
username: ${{ secrets.PUB1_DOMAIN_SSH_USER }}
password: ${{ secrets.PUB1_DOMAIN_SSH_PASSWORD }}
script: |
cd /mnt/data/published/rt-sim-training-client
rm -rf /usr/local/joylink/client/cbtc
mkdir -p /usr/local/joylink/client
tar xz --strip 2 -C /usr/local/joylink/client -f dist-master.tar.gz

1
.gitignore vendored
View File

@ -4,7 +4,6 @@ dist/
npm-debug.log*
yarn-debug.log*
yarn-error.log*
package-lock.json
tests/**/coverage/
src/utils/baseUrl.js*

View File

@ -4,3 +4,6 @@ English | [简体中文](./README-zh.md)
Copyright (c) 2018-present Joylink
### 项目环境
- "node": "<=14.21.3";
- "webpack": ">=4 < 4.29";

View File

@ -18,6 +18,9 @@
"svgo": "svgo -f src/icons/svg --config=src/icons/svgo.yml"
},
"dependencies": {
"@stomp/stompjs": "^5.4.4",
"@wangeditor/editor": "^5.1.23",
"@wangeditor/editor-for-vue": "^1.0.2",
"axios": "^0.18.0",
"dayjs": "^1.11.5",
"echarts": "^4.7.0",
@ -43,9 +46,11 @@
"vue-i18n": "^8.12.0",
"vue-quill-editor": "^3.0.6",
"vue-router": "^3.1.6",
"vue-video-player": "^5.0.1",
"vuedraggable": "^2.24.3",
"vuex": "^3.1.0",
"wangeditor": "^4.6.17",
"ws": "^8.13.0",
"xlsx": "^0.14.2",
"zrender": "^4.0.4"
},

View File

@ -23,7 +23,6 @@
<script>
import { getToken, getUserIdKey } from '@/utils/auth';
import { getSessionStorage, setSessionStorage } from '@/utils/auth';
import { loginInfo } from '@/scripts/ProjectConfig';
import WindowResizeHandler from '@/mixin/WindowResizeHandler';
import LoadingImg from '@/assets/loading.gif';
import AppLoading from '@/assets/appLoading.png';
@ -68,7 +67,7 @@ export default {
callback: action => {
removeToken();
this.$store.dispatch('exit').then(resp => {
this.$router.push({path: loginInfo[this.$store.state.projectConfig.markKey].loginPath});
this.$router.push({path: `/login?project=${this.$store.state.projectConfig.markKey}`});
});
}
});

416
src/api/contest.js Normal file
View File

@ -0,0 +1,416 @@
import request from '@/utils/request';
/**
* 获取竞赛试卷分页列表
* @param {Object} params
* @param {String} params.name 试卷名称
*/
export function getPaperList(params) {
return request({
url: '/api/exercise/race/paper/page',
method: 'GET',
params
});
}
/**
* 创建试卷
* @param {Object} data
* @param {String} data.name 试卷名称
* @param {String} data.desc 基础描述
* @param {Number} data.seasonId 所属赛季id
* @param {Boolean} data.supportCopy 是否支持拷贝
*/
export function createPaper(data) {
return request({
url: '/api/exercise/race/paper',
method: 'POST',
data
});
}
/**
* @param {Object} data 同创建试卷
* @param {Number} id 试卷id
*/
export function editPaper(id, data) {
return request({
url: `/api/exercise/race/paper/${id}`,
method: 'POST',
data
});
}
/**
* @param {Number} id 任务id
*/
export function deletePaper(id) {
return request({
url: `/api/exercise/race/paper/${id}`,
method: 'DELETE'
});
}
/**
* 获取竞赛试卷菜单
* @param {Object} params
* @param {String} params.group 分组ZZ=中职;GZ=高职
*/
export function getPaperMenu(params) {
return request({
url: '/api/exercise/race/paper/menu',
method: 'GET',
params
});
}
/**
* @param {Object} data
* @param {Array} data.modules 所有模块
* @param {Number} data.modules[i].module_name 模块名字
* @param {Number} data.modules[i].duration 考试总时间
* @param {Number} data.modules[i].group 任务分组
* @param {Number} data.modules[i].group.taskIds 此分组中的任务id
* @param {Number} data.modules[i].group.name 此组的名字
* @param {Number} data.modules[i].group.group 此分组的子分组
*/
export function paperModuleTaskSetting(paperId, data) {
return request({
url: `/api/exercise/race/paper/${paperId}/config`,
method: 'POST',
data
});
}
/**
* @param {Number} id 模块id
*/
export function getPaperDetail(id) {
return request({
url: `/api/exercise/race/paper/${id}`,
method: 'GET'
});
}
/**
* @param {Number} id 模块id
*/
export function copyPaper(id) {
console.log(id);
return request({
url: `/api/exercise/race/paper/${id}/copy`,
method: 'PUT'
});
}
/** 查看所有任务数据 */
export function getTaskTreeDatas() {
return request({
url: '/api/exercise/race/task/tree',
method: 'GET'
});
}
/**
* 创建任务
* @param {Object} data
* @param {String} data.name 任务名称
* @param {String} data.desc 基础描述
* @param {String} data.content 考核内容
* @param {String} data.standards 评价标准
* @param {Number} data.parentId 如果是子任务需要父任务的id
*/
export function createTask(data) {
return request({
url: '/api/exercise/race/task',
method: 'POST',
data
});
}
/**
* @param {Object} data 同创建任务
* @param {Number} id 任务id
*/
export function editTask(id, data) {
return request({
url: `/api/exercise/race/task/${id}`,
method: 'POST',
data
});
}
/**
* @param {Number} id 任务id
*/
export function deleteTask(id) {
return request({
url: `/api/exercise/race/task/${id}`,
method: 'DELETE'
});
}
/**
* @param {Number} id 任务id
*/
export function getTaskDetail(id) {
return request({
url: `/api/exercise/race/task/${id}`,
method: 'GET'
});
}
/**
* @param {Number} id 任务id
*/
export function getchildrenTaskDatas(id) {
return request({
url: `/api/exercise/race/task/${id}/children`,
method: 'GET'
});
}
/**
* @param {Array} data
* @param {Number} taskId 任务id
* @param {Number} data[i].bindId 绑定id根据bindtype来区分对应的id
* @param {String} data[i].bindType rule =0评分规则;scene=1场景
* @param {Number} data[i].status 0=绑定 1=解绑
*/
export function bindTask(taskId, data) {
return request({
url: `/api/exercise/race/task/${taskId}/bind`,
method: 'POST',
data
});
}
/**
* @param {Object} data
* @param {Number} data.group 分组 1-高职 2中职
* @param {String} data.term 赛季
* @param {String} data.code 编号
*/
export function addContestSeason(data) {
return request({
url: '/api/exercise/race/season',
method: 'post',
data
});
}
/**
* @param {Object} params
* @param {Number} params.group 分组 1-高职 2中职
* @param {String} params.term 赛季
* @param {String} params.code 编号
*/
export function queryContestSeasonPaged(params) {
return request({
url: '/api/exercise/race/season/page',
method: 'get',
params
});
}
/**
* @param {Object} data
* @param {Number} id 赛季id
* @param {String} data.group 分组 ZZ=中职GZ=高职
* @param {String} data.term 赛季
* @param {String} data.code 编号
*/
export function updateContestSeason(id, data) {
return request({
url: `/api/exercise/race/season/${id}`,
method: 'post',
data
});
}
/**
* @param {Number} id 赛季id
*/
export function deleteContestSeason(id) {
return request({
url: `/api/exercise/race/season/${id}`,
method: 'delete'
});
}
/**
* @param {Object} data
* @param {String} data.name 名称
*/
export function createContextScore(data) {
return request({
url: '/api/exercise/race/score',
method: 'post',
data
});
}
/**
* @param {Object} params
* @param {String} params.name 名称
*/
export function queryContextScorePaged(params) {
return request({
url: '/api/exercise/race/score/page',
method: 'get',
params
});
}
/**
* @param {Number} id 评分id
*/
export function deleteContextScore(id) {
return request({
url: `/api/exercise/race/score/${id}`,
method: 'delete'
});
}
/**
* @param {Number} id 评分id
* @param {Object} data
* @param {Array [object]} data.units 评分单元
* @param {String} data.units[0].text 文字描述
* @param {Number} data.units[0].sceneStepId 场景步骤ID
* @param {Number} data.units[0].score 分值
* @param {String} data.units[0].worker 作业程序
* @param {String} data.units[0].criteria 评分标准
*/
export function updateContextScoreDetail(id, data) {
return request({
url: `/api/exercise/race/score/edit/rule/${id}`,
method: 'post',
data
});
}
/**
* @param {Number} id 评分id
*/
export function getContextScoreDetail(id) {
return request({
url: `/api/exercise/race/score/${id}`,
method: 'get'
});
}
/**
* @param {Object} params
* @param {String} params.type 竞赛类型 local=场景;link=3D
*/
export function queryContestSencePaged(params) {
return request({
url: '/api/exercise/race/scene/page',
method: 'get',
params
});
}
/**
* @param {Number} id 场景id
*/
export function deleteContestSence(id) {
return request({
url: `/api/exercise/race/scene/${id}`,
method: 'delete'
});
}
/**
* @param {Number} id 场景id
*/
export function getContextSenceDetail(id) {
return request({
url: `/api/exercise/race/scene/${id}`,
method: 'get'
});
}
/**
* @param {Object} data
* @param {Number} data.traningPublishId 草稿实训场景id
* @param {String} data.name 大赛场景名称
*/
export function publishContextSence(data) {
return request({
url: `/api/exercise/race/scene/publish/training`,
method: 'post',
data
});
}
/**
* @param {Object} data
* @param {String} data.name 场景名称
* @param {String} data.type Video=视频
* @param {Object} data.scene 大赛场景
* @param {String} data.scene.url 地址
* @param {String} data.scene.fileName 文件名
*/
export function saveSceneVideo(data) {
return request({
url: `/api/exercise/race/scene/custom/edit`,
method: 'post',
data
});
}
/** 场景视频编辑 */
export function editSceneVideo(sceneId, data) {
return request({
url: `/api/exercise/race/scene/custom/${sceneId}/edit`,
method: 'post',
data
});
}
/**
* @param {String} paperId 试卷id
* @param {String} moduleId 模块id
*/
export function getTaskTree(paperId, moduleId) {
return request({
url: `/api/exercise/race/paper/${paperId}/module/${moduleId}/task`,
method: 'get'
});
}
/**
* @param {String} paperId 试卷id
* @param {String} moduleId 模块id
*/
export function beginContestExercise(paperId, moduleId) {
return request({
url: `/api/race/${paperId}/${moduleId}`,
method: 'POST'
});
}
/** 竞赛完成训练 */
export function finishContestExercise() {
return request({
url: '/api/race/finish',
method: 'PUT'
});
}
/** html
* @param {String} id 赛季id
* @param {String} data.htmlContent 内容
*/
export function editSeasonContent(id, data) {
return request({
url: `/api/exercise/race/season/${id}/html`,
method: 'post',
data
});
}
/** html
* @param {String} id 赛季id
*/
export function getSeasonContent(id) {
return request({
url: `/api/exercise/race/season/${id}/html`,
method: 'get'
});
}
export function getTheoryList() {
return request({
url: '/api/exercise/race/paper/questions',
method: 'get'
});
}

View File

@ -7,10 +7,6 @@ const BASE_UPLOAD_API = store.state.user.uploadUrl;
// export const BASE_ASSET_API = store.state.user.resourcesUrl;
export const BASE_ASSET_API = store.state.user.ossUrl;
// console.log(JL3D_LOCAL_STATIC);
// console.log(BASE_UPLOAD_API);
// console.log(BASE_ASSET_API);
export function getUploadModelUrl() {
return (BASE_UPLOAD_API+"/api/upload/MODEL?appId=00001&appSecret=joylink00001");
}

View File

@ -182,7 +182,7 @@ export function localImportMap(data) {
url: '/api/map/local/import',
method: 'post',
data: data
});
});
}
/** 根据group获取排序的车站列表包含车辆段/停车场) */
@ -307,3 +307,25 @@ export function queryMapListByUser() {
method: 'get'
});
}
/** 根据mapId获取客户端信息数据 */
export function getClientDataById(mapId) {
return request({
url: `/api/map/${mapId}/mapClientMap`,
method: 'get'
});
}
/** 发布地图根据id生成实训 */
export function generateTrainingData(data) {
return request({
url: `/api/v2/training/rule/generate/mapId`,
method: 'post',
data: data
});
}
/** 根据mapId获取列车信息 */
export function getTrainListByMapId(mapId) {
return request({
url: `/api/map/${mapId}/trains`,
method: 'get'
});
}

View File

@ -265,3 +265,11 @@ export function loadTrainingBg(group, trainingId) {
method: 'post'
});
}
/** 预备开始场景 */
export function prepareScene(group, params) {
return request({
url:`/api/training2Simulation/${group}/prepare/start`,
method: 'post',
params
});
}

View File

@ -101,7 +101,7 @@ export function getOrgList() {
return request({
url: '/api/orgProject/list',
method: 'get'
})
});
}
/**
@ -111,5 +111,15 @@ export function selectOrgnization(orgId) {
return request({
url: `/api/orgProject/signIn/${orgId}`,
method: 'put'
})
});
}
/**
* 获取用户已经加入的仿真
*/
export function getSimulationJoined() {
return request({
url: '/simulation/joined/by/me',
method: 'get'
});
}

View File

@ -269,12 +269,12 @@ export function generateExam(pcId) {
}
/** 删除用户试卷 */
export function deleteUserExam(param) {
return request({
url: `/api/v2/paper/user/${puId}`,
method: 'method'
});
}
// export function deleteUserExam(param) {
// return request({
// url: `/api/v2/paper/user/${puId}`,
// method: 'DELETE'
// });
// }
/**
* @param {Number} puId 用户试卷Id
@ -344,3 +344,13 @@ export function queryTagList(data) {
data
});
}
/**
* 获取试卷创建者list
*/
export function queryPaperCreatorList(data) {
return request({
url: `/api/v2/paper/composition/list/creatorInfo`,
method: 'POST',
data
})
}

View File

@ -323,3 +323,11 @@ export function isExistEmail(params) {
});
}
// 成工院第三方登录
export function cgyThirdLogin(data) {
return request({
url: '/api/login/cgy/third',
method: 'post',
data
});
}

View File

@ -91,13 +91,13 @@ export function getSimulationTimeChart(mapId) {
})
}
// 课程内实训数据统计
export function getLessonTimeChart(id) {
return request({
url: `/api/stats/lesson/${id}/stats`,
method: 'get',
})
}
// // 课程内实训数据统计
// export function getLessonTimeChart(id) {
// return request({
// url: `/api/stats/lesson/${id}/stats`,
// method: 'get',
// })
// }
// 课程列表
export function getLessonList() {

221
src/api/newChat.js Normal file
View File

@ -0,0 +1,221 @@
import request from '@/utils/request';
/**
* 获取群列表
* @param {String} groupId 房间号
* @returns
*/
export function getGroupList(groupId) {
return request({
url: `/api/simulation/${groupId}/conversation/group/list`,
method: 'get'
});
}
/**
* 创建群
* @param {String} groupId 房间号
* @param {String} data
* @param {String} data.name 群组名称
* @param {String} data.imageUrl 群组头像
* @param {Array} data.memberIds 角色id列表
* @returns
*/
export function createGroup(groupId, data) {
return request({
url: `/simulation/${groupId}/operate/Conversation_Group_Create`,
method: 'post',
data
});
}
/**
* 修改群组名称
* @param {String} groupId 房间号
* @param {Object} data
* @param {String} data.id 群组id
* @param {String} data.name 群组名称
* @returns
*/
export function updateGroupName(groupId, data) {
return request({
url: `/simulation/${groupId}/operate/Conversation_Group_Update_Name`,
method: 'post',
data
});
}
/**
* 修改群组群主
* @param {String} groupId 房间号
* @param {Object} data
* @param {Number} data.id 群组id
* @param {String} data.memberId 角色id
* @returns
*/
export function updateGroupLeader(groupId, data) {
return request({
url: `/simulation/${groupId}/operate/Conversation_Group_Update_Leader`,
method: 'post',
data
});
}
/**
* 邀请人员入群
* @param {String} groupId 房间号
* @param {Object} data
* @param {Number} data.id 群组id
* @param {Array} data.memberIds 角色id列表
* @returns
*/
export function inviteMemberToGroup(groupId, data) {
return request({
url: `/simulation/${groupId}/operate/Conversation_Group_Invite_Member`,
method: 'post',
data
});
}
/**
* 移除群内人员
* @param {String} groupId 房间号
* @param {Object} data
* @param {Number} data.id 群组id
* @param {Array} data.memberIds 角色id列表
* @returns
*/
export function removeMemberFromGroup(groupId, data) {
return request({
url: `/simulation/${groupId}/operate/Conversation_Group_Remove_Member`,
method: 'post',
data
});
}
/**
* 退出群组
* @param {String} groupId 房间号
* @param {Object} data
* @param {Number} data.id 群组id
* @returns
*/
export function exitGroup(groupId, data) {
return request({
url: `/simulation/${groupId}/operate/Conversation_Group_Exit`,
method: 'post',
data
});
}
/**
* 解散群组
* @param {String} groupId 房间号
* @param {Object} data
* @param {Number} data.id 群组id
* @returns
*/
export function dissolveGroup(groupId, data) {
return request({
url: `/simulation/${groupId}/operate/Conversation_Group_Dissolve`,
method: 'post',
data
});
}
/**
* 发送语音信息
* @param {String} groupId 房间号
* @param {Object} data
* @param {Number} data.id 群组id
* @param {String} data.audioPath 文件地址
* @param {String} data.content 语音内容
* @returns
*/
export function sendAudio(groupId, data) {
return request({
url: `/simulation/${groupId}/operate/Conversation_Group_Audio_Chat`,
method: 'post',
data
});
}
/**
* 发送文字信息
* @param {String} groupId 房间号
* @param {Object} data
* @param {Number} data.id 群组id
* @param {String} data.content 文字内容
* @returns
*/
export function sendText(groupId, data) {
return request({
url: `/simulation/${groupId}/operate/Conversation_Group_Text_Chat`,
method: 'post',
data
});
}
/**
* 发送BASE64信息
* @param {String} groupId 房间号
* @param {Object} data
* @param {Number} data.id 群组id
* @param {String} data.fileBase64Str 文件base64码
* @returns
*/
export function sendBase64(groupId, data) {
return request({
url: `/simulation/${groupId}/operate/Conversation_Group_Audio_Base64`,
method: 'post',
data
});
}
/**
* 设置群消息已读
* @param {String} groupId 房间号
* @param {Object} data
* @param {Number} data.id 群组id
* @returns
*/
export function setGroupReadMessage(groupId, data) {
return request({
url: `/simulation/${groupId}/operate/Conversation_Group_Read_Message`,
method: 'post',
data
});
}
/**
* 发送私聊文字信息
* @param {String} groupId 房间号
* @param {Object} data
* @param {Number} data.memberId 角色id
* @param {String} data.content 文字内容
* @returns
*/
export function sendPrivateText(groupId, data) {
return request({
url: `/simulation/${groupId}/operate/Conversation_Group_Private_Text_Chat`,
method: 'post',
data
});
}
/**
* 发送私聊BASE64信息
* @param {String} groupId 房间号
* @param {Object} data
* @param {Number} data.memberId 角色id
* @param {String} data.fileBase64Str 文件base64码
* @returns
*/
export function sendPrivateBase64(groupId, data) {
return request({
url: `/simulation/${groupId}/operate/Conversation_Group_Private_Audio_Base64`,
method: 'post',
data
});
}

View File

@ -15,3 +15,20 @@ export function selectQuestionTypeNum(companyId) {
method: 'get'
});
}
/** 加载场景 */
export function loadRace(simulationId, sceneId) {
return request({
url: `/api/race/${simulationId}/load/${sceneId}`,
method: 'put'
});
}
/** 完成任务 */
export function overTask(taskId, data) {
return request({
url: `/api/race/${taskId}/finish`,
method: 'put',
data
});
}

10
src/api/record.js Normal file
View File

@ -0,0 +1,10 @@
import request from '@/utils/request';
/** 查询用户使用记录统计 */
export function queryUserSimulationRecord(params, userId) {
return request({
url: `/api/record/stats/list/criteria/${userId}`,
method: 'get',
params
});
}

View File

@ -47,39 +47,39 @@ export function examNotifyNew({ examId }) {
});
}
/** 获取用户实训列表*/
export function getSimulationList(data) {
return request({
url: `/api/stats/simulation`,
method: 'get',
params: data
});
}
// export function getSimulationList(data) {
// return request({
// url: `/api/stats/simulation`,
// method: 'get',
// params: data
// });
// }
/** 添加用户仿真数据*/
export function postSimulationStats(data) {
return request({
url: `/api/stats/simulation`,
method: 'post',
data: data
});
}
// /** 添加用户仿真数据*/
// export function postSimulationStats(data) {
// return request({
// url: `/api/stats/simulation`,
// method: 'post',
// data: data
// });
// }
/** 更新用户仿真数据*/
export function putSimulationStats(data) {
return request({
url: `/api/stats/${data.id}`,
method: 'put',
data: data
});
}
// /** 更新用户仿真数据*/
// export function putSimulationStats(data) {
// return request({
// url: `/api/stats/${data.id}`,
// method: 'put',
// data: data
// });
// }
/** 删除用户仿真数据*/
export function deleteSimulationStats(statsId) {
return request({
url: `/api/stats/${statsId}`,
method: 'delete'
});
}
// export function deleteSimulationStats(statsId) {
// return request({
// url: `/api/stats/${statsId}`,
// method: 'delete'
// });
// }
/** 录制脚本仿真(新版)*/
export function scriptRecordNotifyNew(scriptId) {
@ -515,10 +515,10 @@ export function getStandListByRunLineOrTrainCode(group, params) {
params
});
}
/** 上饶列车控制 */
export function srTrainControl(group, params) {
/** 沙盘列车控制 */
export function sandTableTrainControl(group, params) {
return request({
url: `/api/sr/${group}/control`,
url: `/api/sandTable/${group}/control`,
method: 'put',
params
});
@ -583,3 +583,27 @@ export function enterSimulationByTeacher(group) {
method: 'post'
});
}
/** 切换角色后触发消息 */
export function getUnreceivedMessages(simulationId, memberId) {
return request({
url: `/simulation/${simulationId}/${memberId}/unreceivedMessages`,
method: 'get'
});
}
/** 控制叶佳供货的小车 */
export function controlYjTrain(simulationId, right) {
return request({
url: `/api/realDevice/${simulationId}/train`,
method: 'put',
params: { right }
});
}
/** 创建仿真不通过功能id */
export function createSimulationNoFunction(mapId, data) {
return request({
url: `/simulation/new/${mapId}`,
method: 'post',
data
});
}

View File

@ -32,6 +32,21 @@ export function updateTraining(data) {
data
});
}
/** 更新发布实训信息(标签, 描述, 标题) */
export function updateTrainingInfo(data) {
return request({
url: `/api/v2/training/published/update`,
method: 'put',
data
});
}
/** 已发布实训转为草稿 */
export function saveAsTrainingDraft(trainingId) {
return request({
url: `/api/v2/training/published/${trainingId}/saveAsDraft`,
method: 'post'
});
}
/** 查询步骤列表 */
export function getTrainingStepList(trainingId) {
return request({
@ -158,3 +173,26 @@ export function clearDesignTraining(trainingId, group) {
method: 'delete'
});
}
/** 导出实训数据 */
export function exportTrainingData(data) {
return request({
url: `/api/v2/training/published/export`,
method: 'post',
data
});
}
/** 导入实训数据 */
export function importTrainingData(data) {
return request({
url: `/api/v2/training/published/import`,
method: 'post',
data
});
}
/** 实训跳转到当前步骤*/
export function jumpToTraining(group, stepId) {
return request({
url: `/api/training2Simulation/${group}/jumpTo/${stepId}`,
method: 'put'
});
}

View File

@ -193,3 +193,11 @@ export function queryTemplateMapFunPaged(params) {
params
});
}
/** 线路功能覆盖生成(主要用于客户端重新生成后线路功能里客户端重新匹配) */
export function generateMapFun(data) {
return request({
url: `/api/mapFunction/generate/mapIds`,
method: 'post',
data
});
}

BIN
src/assets/bg_pis.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 37 KiB

BIN
src/assets/bg_tms.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 130 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 709 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

View File

@ -332,7 +332,6 @@ export default {
methods: {
handleEdit(row, column, index) {
this.$set(row, 'isEdit', true);
// console.log(this.$refs);
// if (this.$refs.customerInput.length) {
// this.$refs.customerInput[index].$el.querySelector('input').focus();
// }

View File

@ -38,6 +38,12 @@ export default {
permissionManage: 'Permission',
authorityTransferManage: 'Privilege distribution management',
userRulesManage: 'User Rights Statistics',
contestDataManage:'Contest data management',
contestSubjectManage:'contest subject management',
contestTaskManage:'contest task management',
contestSceneManage:'contest scene management',
contestTaskScoreManage:'contest task score management',
contestSeasonManage:'contest season management',
fileManage: 'File Manage',
frontResourceManage: 'Front-End Resource Management',
iscsPrerecordManage: 'ISCS Advance record management',

View File

@ -1,110 +1,112 @@
export default {
homePage: 'Home',
homePage: 'Home',
mapManage: 'Map',
skinManage: 'Skin management',
mapDraw: 'Map draw',
runPlanManage: 'Run plan',
productEdit: 'Product editor',
mapManage: 'Map',
skinManage: 'Skin management',
mapDraw: 'Map draw',
runPlanManage: 'Run plan',
productEdit: 'Product editor',
newDesignEditor: 'Editor',
newDesignEditorList: 'Editor List',
newDesignDraftEditorList: 'Draft Editor List',
uploadPdf: 'Upload Pdf',
fileManage: 'File Manage',
newDesignEditor: 'Editor',
newDesignEditorList: 'Editor List',
newDesignDraftEditorList: 'Draft Editor List',
uploadPdf: 'Upload Pdf',
fileManage: 'File Manage',
designhomePage: 'Public map',
designUserPage: 'Personal map',
newDesignUserPage: 'Personal map',
designhomePage: 'Public map',
designUserPage: 'Personal map',
newDesignUserPage: 'Personal map',
lessaonManage: 'Lesson',
lessonEdit: 'Lesson editor',
trainingRecord: 'Trainning recording',
trainingRule: 'Training rules',
trainingManage: 'Training management',
taskManage: 'Task management',
scriptManage: 'Script',
lessaonManage: 'Lesson',
lessonEdit: 'Lesson editor',
trainingRecord: 'Trainning recording',
trainingRule: 'Training rules',
trainingManage: 'Training management',
taskManage: 'Task management',
scriptManage: 'Script',
teachSystem: 'Teaching',
teachSystem: 'Teaching',
examSystem: 'Examination',
examSystem: 'Examination',
demonstrationSystem: 'Simulation',
demonstrationSystem: 'Simulation',
dpSystem: 'Large screen',
dpSystem: 'Large screen',
planSystem: 'Lian plan',
planSystem: 'Lian plan',
replayManage: 'Playback',
replayManage: 'Playback',
permissionManage: 'Permission',
selfPermission: 'My Permission',
permissionManage: 'Permission',
selfPermission: 'My Permission',
pulishManage: 'Publication',
publishMapManage: 'Publishing map management',
productStateManage: 'Product state management',
publishLessonManage: 'Publishing lesson management',
runPlanTemplateManage: 'Template plan management',
runPlanCommonManage: 'Loading Plan Managemen',
runPlanEveryDayManage: 'Daily plan Management',
examRuleManage: 'Management of examination rules',
pulishManage: 'Publication',
publishMapManage: 'Publishing map management',
productStateManage: 'Product state management',
publishLessonManage: 'Publishing lesson management',
runPlanTemplateManage: 'Template plan management',
runPlanCommonManage: 'Loading Plan Managemen',
runPlanEveryDayManage: 'Daily plan Management',
examRuleManage: 'Management of examination rules',
orderAuthorityManage: 'Order&Authority',
commodityManage: 'Commodity management',
orderManage: 'Order management',
authorityManage: 'authority management',
authorityTransferManage: 'Privilege distribution management',
userRulesManage: 'User Rights Statistics',
addCommodity: 'Adding goods',
addOrder: 'Adding orders',
addCoursePermissions: 'Adding course permissions',
orderAuthorityManage: 'Order&Authority',
commodityManage: 'Commodity management',
orderManage: 'Order management',
authorityManage: 'authority management',
authorityTransferManage: 'Privilege distribution management',
userRulesManage: 'User Rights Statistics',
addCommodity: 'Adding goods',
addOrder: 'Adding orders',
addCoursePermissions: 'Adding course permissions',
systemManage: 'System',
dataDictionary: 'Data dictionary',
dataDictionaryDetails: 'Data dictionary details',
userManage: 'user management',
loginUserManage: 'login user Manage',
cacheManage: 'cache management',
userTrainingManage: 'User training management',
userExamManage: 'User examination management',
userSimulationManage: 'User simulation management',
existingSimulation: 'Existence simulation management',
ibpDraw: 'Ibp Draw',
trainingPlatform: 'trainingPlatform',
releaseApplication: 'Release application',
courseApplication: 'Course release application',
scriptReleaseApplication: 'Script release application',
runGraphReleaseApplication: 'Run graph release application',
subsystemGeneration: 'Subsystem generation',
newsBulletin: 'New bulletin',
notificationBulletin: 'Systematic notification',
commandDictionary: 'Command dictionary',
configLine: 'Line management',
deviceManage: 'Device management',
iscsDraw: 'Iscs Draw',
iscsSystem: 'Iscs System',
studentManage: 'Student manage',
examDetail: 'Exam detail',
raceManage: 'Race manage',
practiceManage: 'Practice manage',
bankManage: 'Bank manage',
sceneManage: 'Scene manage',
companyManage: 'Company manage',
authorApply: 'Grant application',
AuthorList: 'Authorization code list',
questionsRuleManage: 'Question rule manage',
preTheoryData: 'Pre Theory Data',
boardManage: 'Message Board Manage',
publishIBPManage: 'publish IBP Manage',
publishISCSManage: 'publish ISCS Manage',
publishTrainingManage: 'publish Training Manage',
voiceTraining: 'Voice Training',
mapGroup: 'Map Group',
drawingMange: 'Drawing Mange',
projectServer: 'Project Server',
audioResourcesManage: 'Audio Resources Manage',
iscsDeviceManage: 'ISCS Device Manage',
iscsResourcesManage: 'ISCS Resources Manage',
projectManage: 'Project Manage',
frontProjectConfigManage: 'Front Project Config Manage',
}
systemManage: 'System',
dataDictionary: 'Data dictionary',
dataDictionaryDetails: 'Data dictionary details',
userManage: 'user management',
loginUserManage: 'login user Manage',
cacheManage: 'cache management',
userTrainingManage: 'User training management',
userExamManage: 'User examination management',
userSimulationManage: 'User simulation management',
existingSimulation: 'Existence simulation management',
ibpDraw: 'Ibp Draw',
trainingPlatform: 'trainingPlatform',
releaseApplication: 'Release application',
courseApplication: 'Course release application',
scriptReleaseApplication: 'Script release application',
runGraphReleaseApplication: 'Run graph release application',
subsystemGeneration: 'Subsystem generation',
newsBulletin: 'New bulletin',
notificationBulletin: 'Systematic notification',
commandDictionary: 'Command dictionary',
configLine: 'Line management',
deviceManage: 'Device management',
iscsDraw: 'Iscs Draw',
iscsSystem: 'Iscs System',
studentManage: 'Student manage',
examDetail: 'Exam detail',
raceManage: 'Race manage',
practiceManage: 'Practice manage',
bankManage: 'Bank manage',
sceneManage: 'Scene manage',
companyManage: 'Company manage',
authorApply: 'Grant application',
AuthorList: 'Authorization code list',
questionsRuleManage: 'Question rule manage',
preTheoryData: 'Pre Theory Data',
boardManage: 'Message Board Manage',
publishIBPManage: 'publish IBP Manage',
publishISCSManage: 'publish ISCS Manage',
publishTrainingManage: 'publish Training Manage',
voiceTraining: 'Voice Training',
mapGroup: 'Map Group',
drawingMange: 'Drawing Mange',
projectServer: 'Project Server',
audioResourcesManage: 'Audio Resources Manage',
iscsDeviceManage: 'ISCS Device Manage',
iscsResourcesManage: 'ISCS Resources Manage',
projectManage: 'Project Manage',
frontProjectConfigManage: 'Front Project Config Manage',
training: 'Training',
theory: 'Theory'
};

View File

@ -51,7 +51,7 @@ export default {
menuSignal: {
routeSelect: '进路选排',
routeCancel: '进路取消',
signalBlock: '信号封',
signalBlock: '信号封',
signalDeblock: '信号解封',
signalReopen: '信号重开',
guideRouteHandle: '引导进路办理',

View File

@ -38,6 +38,12 @@ export default {
permissionManage: '权限管理',
authorityTransferManage: '权限分发管理',
userRulesManage: '用户权限管理',
contestDataManage:'竞赛数据管理',
contestSubjectManage:'竞赛题目管理',
contestTaskManage:'竞赛任务管理',
contestSceneManage:'竞赛场景管理',
contestTaskScoreManage:'竞赛任务评分管理',
contestSeasonManage:'竞赛赛季管理',
fileManage: '文件管理',
frontResourceManage: '前端资源管理',
iscsPrerecordManage: 'ISCS预录管理',

View File

@ -1,114 +1,116 @@
export default {
homePage: '首页',
homePage: '首页',
designhomePage: '公共地图',
designUserPage: '个人地图',
newDesignUserPage: '地图绘制',
newDesignEditor: '编辑器',
newDesignEditorList: '图文列表',
newDesignDraftEditorList: '文章草稿',
uploadPdf: 'PDF上传',
fileManage: '文件管理',
designhomePage: '公共地图',
designUserPage: '个人地图',
newDesignUserPage: '地图绘制',
newDesignEditor: '编辑器',
newDesignEditorList: '图文列表',
newDesignDraftEditorList: '文章草稿',
uploadPdf: 'PDF上传',
fileManage: '文件管理',
mapManage: '地图管理',
skinManage: '皮肤管理',
mapDraw: '地图绘制',
runPlanManage: '运行图管理',
productEdit: '产品编辑',
mapManage: '地图管理',
skinManage: '皮肤管理',
mapDraw: '地图绘制',
runPlanManage: '运行图管理',
productEdit: '产品编辑',
lessaonManage: '课程管理',
trainingRecord: '实训录制',
taskManage: '任务管理',
trainingRule: '操作定义',
trainingManage: '实训管理',
lessonEdit: '课程编辑',
scriptManage: '剧本管理',
lessaonManage: '课程管理',
trainingRecord: '实训录制',
taskManage: '任务管理',
trainingRule: '操作定义',
trainingManage: '实训管理',
lessonEdit: '课程编辑',
scriptManage: '剧本管理',
teachSystem: '教学系统',
teachSystem: '教学系统',
examSystem: '考试系统',
examSystem: '考试系统',
demonstrationSystem: '仿真系统',
demonstrationSystem: '仿真系统',
dpSystem: '大屏系统',
dpSystem: '大屏系统',
planSystem: '琏计划',
planSystem: '琏计划',
replayManage: '回放管理',
replayManage: '回放管理',
permissionManage: '权限管理',
selfPermission: '我的权限',
permissionManage: '权限管理',
selfPermission: '我的权限',
pulishManage: '发布内容管理',
publishMapManage: '发布地图管理',
productStateManage: '产品状态管理',
publishLessonManage: '发布课程管理',
runPlanTemplateManage: '模板运行图管理',
runPlanCommonManage: '加载计划运行图管理',
runPlanEveryDayManage: '每日运行图管理',
examRuleManage: '试卷规则管理',
pulishManage: '发布内容管理',
publishMapManage: '发布地图管理',
productStateManage: '产品状态管理',
publishLessonManage: '发布课程管理',
runPlanTemplateManage: '模板运行图管理',
runPlanCommonManage: '加载计划运行图管理',
runPlanEveryDayManage: '每日运行图管理',
examRuleManage: '试卷规则管理',
orderAuthorityManage: '订单权限管理',
commodityManage: '商品管理',
orderManage: '订单管理',
authorityManage: '权限管理',
authorityTransferManage: '权限分发管理',
userRulesManage: '用户权限统计',
addCommodity: '添加商品',
addOrder: '添加订单',
addCoursePermissions: '添加课程权限',
orderAuthorityManage: '订单权限管理',
commodityManage: '商品管理',
orderManage: '订单管理',
authorityManage: '权限管理',
authorityTransferManage: '权限分发管理',
userRulesManage: '用户权限统计',
addCommodity: '添加商品',
addOrder: '添加订单',
addCoursePermissions: '添加课程权限',
systemManage: '系统管理',
dataDictionary: '数据字典',
dataDictionaryDetails: '数据字典明细',
userManage: '用户管理',
loginUserManage: '在线用户管理',
cacheManage: '缓存管理',
userTrainingManage: '用户实训统计',
userExamManage: '用户考试统计',
userSimulationManage: '用户仿真统计',
existingSimulation: '存在仿真管理',
systemManage: '系统管理',
dataDictionary: '数据字典',
dataDictionaryDetails: '数据字典明细',
userManage: '用户管理',
loginUserManage: '在线用户管理',
cacheManage: '缓存管理',
userTrainingManage: '用户实训统计',
userExamManage: '用户考试统计',
userSimulationManage: '用户仿真统计',
existingSimulation: '存在仿真管理',
ibpDraw: 'Ibp盘绘制',
trainingPlatform: '实训平台',
releaseApplication: '发布申请',
courseApplication: '课程发布申请',
scriptReleaseApplication: '剧本发布申请',
runGraphReleaseApplication: '运行图发布申请',
subsystemGeneration: '子系统生成',
newsBulletin: '消息公告',
notificationBulletin: '系统通知',
commandDictionary: '指令字典',
configLine: '线路管理',
deviceManage: '设备管理',
iscsDraw: 'Iscs绘制',
iscsSystem: 'Iscs系统',
studentManage: '学生管理',
competitionManage: '竞赛管理',
refereeJManage: '仿真管理',
homeJsxt: '首页',
examDetail: '考试详情',
raceManage: '竞赛管理',
recaList: '报名列表',
bankManage: '题库列表',
practiceManage: '实操列表',
sceneManage: '场景列表',
companyManage: '组织管理',
authorApply: '授权申请',
AuthorList: '授权列表',
questionsRuleManage: '出题规则管理',
preTheoryData: '理论导入预处理',
boardManage: '留言板管理',
publishIBPManage: '发布IBP盘管理',
publishISCSManage: '发布ISCS管理',
publishTrainingManage: '发布实训管理',
voiceTraining: '语音训练',
mapGroup: '地图分组',
drawingMange: '图纸管理',
projectServer: '项目域名',
audioResourcesManage: '音频资源管理',
iscsDeviceManage: 'ISCS设备管理',
iscsResourcesManage: 'ISCS资源管理',
projectManage: '项目管理',
frontProjectConfigManage: '前端项目配置管理',
}
ibpDraw: 'Ibp盘绘制',
trainingPlatform: '实训平台',
releaseApplication: '发布申请',
courseApplication: '课程发布申请',
scriptReleaseApplication: '剧本发布申请',
runGraphReleaseApplication: '运行图发布申请',
subsystemGeneration: '子系统生成',
newsBulletin: '消息公告',
notificationBulletin: '系统通知',
commandDictionary: '指令字典',
configLine: '线路管理',
deviceManage: '设备管理',
iscsDraw: 'Iscs绘制',
iscsSystem: 'Iscs系统',
studentManage: '学生管理',
competitionManage: '竞赛管理',
refereeJManage: '仿真管理',
homeJsxt: '首页',
examDetail: '考试详情',
raceManage: '竞赛管理',
recaList: '报名列表',
bankManage: '题库列表',
practiceManage: '实操列表',
sceneManage: '场景列表',
companyManage: '组织管理',
authorApply: '授权申请',
AuthorList: '授权列表',
questionsRuleManage: '出题规则管理',
preTheoryData: '理论导入预处理',
boardManage: '留言板管理',
publishIBPManage: '发布IBP盘管理',
publishISCSManage: '发布ISCS管理',
publishTrainingManage: '发布实训管理',
voiceTraining: '语音训练',
mapGroup: '地图分组',
drawingMange: '图纸管理',
projectServer: '项目域名',
audioResourcesManage: '音频资源管理',
iscsDeviceManage: 'ISCS设备管理',
iscsResourcesManage: 'ISCS资源管理',
projectManage: '项目管理',
frontProjectConfigManage: '前端项目配置管理',
training: '实训',
theory: '理论'
};

View File

@ -9,7 +9,15 @@ const mapDeviceStyle = {
'09': 'xian_02',
'10': 'xian_01', // 西安一号线
'11': 'xian_01', // 西安三号线
'12': 'ningbo_03' // 宁波三号线
'12': 'ningbo_03', // 宁波三号线
'13': 'race_01', // 2020国赛线路
'14':'nanjing_02', // 南京二号线
'15': 'datie_01', // 大铁线路一
'16': 'datie_02', // 大铁线路二
'17':'datie_tky', // 铁科院大铁线路
'18':'datie_jd1a',
'19': 'datie_ksk', // 大铁 卡斯柯
'20': 'ningbo_01'
};
export function selectLineCode(code) {

View File

@ -5,7 +5,6 @@ export function SetScene(project) {
// var cubeTextureLoader = new THREE.CubeTextureLoader();
var bgTexture;
// console.log(project);
if(project == "login" || project == undefined){
bgTexture = new THREE.TextureLoader().load(JL3D_LOCAL_STATIC+"/background/other.jpg");
}else if(project == "heb"){

View File

@ -48,7 +48,6 @@ export function Pathaction(){
document.onmousedown = function(event){
jlmap3dedit.selectswitch = false;
console.log(event.button);
//辅助线段
@ -60,7 +59,6 @@ export function Pathaction(){
lineswitch = null;
console.log(linenew);
if(linenew){
@ -74,7 +72,6 @@ export function Pathaction(){
point1 = mouserray(event,jlmap3dedit);
console.log("new");
if(point1){
linenew = addline(point1,1,jlmap3dedit.splineHelperObjects,jlmap3dedit.scene);
jlmap3dedit.mapdata.path.push(linenew);
@ -104,7 +101,6 @@ export function Pathaction(){
jlmap3dedit.mapdata.sectionlist.sections.datalist[i].rail.push(linenew.geometry.vertices[n]);
}
jlmap3dedit.mapdata.sectionlist.sections.datalist[i].railline = linenew;
console.log(jlmap3dedit.mapdata.sectionlist.sections.datalist[i].rail);
i = jlmap3dedit.mapdata.sectionlist.sections.modellist.length;
}
}
@ -177,7 +173,6 @@ export function Pathaction(){
document.onmousedown = function(event){
console.log(event.button);
//辅助线段
@ -189,7 +184,6 @@ export function Pathaction(){
lineswitch = null;
console.log(linenew);
if(linenew){
@ -233,8 +227,6 @@ export function Pathaction(){
for(let n=0;n<linenew.geometry.vertices.length;n++){
jlmap3dedit.mapdata.sectionlist.sections.datalist[i].rail.push(linenew.geometry.vertices[n]);
}
console.log(jlmap3dedit.mapdata.sectionlist.sections.datalist[i]);
console.log(jlmap3dedit.mapdata.sectionlist.sections.datalist[i].rail);
}
}
}
@ -289,7 +281,6 @@ export function Pathaction(){
}
//点击事件
this.raycaster = function(data){
console.log();
if(scope.on == true){
//定义光线
@ -300,13 +291,11 @@ export function Pathaction(){
mouse.y = -(event.clientY / window.innerHeight) * 2 + 1;
raycaster.setFromCamera( mouse, data.camera );
console.log(data.splineHelperObjects);
let intersects1;
intersects1 = raycaster.intersectObjects( data.splineHelperObjects);
if(intersects1[0]){
console.log(intersects1[0]);
return intersects1[0].object;
}
@ -329,9 +318,7 @@ export function Pathaction(){
mouse.y = -(mousep.clientY / window.innerHeight) * 2 + 1;
raycaster.setFromCamera( mouse, jlmap3dedit.camera );
console.log(jlmap3dedit.assetloader.modellist[3].mesh);
var intersects = raycaster.intersectObjects(jlmap3dedit.assetloader.modellist[3].mesh.children);
console.log(intersects);
if(intersects[0]){
resultpoint = intersects[0].point;
return resultpoint;

View File

@ -79,13 +79,9 @@ export function Sectionaction(){
raycaster.setFromCamera( mouse, data.camera );
let intersects1;
// console.log(modellist);
for(let i=0;i<modellist.length;i++){
intersects1 = raycaster.intersectObject(modellist[i],true);
// console.log(intersects1);
if(intersects1[0]){
// console.log(intersects1[0].object.code);
// console.log(modellist[i].code);
if(intersects1[0].object.code == modellist[i].code){
return modellist[i];
@ -97,20 +93,17 @@ export function Sectionaction(){
}
this.changemodel = function(jlmap3dedit,changedata){
console.log(changedata);
let scene = jlmap3dedit.scene;
let assetloader = jlmap3dedit.assetloader;
let isnewmodel = true;
//判断是否是未加载模型
for(let i=0;i<assetloader.modellist.length;i++){
console.log(assetloader.modellist[i].assetUrl);
if(changedata.assetUrl == assetloader.modellist[i].assetUrl){
isnewmodel = false;
i = assetloader.modellist.length;
}
}
console.log(isnewmodel);
jlmap3dedit.assetloader.loadnewsection(changedata,jlmap3dedit);
@ -118,25 +111,19 @@ export function Sectionaction(){
// for(let i=0;i<jlmap3dedit.mapdata.signallist.list.length;i++){
// if(jlmap3dedit.selectmodel.code == jlmap3dedit.mapdata.signallist.list[i].mesh.code){
// console.log("change");
// let num = i;
//
// //判断是否修改模型
// console.log(changedata.id );
// console.log(jlmap3dedit.mapdata.signallist.list[i].mesh.name);
// if(changedata.id != jlmap3dedit.mapdata.signallist.list[i].mesh.name){
//
// if(isnewmodel == true){
// console.log("new");
// return jlmap3dedit.assetloader.loadnewasset(jlmap3dedit,changedata,num);
//
// }else{
// console.log("old");
// return jlmap3dedit.assetloader.loadoldasset(jlmap3dedit,changedata,num);
//
// }
// }else{
// console.log("same");
// return jlmap3dedit.selectmodel;
// }
//

View File

@ -50,7 +50,6 @@ export function Signalaction(){
for(let i=0;i<data.mapdata.signallist.list.length;i++){
intersects1 = raycaster.intersectObjects( data.mapdata.signallist.list[i].mesh.children);
if(intersects1[0]){
console.log(intersects1[0].object);
if(intersects1[0].object.parent.code == data.mapdata.signallist.list[i].mesh.code){
return data.mapdata.signallist.list[i].mesh;
}
@ -62,11 +61,9 @@ export function Signalaction(){
}
this.changemodel = function(jlmap3dedit,changedata){
console.log(changedata);
let isnewmodel = true;
//判断是否是未加载模型
for(let i=0;i<jlmap3dedit.assetloader.modellist.length;i++){
console.log(jlmap3dedit.assetloader.modellist[i].assetUrl);
if(changedata.assetUrl == jlmap3dedit.assetloader.modellist[i].assetUrl){
isnewmodel = false;
@ -77,25 +74,19 @@ export function Signalaction(){
let scene = jlmap3dedit.scene;
for(let i=0;i<jlmap3dedit.mapdata.signallist.list.length;i++){
if(jlmap3dedit.selectmodel.code == jlmap3dedit.mapdata.signallist.list[i].mesh.code){
console.log("change");
let num = i;
//判断是否修改模型
console.log(changedata.id );
console.log(jlmap3dedit.mapdata.signallist.list[i].mesh.name);
if(changedata.id != jlmap3dedit.mapdata.signallist.list[i].mesh.name){
if(isnewmodel == true){
console.log("new");
return jlmap3dedit.assetloader.loadnewasset(jlmap3dedit,changedata,num);
}else{
console.log("old");
return jlmap3dedit.assetloader.loadoldasset(jlmap3dedit,changedata,num);
}
}else{
console.log("same");
return jlmap3dedit.selectmodel;
}

View File

@ -48,15 +48,11 @@ export function Stationaction(){
raycaster.setFromCamera( mouse, data.camera );
let intersects1;
console.log( data.mapdata.stationstandlist);
for(let i=0;i<data.mapdata.stationstandlist.group.children.length;i++){
intersects1 = raycaster.intersectObjects( data.mapdata.stationstandlist.group.children[i].children);
if(intersects1[0]){
console.log(data.mapdata.stationstandlist.group);
console.log(intersects1[0]);
console.log(data.mapdata.stationstandlist.group.children[i]);
if(intersects1[0].object.parent.code == data.mapdata.stationstandlist.group.children[i].code){
return data.mapdata.stationstandlist.group.children[i];
}

View File

@ -55,7 +55,6 @@ export function Switchaction(){
if(intersects1[0]){
if(intersects1[0].object.code == data.mapdata.sectionlist.switchs.modellist[i].code){
//console.log(intersects1[0].object.name);
return data.mapdata.sectionlist.switchs.modellist[i];
}
}

View File

@ -55,8 +55,6 @@ export function Trainaction(){
if(intersects1[0]){
if(intersects1[0].object.name == data.mapdata.trainlisttest.list[i].name){
//console.log(intersects1[0].object.name);
console.log(data.mapdata.trainlisttest.list[i]);
return data.mapdata.trainlisttest.list[i];
}
}

View File

@ -1,7 +1,6 @@
//import request from '@/utils/request';
export function initDataSave(data) {
console.log(data);
let postmap = {
id:data.mapdata.id,
mapId:data.mapdata.mapId,
@ -24,7 +23,6 @@ export function initDataSave(data) {
}else{
let models = data.assetManager;
console.log(data.assetManager);
postmap.assets = JSON.stringify(models);
@ -113,7 +111,6 @@ export function initDataSave(data) {
postmap.signals = JSON.stringify(signals);
//车站
let stands = [];
console.log(data.mapdata.stationstandlist);
if(data.mapdata.stationstandlist){
for(let i=0;i<data.mapdata.stationstandlist.list.length;i++){
let station = {

View File

@ -1,6 +1,5 @@
//import request from '@/utils/request';
export function specilDataSave(data) {
console.log(data);
let postmap = {
id:data.mapdata.id,
mapId:data.mapdata.mapId,
@ -55,7 +54,6 @@ export function specilDataSave(data) {
let models = data.assetManager;
console.log(data.assetManager);
postmap.assets = JSON.stringify(models);

View File

@ -23,13 +23,11 @@ export function testgetmodels(data) {
}else{
let models = data.assetManager;
console.log(data.assetManager);
postmap.assets = JSON.stringify(models);
//section隧道
let sections = [];
// console.log(data.mapdata.sectionlist.sections.datalist);
for(let i in data.mapdata.sectionlist.sections.datalist){
let section = {
// uuid:data.mapdata.sectionlist.sections.modellist[i].uuid,
@ -47,7 +45,6 @@ export function testgetmodels(data) {
}
let nowmesh = data.mapdata.sectionlist.sectiongroup.getObjectByProperty("code",section.code);
section.railpoint = nowmesh.railpoint;
// console.log(nowmesh.railpoint);
// if(data.mapdata.sectionlist.sections.datalist[i].rsection){
// section.rsection = data.mapdata.sectionlist.sections.datalist[i].rsection;
// }

View File

@ -27,7 +27,6 @@ export function jl3dEditorLoader(mapid,scope){
get3dMapData(editmapid).then(data => {
if(data.data ){
console.log(data);
if(data.data.assets){
// initData(editmapid,data.data.id);
loadData(editmapid,data.data);
@ -40,26 +39,22 @@ export function jl3dEditorLoader(mapid,scope){
set3dMapData(params).then(data => {
if(data.code == "200"){
//console.log("创建三维数据成功");
// console.log(data);
initData(editmapid,data.data.id);
}
}).catch(error => {
console.log(error);
console.error(error);
});
}
}).catch(error => {
console.log(error);
console.error(error);
});
function initData(mapid,data3did){
getMapDetail(mapid).then(data => {
console.log(data);
let mapdata = data.data;
//console.log(data3did);
jlmap3ddata.id = data3did;
jlmap3ddata.mapId = mapid;
@ -71,11 +66,9 @@ export function jl3dEditorLoader(mapid,scope){
jlmap3ddata.switchlist = new rSwitchList();
assetloader.assetinit(scene)
.then(function(data){
//console.log(data);
return jlmap3ddata.sectionlist.initpromise(jlmap3ddata,assetloader,mapdata.sectionList,mapdata.switchList,scene);
})
.then(function(data){
//console.log(data);
return jlmap3ddata.signallist.initpromise(jlmap3ddata,mapdata.signalList,scene,assetloader);
})
.then(function(data){
@ -83,7 +76,6 @@ export function jl3dEditorLoader(mapid,scope){
})
.then(function(data){
//console.log(data);
loadingInstance.close();
});
}else{
@ -100,15 +92,12 @@ export function jl3dEditorLoader(mapid,scope){
jlmap3ddata.raillist.setrail();
assetloader.assetinit(scene)
.then(function(data){
//console.log(data);
return jlmap3ddata.stationstandlist.initpromise(jlmap3ddata,mapdata.stationList,mapdata.stationStandList,scene,assetloader);
})
.then(function(data){
//console.log(data);
return jlmap3ddata.sectionlist.initpromise(jlmap3ddata,assetloader,mapdata.sectionList,mapdata.switchList,scene);
})
.then(function(data){
//console.log(data);
return jlmap3ddata.signallist.initpromise(jlmap3ddata,mapdata.signalList,scene,assetloader);
})
.then(function(data){
@ -116,7 +105,6 @@ export function jl3dEditorLoader(mapid,scope){
})
.then(function(data){
//console.log(data);
loadingInstance.close();
});
}
@ -151,12 +139,10 @@ export function jl3dEditorLoader(mapid,scope){
assetloader.setModelListOver(jlmap3dasset.sceneAssetList,5,jlmap3dasset.others);
assetloader.assetPromiseOver(scene)
.then(function(data){
//console.log(data);
// return jlmap3ddata.sectionlist.initpromise(jlmap3ddata,assetloader,mapdata.sectionList,mapdata.switchList,scene);
return jlmap3ddata.sectionlist.loadpromise(jlmap3ddata,assetloader,sectiondata.section,mapdata.sectionList,mapdata.switchList,scene);
})
.then(function(data){
//console.log(data);
// return jlmap3ddata.signallist.initpromise(jlmap3ddata,mapdata.signalList,scene,assetloader);
return jlmap3ddata.signallist.loadpromise(signaldata,scene,assetloader,mapdata.signalList);
})
@ -165,7 +151,6 @@ export function jl3dEditorLoader(mapid,scope){
return jlmap3ddata.switchlist.loadpromise(jlmap3ddata,switchdata,scene,assetloader);
})
.then(function(data){
//console.log(data);
loadingInstance.close();
});
}else{
@ -179,7 +164,6 @@ export function jl3dEditorLoader(mapid,scope){
jlmap3ddata.switchlist = new SwitchList();
jlmap3ddata.raillist = new RailList();
console.log(netdata);
let sectiondata = JSON.parse(netdata.sections);
let switchdata = JSON.parse(netdata.switchs);
let signaldata = JSON.parse(netdata.signals);
@ -196,12 +180,10 @@ export function jl3dEditorLoader(mapid,scope){
return jlmap3ddata.stationstandlist.loadpromise(jlmap3ddata,standsdata,mapdata.stationStandList,scene,assetloader);
})
.then(function(data){
//console.log(data);
// return jlmap3ddata.sectionlist.initpromise(jlmap3ddata,assetloader,mapdata.sectionList,mapdata.switchList,scene);
return jlmap3ddata.sectionlist.loadpromise(jlmap3ddata,assetloader,sectiondata.section,scene);
})
.then(function(data){
//console.log(data);
// return jlmap3ddata.signallist.initpromise(jlmap3ddata,mapdata.signalList,scene,assetloader);
return jlmap3ddata.signallist.loadpromise(signaldata,scene,assetloader,mapdata.signalList);
})
@ -210,7 +192,6 @@ export function jl3dEditorLoader(mapid,scope){
return jlmap3ddata.switchlist.loadpromise(jlmap3ddata,switchdata,scene,assetloader);
})
.then(function(data){
//console.log(data);
loadingInstance.close();
});
}else{
@ -222,12 +203,10 @@ export function jl3dEditorLoader(mapid,scope){
return jlmap3ddata.stationstandlist.loadpromise(jlmap3ddata,standsdata,mapdata,scene,assetloader,jlmap3dasset.others);
})
.then(function(data){
//console.log(data);
// return jlmap3ddata.sectionlist.initpromise(jlmap3ddata,assetloader,mapdata.sectionList,mapdata.switchList,scene);
return jlmap3ddata.sectionlist.loadpromise(jlmap3ddata,assetloader,sectiondata.section,mapdata.sectionList,mapdata.switchList,scene);
})
.then(function(data){
//console.log(data);
// return jlmap3ddata.signallist.initpromise(jlmap3ddata,mapdata.signalList,scene,assetloader);
return jlmap3ddata.signallist.loadpromise(signaldata,scene,assetloader,mapdata.signalList);
})
@ -236,7 +215,6 @@ export function jl3dEditorLoader(mapid,scope){
return jlmap3ddata.switchlist.loadpromise(jlmap3ddata,switchdata,scene,assetloader);
})
.then(function(data){
//console.log(data);
loadingInstance.close();
});
}

View File

@ -29,7 +29,6 @@ import { jl3dEditorLoader } from '@/jlmap3d/edit/jl3dEditorLoader';
import { Actionmanage } from '@/jlmap3d/edit/actionmanage';
export function JLmap3dEdit(dom, data, mapid) {
console.log(data);
var scope = this;
@ -144,7 +143,6 @@ export function JLmap3dEdit(dom, data, mapid) {
};
this.eventon = function(){
//console.log("on");
//raycaster交互模型点击事件
document.getElementById("testdraw").addEventListener( "mousedown", onselect, false );
//窗口自适应
@ -154,7 +152,6 @@ export function JLmap3dEdit(dom, data, mapid) {
};
this.eventoff = function(){
//console.log("off");
//raycaster交互模型点击事件
document.getElementById("testdraw").removeEventListener( "mousedown", onselect, false );
//窗口自适应
@ -163,7 +160,6 @@ export function JLmap3dEdit(dom, data, mapid) {
this.exportsection = function(){
let exporter = new THREE.OBJExporter();
console.log(scope.mapdata);
// let exportmodels = scope.mapdata.stationstandlist.group;
let exportmodels = scope.mapdata.sectionlist.sectiongroup;
// let exportmodels = scope.mapdata.stationstandlist.group;
@ -184,7 +180,6 @@ export function JLmap3dEdit(dom, data, mapid) {
this.exportsection = function(){
let exporter = new THREE.OBJExporter();
console.log(scope.mapdata);
// let exportmodels = scope.mapdata.stationstandlist.group;
let exportSectionModel = scope.mapdata.sectionlist.sectiongroup;
objDownload("section",exporter.parse( exportSectionModel ));
@ -226,10 +221,6 @@ export function JLmap3dEdit(dom, data, mapid) {
}
this.actiommode = function(changedata){
console.log(changedata);
console.log(scope.editmode);
// console.log(scope.actionmode);
// console.log(changedata);
if(changedata == "trackreplace"){
scope.editmode = "trackedit";
scope.eventon();
@ -274,7 +265,6 @@ export function JLmap3dEdit(dom, data, mapid) {
// if(scope.editmode == "pathedit"){
//
// if(scope.actionmode == "drawrail"){
// //console.log("drawrail");
// scope.selectmodel = scope.action.pathaction.drawline(scope);
// }
//
@ -305,27 +295,14 @@ export function JLmap3dEdit(dom, data, mapid) {
for(let i=0,leni=scope.mapdata.stationstandlist.list.length;i<leni;i++){
if(changeStation.code == scope.mapdata.stationstandlist.list[i].code){
let changeData = scope.mapdata.stationstandlist.list[i];
console.log(changeData);
let topStandTrack = scope.mapdata.sectionlist.sections.datalist[changeData.stands[0].section];
let downStandTrack = scope.mapdata.sectionlist.sections.datalist[changeData.stands[changeData.stands.length-1].section];
console.log(scope.mapdata.sectionlist.sections);
console.log(topStandTrack.mesh.railpoint[0].x);
console.log(topStandTrack.mesh.railpoint[2].x);
console.log(downStandTrack.mesh.railpoint[0].x);
console.log(downStandTrack.mesh.railpoint[2].x);
let rightpos = topStandTrack.leftStopPercent*(topStandTrack.mesh.railpoint[2].x -topStandTrack.mesh.railpoint[0].x)+topStandTrack.mesh.railpoint[0].x;
let leftpos = downStandTrack.rightStopPercent*(downStandTrack.mesh.railpoint[2].x -downStandTrack.mesh.railpoint[0].x)+downStandTrack.mesh.railpoint[0].x;
let rightX = changeData.mesh.position.x-63.4 - rightpos;
let leftX = changeData.mesh.position.x+63.4 - leftpos;
console.log("----------------------------");
console.log(rightpos);
console.log(leftpos);
console.log("----------------------------");
console.log(rightX);
console.log(leftX);
topStandTrack.mesh.position.x = topStandTrack.mesh.position.z + rightX;
downStandTrack.mesh.position.x = downStandTrack.mesh.position.x + leftX;
//
@ -367,9 +344,6 @@ export function JLmap3dEdit(dom, data, mapid) {
plane2.rotation.y = Math.PI/2;
let leftpos = scope.mapdata.sectionlist.sections.datalist[k].leftStopPercent*(scope.mapdata.sectionlist.sections.datalist[k].railpoint[2].x -scope.mapdata.sectionlist.sections.datalist[k].railpoint[0].x)+scope.mapdata.sectionlist.sections.datalist[k].railpoint[0].x;
let rightpos = scope.mapdata.sectionlist.sections.datalist[k].rightStopPercent*(scope.mapdata.sectionlist.sections.datalist[k].railpoint[2].x -scope.mapdata.sectionlist.sections.datalist[k].railpoint[0].x)+scope.mapdata.sectionlist.sections.datalist[k].railpoint[0].x;
// console.log("==========");
// console.log(scope.mapdata.sectionlist.sections.datalist[k].leftStopPercent);
// console.log(scope.mapdata.sectionlist.sections.datalist[k].rightStopPercent);
plane1.position.set(leftpos,scope.mapdata.sectionlist.sections.datalist[k].railpoint[1].y,scope.mapdata.sectionlist.sections.datalist[k].railpoint[1].z);
plane2.position.set(rightpos,scope.mapdata.sectionlist.sections.datalist[k].railpoint[1].y,scope.mapdata.sectionlist.sections.datalist[k].railpoint[1].z);
stationStopGroup.add(plane1);
@ -393,8 +367,6 @@ export function JLmap3dEdit(dom, data, mapid) {
//自动匹配轨道信号灯道岔
this.autoss = function(){
console.log("autoss");
// console.log(scope.mapdata);
scope.mapdata.signallist.resetsignal(scope.mapdata);
scope.mapdata.switchlist.resetswitch(scope.mapdata);
//old
@ -494,8 +466,6 @@ export function JLmap3dEdit(dom, data, mapid) {
newpointlist.push(new THREE.Vector3(alignmentModel.railpoint[1].x,alignmentModel.railpoint[0].y,alignmentModel.railpoint[0].z+0.001));
newpointlist.push(new THREE.Vector3(alignmentModel.railpoint[2].x,alignmentModel.railpoint[0].y,alignmentModel.railpoint[0].z));
// console.log(oldobject);
let newSection = reCreatSection(newpointlist,oldobject);
newSection.meshtype = "section";
scope.mapdata.sectionlist.sections.datalist[alignmentCode].mesh = newSection;
@ -569,8 +539,6 @@ export function JLmap3dEdit(dom, data, mapid) {
//三维交互点击事件函数
function onselect(event) {
//console.log("select");
//console.log("select");
if(scope.selectswitch == true){
scope.transcontrol.detach();
@ -593,7 +561,6 @@ export function JLmap3dEdit(dom, data, mapid) {
}
if(scope.editmode == "stationedit"){
console.log("stat!!!!!!!!!!!!");
scope.selectmodel = scope.action.stationaction.raycaster(scope);
}
@ -607,11 +574,9 @@ export function JLmap3dEdit(dom, data, mapid) {
if(scope.editmode == "pathedit"){
scope.selectmodel = scope.action.pathaction.raycaster(scope);
//console.log(scope.selectmodel);
}
if(scope.selectmodel != null){
//console.log(scope.selectmodel.rotation);
if(scalControls.scalon){
}else{

View File

@ -36,7 +36,6 @@ export function rSectionList() {
if(sectiondata[i].type == "01" || sectiondata[i].type == "03"){
//初始化区段对象数据
let newsection = new SectionModel(sectiondata[i]);
// console.log(sectiondata[i]);
newsection.name = sectiondata[i].name;
newsection.code = sectiondata[i].code;
newsection.index = i;
@ -49,7 +48,6 @@ export function rSectionList() {
newsection.points = sectiondata[i].points;
newsection.pointslength = sectiondata[i].points.length-1;
newsection.railpoint = [];
// console.log(sectiondata[i].points.length);
newsection.standTrack = sectiondata[i].standTrack;
newsection.endbuild = false;
@ -74,7 +72,6 @@ export function rSectionList() {
let acode = switchdata[i].sectionACode;
let bcode = switchdata[i].sectionBCode;
let ccode = switchdata[i].sectionCCode;
// console.log(switchdata[i]);
let aposx = (scope.sections.datalist[acode].points[0].x + scope.sections.datalist[acode].points[scope.sections.datalist[acode].pointslength].x)/2;
@ -83,7 +80,6 @@ export function rSectionList() {
let aposy = (scope.sections.datalist[acode].points[0].y + scope.sections.datalist[acode].points[scope.sections.datalist[acode].pointslength].y)/2;
let cposy = (scope.sections.datalist[ccode].points[0].y + scope.sections.datalist[ccode].points[scope.sections.datalist[ccode].pointslength].y)/2;
// console.log("----------------");
if(aposx > cposx){
if(aposy < cposy){
// ——A
@ -157,8 +153,6 @@ export function rSectionList() {
y:0,
z:0
});
console.log(scope.sections.datalist);
console.log("START BUILD !!!!!!!!!!!!!!!!!");
buildsectionall(scope.sections.datalist["T1"]);
resolve("loadersection");
});
@ -246,12 +240,7 @@ export function rSectionList() {
y:0,
z:position.z
};
// console.log(origin+"******************************");
// console.log(start);
// console.log(origin);
if(scope.sections.datalist[start].standTrack == true && start != origin){
// console.log(start+"到达");
// console.log("++++++++++++++++++++++++");
return ;
}else if(scope.sections.datalist[start].rsection == undefined){
return ;
@ -420,11 +409,7 @@ export function rSectionList() {
];
}
// console.log(data.ctype);
if(type == "cross"){
// console.log(data.ctype);
// console.log(scope.sections.datalist[data.code].points.length);
// console.log(scope.sections.datalist[data.code]);
if(data.ctype == "1"||data.ctype == "2" ){
@ -769,16 +754,13 @@ export function rSectionList() {
let acode = switch2d[i].sectionACode;
let bcode = switch2d[i].sectionBCode;
let ccode = switch2d[i].sectionCCode;
// console.log(switchdata[i]);
// console.log(scope.sections.datalist[acode]);
let aposx = (scope.sections.datalist[acode].points[0].x + scope.sections.datalist[acode].points[scope.sections.datalist[acode].pointslength].x)/2;
let cposx = (scope.sections.datalist[ccode].points[0].x + scope.sections.datalist[ccode].points[scope.sections.datalist[ccode].pointslength].x)/2;
let aposy = (scope.sections.datalist[acode].points[0].y + scope.sections.datalist[acode].points[scope.sections.datalist[acode].pointslength].y)/2;
let cposy = (scope.sections.datalist[ccode].points[0].y + scope.sections.datalist[ccode].points[scope.sections.datalist[ccode].pointslength].y)/2;
// console.log("----------------");
if(aposx > cposx){
if(aposy < cposy){
// ——A

View File

@ -13,7 +13,6 @@ export function rSignalList() {
this.initpromise = function(jlmap3ddata,data,scene,assetloader,netdata){
return new Promise(function(resolve, reject){
scope.group.name = "signal";
// console.log(data);
//遍历信号数据
let netsignal = null;
let haddata = false;
@ -32,7 +31,6 @@ export function rSignalList() {
if(data[i].virtual == false){
let newsignal = new SignalModel(data[i]);
if(haddata == false){
// console.log(data[i])
let newmesh = assetloader.modellist[num].mesh.clone(true);
newmesh.name = data[i].name;
@ -154,7 +152,6 @@ export function rSignalList() {
if(data[n].virtual == false){
let newsignal = new SignalModel(signaldata[i]);
// console.log(signaldata[i]);
let newmesh = assetloader.modellist[num].mesh.clone(true);
newmesh.sectionCode = data[n].sectionCode;
newmesh.sectionOffset = data[n].sectionOffset;
@ -191,7 +188,6 @@ export function rSignalList() {
});
};
this.resetsignal = function(jlmap3ddata){
// console.log(jlmap3ddata.linksgroup);
let sectiondata = jlmap3ddata.sectionlist.sectiongroup.children;
for(let i=0;i<scope.group.children.length;i++){
let signaldata = scope.group.children[i];
@ -200,7 +196,6 @@ export function rSignalList() {
if(sectiondata[j].code == signaldata.sectionCode){
let section = sectiondata[j];
let posx = null;
// console.log(section);
posx = section.railpoint[0].x + signaldata.sectionOffset;

View File

@ -14,11 +14,9 @@ export function rSwitchList() {
};
this.initpromise = function(jlmap3ddata,data,scene,assetloader,netdata){
// console.log(jlmap3ddata);
return new Promise(function(resolve, reject){
scene.add( scope.switchgroup );
let sectiondata = jlmap3ddata.sectionlist.sections.datalist;
// console.log(sectiondata);
let num;
for(let j=0;j<assetloader.modellist.length;j++){
if(assetloader.modellist[j].deviceType == "autoswitch"){
@ -58,7 +56,6 @@ export function rSwitchList() {
return new Promise(function(resolve, reject){
scene.add( scope.switchgroup );
// let sectiondata = jlmap3ddata.sectionlist.sections.datalist;
// console.log(sectiondata);
let num;
for(let j=0;j<assetloader.modellist.length;j++){
if(assetloader.modellist[j].type == "switch"){
@ -70,7 +67,6 @@ export function rSwitchList() {
}
};
for(let i=0,leni = switchdata.length;i<leni;i++){
// console.log(switchdata[i]);
let newswitch = {
code:switchdata[i].code,
name:switchdata[i].name,
@ -79,7 +75,6 @@ export function rSwitchList() {
pc:switchdata[i].pc
};
// console.log(newswitch.pa);
let autoswitch = assetloader.modellist[num].mesh.clone(true);
autoswitch.code = switchdata[i].code;
for(let j=0;j<autoswitch.children.length;j++){
@ -101,7 +96,6 @@ export function rSwitchList() {
}
this.resetswitch = function(data){
// console.log("reset");
let sectiondata = data.sectionlist.sectiongroup;
for(let i=0;i<scope.switchs.datalist.length;i++){

View File

@ -61,12 +61,7 @@ export function RailList(){
x:circle1.position.x,
z:circle1.position.z
}];
// console.log(i);
// console.log(section[i].mesh);
// console.log(mapdata.sectionlist.sections.datalist[i].rail);
// console.log("=======================");
}
// console.log(n);
// for(let i=0;i<mapdata.switchlist.switchgroup.children.length;i++){
// var geometry = new THREE.CircleBufferGeometry( 1, 16 );
// var material = new THREE.MeshBasicMaterial( { color: 0xff00ff } );

View File

@ -36,7 +36,6 @@ export function SectionList() {
if(sectiondata[i].type == "01" || sectiondata[i].type == "03"){
//初始化区段对象数据
let newsection = new SectionModel(sectiondata[i]);
// console.log(sectiondata[i]);
newsection.name = sectiondata[i].name;
newsection.code = sectiondata[i].code;
newsection.index = i;
@ -49,7 +48,6 @@ export function SectionList() {
newsection.points = sectiondata[i].points;
newsection.pointslength = sectiondata[i].points.length-1;
newsection.railpoint = [];
// console.log(sectiondata[i].points.length);
newsection.standTrack = sectiondata[i].standTrack;
newsection.endbuild = false;
@ -97,7 +95,6 @@ export function SectionList() {
let acode = switchdata[i].sectionACode;
let bcode = switchdata[i].sectionBCode;
let ccode = switchdata[i].sectionCCode;
// console.log(switchdata[i]);
let aposx = (scope.sections.datalist[acode].points[0].x + scope.sections.datalist[acode].points[scope.sections.datalist[acode].pointslength].x)/2;
@ -106,7 +103,6 @@ export function SectionList() {
let aposy = (scope.sections.datalist[acode].points[0].y + scope.sections.datalist[acode].points[scope.sections.datalist[acode].pointslength].y)/2;
let cposy = (scope.sections.datalist[ccode].points[0].y + scope.sections.datalist[ccode].points[scope.sections.datalist[ccode].pointslength].y)/2;
// console.log("----------------");
if(aposx > cposx){
if(aposy < cposy){
// ——A
@ -175,7 +171,6 @@ export function SectionList() {
reals:[],
posx:null,
};
// console.log(stationlist[i]);
// realstopsection.stands.push();
for(let n=0,lenn = stationlist[i].stands.length;n<lenn;n++){
@ -384,7 +379,6 @@ export function SectionList() {
}
//根据站台区段创建站台位置 120停车点距离
for(let j=0,lenj=stations.length;j<lenj;j++){
// console.log(j);
let direction1 = scope.sections.datalist[stations[j].stands[0].section];
let direction2 = scope.sections.datalist[stations[j].stands[1].section];
@ -404,7 +398,6 @@ export function SectionList() {
}
// scope.sections.datalist[stations[0].stands[0].section].endbuild = true;
console.log("START BUILD !!!!!!!!!!!!!!!!!");
buildsectionall(scope.sections.datalist[stations[0].stands[0].section]);
resolve("loadersection");
});
@ -492,12 +485,7 @@ export function SectionList() {
y:0,
z:position.z
};
// console.log(origin+"******************************");
// console.log(start);
// console.log(origin);
if(scope.sections.datalist[start].standTrack == true && start != origin){
// console.log(start+"到达");
// console.log("++++++++++++++++++++++++");
return ;
}else if(scope.sections.datalist[start].rsection == undefined){
return ;
@ -666,11 +654,7 @@ export function SectionList() {
];
}
// console.log(data.ctype);
if(type == "cross"){
// console.log(data.ctype);
// console.log(scope.sections.datalist[data.code].points.length);
// console.log(scope.sections.datalist[data.code]);
if(data.ctype == "1"||data.ctype == "2" ){
@ -1015,16 +999,13 @@ export function SectionList() {
let acode = switch2d[i].sectionACode;
let bcode = switch2d[i].sectionBCode;
let ccode = switch2d[i].sectionCCode;
// console.log(switchdata[i]);
// console.log(scope.sections.datalist[acode]);
let aposx = (scope.sections.datalist[acode].points[0].x + scope.sections.datalist[acode].points[scope.sections.datalist[acode].pointslength].x)/2;
let cposx = (scope.sections.datalist[ccode].points[0].x + scope.sections.datalist[ccode].points[scope.sections.datalist[ccode].pointslength].x)/2;
let aposy = (scope.sections.datalist[acode].points[0].y + scope.sections.datalist[acode].points[scope.sections.datalist[acode].pointslength].y)/2;
let cposy = (scope.sections.datalist[ccode].points[0].y + scope.sections.datalist[ccode].points[scope.sections.datalist[ccode].pointslength].y)/2;
// console.log("----------------");
if(aposx > cposx){
if(aposy < cposy){
// ——A

View File

@ -13,7 +13,6 @@ export function SignalList() {
this.initpromise = function(jlmap3ddata,data,scene,assetloader,netdata){
return new Promise(function(resolve, reject){
scope.group.name = "signal";
// console.log(data);
//遍历信号数据
let netsignal = null;
let haddata = false;
@ -32,7 +31,6 @@ export function SignalList() {
if(data[i].virtual == false){
let newsignal = new SignalModel(data[i]);
if(haddata == false){
// console.log(data[i])
let newmesh = assetloader.modellist[num].mesh.clone(true);
newmesh.name = data[i].name;
@ -154,7 +152,6 @@ export function SignalList() {
if(data[n].virtual == false){
let newsignal = new SignalModel(signaldata[i]);
// console.log(signaldata[i]);
let newmesh = assetloader.modellist[num].mesh.clone(true);
newmesh.sectionCode = data[n].sectionCode;
newmesh.sectionOffset = data[n].sectionOffset;
@ -191,7 +188,6 @@ export function SignalList() {
});
};
this.resetsignal = function(jlmap3ddata){
// console.log(jlmap3ddata.linksgroup);
let sectiondata = jlmap3ddata.sectionlist.sectiongroup.children;
for(let i=0;i<scope.group.children.length;i++){
let signaldata = scope.group.children[i];
@ -200,7 +196,6 @@ export function SignalList() {
if(sectiondata[j].code == signaldata.sectionCode){
let section = sectiondata[j];
let posx = null;
// console.log(section);
posx = section.railpoint[0].x + signaldata.sectionOffset;

View File

@ -83,18 +83,14 @@ export function StationStandList() {
}
}
console.log(scope.list);
resolve("loadedstation");
});
}
this.loadpromise = function(jlmap3ddata,standsdata,jlmapdata,scene,assetloader,otherStation){
return new Promise(function(resolve, reject){
// console.log(jlmap3ddata);
let jlmapstationdata = jlmapdata.stationList;
let jlmapstanddata = jlmapdata.stationStandList;
// jlmapstationdata.splice(0,1);
console.log(standsdata);
console.log(jlmapstationdata);
// for(let i=0;i<jlmapstationdata.length;i++){// || jlmapstationdata[i].subheadDisplay == false
// if(jlmapstationdata[i].visible == false){
// jlmapstationdata.splice(i,1);
@ -103,30 +99,19 @@ export function StationStandList() {
// standsdata[i].code = jlmapstationdata[i].code;
// standsdata[i].name = jlmapstationdata[i].name;
// }
// // console.log(jlmapstationdata[i].subheadDisplay);
// }
// console.log(jlmapstationdata);
console.log(standsdata);
//
// console.log(jlmapstationdata);
//
// console.log(standsdata);
// console.log(jlmapstationdata);
for(let i=0;i<jlmapstationdata.length;i++){
if(jlmapstationdata[i].visible == false || jlmapstationdata[i].depot == true){
jlmapstationdata.splice(i,1);
i--;
}else{
// console.log(jlmapstationdata[i]);
// console.log(standsdata[i]);
standsdata[i].code = jlmapstationdata[i].code;
standsdata[i].name = jlmapstationdata[i].name;
}
}
// console.log(otherStation);
// console.log(standsdata);
// console.log(assetloader.modellist);
let stations = jlmap3ddata.stationstandlist.list;
let num;
let num2;
@ -154,9 +139,6 @@ export function StationStandList() {
num3 = j;
}
}
// console.log("+++++++++++++");
// console.log(jlmapstanddata);
// console.log(standsdata);
for(let i=0;i<standsdata.length;i++){
let newstationstand = new StationStandModel(standsdata[i]);
let newstationmesh;
@ -186,7 +168,6 @@ export function StationStandList() {
newstationstand.name = standsdata[i].name;
newstationstand.inside = standsdata[i].inside;
// console.log(standsdata[i]);
newstationmesh.code = standsdata[i].code;
newstationmesh.name = standsdata[i].name;
newstationmesh.meshtype = "station";
@ -211,13 +192,11 @@ export function StationStandList() {
}else{
newstationmesh = assetloader.modellist[num2].mesh.clone(true);
}
// console.log(jlmapstanddata[j]);
newstationstand.code = standsdata[i].code;
newstationstand.name = standsdata[i].name;
newstationstand.inside = standsdata[i].inside;
// console.log(standsdata[i]);
newstationmesh.code = standsdata[i].code;
newstationmesh.name = standsdata[i].name;
newstationmesh.meshtype = "station";
@ -232,11 +211,9 @@ export function StationStandList() {
scope.list.push(newstationstand);
}else{
newstationmesh = assetloader.modellist[num3].mesh.clone(true);
// console.log(jlmapstanddata[j]);
newstationstand.code = standsdata[i].code;
newstationstand.name = standsdata[i].name;
newstationstand.inside = standsdata[i].inside;
// console.log(standsdata[i]);
newstationmesh.code = standsdata[i].code;
newstationmesh.name = standsdata[i].name;
newstationmesh.position.x = standsdata[i].position.x;

View File

@ -14,11 +14,9 @@ export function SwitchList() {
};
this.initpromise = function(jlmap3ddata,data,scene,assetloader,netdata){
// console.log(jlmap3ddata);
return new Promise(function(resolve, reject){
scene.add( scope.switchgroup );
let sectiondata = jlmap3ddata.sectionlist.sections.datalist;
// console.log(sectiondata);
let num;
for(let j=0;j<assetloader.modellist.length;j++){
if(assetloader.modellist[j].deviceType == "autoswitch"){
@ -58,7 +56,6 @@ export function SwitchList() {
return new Promise(function(resolve, reject){
scene.add( scope.switchgroup );
// let sectiondata = jlmap3ddata.sectionlist.sections.datalist;
// console.log(sectiondata);
let num;
for(let j=0;j<assetloader.modellist.length;j++){
if(assetloader.modellist[j].type == "switch"){
@ -70,7 +67,6 @@ export function SwitchList() {
}
};
for(let i=0,leni = switchdata.length;i<leni;i++){
// console.log(switchdata[i]);
let newswitch = {
code:switchdata[i].code,
name:switchdata[i].name,
@ -79,7 +75,6 @@ export function SwitchList() {
pc:switchdata[i].pc
};
// console.log(newswitch.pa);
let autoswitch = assetloader.modellist[num].mesh.clone(true);
autoswitch.code = switchdata[i].code;
for(let j=0;j<autoswitch.children.length;j++){
@ -101,7 +96,6 @@ export function SwitchList() {
}
this.resetswitch = function(data){
// console.log("reset");
let sectiondata = data.sectionlist.sectiongroup;
for(let i=0;i<scope.switchs.datalist.length;i++){

View File

@ -76,7 +76,6 @@ let onProgress = function ( xhr ) {
if ( xhr.lengthComputable ) {
let percentComplete = xhr.loaded / xhr.total * 100;
//console.log( Math.round( percentComplete, 2 ) + '% downloaded' );
}

View File

@ -46,7 +46,6 @@ export function SetObj(data,scope) {
if(data.sectionList[i].type == "01"){
if(data.sectionList[i].points.length>=3){
console.log(data.sectionList[i]);
for(let j=1;j<data.sectionList[i].points.length;j++){
point1 = data.sectionList[i].points[j-1];
@ -203,7 +202,5 @@ export function SetObj(data,scope) {
group.add(object);
}
console.log("setobj");
scope.exportmodel = group;
console.log(group);
}

View File

@ -15,17 +15,12 @@
var intersects4 = raycaster4.intersectObjects( helppoints[i] );
//// //console.log(raycaster1);
if(intersects1[0] != undefined){
// // //console.log("intersects1");
// // //console.log(intersects1[0]);
intersects1[0].name = "1";
mindistance = intersects1[0].distance;
result = intersects1[0];
}
if(intersects2[0] != undefined){
// // //console.log("intersects2");
// // //console.log(mindistance);
intersects2[0].name = "2";
if(mindistance == undefined){
mindistance = intersects2[0].distance;
@ -38,8 +33,6 @@
}
if(intersects3[0] != undefined){
// // //console.log("intersects3");
// // //console.log(mindistance);
intersects3[0].name = "3";
if(mindistance == undefined){
mindistance = intersects3[0].distance;
@ -50,8 +43,6 @@
}
}
if(intersects4[0] != undefined){
// // //console.log("intersects4");
// // //console.log(mindistance);
intersects4[0].name = "4";
if(mindistance == undefined){
mindistance = intersects4[0].distance;

View File

@ -485,7 +485,6 @@ export function Moveanimate(main){
}
}else{
// console.log(scope.animatelist[k].connectmodel);
if(scope.nowmodelname != scope.playlist[scope.playorder][i].connectmodel.name){
scope.nowmodelname = scope.playlist[scope.playorder][i].connectmodel.name;
main.animationmsgshowon(scope.playlist[scope.playorder][i].connectmodel);

View File

@ -10,7 +10,6 @@ export function Textconfig(){
if(scope.devicelist.length>0){
scope.devicelist = [];
}
console.log(selectmodel.deviceType);
if(selectmodel.deviceType == "DeviceSwitch"){
initSwitchText(selectmodel);
}
@ -92,9 +91,6 @@ export function Textconfig(){
}
// if(part.text == null){
// console.log(selectmodel.children[i].name);
// }
if(part.text){
scope.devicelist.push(part);
}
@ -192,9 +188,6 @@ export function Textconfig(){
part.msg = "用于机内外电缆连接,方便更换转辙机。";
selectmodel.children[i].text = "二十位插接件";
}
// if(part.text == null){
// console.log(selectmodel.children[i].name);
// }
if(part.text){
scope.devicelist.push(part);
}

View File

@ -143,11 +143,8 @@ export function Jl3ddeviceNew(dom,group,token,skinCode) {
stationList.push(mapnetdata.stationList[i]);
}
}
// console.log(mapnetdata.stationList);
for(let k in psdVoiceStationList){
for(let i=0,leni=stationList.length;i<leni;i++){
// console.log("---------------");
// console.log("---------------");
if(psdVoiceStationList[k].stationCode == stationList[i].code){
psdVoiceStationList[k].nowStationName = stationList[i].name;
@ -294,7 +291,6 @@ export function Jl3ddeviceNew(dom,group,token,skinCode) {
for (let i = 0; i < scope.mixers.length; i++) {
if (scope.mixers[i]) {
if( scope.mixers[i].staticType){
// console.log(scope.mixers[i].time);
if(scope.mixers[i]._actions[0].time<stopTime){
scope.mixers[i].update(delta);
}else{
@ -343,11 +339,7 @@ export function Jl3ddeviceNew(dom,group,token,skinCode) {
scope.raycasterstatus = false;
scope.nowobject = null;
updatemenulist();
if(data._type == "Station"){
console.log(data);
}
if (data._type == "Switch") {
// scope.modelmanager.switchmodel.locateType = data.body.locateType;
scope.modelmanager.switchmodel.code = data.code;
@ -493,8 +485,6 @@ export function Jl3ddeviceNew(dom,group,token,skinCode) {
this.changeAnimate = function(type){
//
console.log(type);
// console.log(scope.modelmanager.staticswitchmodel);
// scope.modelmanager.staticswitchmodel.action["2kai"].reset();
// scope.modelmanager.staticswitchmodel.action["5jiasuo"].reset();
@ -520,7 +510,6 @@ export function Jl3ddeviceNew(dom,group,token,skinCode) {
stopTime = 3.33;
scope.modelmanager.staticswitchmodel.action.play();
console.log(scope.mixers);
}
if(type == "action2"){
scope.camera.position.x = -7.23;
@ -584,8 +573,6 @@ export function Jl3ddeviceNew(dom,group,token,skinCode) {
scope.camera.position.y = 22.56;
scope.camera.position.z = -1.348;
scope.controls.target = new THREE.Vector3(-2.15,10,-1.348);
// console.log(scope.camera.position);
// console.log(scope.controls.target);
scope.modelmanager.staticswitchmodel.action.reset();
scope.modelmanager.staticswitchmodel.action.time = 23.36;
stopTime = 26.66;

View File

@ -93,7 +93,6 @@ export function ModelManager(){
Promise.all(initlist).then((result) => {
resolve("success"); //['成功了', 'success']
}).catch((error) => {
//console.log(error);
});
});

View File

@ -156,7 +156,6 @@ export function JLmapDriving(dom,data,mapId,storemod,translation,routegroup,proj
getPublishMapDetail(mapId).then(data => {
let mapnetdata = data.data;
getPublish3dMapDetail(mapId).then(netdata => {
// console.log(netdata);
let assetsdata = JSON.parse(netdata.data.sections);
scope.datatype = "new";
@ -271,7 +270,6 @@ export function JLmapDriving(dom,data,mapId,storemod,translation,routegroup,proj
};
updatemmi.updatedrivingcode = function(code) {
// console.log(trainlisttest);
drivingcode = code;
trainlisttest.group.children[0].children[0].add(controls3.getObject());
controls3.getObject().position.x = 10;
@ -313,7 +311,6 @@ export function JLmapDriving(dom,data,mapId,storemod,translation,routegroup,proj
if(driverWebWorker){
driverWebWorker.terminate();
}
// console.log(scope);
// scope = null;
};
@ -386,7 +383,6 @@ export function JLmapDriving(dom,data,mapId,storemod,translation,routegroup,proj
realsectionlist = loadrealsectionlist;
rails = loadrails;
console.log(trainlisttest);
trainlisttest.group.children[0].getObjectByName("C6").add(cameracctv);
}
@ -401,7 +397,6 @@ export function JLmapDriving(dom,data,mapId,storemod,translation,routegroup,proj
};
this.eventoff = function() {
// console.log("off");
// raycaster交互模型点击事件
document.getElementById('jlsimulation').removeEventListener( 'mousedown', onselect, false );
// 窗口自适应
@ -420,7 +415,6 @@ export function JLmapDriving(dom,data,mapId,storemod,translation,routegroup,proj
camera.position.z = mesh.children[0].position.z;
// controls.target = new THREE.Vector3(mesh.position.x,0,mesh.children[0].position.z);
}
// console.log(mesh);
if (type == 'station') {
camera.position.x = mesh.position.x;
camera.position.y = mesh.position.y+800;
@ -493,7 +487,6 @@ export function JLmapDriving(dom,data,mapId,storemod,translation,routegroup,proj
}
if (scope.raycasterswitch == 'section') {
// console.log(sectionlist.sections.modellist);
let intersects = raycaster.intersectObjects( sectionlist.sections.modellist, true);
if (intersects[0]) {

View File

@ -81,7 +81,6 @@ export function Jl3dDrivingNew(mixers,updatemmi,sound,translation,routegroup,dri
}
if(data.type == "DeviceCtrl_3D"){
// console.log(data);
if (data.body.type== 'SIGNAL' && signallist) {
signalupdate(data.body);
return;
@ -201,8 +200,6 @@ export function Jl3dDrivingNew(mixers,updatemmi,sound,translation,routegroup,dri
}
this.updatamap = function(newsectionlist,newlinklist,newsignallist,newstationstandlist,newtrainlisttest,newrealsectionlist,newrails,newtdt, materiallist, nowaction, scene) {
// console.log(mapdata);
// console.log(newtrainlisttest);
trainmodel = newtrainlisttest.group.children[0];
trainlisttest = newtrainlisttest;
sectionlist = newsectionlist;
@ -222,7 +219,6 @@ export function Jl3dDrivingNew(mixers,updatemmi,sound,translation,routegroup,dri
this.socketon = function(topic) {
try {
// console.log("teststomp");
// scope.teststomp.subscribe(topic, callback, header);
} catch (error) {
console.error('websocket订阅失败');
@ -255,13 +251,11 @@ export function Jl3dDrivingNew(mixers,updatemmi,sound,translation,routegroup,dri
// 仿真socket接口回调函数
function callback(Response) {
// console.log(Response);
// 对象化数据
let data = JSON.parse(Response.body);
// stats.update();
// 遍历后台数据
// console.log(data);
if(data.type == "Train_Position"){
nowTrainRun(data.body);
@ -306,7 +300,6 @@ export function Jl3dDrivingNew(mixers,updatemmi,sound,translation,routegroup,dri
}
function DeviceDestroy(data){
// console.log(data);
for(let i=0,leni=data.length;i<leni;i++){
if(data[i].type == "SIGNAL"){
@ -359,10 +352,6 @@ export function Jl3dDrivingNew(mixers,updatemmi,sound,translation,routegroup,dri
}
function otherTrainUpdate(data,updateTrainModel){
// console.log(data);
// if(data.code = "336"){
// console.log(data);
// }
if(rails.sectionrail[data.section]){
if(data.section != updateTrainModel.nowsection){
updateTrainModel.nowsection = data.section;
@ -418,7 +407,6 @@ export function Jl3dDrivingNew(mixers,updatemmi,sound,translation,routegroup,dri
// if(updateTrainModel.children[1].rotalist.length > 0 || updateTrainModel.children[2].rotalist.length > 0 || updateTrainModel.children[3].rotalist.length > 0 || updateTrainModel.children[4].rotalist.length > 0|| updateTrainModel.children[5].rotalist.length > 0){
for(let rs = 1;rs<updateTrainModel.children.length;rs++){
//console.log(rs);
if(updateTrainModel.children[rs].rotalist[0]){
let offsetz = parseFloat(updateTrainModel.children[rs].rotalist[0].posr.z) + parseFloat(updateTrainModel.children[rs].position.z);
@ -441,13 +429,11 @@ export function Jl3dDrivingNew(mixers,updatemmi,sound,translation,routegroup,dri
xh = updateTrainModel.children[rs].rotalist.length;
}
}
//console.log(trainmodel.children[rs].rotalist.length);
}
}
// console.log(trainmodel.rotalist);
// }
}else{
@ -493,7 +479,6 @@ export function Jl3dDrivingNew(mixers,updatemmi,sound,translation,routegroup,dri
// if(updateTrainModel.children[1].rotalist.length > 0 || updateTrainModel.children[2].rotalist.length > 0 || updateTrainModel.children[3].rotalist.length > 0 || updateTrainModel.children[4].rotalist.length > 0|| updateTrainModel.children[5].rotalist.length > 0){
for(let rs = 1;rs<updateTrainModel.children.length;rs++){
//console.log(rs);
if(updateTrainModel.children[rs].rotalist[0]){
let offsetz = parseFloat(updateTrainModel.children[rs].rotalist[0].posr.z) - parseFloat(updateTrainModel.children[rs].matrixWorld.elements[14]);
@ -658,7 +643,6 @@ export function Jl3dDrivingNew(mixers,updatemmi,sound,translation,routegroup,dri
if(trainmodel.children[1].rotalist.length > 0 || trainmodel.children[2].rotalist.length > 0 || trainmodel.children[3].rotalist.length > 0 || trainmodel.children[4].rotalist.length > 0|| trainmodel.children[5].rotalist.length > 0){
for(let rs = 1;rs<trainmodel.children.length;rs++){
//console.log(rs);
if(trainmodel.children[rs].rotalist[0]){
let offsetz = parseFloat(trainmodel.children[rs].rotalist[0].posr.z) + parseFloat(trainmodel.children[rs].position.z);
@ -685,13 +669,10 @@ export function Jl3dDrivingNew(mixers,updatemmi,sound,translation,routegroup,dri
xh = trainmodel.children[rs].rotalist.length;
}
}
//console.log(trainmodel.children[rs].rotalist.length);
}
}
// console.log(trainmodel.rotalist);
}
}else{
@ -768,7 +749,6 @@ export function Jl3dDrivingNew(mixers,updatemmi,sound,translation,routegroup,dri
if(trainmodel.children[1].rotalist.length > 0 || trainmodel.children[2].rotalist.length > 0 || trainmodel.children[3].rotalist.length > 0 || trainmodel.children[4].rotalist.length > 0|| trainmodel.children[5].rotalist.length > 0){
for(let rs = 1;rs<trainmodel.children.length;rs++){
//console.log(rs);
if(trainmodel.children[rs].rotalist[0]){
let offsetz = parseFloat(trainmodel.children[rs].rotalist[0].posr.z) - parseFloat(trainmodel.children[rs].matrixWorld.elements[14]);
trainmodel.children[rs].position.z += offsetz;
@ -794,7 +774,6 @@ export function Jl3dDrivingNew(mixers,updatemmi,sound,translation,routegroup,dri
xh = trainmodel.children[rs].rotalist.length;
}
}
//console.log(trainmodel.children[rs].rotalist.length);
}
}
}
@ -817,10 +796,6 @@ export function Jl3dDrivingNew(mixers,updatemmi,sound,translation,routegroup,dri
function traindoorupdate(data){
// console.log(data);
// console.log("direct:"+trainmodel.right);
// console.log(trainmodel.openleft);
// console.log(trainmodel.openright);
if(trainmodel.code == data.trainCode){
if(trainmodel.right == "0"){
if(data.code == "2"){

View File

@ -4,11 +4,9 @@ export function UpdateTrain(camera,traindata,control){
if(traindata != undefined && traindata.group.children[0]){//traindata.group.children[0].dispose == false
if(traindata.group.children[0].progress != null){
// console.log(traindata.group);
let trainmodel = traindata.group.children[0];
if(trainmodel.speeds > 0 && trainmodel.speeds){
let speed = null;
// console.log(traindata.group.children[0].progress);
if(traindata.group.children[0].progress >=0&&traindata.group.children[0].progress<=1){
let movecurve = trainmodel.curve;
@ -44,7 +42,6 @@ export function UpdateTrain(camera,traindata,control){
if(trainmodel.children[1].rotalist.length > 0 || trainmodel.children[2].rotalist.length > 0 || trainmodel.children[3].rotalist.length > 0 || trainmodel.children[4].rotalist.length > 0|| trainmodel.children[5].rotalist.length > 0){
for(let rs = 1;rs<6;rs++){
//console.log(rs);
if(trainmodel.children[rs].rotalist[0]){
let offsetz = parseFloat(trainmodel.children[rs].matrixWorld.elements[14]) - parseFloat(trainmodel.children[rs].rotalist[0].posr.z);
@ -66,7 +63,6 @@ export function UpdateTrain(camera,traindata,control){
xh = trainmodel.children[rs].rotalist.length;
}
}
//console.log(trainmodel.children[rs].rotalist.length);
}
}
}
@ -103,7 +99,6 @@ export function UpdateTrain(camera,traindata,control){
if(trainmodel.children[1].rotalist.length > 0 || trainmodel.children[2].rotalist.length > 0 || trainmodel.children[3].rotalist.length > 0 || trainmodel.children[4].rotalist.length > 0|| trainmodel.children[5].rotalist.length > 0){
for(let rs = 1;rs<6;rs++){
//console.log(rs);
if(trainmodel.children[rs].rotalist[0]){
let offsetz = parseFloat(trainmodel.children[rs].rotalist[0].posr.z) - parseFloat(trainmodel.children[rs].matrixWorld.elements[14]);
@ -126,13 +121,10 @@ export function UpdateTrain(camera,traindata,control){
xh = trainmodel.children[rs].rotalist.length;
}
}
//console.log(trainmodel.children[rs].rotalist.length);
}
}
// console.log(trainmodel.rotalist);
}
trainmodel.progress += trainmodel.speeds;
}
@ -152,9 +144,6 @@ export function UpdateTrain(camera,traindata,control){
trainmodel.nextcode = null;
}
// console.log(trainmodel.name);
// console.log(trainmodel.progress);
// console.log(trainmodel.nextcurve);
// if(trainmodel.status == "02"){
// trainmodel.progress = 0;
// }else if(trainmodel.status == "03"){
@ -197,7 +186,6 @@ export function UpdateTrain(camera,traindata,control){
if(trainmodel.children[1].rotalist.length > 0 || trainmodel.children[2].rotalist.length > 0 || trainmodel.children[3].rotalist.length > 0 || trainmodel.children[4].rotalist.length > 0|| trainmodel.children[5].rotalist.length > 0){
for(let rs = 1;rs<6;rs++){
//console.log(rs);
if(trainmodel.children[rs].rotalist[0]){
let offsetz = parseFloat(trainmodel.children[rs].matrixWorld.elements[14]) - parseFloat(trainmodel.children[rs].rotalist[0].posr.z);
@ -219,7 +207,6 @@ export function UpdateTrain(camera,traindata,control){
xh = trainmodel.children[rs].rotalist.length;
}
}
//console.log(trainmodel.children[rs].rotalist.length);
}
}
}
@ -256,7 +243,6 @@ export function UpdateTrain(camera,traindata,control){
if(trainmodel.children[1].rotalist.length > 0 || trainmodel.children[2].rotalist.length > 0 || trainmodel.children[3].rotalist.length > 0 || trainmodel.children[4].rotalist.length > 0|| trainmodel.children[5].rotalist.length > 0){
for(let rs = 1;rs<6;rs++){
//console.log(rs);
if(trainmodel.children[rs].rotalist[0]){
let offsetz = parseFloat(trainmodel.children[rs].rotalist[0].posr.z) - parseFloat(trainmodel.children[rs].matrixWorld.elements[14]);
@ -279,16 +265,12 @@ export function UpdateTrain(camera,traindata,control){
xh = trainmodel.children[rs].rotalist.length;
}
}
//console.log(trainmodel.children[rs].rotalist.length);
}
}
// console.log(trainmodel.rotalist);
}
// console.log(trainmodel.nextcurve);
if(trainmodel.progress > -(trainmodel.speeds)){
trainmodel.progress += trainmodel.speeds;
}

View File

@ -106,7 +106,6 @@ export function Jl3dfaultdevice(dom,group,token,skinCode) {
let topic = '/user/queue/simulation/'+ group +'/jl3d';
let header = {'X-Token': token};
try {
// console.log("teststomp");
teststomp.subscribe(topic, callback, header);
} catch (error) {
console.error('websocket订阅失败');
@ -120,7 +119,6 @@ export function Jl3dfaultdevice(dom,group,token,skinCode) {
// scope.selectmodel(data);
// }else{
if(data.type == "DeviceCtrl_3D"){
// console.log(data.body);
if(data.body.code == scope.nowcode){
scope.updateaction(data.body);
}
@ -143,7 +141,6 @@ export function Jl3dfaultdevice(dom,group,token,skinCode) {
this.anime = null;
this.modelmanager = new ModelManager();
console.log(skinCode);
getPublish3dMapDetail(skinCode).then(netdata => {
let netDataAssets = JSON.parse(netdata.data.assets);
setpsdstationmap(JSON.parse(netdata.data.stands));
@ -206,7 +203,6 @@ export function Jl3dfaultdevice(dom,group,token,skinCode) {
}
this.selectmodel = function (data) {
console.log(data);
if (scope.showmodel) {
if (scope.showmodel.code != data.code) {
@ -250,7 +246,6 @@ export function Jl3dfaultdevice(dom,group,token,skinCode) {
}
if (data.type == "STAND") {
// console.log(data);
scope.modelmanager.standmodel.code = data.code;
scope.showmodel = scope.modelmanager.standmodel.mesh;
scope.scene.add(scope.showmodel);
@ -267,7 +262,6 @@ export function Jl3dfaultdevice(dom,group,token,skinCode) {
}
if (data.type == "SECTION") {
// console.log(data);
scope.modelmanager.sectionmodel.code = data.code;
scope.showmodel = scope.modelmanager.sectionmodel.mesh;
scope.scene.add(scope.showmodel);
@ -285,7 +279,6 @@ export function Jl3dfaultdevice(dom,group,token,skinCode) {
} else {
scope.nowcode = data.code;
if (data.type == "room") {
// console.log(scope.modelmanager.roommodel.mesh);
scope.showmodel = scope.modelmanager.roommodel.mesh;
scope.scene.add(scope.showmodel);
scope.camera.position.set(5, 7, -9);
@ -409,7 +402,6 @@ export function Jl3dfaultdevice(dom,group,token,skinCode) {
}
settext(scope.animationmodel,scope.animationmodel.position);
// console.log(scope.animationmodel);
helpbox = new THREE.BoxHelper( scope.animationmodel, 0xff0000 );
moveanima.updatehelpbox(helpbox,textplane);
// settext(intersects[0].object,intersects[0].point);
@ -548,13 +540,11 @@ export function Jl3dfaultdevice(dom,group,token,skinCode) {
scope.modelmanager.standmodel.action.play();
}
this.updateselect = function(updata){
// console.log(updata);
if(helpbox){
scope.scene.remove( helpbox );
helpbox = null;
}
helpbox = new THREE.BoxHelper( updata.mesh, 0xff0000 );
// console.log(updata.mesh);
let point = {
x:updata.mesh.matrixWorld.elements[12],
y:updata.mesh.matrixWorld.elements[13],
@ -566,7 +556,6 @@ export function Jl3dfaultdevice(dom,group,token,skinCode) {
}
function getdevicemsg(selectname){
// console.log(selectname);
for(let i=0,leni=scope.devicetext.devicelist.length;i<leni;i++){
if(selectname == scope.devicetext.devicelist[i].name){
@ -730,7 +719,6 @@ export function Jl3dfaultdevice(dom,group,token,skinCode) {
textplane.position.x = point.x;
textplane.position.y = point.y+6;
textplane.position.z = point.z;
// console.log(textplane.position);
// textplane.tcode = data[i].code;
textplane.rotation.y = -Math.PI/2;
textplane.lookAt(scope.camera.position);
@ -764,7 +752,6 @@ export function Jl3dfaultdevice(dom,group,token,skinCode) {
ctx.textAlign = 'center';
ctx.textBaseline = 'middle';
ctx.clearRect(0,0,256,128);
//console.log(text.groupNumber);
ctx.drawImage(beauty,0,0,256, 128);
ctx.fillText("设备部件:"+text, 90,30);
// ctx.fillText("车组人员:XXX", 40,20);

View File

@ -700,7 +700,6 @@ export function jl3dFaultDeviceVr(dom,group,skinCode) {
function onSelectStart( event ) {
var controller = event.target;
// console.log(event);
let clickGui = getGuiButton(controller);
if(clickGui.length > 0){
if(positionStatus == "dm"){
@ -853,9 +852,7 @@ export function jl3dFaultDeviceVr(dom,group,skinCode) {
}else{
var intersections = getIntersections( controller );
// console.log(intersections);
if ( intersections) {
// console.log(intersections);
var intersection = intersections[ 0 ];
if(intersection.distance <3.5){
if(positionStatus != intersection.object.name){
@ -886,14 +883,12 @@ export function jl3dFaultDeviceVr(dom,group,skinCode) {
let posx = intersection.point.x - trainControl.toptrain.position.x;
let posz = intersection.point.z - trainControl.toptrain.position.z;
human.position.set( posx, intersection.point.y+0.6, posz);
// console.log(human.position);
}
if(positionStatus == "downfloor"){
let posx = trainControl.downtrain.position.x - intersection.point.x;
let posz = trainControl.downtrain.position.z - intersection.point.z;
human.position.set( posx, intersection.point.y+0.6, posz);
// console.log(human.position);
}
let postData = {
type:"syn",
@ -929,9 +924,7 @@ export function jl3dFaultDeviceVr(dom,group,skinCode) {
// if ( intersections.length > 0 ) {
//
// // for(){}
// // console.log(intersections);
// var intersection = intersections[ 0 ];
// // console.log(intersection);
// // tempMatrix.getInverse( controller.matrixWorld );
// //
// // var object = intersection.object;
@ -957,7 +950,6 @@ export function jl3dFaultDeviceVr(dom,group,skinCode) {
}
function squeezeStart(){
console.log("squeeze");
scope.modelmanager.otherDevice.action.play();
if(positionStatus == "dm"){
if(vrPlaneStatus){
@ -986,7 +978,6 @@ export function jl3dFaultDeviceVr(dom,group,skinCode) {
// }
// settext(scope.animationmodel,scope.animationmodel.position);
// console.log(scope.animationmodel);
// helpbox = new THREE.BoxHelper( scope.animationmodel, 0xff0000 );
// moveanima.updatehelpbox(helpbox,textplane);
// settext(intersects[0].object,intersects[0].point);
@ -1022,7 +1013,6 @@ export function jl3dFaultDeviceVr(dom,group,skinCode) {
raycastervr.ray.direction.set( 0, 0, - 1 ).applyMatrix4( tempMatrix );
for(let i=0;i<3;i++){
let rayObject = raycastervr.intersectObject( floors[i]);
// console.log(rayObject);
if(rayObject.length>0){
return rayObject;
}
@ -1073,7 +1063,6 @@ export function jl3dFaultDeviceVr(dom,group,skinCode) {
if ( intersections) {
var intersection = intersections[ 0 ];
// console.log(intersection);
if(intersection.distance <3.5){
var object = intersection.object;
circle.position.set( intersection.point.x, intersection.point.y+0.05, intersection.point.z );
@ -1131,7 +1120,6 @@ export function jl3dFaultDeviceVr(dom,group,skinCode) {
}
function getdevicemsg(selectname){
// console.log(selectname);
for(let i=0,leni=scope.devicetext.devicelist.length;i<leni;i++){
if(selectname == scope.devicetext.devicelist[i].name){
@ -1205,7 +1193,6 @@ export function jl3dFaultDeviceVr(dom,group,skinCode) {
}
// console.log(scope.nowstation);
}
function initstationanimation(object){

View File

@ -299,7 +299,6 @@ export function MoveanimateVr(main){
}
//动画播放器
this.animateupdate = function(){
// console.log(scope.animatelist);
if(scope.enable){
if(scope.playlist){
@ -335,7 +334,6 @@ export function MoveanimateVr(main){
}else{
// console.log(scope.animatelist[k].connectmodel);
if(scope.nowmodelname != scope.playlist[scope.playorder][i].connectmodel.name){
scope.nowmodelname = scope.playlist[scope.playorder][i].connectmodel.name;
main.animationmsgshowon(scope.playlist[scope.playorder][i].connectmodel);

View File

@ -18,7 +18,6 @@ function setTextVr(intersects,plane){
textplane.position.x = 0;
textplane.position.y = 1.55;
textplane.position.z = 0.01;
// console.log(textplane.position);
// textplane.tcode = data[i].code;
// textplane.rotation.y = -Math.PI/2;
// scope.textlist.push(textplane);
@ -51,7 +50,6 @@ function getTextCanvas(text){
ctx.textAlign = 'center';
ctx.textBaseline = 'middle';
ctx.clearRect(0,0,256,128);
//console.log(text.groupNumber);
ctx.drawImage(beauty,0,0,256, 128);
ctx.fillText("新的设备故障", 110,30);
ctx.fillText(text.name, 110,65);

View File

@ -277,8 +277,6 @@ export function VrGui(){
//
// let nowGroupComponent = scope.homeGroup;
this.setStationPlane = function(stations){
// console.log(stations);
// console.log(textures);
let posX,posY;
for(let i=0,leni = stations.length;i<leni;i++){
@ -368,7 +366,6 @@ export function VrGui(){
}
this.updataDeviceFaultMsg = function(faultData){
console.log(faultData);
let textt = new THREE.CanvasTexture(getTextCanvas(faultData,"faultMsg"));
scope.deviceGroup.getObjectByName("deviceText").material.map = textt;
scope.deviceGroup.getObjectByName("deviceText").material.map.needsUpdate = true;
@ -474,7 +471,6 @@ export function VrGui(){
ctx.textAlign = 'center';
ctx.textBaseline = 'middle';
ctx.clearRect(0,0,128,64);
//console.log(text.groupNumber);
ctx.drawImage(beauty,0,0,128, 64);
ctx.fillText(text.name, 64,32);
//ctx.fillText(text.trainModel.name, width/2,height*3/4);
@ -493,7 +489,6 @@ export function VrGui(){
ctx.textAlign = 'center';
ctx.textBaseline = 'middle';
ctx.clearRect(0,0,128,64);
//console.log(text.groupNumber);
ctx.drawImage(beauty,0,0,128, 64);
ctx.fillText("故障设备编号:", 64,16);
ctx.fillText(text.name, 64,48);
@ -513,7 +508,6 @@ export function VrGui(){
ctx.textAlign = 'center';
ctx.textBaseline = 'middle';
ctx.clearRect(0,0,256,256);
//console.log(text.groupNumber);
ctx.drawImage(beauty,0,0,256, 256);
ctx.fillText("当前车站信息", 128,32);
ctx.fillText("车站名:"+text.name, 128,64);
@ -540,7 +534,6 @@ export function VrGui(){
ctx.textAlign = 'center';
ctx.textBaseline = 'middle';
ctx.clearRect(0,0,256,256);
//console.log(text.groupNumber);
ctx.drawImage(beauty,0,0,256, 256);
ctx.fillText("当前故障信息", 128,32);
ctx.fillText("故障设备:"+text.code, 128,64);

View File

@ -183,9 +183,7 @@ export function Jl3dOtherVR(dom,group,skinCode) {
otherVrViewWorker.onmessage = function (event) {
// maintainerHuman
console.log(event.data);
if(event.data.type == "VR_Sync_3D"){
console.log(event.data);
humanMove(event.data);
@ -268,8 +266,6 @@ export function Jl3dOtherVR(dom,group,skinCode) {
}
if(event.data.type == "takeDownTrain"){
console.log(event.data);
console.log(stationList);
for(let i=0,leni=stationList.length;i<leni;i++){
if(stationList[i].code == event.data.stationcode){
scope.nowstation = stationList[i];
@ -294,8 +290,6 @@ export function Jl3dOtherVR(dom,group,skinCode) {
}
if(event.data.type == "topTrain"){
console.log(event.data);
console.log(trainControl.toptrain.status);
if(trainControl.toptrain.status != 1){
trainControl.toptrain.position.copy(trainControl.toptrain.curve.getPointAt(event.data.offset));
}
@ -310,8 +304,6 @@ export function Jl3dOtherVR(dom,group,skinCode) {
if(event.data.type == "topTrainDoor"){
console.log(event.data);
if(event.data.open == "0"){
trainControl.closetraindoor(trainControl.toptrain,event.data.doorCode,"top");
// trainLeaveStation("top");
@ -527,7 +519,6 @@ export function Jl3dOtherVR(dom,group,skinCode) {
// }
// settext(scope.animationmodel,scope.animationmodel.position);
// console.log(scope.animationmodel);
// helpbox = new THREE.BoxHelper( scope.animationmodel, 0xff0000 );
// moveanima.updatehelpbox(helpbox,textplane);
// settext(intersects[0].object,intersects[0].point);
@ -602,7 +593,6 @@ export function Jl3dOtherVR(dom,group,skinCode) {
function getdevicemsg(selectname){
// console.log(selectname);
for(let i=0,leni=scope.devicetext.devicelist.length;i<leni;i++){
if(selectname == scope.devicetext.devicelist[i].name){
@ -666,7 +656,6 @@ export function Jl3dOtherVR(dom,group,skinCode) {
}
}
console.log(stationList);
scope.nowstation = stationList[0];
let stationworket = {
type:'station',
@ -676,7 +665,6 @@ export function Jl3dOtherVR(dom,group,skinCode) {
}
// console.log(scope.nowstation);
}
@ -751,7 +739,6 @@ export function Jl3dOtherVR(dom,group,skinCode) {
}
function humanMove(movedata){
console.log(maintainerHuman);
let distance = Math.sqrt(Math.pow(movedata.body.pos.x - maintainerGroup.position.x, 2) + Math.pow(movedata.body.pos.y - maintainerGroup.position.y, 2) + Math.pow(movedata.body.pos.z - maintainerGroup.position.z, 2));
if(distance <5){
@ -789,8 +776,6 @@ export function Jl3dOtherVR(dom,group,skinCode) {
}
function setTextVr(intersects,plane){
console.log(intersects);
console.log(plane);
if(intersects.text){
let textgeometry = new THREE.PlaneBufferGeometry( 1.2, 0.8, 1 );
let textt = new THREE.CanvasTexture(getTextCanvas(intersects));
@ -809,7 +794,6 @@ export function Jl3dOtherVR(dom,group,skinCode) {
textplane.position.x = 0;
textplane.position.y = 1.55;
textplane.position.z = 0.01;
// console.log(textplane.position);
// textplane.tcode = data[i].code;
// textplane.rotation.y = -Math.PI/2;
// scope.textlist.push(textplane);
@ -842,7 +826,6 @@ export function Jl3dOtherVR(dom,group,skinCode) {
ctx.textAlign = 'center';
ctx.textBaseline = 'middle';
ctx.clearRect(0,0,256,128);
//console.log(text.groupNumber);
ctx.drawImage(beauty,0,0,256, 128);
ctx.fillText("新的设备故障", 110,30);
ctx.fillText(text.name, 110,65);

View File

@ -54,7 +54,6 @@ export function Jl3dTrainRescueVr(dom,group,skinCode) {
// this.renderer.shadowMap.type = THREE.PCFSoftShadowMap;
this.renderer.gammaInput = true;
this.renderer.gammaOutput = true;
console.log( this.renderer);
this.renderer.vr.enabled = true;
this.dom.appendChild(this.renderer.domElement);
document.body.appendChild( VRButton.createButton( human,{x:25,y:1.3,z:1},this.renderer ) );
@ -139,7 +138,6 @@ export function Jl3dTrainRescueVr(dom,group,skinCode) {
let timer=setInterval(function(){
if(TrainRescueStatic.other.mesh){
console.log(TrainRescueStatic);
scope.scene.add(TrainRescueStatic.animatemodel.mesh);
scope.scene.add(TrainRescueStatic.controlmodel.mesh);
scope.scene.add(TrainRescueStatic.floorplane.mesh);
@ -150,7 +148,6 @@ export function Jl3dTrainRescueVr(dom,group,skinCode) {
// controller1.add(handrBox);
controller1.add( TrainRescueStatic.handR.mesh );
console.log(TrainRescueStatic.controlmodel.mesh);
// floors.push(TrainRescueStatic.floorplane.mesh);
animate();
@ -209,8 +206,6 @@ export function Jl3dTrainRescueVr(dom,group,skinCode) {
}
function onSelectStart( event ) {
// console.log();
console.log("select");
var controller = event.target;
var intersections = getIntersections( controller );
@ -252,7 +247,6 @@ export function Jl3dTrainRescueVr(dom,group,skinCode) {
let controlMoveSwitch = false;
let nowControlModel = null;
function squeezeStart(){
console.log("squeezestart");
TrainRescueStatic.handR.action.reset();
TrainRescueStatic.handR.action.time = TrainRescueStatic.handR.action._clip.duration;
TrainRescueStatic.handR.action.timeScale = 1;
@ -275,7 +269,6 @@ export function Jl3dTrainRescueVr(dom,group,skinCode) {
}
function squeezeEnd(){
console.log("squeezeend");
TrainRescueStatic.handR.action.reset();
TrainRescueStatic.handR.action.time = 0;
TrainRescueStatic.handR.action.timeScale = -1;
@ -297,7 +290,6 @@ export function Jl3dTrainRescueVr(dom,group,skinCode) {
}
// for(let i=0;i<1;i++){
// let rayObject = raycastervr.intersectObject( floors[i]);
// console.log(rayObject);
// if(rayObject.length>0){
// return rayObject;
// }
@ -315,7 +307,6 @@ export function Jl3dTrainRescueVr(dom,group,skinCode) {
if ( intersections) {
var intersection = intersections[ 0 ];
// console.log(intersection);
var object = intersection.object;
circle.position.set( intersection.point.x, intersection.point.y+0.2, intersection.point.z );
}
@ -394,13 +385,8 @@ export function Jl3dTrainRescueVr(dom,group,skinCode) {
let animateStage = "0";
function updateControlModel(){
if(controlMoveSwitch == true){
console.log(nowControlModel.name);
console.log(TrainRescueStatic.animatemodel.action.time);
// console.log(nowControlModel);
// console.log(TrainRescueStatic.handR.mesh);
let originPoint = new THREE.Vector3(nowControlModel.matrixWorld.elements[12],nowControlModel.matrixWorld.elements[13],nowControlModel.matrixWorld.elements[14]);
let overPoint = new THREE.Vector3(TrainRescueStatic.handR.mesh.matrixWorld.elements[12],TrainRescueStatic.handR.mesh.matrixWorld.elements[13],TrainRescueStatic.handR.mesh.matrixWorld.elements[14]);
// console.log(originPoint);
// rad *= ( endNorm.cross( startNorm ).dot( eye ) < 0 ? 1 : -1);
if(nowControlModel.name == "5"){
@ -408,7 +394,6 @@ export function Jl3dTrainRescueVr(dom,group,skinCode) {
let v2 = new THREE.Vector3(overPoint.z-originPoint.z,overPoint.y-originPoint.y,overPoint.x-originPoint.x);
let rad = v1.angleTo(v2);
console.log(rad);
if(rad>0.725 && rad<2.37){
if(TrainRescueStatic.animatemodel.action.time >= 7.8 && TrainRescueStatic.animatemodel.action.time <20){
animateStage = "3";
@ -510,7 +495,6 @@ export function Jl3dTrainRescueVr(dom,group,skinCode) {
let rad = v1.angleTo(v2);
if(rad>0.546 && rad<2.4){
if(TrainRescueStatic.animatemodel.action.time>=2.6 && TrainRescueStatic.animatemodel.action.time<5.2){
console.log(animateStage);
animateStage = "1";
if(rad>1.3){
if(controlStage == false){
@ -604,7 +588,6 @@ export function Jl3dTrainRescueVr(dom,group,skinCode) {
textplane.position.x = 0;
textplane.position.y = 1.55;
textplane.position.z = 0.01;
// console.log(textplane.position);
// textplane.tcode = data[i].code;
// textplane.rotation.y = -Math.PI/2;
// scope.textlist.push(textplane);
@ -637,7 +620,6 @@ export function Jl3dTrainRescueVr(dom,group,skinCode) {
ctx.textAlign = 'center';
ctx.textBaseline = 'middle';
ctx.clearRect(0,0,256,128);
//console.log(text.groupNumber);
ctx.drawImage(beauty,0,0,256, 128);
ctx.fillText("新的设备故障", 110,30);
ctx.fillText(text.name, 110,65);

View File

@ -200,7 +200,6 @@ export function JLmap3dMaintainer(dom, data,skinCode,storemod,routegroup,project
if(camerarail.moveswitch == true){
// console.log(camerarail.progress);
if(camerarail.progress>=0.99){
camerarail.moveswitch = false;
camerarail.curve = null;
@ -222,7 +221,6 @@ export function JLmap3dMaintainer(dom, data,skinCode,storemod,routegroup,project
delta = clock.getDelta();
for(let i=scope.mixers.length-1;i>=0;i--){
if(scope.mixers[i]._actions[0].isRunning()){
// console.log(scope.mixers[i]._actions[0].isRunning());
scope.mixers[i].update( delta );
}
}
@ -249,7 +247,6 @@ export function JLmap3dMaintainer(dom, data,skinCode,storemod,routegroup,project
scope.mixers = null;
scope.actions = null;
scope.Subscribe = null;
//console.log(scope);
//scope = null;
}
@ -320,7 +317,6 @@ export function JLmap3dMaintainer(dom, data,skinCode,storemod,routegroup,project
};
this.eventoff = function(){
//console.log("off");
//raycaster交互模型点击事件
document.getElementById("testjlmap3d").removeEventListener( "mousedown", onselect, false );
//窗口自适应
@ -328,7 +324,6 @@ export function JLmap3dMaintainer(dom, data,skinCode,storemod,routegroup,project
};
this.updatecamera = function(mesh,type){
//console.log(mesh);
if(type == "station"){
camera.position.x = mesh.position.x;
camera.position.y = mesh.position.y+800;
@ -398,13 +393,9 @@ export function JLmap3dMaintainer(dom, data,skinCode,storemod,routegroup,project
if(intersects[0]){
for(let j=0;j<trainlisttest.list.length;j++){
if(intersects[0].object.name == trainlisttest.list[j].name){
// console.log(trainlisttest.list[j].position.x);
// console.log(trainlisttest.list[j].position.y);
// console.log(trainlisttest.list[j].children[2].matrixWorld.elements[14]);
camera.position.x = trainlisttest.list[j].position.x;
camera.position.y = 200;
camera.position.z = trainlisttest.list[j].children[2].matrixWorld.elements[14]+300;
//console.log(camera.position);
controls.target = new THREE.Vector3(trainlisttest.list[j].children[2].matrixWorld.elements[12],trainlisttest.list[j].children[2].matrixWorld.elements[13],trainlisttest.list[j].children[2].matrixWorld.elements[14]);
controls.update();
}
@ -414,10 +405,8 @@ export function JLmap3dMaintainer(dom, data,skinCode,storemod,routegroup,project
if(scope.raycasterswitch == "section"){
//console.log(sectionlist.sections.modellist);
let intersects = raycaster.intersectObjects( linklist.linksgroup.children,true);
if(intersects[0]){
// console.log(intersects[0].object);
scope.helpbox = new THREE.BoxHelper( intersects[0].object, 0xff0000 );
scene.add( scope.helpbox );
}
@ -427,7 +416,6 @@ export function JLmap3dMaintainer(dom, data,skinCode,storemod,routegroup,project
let intersects = raycaster.intersectObjects( signallist.group.children,true);
if(intersects[0]){
// console.log(intersects[0].object.matrixWorld);
scope.helpbox = new THREE.BoxHelper( intersects[0].object, 0xff0000 );
scene.add( scope.helpbox );
}

View File

@ -55,13 +55,7 @@ export function Maintainerconnect(jlmap3d,routegroup,jsonwebwork,lablecodemap) {
// if(event.data.deviceType == "TRAIN"){
// // console.log(event.data);
//
// }
// console.log(event.data);
if(event.data.type == "Device_Fault_Set_3D"){
// console.log(event.data);
let newfault = {
code:event.data.body.code,
name:'',
@ -240,19 +234,16 @@ export function Maintainerconnect(jlmap3d,routegroup,jsonwebwork,lablecodemap) {
// if(event.data.type == 'TrainRun_3D'){
//
// for(let i=0,leni=event.data.body.length;i<leni;i++){
// // console.log(event.data.body[i]);
// trainrunnew(event.data.body[i]);
// }
// return;
// }
// if(event.data.type == 'TRAIN'){
// console.log(event.data);
// trainrun(event.data);
// }
// if (event.data.type== 'SIGNAL' && signallist) {
// signalupdate(event.data);
// // console.log(event.data);
// return;
// }
//
@ -282,7 +273,7 @@ export function Maintainerconnect(jlmap3d,routegroup,jsonwebwork,lablecodemap) {
return;
}
};
this.updatamap = function(newsectionlist,newlinklist,newsignallist,newstationstandlist,newtrainlisttest,newrealsectionlist,newrails, materiallist, nowaction, scene) {
trainlisttest = newtrainlisttest;
sectionlist = newsectionlist;
@ -297,7 +288,6 @@ export function Maintainerconnect(jlmap3d,routegroup,jsonwebwork,lablecodemap) {
this.socketon = function(topic) {
try {
// console.log("teststomp");
// scope.teststomp.subscribe(topic, callback, header);
} catch (error) {
console.error('websocket订阅失败');
@ -348,7 +338,6 @@ export function Maintainerconnect(jlmap3d,routegroup,jsonwebwork,lablecodemap) {
}
}
// console.log(data);
if(trainlisttest.list[code].dispose == "0"){
if (data.right == '1') { // 向右
@ -398,7 +387,6 @@ export function Maintainerconnect(jlmap3d,routegroup,jsonwebwork,lablecodemap) {
}
if(trainlisttest.list[code].children[1].rotalist.length > 0 || trainlisttest.list[code].children[2].rotalist.length > 0 || trainlisttest.list[code].children[3].rotalist.length > 0 || trainlisttest.list[code].children[4].rotalist.length > 0|| trainlisttest.list[code].children[5].rotalist.length > 0){
for(let rs = 1;rs<6;rs++){
//console.log(rs);
if(trainlisttest.list[code].children[rs].rotalist[0]){
let offsetz = parseFloat(trainlisttest.list[code].children[rs].rotalist[0].posr.z) - parseFloat(trainlisttest.list[code].children[rs].matrixWorld.elements[14]);
@ -406,11 +394,6 @@ export function Maintainerconnect(jlmap3d,routegroup,jsonwebwork,lablecodemap) {
for(let xh=0;xh<trainlisttest.list[code].children[rs].rotalist.length;xh++){
if((trainlisttest.list[code].children[rs].matrixWorld.elements[12])>=trainlisttest.list[code].children[rs].rotalist[0].posr.x){
// if(trainlisttest.list[code].groupNumber == "005"){
// console.log("rs:"+rs);
// console.log(trainlisttest.list[code].children[rs].matrixWorld.elements[12]);
// console.log(trainlisttest.list[code].children[rs].rotalist[0].posr.x);
// }
if(rs != 5){
let asd = trainlisttest.list[code].children[rs].rotalist[0];
trainlisttest.list[code].children[rs+1].rotalist.push(asd);
@ -424,7 +407,6 @@ export function Maintainerconnect(jlmap3d,routegroup,jsonwebwork,lablecodemap) {
xh = trainlisttest.list[code].children[rs].rotalist.length;
}
}
//console.log(trainlisttest.list[code].children[rs].rotalist.length);
}
}
}
@ -481,7 +463,6 @@ export function Maintainerconnect(jlmap3d,routegroup,jsonwebwork,lablecodemap) {
if(trainlisttest.list[code].children[1].rotalist.length > 0 || trainlisttest.list[code].children[2].rotalist.length > 0 || trainlisttest.list[code].children[3].rotalist.length > 0 || trainlisttest.list[code].children[4].rotalist.length > 0|| trainlisttest.list[code].children[5].rotalist.length > 0){
for(let rs = 1;rs<6;rs++){
//console.log(rs);
if(trainlisttest.list[code].children[rs].rotalist[0]){
let offsetz = parseFloat(trainlisttest.list[code].children[rs].rotalist[0].posr.z) + parseFloat(trainlisttest.list[code].children[rs].position.z);
@ -504,13 +485,11 @@ export function Maintainerconnect(jlmap3d,routegroup,jsonwebwork,lablecodemap) {
xh = trainlisttest.list[code].children[rs].rotalist.length;
}
}
//console.log(trainlisttest.list[code].children[rs].rotalist.length);
}
}
// console.log(trainlisttest.list[code].rotalist);
}
}
@ -523,7 +502,6 @@ export function Maintainerconnect(jlmap3d,routegroup,jsonwebwork,lablecodemap) {
}
function trainrun(data){
let code = data.code;
// console.log(data);
if(trainlisttest.list[code].dispose == "0"){
if(trainlisttest.list[code].curve == null){
if (data.right == '1') { // 向右

View File

@ -135,7 +135,6 @@ export function MaintainerLoad(data,scope,netdata,mapdata,camera,controls,scene)
// if(scope.assetloader.modellist[mn].name && scope.assetloader.modellist[mn].name == "suidao"){
// // scope.assetloader.modellist[mn].mesh.rotation.x = Math.PI/2;
// // scope.assetloader.modellist[mn].mesh.position.y -=0.1;
// // console.log(scope.assetloader.modellist[mn].mesh);
// scene.add(scope.assetloader.modellist[mn].mesh);
// }
// }
@ -155,7 +154,6 @@ export function MaintainerLoad(data,scope,netdata,mapdata,camera,controls,scene)
if ( xhr.lengthComputable ) {
let percentComplete = xhr.loaded / xhr.total * 100;
//console.log( 'model ' + Math.round( percentComplete, 2 ) + '% downloaded' );
}

View File

@ -76,7 +76,6 @@ export function PassflowConnect(deviceaction, toptrain, downtrain, routegroup, p
}
if (downtrain.nowcode == data.body.trainCode) {
// console.log(data.body);
if (data.body.command == 'G') {
closetraindoor(downtrain, data.body.code, 'down');

View File

@ -221,7 +221,6 @@ export function Jl3dpassflow(dom,skinCode,routegroup,viewMap) {
passerAi.initPasser(humanlist,passerHuman);
let updateaianimate = setInterval(
function(){
// console.log("?");
if(aiswitch == 0){
passerHuman.moveAnimateUpdate(humanlist,olddataai,passerHuman);
passerAi.aiUpdate(humanlist,passerHuman,passerCheckDoor,deviceaction);
@ -244,7 +243,6 @@ export function Jl3dpassflow(dom,skinCode,routegroup,viewMap) {
passerWebWork.onmessage = function (event) {
if(aiswitch == 0){
// console.log(humanlist.children.length);
if(humanlist.children.length < 80){
let direct = Math.floor(Math.random()*(3-1+1))+1;
//1--top

View File

@ -101,7 +101,6 @@ export function ModelManager(){
Promise.all(initlist).then((result) => {
resolve("success"); //['成功了', 'success']
}).catch((error) => {
//console.log(error);
});
});

View File

@ -61,7 +61,6 @@ export function PasserHuman() {
newhuman.speed = 0;
newhuman.mixer = mixer;
humanlist.add(newhuman);
// console.log(humanlist.children.length);
}
//定义新模型走路动画
this.initMoveAnimate = function(model,name,points,index){
@ -73,7 +72,6 @@ export function PasserHuman() {
// progress动画进度
// enable当前动画开关
// speed动画速度
// console.log(curve);
model.action.play();
model.progress = 0;
@ -129,7 +127,6 @@ export function PasserHuman() {
humanlist.children[i].stage = 2;
}else if(humanlist.children[i].stage == 0){
// // console.log(humans[i].doors);
// zhajiin[humanlist.children[i].doors].waiting = 0;
humanlist.children[i].stage = 1;
}
@ -138,9 +135,6 @@ export function PasserHuman() {
}else{
//根据动画进度获取动画轨迹上点
// console.log(i);
// console.log(humanlist.children[i].runrail);
// console.log(humanlist.children[i].progress);
let point = humanlist.children[i].runrail.getPointAt(humanlist.children[i].progress);
//更新模型坐标

View File

@ -87,7 +87,6 @@ export function PasserStation() {
} );
scope.stationMesh = object;
// console.log(deviceaction);
scene.add(object);
}

View File

@ -188,10 +188,8 @@ export function ZoneManager() {
}
//获取区域范围内点
this.getinitposition = function(name){
// console.log(scope.list[name]);
let randompoint = new THREE.Vector3(0,scope.list[name].randompoint.y,0);
// console.log(randompoint);
if(name == "enter1"){
randompoint.x = scope.list[name].randompoint.x + Math.random()*8;
randompoint.z = scope.list[name].randompoint.z + Math.random()*8;

View File

@ -17,9 +17,7 @@ export function PasserAi(zone,finder) {
let targetPosition = new THREE.Vector3();
//生成下车出站人物
this.passerout = function(direct){
// console.log(direct);
if(direct == "top"){
// console.log("toppasser");
scope.toppasseron = true;
setTimeout(function(){
scope.toppasseron = false
@ -31,7 +29,6 @@ export function PasserAi(zone,finder) {
}, 5000);
}
if(direct == "down"){
// console.log("downpasser");
scope.downpasseron = true;
setTimeout(function(){
scope.downpasseron = false;
@ -71,7 +68,6 @@ export function PasserAi(zone,finder) {
//人物站台阶段更新
this.aiUpdate = function(humanlist,passerHuman,passerCheckDoor,deviceaction){
for(let i=0;i<humanlist.children.length;i++){
// console.log(humans[i]);
if(humanlist.children[i].status == 0){
//stage = 0 进入车站
@ -87,7 +83,6 @@ export function PasserAi(zone,finder) {
points.push(new THREE.Vector3(path[i].x,path[i].y,path[i].z));
}
passerHuman.initMoveAnimate(humanlist.children[i],i,points,i);
// console.log(path);
}
//stage = 1 前往进站闸机
@ -120,7 +115,6 @@ export function PasserAi(zone,finder) {
if(humanlist.children[i].stage == 3){
let direct = Math.floor(Math.random()*(2))+1;
// console.log(direct);
let points = [];
points.push(new THREE.Vector3(humanlist.children[i].position.x,humanlist.children[i].position.y,humanlist.children[i].position.z));
// points.push(new THREE.Vector3(11.81,9.8,13.11));
@ -178,7 +172,6 @@ export function PasserAi(zone,finder) {
}else{
passerHuman.initMoveAnimate(humanlist.children[i],i,points,i);
}
// console.log(points);
}
}

View File

@ -243,11 +243,8 @@ export function Moveanimate(main){
// points.push(new THREE.Vector3(switchmodel.children[i].position.x,switchmodel.children[i].position.y,switchmodel.children[i].position.z));
// scope.initanimate(switchmodel.children[i],switchmodel.name+"select1",points,true);
let modelorderlist = [];
console.log(switchmodel);
for(let i=0;i<switchmodel.children.length;i++){
console.log(switchmodel.children[i].name);
console.log(switchmodel.children[i]);
}
// for(let i=0;i<switchmodel.children.length;i++){
// }
modelorderlist[switchmodel.animacode] = [
{name:"SJ",pos:[-3.5,0,-1]},
{name:"ZZJJG",pos:[0,9,0]},
@ -275,16 +272,12 @@ export function Moveanimate(main){
scope.animatelist[switchmodel.animacode+"on"] = [];
scope.animatelist[switchmodel.animacode+"off"] = [];
console.log("==========");
for(let i=0,leni=modelorderlist[switchmodel.animacode].length;i<leni;i++){
let orderdata = modelorderlist[switchmodel.animacode];
console.log(switchmodel.animacode);
console.log(orderdata[i].name);
let modelon = switchmodel.getObjectByName(orderdata[i].name);
// modelon.helpbox = undefined;
console.log(modelon);
let pointson = [];
pointson.push(new THREE.Vector3(modelon.position.x,modelon.position.y,modelon.position.z));
pointson.push(new THREE.Vector3(modelon.position.x+orderdata[i].pos[0],modelon.position.y+orderdata[i].pos[1],modelon.position.z+orderdata[i].pos[2]));
@ -401,7 +394,6 @@ export function Moveanimate(main){
}
}else{
// console.log(scope.animatelist[k].connectmodel);
if(scope.nowmodelname != scope.playlist[scope.playorder][i].connectmodel.name){
scope.nowmodelname = scope.playlist[scope.playorder][i].connectmodel.name;
main.animationmsgshowon(scope.playlist[scope.playorder][i].connectmodel);

View File

@ -232,9 +232,6 @@ export function Textconfig(){
part.msg = "用于机内外电缆连接,方便更换转辙机。";
selectmodel.children[i].text = "二十位插接件";
}
// if(part.text == null){
// console.log(selectmodel.children[i].name);
// }
if(part.text){
scope.devicelist.push(part);
}

View File

@ -125,7 +125,6 @@ export function Jl3ddeviceNew(dom,group,token,skinCode) {
stationList.push(mapnetdata.stationList[i]);
}
}
// console.log(mapnetdata.stationList);
});
@ -149,7 +148,6 @@ export function Jl3ddeviceNew(dom,group,token,skinCode) {
function callback(Response) {
let data = JSON.parse(Response.body);
console.log(data);
if(data.srSignal){
if(data.srSignal[0] == scope.nowcode){
@ -227,7 +225,6 @@ export function Jl3ddeviceNew(dom,group,token,skinCode) {
for (let i = 0; i < scope.mixers.length; i++) {
if (scope.mixers[i]) {
if( scope.mixers[i].staticType){
// console.log(scope.mixers[i].time);
if(scope.mixers[i]._actions[0].time<stopTime){
scope.mixers[i].update(delta);
}else{
@ -399,8 +396,6 @@ export function Jl3ddeviceNew(dom,group,token,skinCode) {
let switchActionMode = true;
this.changeAnimate = function(type){
// console.log(scope.modelmanager.staticswitchmodel);
// scope.modelmanager.staticswitchmodel.action["2kai"].reset();
// scope.modelmanager.staticswitchmodel.action["5jiasuo"].reset();
// scope.modelmanager.staticswitchmodel.action["8shunyao"].reset();
@ -424,8 +419,6 @@ export function Jl3ddeviceNew(dom,group,token,skinCode) {
scope.modelmanager.staticswitchmodel.action.time = 0;
stopTime = 3.33;
scope.modelmanager.staticswitchmodel.action.play();
console.log(scope.mixers);
}
if(type == "action2"){
scope.camera.position.x = -7.23;
@ -489,8 +482,6 @@ export function Jl3ddeviceNew(dom,group,token,skinCode) {
scope.camera.position.y = 22.56;
scope.camera.position.z = -1.348;
scope.controls.target = new THREE.Vector3(-2.15,10,-1.348);
// console.log(scope.camera.position);
// console.log(scope.controls.target);
scope.modelmanager.staticswitchmodel.action.reset();
scope.modelmanager.staticswitchmodel.action.time = 23.36;
stopTime = 26.66;
@ -865,10 +856,6 @@ export function Jl3ddeviceNew(dom,group,token,skinCode) {
}
}
if (data._type == "Signal") {
console.log(data);
}
}

View File

@ -139,7 +139,6 @@ export function ModelManager(){
Promise.all(initlist).then((result) => {
resolve("success"); //['成功了', 'success']
}).catch((error) => {
//console.log(error);
});
});

View File

@ -199,7 +199,6 @@ export function JLmapDriving(dom,data,mapId,storemod,translation,routegroup,proj
getPublishMapDetail(mapId).then(data => {
let mapnetdata = data.data;
getPublish3dMapDetail(mapId).then(netdata => {
// console.log(netdata);
let assetsdata = JSON.parse(netdata.data.sections);
scope.datatype = "new";
@ -314,7 +313,6 @@ export function JLmapDriving(dom,data,mapId,storemod,translation,routegroup,proj
// };
updatemmi.updatedrivingcode = function(code) {
// console.log(trainlisttest);
drivingcode = code;
trainlisttest.group.children[0].children[0].add(controls3.getObject());
controls3.getObject().position.x = 10;
@ -425,7 +423,6 @@ export function JLmapDriving(dom,data,mapId,storemod,translation,routegroup,proj
realsectionlist = loadrealsectionlist;
rails = loadrails;
console.log(trainlisttest.group);
trainlisttest.group.children[0].add(cameracctv);
}
@ -440,7 +437,6 @@ export function JLmapDriving(dom,data,mapId,storemod,translation,routegroup,proj
};
this.eventoff = function() {
// console.log("off");
// raycaster交互模型点击事件
document.getElementById('jlsimulation').removeEventListener( 'mousedown', onselect, false );
// 窗口自适应
@ -459,7 +455,6 @@ export function JLmapDriving(dom,data,mapId,storemod,translation,routegroup,proj
camera.position.z = mesh.children[0].position.z;
// controls.target = new THREE.Vector3(mesh.position.x,0,mesh.children[0].position.z);
}
// console.log(mesh);
if (type == 'station') {
camera.position.x = mesh.position.x;
camera.position.y = mesh.position.y+800;
@ -532,7 +527,6 @@ export function JLmapDriving(dom,data,mapId,storemod,translation,routegroup,proj
}
if (scope.raycasterswitch == 'section') {
// console.log(sectionlist.sections.modellist);
let intersects = raycaster.intersectObjects( sectionlist.sections.modellist, true);
if (intersects[0]) {

View File

@ -115,7 +115,6 @@ export function AssetLoader(){
resolve("loaderassets"); //['成功了', 'success']
}).catch((error) => {
//console.log(error);
});
});
@ -135,7 +134,6 @@ export function AssetLoader(){
resolve("loaderassets"); //['成功了', 'success']
}).catch((error) => {
//console.log(error);
});
});
@ -170,45 +168,30 @@ export function AssetLoader(){
fbxpromise(signal)
.then(function(data){
////console.log(data);
// console.log("test");
return fbxpromise(train);
})
.then(function(data){
////console.log(data);
// console.log("test");
return fbxpromise(station);
})
.then(function(data){
////console.log(data);
// console.log("test");
return fbxpromise(wstation);
})
// .then(function(data){
// ////console.log(data);
// return fbxpromise(autorail);
// })
// .then(function(data){
// ////console.log(data);
// return fbxpromise(autosuidao);
// })
.then(function(data){
////console.log(data);
// console.log("defaultswitch1");
return fbxpromise(defaultswitch1);
})
.then(function(data){
// console.log("defaultswitch2");
////console.log(data);
return fbxpromise(defaultswitch2);
})
.then(function(data){
////console.log(data);
// console.log("autoswitchs");
return fbxpromise(autoswitchs);
})
.then(function(data){
////console.log(scope.modellist);
resolve("loaderassets");
});
});
@ -228,7 +211,6 @@ export function AssetLoader(){
let newmesh = object;
//let mixer = new THREE.AnimationMixer( newmesh );
////console.log(jlmap3ddata.sectionlist);
for(let i=0;i<newmesh.children.length;i++){
let name = newmesh.children[i].name.split("_");
@ -314,7 +296,6 @@ export function AssetLoader(){
scene.add(newmesh);
loadingInstance.close();
//console.log("add");
} );
}
@ -414,7 +395,6 @@ export function AssetLoader(){
function fbxPromiseOver(asset){
return new Promise(function(resolve, reject){
var loader = new THREE.FBXLoader();
console.log(asset);
if(asset.type == "static"){
loader.load(asset.url, function ( object ) {
let mixer = new THREE.AnimationMixer( object );

View File

@ -15,10 +15,6 @@ import { Loading } from 'element-ui';
// import {SwitchModel} from '@/jlmap3d/model/SwitchModel.js';
export function DriverLoadNew(data,scope,netdata,mapdata,sectionlist,signallist,switchlist,stationstandlist,trainlisttest,rails,camera,controls,scene,mixerss){
//console.log(mapdata);
//console.log(data);
//console.log(scope);
let sceneload = scene;
let backdata = scope;
let assetloader = scope.assetloader;
@ -33,15 +29,12 @@ export function DriverLoadNew(data,scope,netdata,mapdata,sectionlist,signallist,
let isNewdata = false;
if(netdata.assets){
let assetsdata = JSON.parse(netdata.sections);
// console.log(assetsdata.link);
if(assetsdata.link){
isSection = true;
}else{
isNewdata = true;
}
}
// console.log(isNewdata);
// console.log(netdata);
if(isNewdata == true){
initnew3d(data,netdata);
}else{
@ -100,9 +93,6 @@ export function DriverLoadNew(data,scope,netdata,mapdata,sectionlist,signallist,
return trainlisttest.drivertrain(mapdata.trainList,sceneload,assetloader,mixers,actions,"01");
})
// .then(function(data){
// //console.log(data);
// //console.log(assetloader);
// console.log(stationstandlist);
// return tdt.initTdt(stationstandlist.list,mapdata.sectionList,rails.sectionrail,sceneload);
// })
.then(function(data){

View File

@ -12,8 +12,6 @@ export function RailListN(){
};
// this.init = function(section,linklist,scene){
this.init = function(section,sectionList,switchdata,scene){
// console.log(section);
// console.log(switchdata);
for(let i=0;i<section.length;i++){
scope.sectionrail[section[i].code] = {
lp:section[i].lp,
@ -176,7 +174,6 @@ export function RailListN(){
// circle2.rotation.x = -Math.PI/2;
// scene.add( circle1 );
// scene.add( circle2 );
// console.log(scope.sectionrail[section[i].code]);
}else{
scope.sectionrail[section[i].code].standTrack = false;
}
@ -186,8 +183,6 @@ export function RailListN(){
// var geometry = new THREE.CircleGeometry( 0.05, 16 );
// var material = new THREE.MeshBasicMaterial( { color: 0xffff00 } );
// var circle = new THREE.Mesh( geometry, material );
// // console.log(n);
// // console.log(scope.sectionrail[section[i].code].lineleft.points[n]);
// circle.position.x = scope.sectionrail[section[i].code].lineleft.points[n].x;
// circle.position.y = scope.sectionrail[section[i].code].lineleft.points[n].y;
// circle.position.z = scope.sectionrail[section[i].code].lineleft.points[n].z;
@ -245,8 +240,6 @@ export function RailListN(){
// var geometry = new THREE.CircleGeometry( 0.05, 16 );
// var material = new THREE.MeshBasicMaterial( { color: 0xffff00 } );
// var circle = new THREE.Mesh( geometry, material );
// // console.log(n);
// // console.log(scope.sectionrail[section[i].code].lineleft.points[n]);
// circle.position.x = scope.sectionrail[sectioncode].lineleft.points[n].x;
// circle.position.y = scope.sectionrail[sectioncode].lineleft.points[n].y;
// circle.position.z = scope.sectionrail[sectioncode].lineleft.points[n].z;

View File

@ -49,7 +49,6 @@ this.loadpromise = function(sectionList,sectiondata,rails,scene,assetloader){
// autorail.leftlist = leftlist;
scene.add(scope.sectiongroup);
return new Promise(function(resolve, reject){
// console.log(sectiondata);
let mergegeometry = new THREE.Geometry();
for(let i=0,leni = sectiondata.length;i<leni;i++){
@ -101,7 +100,6 @@ this.loadpromise = function(sectionList,sectiondata,rails,scene,assetloader){
// testmesh2 = null;
if(newsection.railpoint.length>=3){
// console.log(newsection);
let height = Math.random()/1000;
var closedSpline;

View File

@ -37,7 +37,6 @@ export function SignalListN() {
for(let j=0,lenj = data.length;j<lenj;j++){
if(data[j].code == signaldata[i].code){
if(data[j].virtual == false){
// console.log(signaldata[i]);
let newsignal = new SignalModel(signaldata[i]);
let newmesh;
if(data[j].type == "ARRIVAL"){

View File

@ -135,14 +135,12 @@ export function StationStandListN() {
}
this.loadpromise = function(stationdata,standsdata,psddata,scene,assetloader,mixers,actionss,mode,otherStation){
return new Promise(function(resolve, reject){
// console.log(standsdata);
let stations = stationdata;
let selectmesh1;
let selectmesh2;
let selectmesh3;
let specilmesh;
for(let j=0;j<assetloader.modellist.length;j++){
// console.log(assetloader.modellist[j].type);
if(assetloader.modellist[j].type == "stationInside"){
selectmesh1 = assetloader.modellist[j].mesh;
}
@ -202,7 +200,6 @@ export function StationStandListN() {
}
//
//
// console.log(psddata);
for(let i=0;i<standsdata.length;i++){
@ -268,8 +265,6 @@ export function StationStandListN() {
newstationmesh.code = standsdata[i].code;
newstationmesh.name = standsdata[i].code;
// console.log(newstationmesh.name);
// console.log(standsdata[i].inside);
newstationmesh.inside = standsdata[i].inside;
newstationmesh.position.x = standsdata[i].position.x;
newstationmesh.position.y = standsdata[i].position.y;

View File

@ -17,7 +17,6 @@ export function SwitchListN() {
return new Promise(function(resolve, reject){
scene.add( scope.switchgroup );
// let sectiondata = jlmap3ddata.sectionlist.sections.datalist;
// console.log(sectiondata);
let num;
for(let j=0;j<assetloader.modellist.length;j++){
if(assetloader.modellist[j].type == "switch"){
@ -25,7 +24,6 @@ export function SwitchListN() {
}
};
for(let i=0,leni = switchdata.length;i<leni;i++){
// console.log(switchdata[i]);
let newswitch = {
code:switchdata[i].code,
name:switchdata[i].name,
@ -58,7 +56,6 @@ export function SwitchListN() {
actions[autoswitch.code].action.clampWhenFinished = true;
mixers.push(mixer);
}
// console.log(scope.switchs.modellist);
resolve("loadedswitch");
});

View File

@ -17,7 +17,6 @@ export function TdtList() {
stopSections[sectionData[i].code] = sectionData[i];
}
}
// console.log(stationData);
for(let k in stationData){
for(let i=0;i<stationData[k].stands.length;i++){
let newmesh = object.clone(true);
@ -90,7 +89,6 @@ export function TdtList() {
ctx.textAlign = 'center';
ctx.textBaseline = 'middle';
ctx.clearRect(0,0,128,64);
//console.log(text.groupNumber);
ctx.drawImage(beauty,0,0,128, 64);
ctx.fillText(text, 64,32);
return canvas;

View File

@ -60,8 +60,6 @@ export function TrainListN() {
}
this.removeDriveTrain = function(removeLength){
console.log(removeLength);
scope.group.remove(scope.otherTrainmodels[0]);
scope.otherTrainmodels.splice(0,removeLength);
}
@ -69,7 +67,6 @@ export function TrainListN() {
this.drivertrain = function(data,scene,assetloader,mixers,actionss,mode){
return new Promise(function(resolve, reject){
// console.log(data);
let selectmesh,ntracks1,ntracks2,tclip,fclip;
for(let n=assetloader.modellist.length-1;n>=0;n--){
@ -105,15 +102,12 @@ export function TrainListN() {
newmesh.mixer = [];
for(let j=0;j<newmesh.children.length;j++){
// console.log("===================");
for(let n=0,lenn = newmesh.children[j].children.length;n<lenn;n++){
if(newmesh.children[j].children[n].name == "top"){
newmesh.children[j].children[n].animations = [];
newmesh.children[j].children[n].animations.push(tclip.clone());
let mixer = new THREE.AnimationMixer( newmesh.children[j].children[n] );
// console.log(n);
// console.log(newmesh.children[j].children[n]);
newmesh.mixer.push(mixer);
newmesh.mixerpush = false;
@ -151,7 +145,6 @@ export function TrainListN() {
// pos.position.x = -73.5;
// newmesh.children[j].add( pos );
newmesh.children[j].rotalist = [];
// console.log(newmesh);
}
newmesh.first = false;
@ -214,7 +207,6 @@ export function TrainListN() {
} );
//遍历列车数据
// console.log(data.length);
for(let i=0;i<data.length;i++){
@ -224,19 +216,14 @@ export function TrainListN() {
};
let newmesh = selectmesh.clone(true);
newmesh.mixer = [];
// console.log("-------------------------");
// console.log(data[i]);
for(let j=0;j<newmesh.children.length;j++){
// console.log("===================");
for(let n=0,lenn = newmesh.children[j].children.length;n<lenn;n++){
if(newmesh.children[j].children[n].name == "top"){
newmesh.children[j].children[n].animations = [];
newmesh.children[j].children[n].animations.push(tclip.clone());
let mixer = new THREE.AnimationMixer( newmesh.children[j].children[n] );
// console.log(n);
// console.log(newmesh.children[j].children[n]);
newmesh.mixer.push(mixer);
newmesh.mixerpush = false;
// mixers.push(mixer);
@ -274,7 +261,6 @@ export function TrainListN() {
// pos.position.x = -73.5;
// newmesh.children[j].add( pos );
newmesh.children[j].rotalist = [];
// console.log(newmesh);
}
//
@ -343,7 +329,6 @@ export function TrainListN() {
scope.list[data[i].groupNumber] = newmesh;
//scene.add(newmesh);
}
// console.log(selectmesh);
// for(let i=0,leni=selectmesh.children.length;i<leni;i++){
// selectmesh.children[i].geometry.dispose();
// selectmesh.children[i].material.dispose();
@ -361,7 +346,6 @@ let onProgress = function ( xhr ) {
if ( xhr.lengthComputable ) {
let percentComplete = xhr.loaded / xhr.total * 100;
console.log( Math.round( percentComplete, 2 ) + '% downloaded' );
}
@ -389,7 +373,6 @@ function getTextCanvas(text){
ctx.textAlign = 'center';
ctx.textBaseline = 'middle';
ctx.clearRect(0,0,128,64);
//console.log(text.groupNumber);
ctx.drawImage(beauty,0,0,128, 64);
ctx.fillText("车组号:"+text.groupNumber, 40,10);
ctx.fillText("车组人员:XXX", 40,20);

View File

@ -38,7 +38,6 @@ export function Jl3dDrivingNew(mixers,updatemmi,sound,translation,routegroup,sta
var datatype = '00';
this.teststomp = new StompClient();
// let toppic = '/app/topic/simulation/client/'+routegroup+'/drive';
console.log(routegroup);
this.topic = '/queue/simulation/'+routegroup+'/trainPosition';
let allDeviceTopic = '/queue/simulation/'+routegroup+'/srDeviceState';
let hmiTopic = '/queue/simulation/'+routegroup+'/train/001/Hmi';
@ -52,8 +51,6 @@ export function Jl3dDrivingNew(mixers,updatemmi,sound,translation,routegroup,sta
//切换车辆修改列车属性
this.updatamap = function(newsectionlist,newlinklist,newsignallist,newstationstandlist,newtrainlisttest,newrealsectionlist,newrails,newtdt, materiallist, nowaction, scene) {
// console.log(mapdata);
// console.log(newtrainlisttest);
trainmodel = newtrainlisttest.group.children[0];
trainlisttest = newtrainlisttest;
sectionlist = newsectionlist;
@ -102,7 +99,6 @@ export function Jl3dDrivingNew(mixers,updatemmi,sound,translation,routegroup,sta
let initStatus = true;
// 仿真socket接口回调函数
function callback(Response) {
// console.log(Response);
// 对象化数据
let data = JSON.parse(Response.body);
@ -131,7 +127,6 @@ export function Jl3dDrivingNew(mixers,updatemmi,sound,translation,routegroup,sta
}
// stats.update();
// 遍历后台数据
// console.log(data);
}
@ -228,7 +223,6 @@ export function Jl3dDrivingNew(mixers,updatemmi,sound,translation,routegroup,sta
// if(updateTrainModel.children[1].rotalist.length > 0 || updateTrainModel.children[2].rotalist.length > 0 || updateTrainModel.children[3].rotalist.length > 0 || updateTrainModel.children[4].rotalist.length > 0|| updateTrainModel.children["black"].rotalist.length > 0){
for(let rs = 1;rs<updateTrainModel.children.length;rs++){
//console.log(rs);
if(updateTrainModel.children[rs].rotalist[0]){
let offsetz = parseFloat(updateTrainModel.children[rs].rotalist[0].posr.z) + parseFloat(updateTrainModel.children[rs].position.z);
@ -251,13 +245,11 @@ export function Jl3dDrivingNew(mixers,updatemmi,sound,translation,routegroup,sta
xh = updateTrainModel.children[rs].rotalist.length;
}
}
//console.log(trainmodel.children[rs].rotalist.length);
}
}
// console.log(trainmodel.rotalist);
// }
}else{
@ -303,7 +295,6 @@ export function Jl3dDrivingNew(mixers,updatemmi,sound,translation,routegroup,sta
// if(updateTrainModel.children[1].rotalist.length > 0 || updateTrainModel.children[2].rotalist.length > 0 || updateTrainModel.children[3].rotalist.length > 0 || updateTrainModel.children[4].rotalist.length > 0|| updateTrainModel.children["black"].rotalist.length > 0){
for(let rs = 1;rs<updateTrainModel.children.length;rs++){
//console.log(rs);
if(updateTrainModel.children[rs].rotalist[0]){
let offsetz = parseFloat(updateTrainModel.children[rs].rotalist[0].posr.z) - parseFloat(updateTrainModel.children[rs].matrixWorld.elements[14]);

View File

@ -4,11 +4,9 @@ export function UpdateTrain(camera,traindata,control){
if(traindata != undefined && traindata.group.children[0]){//traindata.group.children[0].dispose == false
if(traindata.group.children[0].progress != null){
// console.log(traindata.group);
let trainmodel = traindata.group.children[0];
if(trainmodel.speeds > 0 && trainmodel.speeds){
let speed = null;
// console.log(traindata.group.children[0].progress);
if(traindata.group.children[0].progress >=0&&traindata.group.children[0].progress<=1){
let movecurve = trainmodel.curve;
@ -44,7 +42,6 @@ export function UpdateTrain(camera,traindata,control){
if(trainmodel.children[1].rotalist.length > 0 || trainmodel.children[2].rotalist.length > 0 || trainmodel.children[3].rotalist.length > 0 || trainmodel.children[4].rotalist.length > 0|| trainmodel.children[5].rotalist.length > 0){
for(let rs = 1;rs<6;rs++){
//console.log(rs);
if(trainmodel.children[rs].rotalist[0]){
let offsetz = parseFloat(trainmodel.children[rs].matrixWorld.elements[14]) - parseFloat(trainmodel.children[rs].rotalist[0].posr.z);
@ -66,7 +63,6 @@ export function UpdateTrain(camera,traindata,control){
xh = trainmodel.children[rs].rotalist.length;
}
}
//console.log(trainmodel.children[rs].rotalist.length);
}
}
}
@ -103,7 +99,6 @@ export function UpdateTrain(camera,traindata,control){
if(trainmodel.children[1].rotalist.length > 0 || trainmodel.children[2].rotalist.length > 0 || trainmodel.children[3].rotalist.length > 0 || trainmodel.children[4].rotalist.length > 0|| trainmodel.children[5].rotalist.length > 0){
for(let rs = 1;rs<6;rs++){
//console.log(rs);
if(trainmodel.children[rs].rotalist[0]){
let offsetz = parseFloat(trainmodel.children[rs].rotalist[0].posr.z) - parseFloat(trainmodel.children[rs].matrixWorld.elements[14]);
@ -126,13 +121,10 @@ export function UpdateTrain(camera,traindata,control){
xh = trainmodel.children[rs].rotalist.length;
}
}
//console.log(trainmodel.children[rs].rotalist.length);
}
}
// console.log(trainmodel.rotalist);
}
trainmodel.progress += trainmodel.speeds;
}
@ -152,9 +144,6 @@ export function UpdateTrain(camera,traindata,control){
trainmodel.nextcode = null;
}
// console.log(trainmodel.name);
// console.log(trainmodel.progress);
// console.log(trainmodel.nextcurve);
// if(trainmodel.status == "02"){
// trainmodel.progress = 0;
// }else if(trainmodel.status == "03"){
@ -197,7 +186,6 @@ export function UpdateTrain(camera,traindata,control){
if(trainmodel.children[1].rotalist.length > 0 || trainmodel.children[2].rotalist.length > 0 || trainmodel.children[3].rotalist.length > 0 || trainmodel.children[4].rotalist.length > 0|| trainmodel.children[5].rotalist.length > 0){
for(let rs = 1;rs<6;rs++){
//console.log(rs);
if(trainmodel.children[rs].rotalist[0]){
let offsetz = parseFloat(trainmodel.children[rs].matrixWorld.elements[14]) - parseFloat(trainmodel.children[rs].rotalist[0].posr.z);
@ -219,7 +207,6 @@ export function UpdateTrain(camera,traindata,control){
xh = trainmodel.children[rs].rotalist.length;
}
}
//console.log(trainmodel.children[rs].rotalist.length);
}
}
}
@ -256,7 +243,6 @@ export function UpdateTrain(camera,traindata,control){
if(trainmodel.children[1].rotalist.length > 0 || trainmodel.children[2].rotalist.length > 0 || trainmodel.children[3].rotalist.length > 0 || trainmodel.children[4].rotalist.length > 0|| trainmodel.children[5].rotalist.length > 0){
for(let rs = 1;rs<6;rs++){
//console.log(rs);
if(trainmodel.children[rs].rotalist[0]){
let offsetz = parseFloat(trainmodel.children[rs].rotalist[0].posr.z) - parseFloat(trainmodel.children[rs].matrixWorld.elements[14]);
@ -279,16 +265,12 @@ export function UpdateTrain(camera,traindata,control){
xh = trainmodel.children[rs].rotalist.length;
}
}
//console.log(trainmodel.children[rs].rotalist.length);
}
}
// console.log(trainmodel.rotalist);
}
// console.log(trainmodel.nextcurve);
if(trainmodel.progress > -(trainmodel.speeds)){
trainmodel.progress += trainmodel.speeds;
}

View File

@ -55,12 +55,9 @@ export function Jlmap3dSubscribeNew(jlmap3d,routegroup,jsonwebwork) {
jsonwebwork.onmessage = function (event) {
// console.log(event.data);
// if(event.data.deviceType == "TRAIN"){
// // console.log(event.data);
//
// }
// console.log(event.data);
if(event.data.type == "Device_Load_Destroy_3D"){
DeviceDestroy(event.data);
return;
@ -69,19 +66,16 @@ export function Jlmap3dSubscribeNew(jlmap3d,routegroup,jsonwebwork) {
if(event.data.type == 'TrainRun_3D'){
for(let i=0,leni=event.data.body.length;i<leni;i++){
// console.log(event.data.body[i]);
trainRunNew(event.data.body[i]);
}
return;
}
// if(event.data.type == 'TRAIN'){
// console.log(event.data);
// trainrun(event.data);
// }
if (event.data.type== 'SIGNAL' && signallist) {
signalupdate(event.data);
// console.log(event.data);
return;
}
@ -131,7 +125,6 @@ export function Jlmap3dSubscribeNew(jlmap3d,routegroup,jsonwebwork) {
this.socketon = function(topic) {
try {
// console.log("teststomp");
// scope.teststomp.subscribe(topic, callback, header);
} catch (error) {
console.error('websocket订阅失败');
@ -166,11 +159,9 @@ export function Jlmap3dSubscribeNew(jlmap3d,routegroup,jsonwebwork) {
function trainRunNew(data){
let code = data.code;
// console.log(rails.sectionrail[data.section],data.section,code,'--------')
if(rails.sectionrail[data.section]){
if(trainlisttest.list[code].right != data.right){
if(data.right == "0"){
console.log('right==0')
trainlisttest.list[code].right = "0";
trainlisttest.list[code].rotation.y = Math.PI;
let point = rails.sectionrail[data.section].lineleft.getPointAt(data.offset);
@ -212,7 +203,6 @@ export function Jlmap3dSubscribeNew(jlmap3d,routegroup,jsonwebwork) {
}
if(data.right == "1"){
console.log('right==1')
trainlisttest.list[code].right = "1";
trainlisttest.list[code].rotation.y = 0;
let point = rails.sectionrail[data.section].lineleft.getPointAt(data.offset);
@ -252,10 +242,7 @@ export function Jlmap3dSubscribeNew(jlmap3d,routegroup,jsonwebwork) {
}
}
// console.log(data);
console.log(trainlisttest.list[code].dispose,'88888888');
if(trainlisttest.list[code].dispose == "0") {
console.log(trainlisttest.list[code].dispose,'-----------');
if (data.right == '1') { // 向右
trainlisttest.list[code].right = '1';
trainlisttest.list[code].progress = data.offset;
@ -310,7 +297,6 @@ export function Jlmap3dSubscribeNew(jlmap3d,routegroup,jsonwebwork) {
}
// if(trainlisttest.list[code].children[1].rotalist.length > 0 || trainlisttest.list[code].children[2].rotalist.length > 0 || trainlisttest.list[code].children[3].rotalist.length > 0 || trainlisttest.list[code].children[4].rotalist.length > 0|| trainlisttest.list[code].children[5].rotalist.length > 0){
for(let rs = 1;rs<trainlisttest.list[code].children.length;rs++){
//console.log(rs);
if(trainlisttest.list[code].children[rs].rotalist[0]){
let offsetz = parseFloat(trainlisttest.list[code].children[rs].rotalist[0].posr.z) - parseFloat(trainlisttest.list[code].children[rs].matrixWorld.elements[14]);
trainlisttest.list[code].children[rs].position.z += offsetz;
@ -320,9 +306,6 @@ export function Jlmap3dSubscribeNew(jlmap3d,routegroup,jsonwebwork) {
for(let xh=0;xh<trainlisttest.list[code].children[rs].rotalist.length;xh++){
if((trainlisttest.list[code].children[rs].matrixWorld.elements[12])>=trainlisttest.list[code].children[rs].rotalist[0].posr.x){
// if(trainlisttest.list[code].groupNumber == "005"){
// console.log("rs:"+rs);
// console.log(trainlisttest.list[code].children[rs].matrixWorld.elements[12]);
// console.log(trainlisttest.list[code].children[rs].rotalist[0].posr.x);
// }
if(rs != (trainlisttest.list[code].children.length-1)){
let asd = trainlisttest.list[code].children[rs].rotalist[0];
@ -338,7 +321,6 @@ export function Jlmap3dSubscribeNew(jlmap3d,routegroup,jsonwebwork) {
xh = trainlisttest.list[code].children[rs].rotalist.length;
}
}
//console.log(trainlisttest.list[code].children[rs].rotalist.length);
}
}
// }
@ -402,7 +384,6 @@ export function Jlmap3dSubscribeNew(jlmap3d,routegroup,jsonwebwork) {
// if(trainlisttest.list[code].children[1].rotalist.length > 0 || trainlisttest.list[code].children[2].rotalist.length > 0 || trainlisttest.list[code].children[3].rotalist.length > 0 || trainlisttest.list[code].children[4].rotalist.length > 0|| trainlisttest.list[code].children[5].rotalist.length > 0){
for(let rs = 1;rs<trainlisttest.list[code].children.length;rs++){
//console.log(rs);
if(trainlisttest.list[code].children[rs].rotalist[0]){
let offsetz = parseFloat(trainlisttest.list[code].children[rs].rotalist[0].posr.z) + parseFloat(trainlisttest.list[code].children[rs].position.z);
@ -426,28 +407,23 @@ export function Jlmap3dSubscribeNew(jlmap3d,routegroup,jsonwebwork) {
xh = trainlisttest.list[code].children[rs].rotalist.length;
}
}
//console.log(trainlisttest.list[code].children[rs].rotalist.length);
}
}
// console.log(trainlisttest.list[code].rotalist);
// }
}
}
console.log(code,trainlisttest.list[code].position.x,trainlisttest.list[code].position.y,trainlisttest.list[code].position.z, '666666')
}else{
// console.log(code,'trainlisttest.list[code].position.x = -1000000')
trainlisttest.list[code].position.x = -1000000;
}
}
function trainrun(data){
let code = data.code;
// console.log(data);
if(trainlisttest.list[code].dispose == "0"){
if(trainlisttest.list[code].curve == null){
if (data.right == '1') { // 向右

View File

@ -128,7 +128,6 @@ export function JLmap3d(dom, data,skinCode,storemod,routegroup,project) {
}
weatherManager.update(controlManager.orbitCamera.position);
// console.log(controlManager.orbitCamera.position);
// stats.update();
}
@ -147,14 +146,12 @@ export function JLmap3d(dom, data,skinCode,storemod,routegroup,project) {
delta = clock.getDelta();
for(let i=scope.mixers.length-1;i>=0;i--){
if(scope.mixers[i]._actions[0].isRunning()){
// console.log(scope.mixers[i]._actions[0].isRunning());
scope.mixers[i].update( delta );
}
}
//开启车站漫游
if(camerarail.moveswitch == true){
// console.log(camerarail.progress);
if(camerarail.progress>=0.99){
camerarail.moveswitch = false;
camerarail.curve = null;
@ -193,7 +190,6 @@ export function JLmap3d(dom, data,skinCode,storemod,routegroup,project) {
scope.mixers = null;
scope.actions = null;
scope.Subscribe = null;
//console.log(scope);
//scope = null;
}
@ -224,7 +220,6 @@ export function JLmap3d(dom, data,skinCode,storemod,routegroup,project) {
}
};
this.changeweather = function(weathertype){
// console.log(weathertype);
weatherManager.changeweather(weathertype);
}
//开启轨道镜头交互

Some files were not shown because too many files have changed in this diff Show More