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

7571 Commits

Author SHA1 Message Date
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
0113110060 代码调整 2022-10-12 17:38:07 +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
18b49d772e 前端资源管理 2022-10-12 14:43:38 +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
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
fe212c8cb6 暂提 2022-10-11 15:31:46 +08:00
Yuan
60d2457087 文件上传 2022-10-11 11:08:30 +08:00
fan
b42faa34e4 暂提 2022-10-11 11:00:33 +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
fan
bc56e72414 Revert "Revert "调度命令调整"" 
This reverts commit 802f4abbc0.
 2022-10-09 09:13:49 +08:00
fan
802f4abbc0 Revert "调度命令调整" 
This reverts commit 062a5f2d73.
 2022-10-08 18:25:12 +08:00
fan
6704c4ef4d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-10-08 18:14:10 +08:00
fan
a6917c1d17 实训调整 2022-10-08 18:12:28 +08:00
dong
623b42332e 代码调整 2022-10-08 16:58:18 +08:00
dong
062a5f2d73 调度命令调整 2022-10-08 16:57:48 +08:00
fan
3c1bc4e700 Revert "登录页面增加组织选择" 
This reverts commit b2acf8dc27.
 2022-10-08 16:37:37 +08:00
fan
63962a1f7e 暂提 2022-10-08 15:35:35 +08:00
joylink_cuiweidong
ba3e306211 代码调整 2022-10-08 14:04:25 +08:00
joylink_cuiweidong
89e5543aae 代码调整 2022-10-08 13:29:10 +08:00
dong
5da594ec55 代码调整 2022-10-08 10:34:32 +08:00
Yuan
87b50ba37c Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into test 2022-09-30 17:52:18 +08:00
joylink_cuiweidong
3ae2b5acd5 代码调整 2022-09-30 17:52:16 +08:00
Yuan
2dab07eb44 登录页面增加组织选择 2022-09-30 17:51:45 +08:00
Yuan
b2acf8dc27 登录页面增加组织选择 2022-09-30 17:51:38 +08:00
fan
97670ddb63 去除日志 2022-09-30 17:37:59 +08:00
fan
c73cb667ca Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-09-30 17:34:41 +08:00
fan
79e27bf5dc 实训画面位置切换调整 2022-09-30 17:34:23 +08:00
dong
f9fe3ab615 添加调度台code 2022-09-30 17:26:53 +08:00
fan
bc5b837d22 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-09-30 16:59:04 +08:00
joylink_cuiweidong
91c804b2ff 代码调整 2022-09-30 14:46:02 +08:00
fan
d8686ec6af Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-09-30 13:12:57 +08:00
fan
26062f736c 暂提 2022-09-30 13:11:55 +08:00
joylink_cuiweidong
1fa85333ad 代码调整 2022-09-30 10:34:12 +08:00
joylink_cuiweidong
dcfbe22510 代码调整 2022-09-29 16:59:38 +08:00
joylink_cuiweidong
c2c746406e 校验 项目和前端项目配置 是否存在 2022-09-29 16:50:22 +08:00
joylink_cuiweidong
e29fdb0cb3 代码调整 2022-09-29 16:30:20 +08:00
joylink_cuiweidong
3ed2c52a73 前端项目配置信息 添加修改操作 代码调整 2022-09-29 15:56:17 +08:00
fan
1f8bb3c80b iscs 闸机调整 2022-09-29 15:54:18 +08:00
fan
eafd1634f5 暂提 2022-09-29 14:36:01 +08:00