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

6225 Commits

Author SHA1 Message Date
fan
09781774c7 大铁线路操作调整 2021-04-26 17:59:23 +08:00
fan
d917ccce3d 大铁线路操作调整 2021-04-25 18:13:47 +08:00
fan
c22a40b6f0 BUG234 => 测试环境中苏电院教学管理页面显示问题 2021-04-25 14:54:05 +08:00
fan
2bd741d4ab 大铁操作调整 2021-04-25 10:09:43 +08:00
fan
13e0f107f0 后端状态转译 2021-04-23 17:43:45 +08:00
fan
87daa342d6 query newApi 判断调整 2021-04-23 15:14:10 +08:00
fan
c6f5f84d77 query测试 2021-04-23 15:01:04 +08:00
fan
bd2165ff35 大铁仿真调整 2021-04-23 14:11:29 +08:00
fan
6f06822793 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-23 09:01:26 +08:00
fan
7379945c42 大铁仿真调整 2021-04-23 09:01:12 +08:00
sunzhenyu
cf930c1e72 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-22 18:08:05 +08:00
sunzhenyu
e9b9345e95 增加三维课程播放器，增加第一人称控制碰撞检测，完善编辑器数据 2021-04-22 18:07:56 +08:00
joylink_cuiweidong
e1757e4114 代码调整 2021-04-22 11:30:07 +08:00
joylink_cuiweidong
7ef86d0517 代码调整 2021-04-22 10:52:48 +08:00
joylink_cuiweidong
40909b073e 代码调整 2021-04-21 17:55:41 +08:00
joylink_cuiweidong
5039c09c16 样式调整 2021-04-21 17:19:25 +08:00
joylink_cuiweidong
54ec91a835 添加 修改检查配置接口 2021-04-21 15:46:37 +08:00
joylink_cuiweidong
70e9ab6a87 代码调整 2021-04-21 15:25:08 +08:00
joylink_cuiweidong
62698088d8 代码调整 2021-04-21 15:19:32 +08:00
joylink_cuiweidong
97a07bb70e 大铁 进路删除 代码调整 2021-04-21 15:17:27 +08:00
joylink_cuiweidong
6fe2bf0aca 大铁 进路预览代码调整 2021-04-21 14:40:44 +08:00
joylink_cuiweidong
d13292b8f1 大铁线路 进路预览代码调整 2021-04-21 13:40:37 +08:00
joylink_cuiweidong
af13800539 大铁线路 进路添加代码调整 2021-04-21 09:20:48 +08:00
fan
3ba2f8ac5b merge 2021-04-20 17:29:32 +08:00
fan
0226042942 宁波三Bug调整 2021-04-20 17:25:27 +08:00
joylink_cuiweidong
1ffac1ba84 代码调整 2021-04-16 17:46:07 +08:00
joylink_cuiweidong
d1a177827d 大铁项目 添加进路 代码调整 2021-04-16 17:21:15 +08:00
joylink_cuiweidong
e554ff45b7 代码调整 2021-04-16 16:36:17 +08:00
joylink_cuiweidong
388f85c3db 代码调整 2021-04-16 16:26:58 +08:00
joylink_cuiweidong
a3dff96e73 大铁 项目 添加进路 代码调整 2021-04-16 15:59:08 +08:00
joylink_cuiweidong
3ba63c65ac Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-16 14:22:48 +08:00
joylink_cuiweidong
84169141ab 大铁 指示灯 代码调整 2021-04-16 14:22:29 +08:00
sunzhenyu
3440daf55e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-16 13:19:07 +08:00
sunzhenyu
72d0bb084f 修改三维单体设备信号机亮灯逻辑，修改三维课程编辑播放器 2021-04-16 13:18:59 +08:00
joylink_cuiweidong
0de0206192 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-16 09:48:35 +08:00
joylink_cuiweidong
91190c6dc3 代码调整 2021-04-16 09:48:03 +08:00
ival
14fd6c1a40 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-15 18:15:20 +08:00
ival
14f718ec1a 增加指示器显示 2021-04-15 18:15:12 +08:00
joylink_cuiweidong
b5b9b493e7 代码调整 2021-04-15 18:07:51 +08:00
joylink_cuiweidong
16294b6373 代码调整 2021-04-15 17:12:41 +08:00
joylink_cuiweidong
d3b240989b 代码调整 2021-04-15 16:15:18 +08:00
joylink_cuiweidong
bb928cb37b 代码调整 2021-04-15 15:55:30 +08:00
joylink_cuiweidong
4050ddf937 大铁进路添加 代码调整 2021-04-15 15:53:34 +08:00
joylink_cuiweidong
bebac3b8e5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-14 17:48:55 +08:00
joylink_cuiweidong
9233b651f6 代码调整 2021-04-14 17:48:28 +08:00
sunzhenyu
2412aac899 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-14 17:35:46 +08:00
sunzhenyu
63f935616d 修改三维课程编辑器事件和图片资源部分 2021-04-14 17:35:41 +08:00
joylink_cuiweidong
8d763d00e4 运行图编制代码调整 2021-04-14 16:43:09 +08:00
joylink_cuiweidong
1a7786dd14 运行图编制 代码调整 2021-04-14 15:30:52 +08:00
joylink_cuiweidong
63855ca1ff 运行图编制代码调整 2021-04-14 15:17:34 +08:00
joylink_cuiweidong
a1342ed2b6 运行图代码调整 2021-04-14 14:36:33 +08:00
joylink_cuiweidong
448832293b 运行图代码调整 2021-04-14 14:26:00 +08:00
joylink_cuiweidong
ae263b0dc7 运行图样式调整 2021-04-14 13:57:35 +08:00
sunzhenyu
c9b7d18e43 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-14 09:13:02 +08:00
sunzhenyu
f1ab1f9819 三维课程编辑测试展示(未完成) 2021-04-14 09:12:53 +08:00
fan
8575de2bd9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-13 18:09:52 +08:00
fan
0b5cc8e15d 信号按钮调整 2021-04-13 18:09:37 +08:00
ival
68cad1616a 删除无用代码 2021-04-13 15:48:01 +08:00
ival
584852038c 增加大铁仿真display 
# Conflicts:
#	src/iscs_new/plugins/shapeBuilder/entry.vue
 2021-04-13 15:47:49 +08:00
fan
8a363c068a 大铁调整 2021-04-13 14:10:20 +08:00
fan
75e7c00957 地图分组管理 2021-04-13 10:15:11 +08:00
fan
cbb02621d9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-12 18:19:58 +08:00
fan
8d5de4cc1a 地图分组管理 2021-04-12 18:09:49 +08:00
ival
dde06f834d 修改语言校验页面 2021-04-12 17:11:36 +08:00
fan
904d84e8ab 语音 2021-04-12 14:56:21 +08:00
sunzhenyu
f86c13ea86 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-09 18:21:45 +08:00
sunzhenyu
cea95f9d92 三维课程编辑器课程组件和数据结构修改，升级threejs版本 2021-04-09 18:21:24 +08:00
fan
7532c86e15 宁波三操作调整&导入运行图放开 2021-04-08 17:28:46 +08:00
joylink_cuiweidong
5f9e6fe882 运行图编制代码调整 2021-04-07 14:21:26 +08:00
fan
2d5b863231 iscs Button hideType 赋值调整 2021-04-07 09:27:31 +08:00
fan
9a84b61e5a ISCS调整 2021-04-06 17:48:33 +08:00
ival
a215004143 修改代码 2021-04-06 16:01:14 +08:00
sunzhenyu
fb00e1418e 修改三维课程存读 2021-04-02 18:05:19 +08:00
sunzhenyu
a9745eb709 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-02 15:49:32 +08:00
sunzhenyu
1cab2116d6 三维课程代码，修改课程组件间逻辑，修改课程数据结构。(未实装) 2021-04-02 15:49:24 +08:00
fan
fc861b1c70 组织管理调整 2021-04-02 09:58:45 +08:00
fan
baf424cfad Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-01 16:37:25 +08:00
fan
a5b3f9cf04 组织管理调整 2021-04-01 16:28:30 +08:00
joylink_cuiweidong
81ecf0ac20 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-01 10:59:05 +08:00
joylink_cuiweidong
fcf7d1b8ee 运行图代码调整 2021-04-01 10:58:41 +08:00
fan
f1824ad324 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-01 09:59:11 +08:00
fan
f327889bca 组织管理调整 2021-04-01 09:59:01 +08:00
joylink_cuiweidong
45c51157a1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-01 09:42:12 +08:00
joylink_cuiweidong
618d975d68 运行图编制 代码调整 2021-04-01 09:41:14 +08:00
fan
0253e6e590 组织管理调整 2021-03-31 18:27:29 +08:00
fan
887edee9e6 考试系统按钮位置调整 2021-03-31 09:35:51 +08:00
fan
30bf7487ae 试卷编辑调整 2021-03-31 09:31:50 +08:00
fan
076c7192ec 教学管理调整 2021-03-30 18:07:45 +08:00
fan
1d50b1582d BUG：208、209、210 2021-03-30 15:51:15 +08:00
fan
28d092401e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-30 15:23:48 +08:00
fan
d42579479b 教学管理问题调整 2021-03-30 15:23:37 +08:00
joylink_cuiweidong
0c407dbfa9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-30 14:59:09 +08:00
joylink_cuiweidong
b78454781b 运行图编制 添加任务/修改任务 代码调整 2021-03-30 14:58:51 +08:00
fan
51bce2825e 教学管理问题调整 2021-03-30 14:49:47 +08:00
fan
d8462bb404 教学管理问题调整 2021-03-30 14:31:25 +08:00
fan
692c9f0c03 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-30 10:41:48 +08:00
fan
894dc96ea5 教学管理问题调整 2021-03-30 10:41:27 +08:00
joylink_cuiweidong
770bdff791 代码调整 2021-03-30 09:59:51 +08:00
joylink_cuiweidong
65595cbe85 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-30 09:57:35 +08:00
joylink_cuiweidong
09b2923126 iscs 代码调整 2021-03-30 09:57:05 +08:00
fan
def94fee3e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-29 18:05:30 +08:00
fan
d0f756ed2f BUG202\200:成绩查询页面点击重置报错;删除课程的提示需要修改 2021-03-29 18:05:22 +08:00
joylink_cuiweidong
14b98e0e3e 代码调整 2021-03-29 17:34:57 +08:00
joylink_cuiweidong
7521b8f2db iscs 代码调整 2021-03-29 17:33:31 +08:00
fan
c4ae02df0d BUG196:进入其他用户创建的班级的学生管理界面，建议删除导入模板下载 2021-03-29 17:08:45 +08:00
fan
ac56715942 课程详情调整 2021-03-29 17:07:14 +08:00
fan
1395beacb8 考试调整 2021-03-29 16:17:52 +08:00
fan
577fc1444f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-29 15:01:56 +08:00
fan
64a673419b 考试调整 2021-03-29 15:01:43 +08:00
ival
3440c5ddc0 增加 圆 2021-03-29 15:00:02 +08:00
ival
a1fd2ed090 修改 福州door设备图层问题 2021-03-29 14:57:18 +08:00
joylink_cuiweidong
3c61302df1 代码调整 2021-03-29 13:13:35 +08:00
ival
7456a19b3e 增加 门禁iscs背景图，以及iscs_new的部分代码 2021-03-29 13:09:51 +08:00
ival
45027796e7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-29 11:32:00 +08:00
ival
7ffff137b5 修改 删除生成计划的 滚动 2021-03-29 11:31:47 +08:00
fan
5090b14819 merge 2021-03-29 11:10:57 +08:00
fan
57f3b563fd 考试调整 2021-03-29 11:04:57 +08:00
fan
d3b4a73595 留言板调整 2021-03-29 11:04:18 +08:00
ival
3e3ca007e1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-29 11:00:44 +08:00
ival
2a66a7b2c6 修改代码 2021-03-29 11:00:24 +08:00
joylink_cuiweidong
0a796d4218 运行图编制 代码调整 2021-03-29 10:09:33 +08:00
joylink_cuiweidong
ea85ed29ae Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-26 16:09:44 +08:00
ival
83c630bfc7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/utils/baseUrl.js
 2021-03-26 16:09:05 +08:00
joylink_cuiweidong
c22b59733a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-26 16:08:43 +08:00
ival
6f0eca2503 修改 iscs加载的问题 2021-03-26 16:08:39 +08:00
joylink_cuiweidong
ce79c12b7d 代码调整 2021-03-26 16:08:21 +08:00
fan
ab49d70a61 教学管理返回按钮调整 2021-03-26 13:31:12 +08:00
fan
c519f74189 教学管理问题调整 2021-03-26 13:09:56 +08:00
fan
a70597a267 教学管理问题调整 2021-03-25 20:01:21 +08:00
fan
0607e63d37 教学管理问题调整 2021-03-25 19:46:02 +08:00
fan
a267b1b64f 教学管理问题调整 2021-03-25 18:34:41 +08:00
fan
81d30804bb 教学管理问题调整 2021-03-25 17:38:46 +08:00
fan
c0add0cf1a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_teach 2021-03-25 16:08:53 +08:00
fan
bffb689e72 教学管理调整 2021-03-25 16:08:44 +08:00
joylink_cuiweidong
04ec5432d9 运行图编制代码调整 2021-03-25 15:18:58 +08:00
joylink_cuiweidong
c541e62be4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-25 15:07:34 +08:00
joylink_cuiweidong
f8d7ad88bb 运行图编制 代码调整 2021-03-25 15:07:14 +08:00
fan
c1580ca6ea 应用处班级添加提示文字 2021-03-25 15:00:30 +08:00
ival
d6e24e40fa Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-25 14:10:24 +08:00
ival
ba51c50417 修改代码 2021-03-25 14:10:18 +08:00
fan
19421566de Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_teach 2021-03-25 14:09:38 +08:00
fan
159aec918f 教学管理调整 2021-03-25 14:09:03 +08:00
joylink_cuiweidong
8a8cc8e04c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-25 13:39:51 +08:00
joylink_cuiweidong
ccc4970a1a 运行图编制 生成计划 获取交路代码调整 2021-03-25 13:39:28 +08:00
ival
988f879d46 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/views/iscs/iscsDraw/icscComponents/picture.vue
 2021-03-25 13:20:26 +08:00
ival
85f73964d3 调整iscs站厅子图顺序 2021-03-25 13:19:28 +08:00
fan
0d57d977a1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_teach 2021-03-25 13:07:34 +08:00
ival
ee7453d5cd 修改 站厅子图列表 2021-03-25 13:08:03 +08:00
fan
5106ae8d14 meger 2021-03-25 13:07:02 +08:00
fan
a3d6dc727f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_teach 2021-03-25 13:03:27 +08:00