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
|
a8e2683693
|
实训预览 代码调整
|
2022-10-28 18:17:28 +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 |
|
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 |
|
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
|
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 |
|
dong
|
18c07ff9a2
|
代码调整
|
2022-10-27 09:13:01 +08:00 |
|
joylink_cuiweidong
|
1381bd8a9c
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2022-10-26 18:17:36 +08:00 |
|
joylink_cuiweidong
|
75f7165750
|
实训管理代码调整
|
2022-10-26 18:16:54 +08:00 |
|
dong
|
a163ba51db
|
代码调整
|
2022-10-26 17:25:48 +08:00 |
|
dong
|
48fe57cde1
|
代码调整
|
2022-10-26 17:08:09 +08:00 |
|
dong
|
df9e1f4132
|
权限分发和用户权限管理
|
2022-10-26 15:31:55 +08:00 |
|
Yuan
|
157e1ed45b
|
考试管理 题目数量校验
|
2022-10-26 11:25:40 +08:00 |
|
Yuan
|
491b28125b
|
考试管理 题目数量校验
|
2022-10-26 09:39:00 +08:00 |
|
fan
|
9e4576d30c
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2022-10-25 18:02:42 +08:00 |
|
fan
|
c8d71db508
|
代码调整
|
2022-10-25 18:02:23 +08:00 |
|
joylink_cuiweidong
|
7dee28ea8e
|
代码调整
|
2022-10-25 17:23:44 +08:00 |
|
joylink_cuiweidong
|
e308f3acb8
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2022-10-25 15:18:38 +08:00 |
|
joylink_cuiweidong
|
21b526bce0
|
代码调整
|
2022-10-25 15:18:22 +08:00 |
|
dong
|
f4a53f6404
|
代码调整
|
2022-10-25 11:01:28 +08:00 |
|
fan
|
205fce9512
|
代码调整
|
2022-10-25 10:45:23 +08:00 |
|
joylink_cuiweidong
|
6d20dcb132
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2022-10-24 18:21:16 +08:00 |
|
joylink_cuiweidong
|
1475848fea
|
综合演练代码调整
|
2022-10-24 18:20:45 +08:00 |
|
Yuan
|
d4538b441d
|
Merge branch 'test_dispaly' of git.code.tencent.com:lian-cbtc/jl-client into test_dispaly
|
2022-10-24 18:13:47 +08:00 |
|
Yuan
|
90a1c03bd4
|
考试面板样式修改
|
2022-10-24 18:13:43 +08:00 |
|
fan
|
67492c4e90
|
代码调整
|
2022-10-24 17:34:14 +08:00 |
|
fan
|
cb61f11753
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2022-10-24 16:41:53 +08:00 |
|
fan
|
18f1c6231b
|
大铁菜单调整
|
2022-10-24 16:41:38 +08:00 |
|
joylink_cuiweidong
|
1d565398e9
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2022-10-24 16:21:52 +08:00 |
|
joylink_cuiweidong
|
63c362635a
|
代码调整
|
2022-10-24 16:21:38 +08:00 |
|
Yuan
|
4e0635b7ad
|
考试-理论
|
2022-10-24 15:31:54 +08:00 |
|
Yuan
|
8976cfd474
|
Merge branch 'test_dispaly' of git.code.tencent.com:lian-cbtc/jl-client into test_dispaly
|
2022-10-24 13:47:44 +08:00 |
|
Yuan
|
a11c8d8829
|
理论考试提交
|
2022-10-24 13:47:36 +08:00 |
|
dong
|
9cd804e2b7
|
代码调整
|
2022-10-24 13:24:40 +08:00 |
|
Yuan
|
0fe83a4f31
|
考试-理论
|
2022-10-24 13:16:01 +08:00 |
|
Yuan
|
44fcdee7cf
|
WIP:考试面板
|
2022-10-24 13:12:14 +08:00 |
|
joylink_cuiweidong
|
b1b00fd57b
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2022-10-24 10:42:52 +08:00 |
|
joylink_cuiweidong
|
2e492ad27f
|
CCTV去掉删除按钮
|
2022-10-24 10:41:36 +08:00 |
|
fan
|
32409d4baf
|
代码调整
|
2022-10-24 10:03:46 +08:00 |
|
fan
|
bcca6e1db0
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2022-10-21 18:03:45 +08:00 |
|
fan
|
fb0d06a491
|
代码调整
|
2022-10-21 18:03:36 +08:00 |
|
joylink_cuiweidong
|
bc48d4c82e
|
代码调整
|
2022-10-21 16:53:24 +08:00 |
|
joylink_cuiweidong
|
16beaf8f94
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
# Conflicts:
# src/views/newMap/display/terminals/index.vue
# src/views/newMap/display/terminals/terminalMenu.vue
|
2022-10-21 16:49:14 +08:00 |
|
joylink_cuiweidong
|
42dc17d87e
|
大客流视图代码调整
|
2022-10-21 16:46:35 +08:00 |
|
fan
|
afa5a9aeab
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
Conflicts:
src/views/newMap/display/terminals/index.vue
src/views/newMap/display/terminals/terminalMenu.vue
|
2022-10-21 16:12:55 +08:00 |
|
fan
|
354192e953
|
代码调整
|
2022-10-21 16:10:05 +08:00 |
|
joylink_cuiweidong
|
363cd1fda9
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2022-10-21 15:52:37 +08:00 |
|
joylink_cuiweidong
|
baf089d889
|
大客流策略客户端 代码调整
|
2022-10-21 15:52:20 +08:00 |
|
dong
|
a97d34d3f3
|
功能管理和权限管理调整
|
2022-10-21 15:21:15 +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 |
|
Yuan
|
2601028c19
|
WIP: 考试
|
2022-10-20 18:22:56 +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 |
|
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 |
|