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

12037 Commits

Author SHA1 Message Date
dong
a97d34d3f3 功能管理和权限管理调整 2022-10-21 15:21:15 +08:00
joylink_cuiweidong
583830d573 修改三维图片和数据的地址 2022-10-21 14:15:58 +08:00
joylink_cuiweidong
b0431f00f8 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 
# Conflicts:
#	src/views/newMap/display/simulationMenu.vue
 2022-10-21 11:30:35 +08:00
joylink_cuiweidong
34ff82d6e9 菜单添加实训按钮 代码调整 2022-10-21 10:38:36 +08:00
fan
f2ac931350 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-10-21 09:52:46 +08:00
fan
1b90935de6 代码调整 2022-10-21 09:52:27 +08:00
Yuan
2601028c19 WIP: 考试 2022-10-20 18:22:56 +08:00
fan
812ef04cbd Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-10-20 17:57:52 +08:00
fan
c8c9ec4b43 代码调整 2022-10-20 17:57:41 +08:00
joylink_cuiweidong
090b07bb41 代码调整 2022-10-20 17:56:55 +08:00
joylink_cuiweidong
85e0abea4a Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-10-20 16:23:16 +08:00
joylink_cuiweidong
77d0488450 代码调整 2022-10-20 16:22:56 +08:00
fan
f1ab35ce4b Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-10-20 15:12:02 +08:00
fan
d0eed68a4b 代码调整 2022-10-20 15:11:40 +08:00
joylink_cuiweidong
63e86119ef 代码调整 2022-10-20 14:29:18 +08:00
dong
66b6a7fbf9 代码调整 2022-10-20 11:15:58 +08:00
joylink_cuiweidong
8dbc06409e Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-10-20 11:01:28 +08:00
joylink_cuiweidong
abfde166ba 代码调整 2022-10-20 11:01:12 +08:00
dong
b06248a366 理论题目添加清空操作 2022-10-20 10:17:38 +08:00
dong
2754e14bff 代码调整 2022-10-19 18:46:22 +08:00
dong
0d6f6dda1c 理论题目导入调整 2022-10-19 18:15:17 +08:00
joylink_cuiweidong
daa05eb67b 数字沙盘代码调整 2022-10-19 17:11:28 +08:00
joylink_cuiweidong
ae5f211154 代码调整 2022-10-19 16:43:42 +08:00
joylink_cuiweidong
a1035a4e1f 代码调整 2022-10-19 15:35:53 +08:00
fan
19db91123c 设备右键菜单暂提 2022-10-19 15:32:56 +08:00
fan
159ff15ace 仿真系统创建生成调整 2022-10-19 11:04:49 +08:00
fan
0cbf642586 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-10-19 09:30:36 +08:00
fan
a7e21bbfae 增加一键生成仿真系统 2022-10-19 09:30:23 +08:00
joylink_cuiweidong
cd11ff9988 iscs 代码调整 2022-10-18 17:37:18 +08:00
joylink_cuiweidong
acde5489ca 代码调整 2022-10-18 17:20:40 +08:00
joylink_cuiweidong
bf098fc8e1 代码调整 2022-10-18 16:50:54 +08:00
dong
e049334401 理论题目导出模板调整 2022-10-18 16:28:32 +08:00
joylink_cuiweidong
353dff98ae Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-10-18 16:14:46 +08:00
joylink_cuiweidong
013009e3f8 代码调整 2022-10-18 16:14:34 +08:00
Yuan
2c7796baf3 Merge branch 'test_dispaly' of git.code.tencent.com:lian-cbtc/jl-client into test_dispaly 2022-10-18 15:41:44 +08:00
Yuan
37fcac449f 试卷名称及简介限制长度 2022-10-18 15:41:40 +08:00
joylink_cuiweidong
e7239d35fc Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-10-18 15:20:22 +08:00
joylink_cuiweidong
a21049966c 代码调整 2022-10-18 15:20:06 +08:00
Yuan
918752ecf7 Merge branch 'test_dispaly' of git.code.tencent.com:lian-cbtc/jl-client into test_dispaly 2022-10-18 14:46:34 +08:00
Yuan
481b726989 bugfix - 考试管理查询分类字段修改 2022-10-18 14:46:27 +08:00
joylink_cuiweidong
ac9668f246 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-10-18 14:15:46 +08:00
joylink_cuiweidong
2a6300ce69 代码调整 2022-10-18 14:15:29 +08:00
Yuan
6a97b173c3 bugfix - 考试管理查询字段调整 2022-10-18 13:55:04 +08:00
dong
01f9a2abaa 理论题目导入和导出功能 2022-10-18 13:54:29 +08:00
Yuan
248661e0d7 bugfix - 考试管理标签及状态查询传参修改 2022-10-18 13:38:48 +08:00
Yuan
b14c682049 考试规则标签显示修改 2022-10-18 13:19:31 +08:00
joylink_cuiweidong
e1d935cb5f Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-10-17 18:09:13 +08:00
joylink_cuiweidong
eaf1ccaff4 代码调整 2022-10-17 18:08:47 +08:00
fan
c7f1984f92 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-10-17 18:03:46 +08:00
fan
1764b10908 代码调整 2022-10-17 18:03:31 +08:00
joylink_cuiweidong
14293f28f1 代码调整 2022-10-17 17:11:33 +08:00
joylink_cuiweidong
8b6349ce26 代码调整 2022-10-17 16:47:06 +08:00
joylink_cuiweidong
78b4022062 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-10-17 16:27:03 +08:00
joylink_cuiweidong
379510017e iscs代码调整 2022-10-17 16:26:49 +08:00
Yuan
574dc69a3c 考试管理 2022-10-17 16:18:58 +08:00
Yuan
aa3bd6770f WIP: 考试管理 2022-10-17 16:18:58 +08:00
dong
fb0b52aa60 代码调整 2022-10-17 15:54:47 +08:00
fan
ad5c4b78d4 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-10-17 15:40:52 +08:00
fan
470260e03d 代码调整 2022-10-17 15:40:33 +08:00
dong
3c0f9ab3d2 代码调整 2022-10-17 14:53:23 +08:00
dong
1a0653c93a Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-10-17 14:35:39 +08:00
dong
9da1a54f93 路由添加发布历史 2022-10-17 14:34:53 +08:00
Yuan
e6ae8750da 考试管理 2022-10-17 14:30:29 +08:00
Yuan
5e634f08f8 WIP: 试卷管理 2022-10-17 14:30:29 +08:00
dong
0b080e2466 代码调整 2022-10-17 14:08:47 +08:00
dong
fe9bf9b495 代码调整 2022-10-17 14:04:56 +08:00
dong
99792cd58f 添加预览答题 2022-10-17 10:01:54 +08:00
fan
88096221b6 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-10-14 18:02:41 +08:00
fan
cb19a6b423 代码调整 2022-10-14 18:02:22 +08:00
joylink_cuiweidong
d7c5ce2c6e Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-10-14 17:40:06 +08:00
joylink_cuiweidong
c8ed557fa3 代码调整 2022-10-14 17:39:51 +08:00
fan
908da1f4a9 代码调整 2022-10-14 16:07:27 +08:00
fan
8f8a9461af Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-10-14 16:05:57 +08:00
fan
74d1249887 代码调整 2022-10-14 16:05:36 +08:00
joylink_cuiweidong
0ed2bf8193 代码调整 2022-10-14 15:58:46 +08:00
joylink_cuiweidong
0062a6d1f6 代码调整 2022-10-14 15:45:50 +08:00
joylink_cuiweidong
7260d592ea Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-10-14 15:43:44 +08:00
joylink_cuiweidong
170be716d3 代码调整 2022-10-14 15:43:30 +08:00
fan
88024ce606 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-10-14 15:32:15 +08:00
fan
4434420415 地图绘制返回调整 2022-10-14 15:31:58 +08:00
dong
887afa3ee0 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-10-14 14:54:14 +08:00
dong
0f09744cc4 理论题目管理调整 2022-10-14 14:53:46 +08:00
fan
fd82c05d03 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-10-14 14:50:51 +08:00
fan
f6ee224404 代码调整 2022-10-14 14:50:16 +08:00
dong
22205736f9 代码调整 2022-10-14 10:02:37 +08:00
dongq107
791999b8c3 代码调整 2022-10-14 09:37:51 +08:00
dong
3554c6c3c5 理论题目管理调整 2022-10-13 18:14:56 +08:00
joylink_cuiweidong
8ceca6ba90 代码调整 2022-10-13 17:50:57 +08:00
fan
9a5ba71218 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-10-13 17:48:46 +08:00
fan
322a227fc8 代码调整 2022-10-13 17:48:34 +08:00
joylink_cuiweidong
cb65f43baf 项目管理 添加 设置/创建默认组织 接口 2022-10-13 15:42:54 +08:00
joylink_cuiweidong
8fbaa08bbf 代码调整 2022-10-13 13:38:19 +08:00
joylink_cuiweidong
bbb546fa42 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-10-13 11:15:16 +08:00
joylink_cuiweidong
b5fd00fdcb 代码调整 2022-10-13 11:14:33 +08:00
fan
ffe67ab78e Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-10-13 10:12:14 +08:00
fan
bd8d61da61 代码调整 2022-10-13 10:11:54 +08:00
dong
229e622d44 路由调整 2022-10-13 10:09:34 +08:00
fan
704e598e5f Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-10-13 09:37:41 +08:00
fan
c1ceebed5e 代码调整 2022-10-13 09:37:30 +08:00
Yuan
a6a806c218 Merge branch 'test_dispaly' of git.code.tencent.com:lian-cbtc/jl-client into test_dispaly 2022-10-13 09:35:03 +08:00
Yuan
d8c5fb79da 去掉无用路由 2022-10-13 09:34:52 +08:00
dong
b15c91bfbc 路由菜单调整 2022-10-12 18:03:12 +08:00
joylink_cuiweidong
fc170e3c5f Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-10-12 17:38:25 +08:00
joylink_cuiweidong
0113110060 代码调整 2022-10-12 17:38:07 +08:00
dong
f03da32e21 代码调整 2022-10-12 17:32:22 +08:00
dong
b4085c609d 调整导航栏图标和名称 2022-10-12 16:53:57 +08:00
joylink_cuiweidong
fae2e31fbc Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-10-12 16:43:29 +08:00
dong
e55a0de42f 代码调整 2022-10-12 16:44:31 +08:00
joylink_cuiweidong
b4452102e9 项目配置 代码调整 2022-10-12 16:42:33 +08:00
joylink_cuiweidong
a3e908d1c2 代码调整 2022-10-12 16:33:45 +08:00
joylink_cuiweidong
29216e6fbb 代码调整 2022-10-12 15:43:25 +08:00
joylink_cuiweidong
c9727f7726 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-10-12 15:39:09 +08:00
joylink_cuiweidong
706a73fafa 登陆代码调整 2022-10-12 15:38:21 +08:00
fan
a6bd34e8bb Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 
 Conflicts:
	src/i18n/langs/en/newRouter.js
	src/i18n/langs/zh/newRouter.js
 2022-10-12 15:31:54 +08:00
fan
8461e49e59 代码调整 2022-10-12 15:31:15 +08:00
joylink_cuiweidong
cf69f61494 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-10-12 15:18:52 +08:00
joylink_cuiweidong
75ee144894 代码调整 2022-10-12 15:18:36 +08:00
Yuan
5210a97e2d Merge branch 'test_dispaly' of git.code.tencent.com:lian-cbtc/jl-client into test_dispaly 2022-10-12 14:43:44 +08:00
Yuan
18b49d772e 前端资源管理 2022-10-12 14:43:38 +08:00
dong
8d08985bb5 路由菜单调整 2022-10-12 13:30:09 +08:00
Yuan
3bac0ad446 菜单及路由路径修改 2022-10-12 13:20:33 +08:00
joylink_cuiweidong
c6af3c8027 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-10-12 11:29:55 +08:00
joylink_cuiweidong
92fed92191 代码调整 2022-10-12 11:29:40 +08:00
Yuan
a00e7ebc03 文件上传管理 增加复制路径功能 2022-10-12 10:43:19 +08:00
dong
d00133aa55 教学管理菜单调整 2022-10-12 10:33:36 +08:00
Yuan
f20a7f9b66 Merge branch 'test_dispaly' of git.code.tencent.com:lian-cbtc/jl-client into test_display 2022-10-11 18:34:32 +08:00
Yuan
c76aeb3826 文件上传和删除 2022-10-11 18:34:27 +08:00
dong
98dfd1574c 代码调整 2022-10-11 17:43:04 +08:00
dong
b8ab34b766 代码调整 2022-10-11 17:36:35 +08:00
fan
a5ca2501da 仿真显示调整 2022-10-11 17:24:40 +08:00
Yuan
390450cb46 Merge branch 'disp_yly' into test_display 2022-10-11 17:21:30 +08:00
Yuan
334a28c5ef 文件上传 2022-10-11 17:20:57 +08:00
fan
8a29cb6288 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-10-11 15:31:55 +08:00
fan
fe212c8cb6 暂提 2022-10-11 15:31:46 +08:00
dong
43ce203058 路由菜单调整 2022-10-11 15:14:24 +08:00
dong
a50049648c 代码调整 2022-10-11 14:07:02 +08:00
Yuan
60d2457087 文件上传 2022-10-11 11:08:30 +08:00
fan
9c4d615b0c Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-10-11 11:00:42 +08:00
fan
b42faa34e4 暂提 2022-10-11 11:00:33 +08:00
dong
c083f0f3e8 代码调整 2022-10-11 10:45:27 +08:00
fan
a51d2348a4 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 
 Conflicts:
	src/utils/baseUrl.js
 2022-10-11 09:56:28 +08:00
fan
d37b5a45dd 仿真界面调整 2022-10-11 09:55:07 +08:00
dong
1a2aa33168 路由菜单调整 2022-10-11 09:55:01 +08:00
joylink_cuiweidong
22203d5b60 新登录页面 前端项目配置页面调整 logo上传代码调整 2022-10-10 18:20:11 +08:00
joylink_cuiweidong
efc2c1447b Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-10-09 13:07:45 +08:00
joylink_cuiweidong
25b4a4fa45 代码调整 2022-10-09 13:06:54 +08:00
Yuan
b7d413bbd1 Revert "Revert "登录页面增加组织选择"" 
This reverts commit 3c1bc4e700.
 2022-10-09 11:09:33 +08:00
fan
ecc7f73d5b Merge remote-tracking branch 'origin/test' into test_dispaly 
# Conflicts:
#	src/utils/stomp.js
#	src/views/jlmap3d/passflow/jl3dpassflow.vue
#	src/views/login/index.vue
 2022-10-09 11:02:09 +08:00
fan
18c08018c6 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-10-09 10:56:01 +08:00
fan
2bf3ce2e2a 客户端代码调整 2022-10-09 10:55:53 +08:00