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