joylink_cuiweidong
|
ae09b3b073
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
# Conflicts:
# src/views/trainingPlatform/simulation.vue
|
2022-11-01 17:33:12 +08:00 |
|
joylink_cuiweidong
|
49d15b50a1
|
代码调整
|
2022-11-01 17:31:49 +08:00 |
|
dong
|
8c924507bc
|
代码调整
|
2022-11-01 14:11:22 +08:00 |
|
dong
|
e67179c3c6
|
代码调整
|
2022-11-01 14:07:24 +08:00 |
|
dong
|
002a2fddd2
|
代码调整
|
2022-11-01 14:02:40 +08:00 |
|
dong
|
88aec8f6dd
|
代码调整
|
2022-11-01 10:55:17 +08:00 |
|
fan
|
071143992e
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2022-11-01 09:29:33 +08:00 |
|
fan
|
fe500964e3
|
客户端调整
|
2022-11-01 09:29:21 +08:00 |
|
dong
|
64dd376229
|
调整权限管理
|
2022-10-31 18:24:47 +08:00 |
|
joylink_cuiweidong
|
56b2885fba
|
代码调整
|
2022-10-31 17:05:17 +08:00 |
|
joylink_cuiweidong
|
88cec5d2b0
|
项目客户端前端配置 logo图片更换 代码调整
|
2022-10-31 16:50:12 +08:00 |
|
joylink_cuiweidong
|
e9fc041b03
|
代码调整
|
2022-10-31 16:32:54 +08:00 |
|
fan
|
e67d26ddf9
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
Conflicts:
src/views/publish/publishMap/editSubsystem.vue
|
2022-10-31 14:34:14 +08:00 |
|
fan
|
ce6781e1d9
|
线路功能调整
|
2022-10-31 14:31:34 +08:00 |
|
joylink_cuiweidong
|
863448fb4a
|
代码调整
|
2022-10-28 18:34:09 +08:00 |
|
joylink_cuiweidong
|
93cfeffbc5
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2022-10-28 18:17:39 +08:00 |
|
joylink_cuiweidong
|
a8e2683693
|
实训预览 代码调整
|
2022-10-28 18:17:28 +08:00 |
|
dong
|
838b43e54d
|
代码调整
|
2022-10-28 18:11:34 +08:00 |
|
joylink_cuiweidong
|
2156ac1880
|
代码调整
|
2022-10-28 17:49:51 +08:00 |
|
joylink_cuiweidong
|
5496469a37
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2022-10-28 17:47:09 +08:00 |
|
Yuan
|
6ccfbdd70f
|
考试管理 mapid 类型转换
|
2022-10-28 16:35:23 +08:00 |
|
Yuan
|
697a744190
|
Merge branch 'test_dispaly' of git.code.tencent.com:lian-cbtc/jl-client into test_dispaly
|
2022-10-28 16:19:44 +08:00 |
|
Yuan
|
5cc2dbde12
|
考试规则创建和编辑增加mapid字段
|
2022-10-28 16:19:39 +08:00 |
|
dong
|
e1f9d6e0c8
|
理论题目分类只能单选
|
2022-10-28 16:17:03 +08:00 |
|
joylink_cuiweidong
|
774cf2b2d9
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2022-10-28 16:07:21 +08:00 |
|
joylink_cuiweidong
|
c57b4f6814
|
代码调整
|
2022-10-28 16:06:21 +08:00 |
|
Yuan
|
8b47049f69
|
Merge branch 'test_dispaly' of git.code.tencent.com:lian-cbtc/jl-client into test_dispaly
|
2022-10-28 16:00:44 +08:00 |
|
Yuan
|
d09e1042c0
|
考试管理分类修改
|
2022-10-28 16:00:37 +08:00 |
|
dong
|
6c1903a6a0
|
实训设计
|
2022-10-28 15:20:26 +08:00 |
|
fan
|
201456a1d0
|
解决 调度台不生效
|
2022-10-28 15:02:58 +08:00 |
|
fan
|
320fa691d5
|
三方跳转不设置子系统节点
|
2022-10-28 14:20:56 +08:00 |
|
Yuan
|
f8257cddfe
|
考试管理 分类改为必选
|
2022-10-28 11:16:21 +08:00 |
|
Yuan
|
b6830c2cfd
|
考试管理-规则重复判断条件修改
|
2022-10-28 10:34:11 +08:00 |
|
joylink_cuiweidong
|
599bf4f722
|
代码调整
|
2022-10-28 10:18:00 +08:00 |
|
joylink_cuiweidong
|
6b37a216cb
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2022-10-27 18:13:23 +08:00 |
|
joylink_cuiweidong
|
a2c685d6bb
|
实训管理代码调整
|
2022-10-27 18:13:03 +08:00 |
|
dong
|
8272afcb13
|
代码调整
|
2022-10-27 17:34:57 +08:00 |
|
joylink_cuiweidong
|
44e4673945
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2022-10-27 17:30:37 +08:00 |
|
joylink_cuiweidong
|
706ba10aca
|
代码调整
|
2022-10-27 17:30:17 +08:00 |
|
Yuan
|
ff7bf2311b
|
考试管理分类上传字段修改
|
2022-10-27 17:10:26 +08:00 |
|
dong
|
1cca675506
|
修改前端显示配置项
|
2022-10-27 16:57:13 +08:00 |
|
fan
|
386cd20086
|
京津冀职业发展联盟
|
2022-10-27 16:53:14 +08:00 |
|
Yuan
|
640f36842f
|
考试管理-分类改为单选
|
2022-10-27 15:20:32 +08:00 |
|
dong
|
26370a4c46
|
代码调整
|
2022-10-27 11:29:27 +08:00 |
|
dong
|
45922ea9d3
|
代码调整
|
2022-10-27 11:25:35 +08:00 |
|
dong
|
5e0146f8da
|
代码调整
|
2022-10-27 10:04:20 +08:00 |
|
joylink_cuiweidong
|
6ca7474eb1
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
# Conflicts:
# src/views/organization/trainingDesign/index.vue
|
2022-10-27 10:00:06 +08:00 |
|
joylink_cuiweidong
|
b63159ff08
|
代码调整
|
2022-10-27 09:58:53 +08:00 |
|
fan
|
d2050dacd8
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2022-10-27 09:48:51 +08:00 |
|
fan
|
4a6fe5bc87
|
发布内容管理调整
|
2022-10-27 09:48:25 +08:00 |
|