dong
|
c363127e9a
|
代码调整
|
2022-11-03 16:23:52 +08:00 |
|
fan
|
551ebe9fc7
|
画面调整
|
2022-11-03 15:38:55 +08:00 |
|
fan
|
f86a8f20c5
|
调整
|
2022-11-03 14:26:17 +08:00 |
|
fan
|
29dd0c4c8b
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2022-11-02 18:05:45 +08:00 |
|
fan
|
74dbc5cff3
|
调整
|
2022-11-02 18:05:37 +08:00 |
|
dong
|
8794db68f2
|
代码调整
|
2022-11-02 17:56:27 +08:00 |
|
fan
|
c92c66f17c
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
Conflicts:
src/store/modules/training.js
src/views/newMap/display/index.vue
src/views/newMap/display/simulationControl.vue
src/views/publish/publishMap/editSubsystem.vue
|
2022-11-02 17:25:45 +08:00 |
|
fan
|
de0be8d66e
|
线路功能调整
|
2022-11-02 17:20:57 +08:00 |
|
dong
|
d79c8986bd
|
代码调整
|
2022-11-02 16:25:37 +08:00 |
|
dong
|
c64d2f95a6
|
代码调整
|
2022-11-02 16:03:39 +08:00 |
|
dong
|
b623a0734e
|
代码调整
|
2022-11-02 15:48:50 +08:00 |
|
dong
|
34a4e92073
|
代码调整
|
2022-11-02 15:07:36 +08:00 |
|
fan
|
f7418db43c
|
代码调整
|
2022-11-02 14:23:03 +08:00 |
|
fan
|
6c02aba151
|
实训调整
|
2022-11-02 14:19:55 +08:00 |
|
dong
|
215fb23f20
|
代码调整
|
2022-11-02 13:30:07 +08:00 |
|
dong
|
42112659c5
|
代码调整
|
2022-11-02 10:28:22 +08:00 |
|
joylink_cuiweidong
|
a91f0063d0
|
代码调整
|
2022-11-01 18:09:16 +08:00 |
|
joylink_cuiweidong
|
45243e1968
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2022-11-01 18:09:06 +08:00 |
|
fan
|
b08def49ee
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2022-11-01 18:07:52 +08:00 |
|
fan
|
a9b47a5a4a
|
代码调整
|
2022-11-01 18:07:26 +08:00 |
|
joylink_cuiweidong
|
ad0f92a0e6
|
代码调整
|
2022-11-01 18:03:31 +08:00 |
|
joylink_cuiweidong
|
295e1246ab
|
代码调整
|
2022-11-01 18:01:21 +08:00 |
|
dong
|
6fb8812039
|
实训设计调整
|
2022-11-01 17:45:36 +08:00 |
|
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 |
|