joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity
12,443 Commits 20 Branches 0 Tags 448 MiB
b3d62115ec
Commit Graph

7708 Commits

Author SHA1 Message Date
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
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
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
fan
bc5b837d22 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-09-30 16:59:04 +08:00
joylink_cuiweidong
91c804b2ff 代码调整 2022-09-30 14:46:02 +08:00
fan
d8686ec6af Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-09-30 13:12:57 +08:00
fan
26062f736c 暂提 2022-09-30 13:11:55 +08:00
joylink_cuiweidong
1fa85333ad 代码调整 2022-09-30 10:34:12 +08:00
joylink_cuiweidong
dcfbe22510 代码调整 2022-09-29 16:59:38 +08:00
joylink_cuiweidong
c2c746406e 校验 项目和前端项目配置 是否存在 2022-09-29 16:50:22 +08:00
joylink_cuiweidong
e29fdb0cb3 代码调整 2022-09-29 16:30:20 +08:00
joylink_cuiweidong
3ed2c52a73 前端项目配置信息 添加修改操作 代码调整 2022-09-29 15:56:17 +08:00
fan
1f8bb3c80b iscs 闸机调整 2022-09-29 15:54:18 +08:00
fan
eafd1634f5 暂提 2022-09-29 14:36:01 +08:00
joylink_cuiweidong
25697b67c9 前端项目配置信息 查询删除操作 代码调整 2022-09-29 13:45:46 +08:00
fan
e2b51b6737 iscs闸机调整 2022-09-28 17:38:30 +08:00
joylink_cuiweidong
5587a3e312 代码调整 2022-09-28 17:37:22 +08:00
joylink_cuiweidong
ae3c42ab29 项目 增删改查 接口调整 2022-09-28 17:22:25 +08:00
fan
9f792f2667 iscs闸机调整 2022-09-28 17:08:29 +08:00
fan
0967f30d1a 暂提 2022-09-28 17:06:15 +08:00
fan
f68f1ce275 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-09-28 16:57:53 +08:00
fan
4217b149df ISCS闸机状态变化 2022-09-28 16:57:35 +08:00
fan
307a6e66d0 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 
 Conflicts:
	src/views/newMap/display/index.vue
 2022-09-28 15:47:54 +08:00
fan
0cc9eded9f 仿真结构调整 2022-09-28 15:46:07 +08:00
Yuan
be0a8cc9da pis类名修改避免污染 2022-09-28 14:37:52 +08:00
Yuan
b94acfb533 pis类名修改避免污染 2022-09-28 14:36:15 +08:00
Yuan
f2e26ac289 pis类名修改避免污染 2022-09-28 14:18:24 +08:00
joylink_cuiweidong
f58cdd4f1c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-09-28 14:13:56 +08:00
joylink_cuiweidong
aeb4560684 代码调整 2022-09-28 14:13:23 +08:00
Yuan
3603c6eae5 Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into test 2022-09-28 14:02:58 +08:00
Yuan
487c798399 PIS轮播: 窗口隐藏时暂停 2022-09-28 14:02:51 +08:00
joylink_cuiweidong
b2d9b4fc9c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-09-28 13:37:03 +08:00
joylink_cuiweidong
b388f10c02 代码调整 2022-09-28 13:36:31 +08:00
Yuan
6f77bdac0c 滚动信息发布去掉声音播放 2022-09-28 09:32:40 +08:00
Yuan
fe20f16b70 Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into test 2022-09-27 18:11:47 +08:00
Yuan
c4d2bad24e PIS轮播图 2022-09-27 18:11:40 +08:00
joylink_cuiweidong
9ebf00d08a 代码调整 2022-09-27 16:57:42 +08:00
joylink_cuiweidong
6068021153 代码调整 2022-09-27 16:19:48 +08:00
joylink_cuiweidong
37fe752136 代码调整 2022-09-27 16:18:35 +08:00
joylink_cuiweidong
9fe0241959 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-09-27 11:08:21 +08:00
joylink_cuiweidong
4aea3760fd 行调工作站，初始化之后再按计划行车，没有默认时间 代码调整 2022-09-27 11:07:00 +08:00
Yuan
9fd6156e2d PIS logo更换 2022-09-27 10:48:16 +08:00
Yuan
47d5850517 站台PIS使用后端滚动字幕 2022-09-27 09:30:53 +08:00
Yuan
94d56cff1d Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into test 2022-09-26 18:32:34 +08:00
Yuan
9b611239a9 pis滚动文字修改 2022-09-26 18:32:30 +08:00
joylink_cuiweidong
4b3fefbf27 代码调整 2022-09-26 18:27:05 +08:00
joylink_cuiweidong
e042b728e8 真实cctv 断线重连 2022-09-26 17:51:50 +08:00
joylink_cuiweidong
47bdeed516 增加 仿真 开始/暂停 组件 2022-09-26 15:58:20 +08:00
dong
5b95a05e29 代码调整 2022-09-26 15:31:00 +08:00
dong
419742737b 代码调整 2022-09-26 15:29:14 +08:00
fan
9bc3133f02 ISCS状态调整 2022-09-26 14:27:41 +08:00
Yuan
c403857230 ISCS信息发布修改 2022-09-26 10:46:28 +08:00
joylink_cuiweidong
4238abdeb5 代码调整 2022-09-26 10:38:27 +08:00
Yuan
5e0983b124 Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into test 2022-09-26 10:09:44 +08:00
Yuan
276bffb930 PIS修改LOGO, 列车PIS适配, 文字修改 2022-09-26 10:09:36 +08:00
fan
282001a7be Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-09-26 09:51:56 +08:00
fan
a3c280bf73 iSCS定时任务广播系统取仿真系统时间 2022-09-26 09:51:36 +08:00
fan
78b5d5fd76 暂提 2022-09-26 09:14:11 +08:00
thesai
2b96d9168b 修改PA系统停止播放无效bug 2022-09-23 21:25:16 +08:00
Yuan
c80213c9b1 站台PIS列车时间显示调整 2022-09-23 18:32:48 +08:00
joylink_cuiweidong
bea349a439 代码调整 2022-09-23 17:18:38 +08:00
Yuan
c467da9a09 图片URL改为PNG 2022-09-23 16:37:58 +08:00
Yuan
285e9b8ab6 Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into test 2022-09-23 16:30:11 +08:00
Yuan
06ff678a48 图片URL修改 2022-09-23 16:30:05 +08:00
dong
b1d6d3ba3f 实训设计添加按钮Id 2022-09-23 16:22:46 +08:00
Yuan
d388631b60 Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into test 2022-09-23 16:12:05 +08:00
Yuan
21e3d49f48 车辆和站台PIS增加背景图 2022-09-23 16:11:59 +08:00
joylink_cuiweidong
d6a3be6bc1 代码调整 2022-09-23 14:43:05 +08:00
dong
255964bfe3 代码调整 2022-09-23 14:11:08 +08:00
Yuan
99a364abf9 Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into test 2022-09-23 11:18:34 +08:00
Yuan
b6401aef96 ISCS 信息发布修改 2022-09-23 11:18:27 +08:00
joylink_cuiweidong
6b6ea5d741 代码调整 2022-09-23 10:39:50 +08:00
fan
55570dbc03 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-09-23 09:41:08 +08:00
fan
8d2a995fba Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-09-23 09:20:26 +08:00
fan
f0ee41a06c pa 时间处理 2022-09-23 09:20:06 +08:00
Yuan
6313b17345 Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into test 2022-09-22 18:21:28 +08:00
Yuan
8d314acc54 PIS滚动信息修改 && ISCS车站广播 2022-09-22 18:19:40 +08:00
fan
22355cf11a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-09-22 17:41:00 +08:00
fan
768af89057 ISCS资源增加类型 2022-09-22 17:40:50 +08:00
dong
c76ca2288c 代码调整 2022-09-22 17:03:13 +08:00
fan
986fe7eada PA系统调整 2022-09-22 16:58:23 +08:00
joylink_cuiweidong
a4a009b808 代码调整 2022-09-22 16:43:25 +08:00
joylink_cuiweidong
e9256df83b 代码调整 2022-09-22 13:11:34 +08:00
fan
d68008ad83 代码调整 2022-09-22 09:04:32 +08:00
joylink_zhangsai
80b509464a 修改PA系统语音播放bug 2022-09-21 15:41:53 +08:00
fan
63d02669dc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-09-21 14:13:54 +08:00
fan
61ff3e0c73 设备管理配置接口调整 2022-09-21 14:13:42 +08:00
fan
77cbbea8e2 暂提 2022-09-21 14:12:32 +08:00
dong
119d2b3c60 代码调整 2022-09-21 14:08:51 +08:00
joylink_cuiweidong
c7001e1946 代码调整 2022-09-21 13:20:40 +08:00
fan
d3a06586ba ISCS设备登录调整&&广播系统调整 2022-09-21 13:15:14 +08:00
fan
a15c916719 暂提 2022-09-21 10:17:36 +08:00
Yuan
bec6112216 PIS列车进站时间修改 2022-09-21 09:38:11 +08:00
fan
d184687860 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-09-21 09:16:40 +08:00
joylink_cuiweidong
b82a1c535a 代码调整 2022-09-20 18:05:02 +08:00
fan
2892517d36 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-09-20 17:41:33 +08:00
fan
b85fc187a0 iScs语音广播调整 2022-09-20 17:41:01 +08:00
dong
8fb99c668d 窗口间通信 2022-09-20 17:25:21 +08:00
fan
198c8fb170 暂提 2022-09-20 17:21:01 +08:00
fan
a49f1b2c7a ISCS语音播放1 2022-09-20 16:20:48 +08:00
joylink_cuiweidong
5c948ea596 北交大 项目 菜单代码调整 2022-09-20 16:17:02 +08:00
fan
fda7794512 ISCS语音播放 2022-09-20 16:03:08 +08:00
fan
91c04e97b1 暂提 2022-09-20 14:22:44 +08:00
fan
e970ca2792 生成音频资源 2022-09-20 10:43:40 +08:00
fan
d5e9c55fcd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-09-20 10:19:21 +08:00
fan
50745ec076 实训步骤id调整 2022-09-20 10:18:59 +08:00
joylink_cuiweidong
ce81e65464 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-09-19 18:07:55 +08:00
joylink_cuiweidong
f455f52f65 代码调整 2022-09-19 18:06:37 +08:00
Yuan
3266a7478d Merge branch 'yly' into test 2022-09-19 18:02:23 +08:00
Yuan
9b9f0ebfa9 仿真时间修改统一 2022-09-19 18:01:57 +08:00
fan
011b768adf Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-09-19 17:55:30 +08:00
fan
41d8635b73 加载实训时清除实训分数 2022-09-19 17:55:19 +08:00
dong
3118d77bf1 代码调整 2022-09-19 17:06:17 +08:00
fan
62d864d996 代码调整 2022-09-19 16:58:18 +08:00
joylink_cuiweidong
fc9f284ee1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-09-19 16:56:22 +08:00
joylink_cuiweidong
718c69c04b 实训 评分代码调整 2022-09-19 16:56:10 +08:00
dong
e5174d7796 代码调整 2022-09-19 16:35:57 +08:00
joylink_cuiweidong
402eb691d1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-09-19 16:04:21 +08:00
joylink_cuiweidong
806b237ae7 代码调整 2022-09-19 16:04:07 +08:00
dong
62904d9056 添加设置调度台数据界面 2022-09-19 15:39:55 +08:00
dong
f2f5a964ec 代码调整 2022-09-19 15:07:09 +08:00
fan
13406673f0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-09-19 14:30:12 +08:00
fan
2716f015db 实训调整 2022-09-19 14:29:58 +08:00
dong
d65e004529 代码调整 2022-09-19 14:03:02 +08:00
dong
847c388fae Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-09-19 13:23:30 +08:00
dong
4b9ae158a5 实训设计添加车务终端管理、路票、薄册 2022-09-19 13:23:07 +08:00
fan
07cf9f0ca7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-09-19 11:08:30 +08:00
fan
a05e429d96 代码调整 2022-09-19 11:08:13 +08:00
dong
bddde1e239 实训设计添加调度台和车务终端 2022-09-19 11:01:45 +08:00
joylink_cuiweidong
b79202c70e 代码调整 2022-09-16 15:28:44 +08:00
fan
d8c4a1278c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-09-16 14:59:47 +08:00
fan
028e533ba2 实训调整 2022-09-16 14:59:34 +08:00
joylink_cuiweidong
9657620d15 大铁线路 终端切换代码调整 2022-09-16 14:47:15 +08:00
Yuan
d506294b40 Merge branch 'yly' into test 2022-09-16 14:28:40 +08:00
Yuan
d32825769e PIS数据 2022-09-16 14:28:24 +08:00
dong
956bf7e7fd 代码调整 2022-09-15 18:12:51 +08:00
Yuan
e5ccd6d525 resolve conflict 2022-09-15 18:08:32 +08:00
joylink_cuiweidong
bf4b376d04 代码调整 2022-09-15 18:04:30 +08:00
Yuan
8fed7739e3 WIP: PIS 2022-09-15 18:03:49 +08:00
fan
ea99a2ed09 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-09-15 17:48:07 +08:00
fan
e766d714b7 实训调整 2022-09-15 17:43:11 +08:00
dong
ff2536c90d 实训草稿发布轨迹 2022-09-15 17:34:09 +08:00
dong
e8c23acab7 代码调整 2022-09-15 14:23:58 +08:00
fan
63f4505ed9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-09-15 13:30:26 +08:00
dong
abf01b7945 代码调整 2022-09-15 13:15:17 +08:00
fan
2eca40ba41 用户密码重置和忘记密码调整 2022-09-15 13:05:11 +08:00
dong
01ef134ad3 代码调整 2022-09-15 11:30:06 +08:00
joylink_cuiweidong
0ccc33e64e 实训录制 评分 代码调整 2022-09-15 10:55:23 +08:00
joylink_cuiweidong
b72736813a 代码调整 2022-09-15 10:20:45 +08:00
dong
507e01ebe8 代码调整 2022-09-15 09:56:51 +08:00
dong
6adcfd9f9b 代码调整 2022-09-14 18:31:20 +08:00
Yuan
afabcfbf3b 时间处理 2022-09-14 18:17:28 +08:00
Yuan
0026faedfe Merge branch 'yly' into test 2022-09-14 17:21:54 +08:00
Yuan
bad5568564 PIS界面 2022-09-14 17:21:32 +08:00
joylink_cuiweidong
67bc0ba2db 代码调整 2022-09-14 16:45:08 +08:00
fan
aef684e320 实训调整 2022-09-14 16:44:44 +08:00
joylink_cuiweidong
bab3449b9a 代码调整 2022-09-14 16:16:20 +08:00
joylink_cuiweidong
cd9db0aa12 代码调整 2022-09-14 16:12:23 +08:00
fan
82857e9808 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-09-14 13:28:18 +08:00
fan
ea8277adb7 实训调整 2022-09-14 13:28:06 +08:00
fan
d1f0d5e27f 武汉项目调整 2022-09-14 13:26:59 +08:00
dong
a33c796bbc 代码调整 2022-09-14 11:09:25 +08:00
joylink_cuiweidong
af30f5d08c 代码调整 2022-09-13 17:56:59 +08:00
joylink_cuiweidong
90554bd2be 代码调整 2022-09-13 17:37:26 +08:00
fan
d504639e15 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-09-13 17:06:59 +08:00
fan
af06707a16 实训场景调整 2022-09-13 17:06:36 +08:00
joylink_cuiweidong
96411d34b7 代码调整 2022-09-13 17:04:08 +08:00
joylink_cuiweidong
289f02ac0f 教学系统 课程 现地 切换实训 地图显示代码调整 2022-09-13 13:35:14 +08:00
joylink_cuiweidong
d9a51cbcec 代码调整 2022-09-13 10:41:01 +08:00
dong
83736869c3 代码调整 2022-09-09 14:35:46 +08:00
Yuan
8bf8b0b742 Merge branch 'yly' into test 2022-09-09 13:47:46 +08:00
Yuan
f00756f2c2 由公里标批量计算区段实际长度 2022-09-09 13:47:26 +08:00
fan
e42537a8e4 实训调整 2022-09-09 13:06:12 +08:00
dong
18937861c4 添加会话domId 2022-09-08 17:12:16 +08:00
fan
4904e30450 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-09-08 15:37:41 +08:00
fan
5e70d4e0bf 代码调整 2022-09-08 15:37:30 +08:00
dong
778cdf2808 代码调整 2022-09-08 15:07:28 +08:00
fan
42cc8d9213 暂提 2022-09-08 09:45:46 +08:00
dong
09f78e9064 代码调整 2022-09-07 18:11:50 +08:00
dong
627faced59 条件表达式 2022-09-07 17:38:42 +08:00
fan
aea62ada61 增加prdType 2022-09-07 09:37:37 +08:00
fan
31f95a02c1 实训调整 2022-09-06 15:43:43 +08:00
fan
9e22641b95 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-09-05 17:55:52 +08:00
fan
6e049fd3e1 代码调整 2022-09-05 17:55:39 +08:00
joylink_cuiweidong
4a128b5f89 代码调整 2022-09-05 16:40:46 +08:00
fan
229528d1ff Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-09-05 15:48:10 +08:00
fan
9edc8a12ae 代码调整 2022-09-05 15:47:56 +08:00
fan
802cc70bfc 区段增加最大最小公里标 2022-09-05 15:47:14 +08:00
dong
4093d02a54 代码调整 2022-09-05 14:32:26 +08:00
dong
cb5179fafb 实训设计代码调整 2022-09-05 14:23:20 +08:00
dong
f7881c85e2 代码调整 2022-09-05 11:08:46 +08:00
dong
08449dd954 代码调整 2022-09-05 10:42:31 +08:00
fan
0d6f5c13f9 实训调整 2022-09-02 17:19:25 +08:00
fan
e7360ce946 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-09-02 17:03:57 +08:00
fan
0851691587 实训调整 2022-09-02 17:03:43 +08:00
dong
bcbb3e860b 代码调整 2022-09-02 16:50:26 +08:00
fan
97065ca162 实训调整 2022-09-02 15:19:32 +08:00
fan
b0cfbb3f35 实训调整 2022-09-02 15:07:37 +08:00
fan
cb3edd42a4 实训调整 2022-09-02 14:36:16 +08:00
fan
7aa2ffb953 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-09-02 10:28:41 +08:00
fan
aeeaac46e0 实训调整 2022-09-02 10:28:29 +08:00
joylink_cuiweidong
a99e6e44bd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-09-02 10:22:46 +08:00
joylink_cuiweidong
9ee9e9ecdc 大铁项目 调度命令文件迁移到对应线路 2022-09-02 10:22:28 +08:00
fan
483536c721 实训调整 2022-09-02 10:00:44 +08:00
fan
0b32f34af2 实训调整 2022-09-02 09:45:51 +08:00
fan
663e19e870 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-09-01 16:24:06 +08:00
fan
8946835dca 实训调整 2022-09-01 16:10:04 +08:00
fan
678dcc3043 红河财经CCTV调整 2022-09-01 16:09:49 +08:00
dong
77ce75c91b 代码调整 2022-09-01 15:39:59 +08:00
dong
b3083b8dc8 代码调整 2022-09-01 13:54:10 +08:00
fan
7f5f1e7851 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-09-01 13:38:29 +08:00
fan
4694f0455c 实训提示 2022-09-01 13:38:11 +08:00
dong
dcded847e9 代码调整 2022-09-01 13:23:02 +08:00
dong
0b69add8bf 代码调整 2022-09-01 12:05:22 +08:00
fan
6b6d8ac871 地图预览大屏等切实训设计预览倒是实训步骤判断错误调整 2022-08-31 17:54:57 +08:00
fan
5fa020edcd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-08-31 17:03:23 +08:00
fan
e935e29001 实训调整 2022-08-31 17:03:10 +08:00
dong
0162aa45a9 代码调整 2022-08-31 15:35:59 +08:00
dong
4f99b40a2b 代码调整 2022-08-31 14:49:01 +08:00
dong
fca267fde1 代码调整 2022-08-31 14:34:24 +08:00
dong
e2c9fa3c3e 代码调整 2022-08-31 14:20:36 +08:00
dong
19a87a79db 代码调整 2022-08-31 11:22:58 +08:00
joylink_cuiweidong
abec73d06c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-08-31 10:56:00 +08:00
joylink_cuiweidong
646c2fb5d6 代码调整 2022-08-31 10:55:45 +08:00
fan
a1dd644078 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-08-31 10:36:04 +08:00
fan
4fe380c003 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 
 Conflicts:
	src/views/designPlatform/trainingDesign.vue
 2022-08-31 10:35:34 +08:00
dong
f72527f177 实训设计界面功能 2022-08-31 10:35:34 +08:00
fan
5adc99158b 实训调整 2022-08-31 10:34:18 +08:00
dong
8161162b45 代码调整 2022-08-30 18:09:09 +08:00
joylink_cuiweidong
271e798cb0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-08-30 17:58:18 +08:00
joylink_cuiweidong
a2eed75f00 代码调整 2022-08-30 17:58:07 +08:00
dong
182610098b 代码调整 2022-08-30 17:36:02 +08:00
joylink_cuiweidong
b5922b2f65 代码调整 2022-08-30 17:28:47 +08:00
joylink_cuiweidong
f38c129319 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-08-30 16:54:00 +08:00
joylink_cuiweidong
68314b3b08 代码调整 2022-08-30 16:53:37 +08:00
fan
4310f07a9b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-08-30 16:09:29 +08:00
fan
5ad7c1f8a1 实训调整 2022-08-30 16:09:17 +08:00
joylink_cuiweidong
74cedff597 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-08-30 15:43:30 +08:00
joylink_cuiweidong
1a92dbf183 实训 打分 代码调整 2022-08-30 15:43:21 +08:00
joylink_cuiweidong
3d40f79501 代码调整 2022-08-30 15:42:28 +08:00
fan
edc15a02ba 实训调整 2022-08-30 15:38:26 +08:00
fan
305b9e7eb5 实训调整 2022-08-30 13:16:39 +08:00
dong
a2c704ffea 实训草稿预览 2022-08-30 11:36:07 +08:00
fan
caacfa5719 实训调整 2022-08-30 11:14:24 +08:00
joylink_cuiweidong
f344e4ea07 实训 打分代码调整 2022-08-30 10:10:17 +08:00
fan
5fe936e754 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-08-30 10:06:52 +08:00
fan
c59285a139 实训调整 2022-08-30 10:06:43 +08:00
dong
9113a5d288 代码调整 2022-08-30 10:03:06 +08:00
fan
3ea1c92f71 实训调整 2022-08-30 09:52:31 +08:00
fan
caef0d9c79 实训调整 2022-08-30 09:42:25 +08:00
fan
647b34e368 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 
 Conflicts:
	src/views/trainingManage/editDetails.vue
 2022-08-30 09:32:17 +08:00
fan
6091119a5d 实训调整 2022-08-30 09:30:27 +08:00
dong
46b807e36e 实训条件编辑 2022-08-29 18:25:52 +08:00
fan
6127e21279 实训调整 2022-08-29 18:00:12 +08:00
fan
e39ea7a8f8 实训调整 2022-08-29 16:51:36 +08:00
fan
68833ecc35 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-08-29 14:37:25 +08:00
fan
13d463570a 实训调整 2022-08-29 14:37:13 +08:00
joylink_cuiweidong
ec24239c9e 代码调整 2022-08-29 14:09:12 +08:00
joylink_cuiweidong
5fd48d092e 代码调整 2022-08-29 14:08:14 +08:00
joylink_cuiweidong
2310b54e11 代码调整 2022-08-29 13:37:50 +08:00
joylink_cuiweidong
7388fc707f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-08-29 11:16:51 +08:00
joylink_cuiweidong
9577b8ecf2 代码调整 2022-08-29 11:16:15 +08:00
fan
3fe6e2076c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-08-29 11:06:31 +08:00
fan
a43ff34ad5 实训调整 2022-08-29 11:06:11 +08:00
joylink_cuiweidong
f0d9184a13 代码调整 2022-08-29 10:05:14 +08:00
joylink_cuiweidong
3410f4fe0f 代码调整 2022-08-29 09:48:09 +08:00
joylink_cuiweidong
af511e12a2 代码调整 2022-08-26 18:05:40 +08:00
joylink_cuiweidong
ca677c232e 代码调整 2022-08-26 17:37:42 +08:00
joylink_cuiweidong
fd87d9b27f 代码调整 2022-08-26 17:32:59 +08:00
Yuan
5f4be2eb18 Merge branch 'yly' into test 2022-08-25 18:24:56 +08:00
Yuan
fed6ac91d6 区域批量操作 2022-08-25 18:22:07 +08:00
joylink_cuiweidong
e671165355 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-08-25 15:19:09 +08:00
joylink_cuiweidong
86ae692f61 大铁项目 车务管理终端 增加/修改列车固定径路 代码调整 2022-08-25 15:18:32 +08:00
fan
c411d7237b 大屏显示调整 2022-08-25 15:16:08 +08:00
dong
3971a33039 代码调整 2022-08-25 14:34:27 +08:00
fan
832d26709f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-08-24 17:52:42 +08:00
fan
2f4816442f 新实训代码调整 2022-08-24 17:52:33 +08:00