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 |
|
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 |
|