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
|
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 |
|
dong
|
0936e40deb
|
代码调整
|
2022-10-26 14:48:10 +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
|
20354a0389
|
语音指令识别错误提示
|
2022-10-24 16:44:15 +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
|
583830d573
|
修改三维图片和数据的地址
|
2022-10-21 14:15:58 +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 |
|
fan
|
f2ac931350
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2022-10-21 09:52:46 +08:00 |
|
fan
|
1b90935de6
|
代码调整
|
2022-10-21 09:52:27 +08:00 |
|
Yuan
|
2601028c19
|
WIP: 考试
|
2022-10-20 18:22:56 +08:00 |
|
fan
|
812ef04cbd
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2022-10-20 17:57:52 +08:00 |
|
fan
|
c8c9ec4b43
|
代码调整
|
2022-10-20 17:57:41 +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 |
|
joylink_cuiweidong
|
8dbc06409e
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2022-10-20 11:01:28 +08:00 |
|
joylink_cuiweidong
|
abfde166ba
|
代码调整
|
2022-10-20 11:01:12 +08:00 |
|
dong
|
b06248a366
|
理论题目添加清空操作
|
2022-10-20 10:17:38 +08:00 |
|
fan
|
42b17a0217
|
列车信息缩放调整
|
2022-10-20 09:42:47 +08:00 |
|
dong
|
2754e14bff
|
代码调整
|
2022-10-19 18:46:22 +08:00 |
|
fan
|
eb3a39aee9
|
武汉8号线调整
|
2022-10-19 18:17:03 +08:00 |
|
dong
|
0d6f6dda1c
|
理论题目导入调整
|
2022-10-19 18:15:17 +08:00 |
|
fan
|
5d810116c7
|
武汉8号线调整
|
2022-10-19 18:07:12 +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
|
c170f8fa74
|
应急指挥调度图标更换
|
2022-10-19 14:02:11 +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 |
|
fan
|
74c1005a8a
|
武汉8号线调整
|
2022-10-18 17:31:58 +08:00 |
|
fan
|
357635d085
|
武汉8号线调整
|
2022-10-18 17:25:39 +08:00 |
|
joylink_cuiweidong
|
acde5489ca
|
代码调整
|
2022-10-18 17:20:40 +08:00 |
|
joylink_cuiweidong
|
bf098fc8e1
|
代码调整
|
2022-10-18 16:50:54 +08:00 |
|
dong
|
e049334401
|
理论题目导出模板调整
|
2022-10-18 16:28:32 +08:00 |
|
joylink_cuiweidong
|
353dff98ae
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2022-10-18 16:14:46 +08:00 |
|
joylink_cuiweidong
|
013009e3f8
|
代码调整
|
2022-10-18 16:14:34 +08:00 |
|
Yuan
|
2c7796baf3
|
Merge branch 'test_dispaly' of git.code.tencent.com:lian-cbtc/jl-client into test_dispaly
|
2022-10-18 15:41:44 +08:00 |
|
Yuan
|
37fcac449f
|
试卷名称及简介限制长度
|
2022-10-18 15:41:40 +08:00 |
|
joylink_cuiweidong
|
e7239d35fc
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2022-10-18 15:20:22 +08:00 |
|
joylink_cuiweidong
|
a21049966c
|
代码调整
|
2022-10-18 15:20:06 +08:00 |
|
Yuan
|
918752ecf7
|
Merge branch 'test_dispaly' of git.code.tencent.com:lian-cbtc/jl-client into test_dispaly
|
2022-10-18 14:46:34 +08:00 |
|
Yuan
|
481b726989
|
bugfix - 考试管理查询分类字段修改
|
2022-10-18 14:46:27 +08:00 |
|
joylink_cuiweidong
|
ac9668f246
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2022-10-18 14:15:46 +08:00 |
|
joylink_cuiweidong
|
2a6300ce69
|
代码调整
|
2022-10-18 14:15:29 +08:00 |
|
Yuan
|
6a97b173c3
|
bugfix - 考试管理查询字段调整
|
2022-10-18 13:55:04 +08:00 |
|
dong
|
01f9a2abaa
|
理论题目导入和导出功能
|
2022-10-18 13:54:29 +08:00 |
|
Yuan
|
248661e0d7
|
bugfix - 考试管理标签及状态查询传参修改
|
2022-10-18 13:38:48 +08:00 |
|
Yuan
|
b14c682049
|
考试规则标签显示修改
|
2022-10-18 13:19:31 +08:00 |
|
joylink_cuiweidong
|
e1d935cb5f
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2022-10-17 18:09:13 +08:00 |
|
joylink_cuiweidong
|
eaf1ccaff4
|
代码调整
|
2022-10-17 18:08:47 +08:00 |
|
fan
|
c7f1984f92
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2022-10-17 18:03:46 +08:00 |
|
fan
|
1764b10908
|
代码调整
|
2022-10-17 18:03:31 +08:00 |
|
joylink_cuiweidong
|
14293f28f1
|
代码调整
|
2022-10-17 17:11:33 +08:00 |
|
joylink_cuiweidong
|
8b6349ce26
|
代码调整
|
2022-10-17 16:47:06 +08:00 |
|
joylink_cuiweidong
|
78b4022062
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2022-10-17 16:27:03 +08:00 |
|
joylink_cuiweidong
|
379510017e
|
iscs代码调整
|
2022-10-17 16:26:49 +08:00 |
|
Yuan
|
574dc69a3c
|
考试管理
|
2022-10-17 16:18:58 +08:00 |
|
Yuan
|
aa3bd6770f
|
WIP: 考试管理
|
2022-10-17 16:18:58 +08:00 |
|
dong
|
fb0b52aa60
|
代码调整
|
2022-10-17 15:54:47 +08:00 |
|
fan
|
ad5c4b78d4
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2022-10-17 15:40:52 +08:00 |
|
fan
|
470260e03d
|
代码调整
|
2022-10-17 15:40:33 +08:00 |
|
dong
|
3c0f9ab3d2
|
代码调整
|
2022-10-17 14:53:23 +08:00 |
|
dong
|
1a0653c93a
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2022-10-17 14:35:39 +08:00 |
|
dong
|
9da1a54f93
|
路由添加发布历史
|
2022-10-17 14:34:53 +08:00 |
|
Yuan
|
e6ae8750da
|
考试管理
|
2022-10-17 14:30:29 +08:00 |
|
Yuan
|
5e634f08f8
|
WIP: 试卷管理
|
2022-10-17 14:30:29 +08:00 |
|
dong
|
0b080e2466
|
代码调整
|
2022-10-17 14:08:47 +08:00 |
|
dong
|
fe9bf9b495
|
代码调整
|
2022-10-17 14:04:56 +08:00 |
|
dong
|
99792cd58f
|
添加预览答题
|
2022-10-17 10:01:54 +08:00 |
|
fan
|
88096221b6
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2022-10-14 18:02:41 +08:00 |
|
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
|
fc170e3c5f
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2022-10-12 17:38:25 +08:00 |
|
joylink_cuiweidong
|
0113110060
|
代码调整
|
2022-10-12 17:38:07 +08:00 |
|
dong
|
f03da32e21
|
代码调整
|
2022-10-12 17:32:22 +08:00 |
|
dong
|
b4085c609d
|
调整导航栏图标和名称
|
2022-10-12 16:53:57 +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
|
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 |
|
fan
|
3c1bc4e700
|
Revert "登录页面增加组织选择"
This reverts commit b2acf8dc27.
|
2022-10-08 16:37:37 +08:00 |
|
fan
|
5ec62c7e18
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls
|
2022-10-08 16:33:49 +08:00 |
|
fan
|
2d772bed22
|
实训调整
|
2022-10-08 16:33:14 +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
|
6db5926156
|
baseurl
|
2022-09-30 17:59:36 +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 |
|