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

11726 Commits

Author SHA1 Message Date
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
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
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
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
fan
78e065ec7a 宁波三号线列车显示调整 2022-09-15 13:29:52 +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
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
fan
aef684e320 实训调整 2022-09-14 16:44:44 +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
fan
6fc5bd1441 实训场景调整 2022-09-13 17:33:46 +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
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
d609cef104 代码调整 2022-09-09 11:09:27 +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
fan
7429c2658e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-09-08 09:15:00 +08:00
fan
dddef9835b 红河财经 隐藏案例 2022-09-08 09:14:21 +08:00
fan
6902214173 实训调整 2022-09-08 09:00:42 +08:00
dong
09f78e9064 代码调整 2022-09-07 18:11:50 +08:00
dong
627faced59 条件表达式 2022-09-07 17:38:42 +08:00
joylink_cuiweidong
b5c0c0051d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-09-07 11:18:19 +08:00
joylink_cuiweidong
29af1e57f5 代码调整 2022-09-07 11:18:04 +08:00
Yuan
dca92ed5cb Merge branch 'yly' into test 2022-09-07 10:52:42 +08:00
Yuan
a202e872fa format 2022-09-07 10:52:18 +08:00
fan
b1419ef839 pictureList 显示调整 2022-09-07 09:50:59 +08:00
fan
b09e2f003c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-09-07 09:37:49 +08:00
fan
aea62ada61 增加prdType 2022-09-07 09:37:37 +08:00
Yuan
c7419c7066 操作日志查询&&信息窗口 2022-09-06 16:52:07 +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
27b664aad7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-09-05 17:28:16 +08:00
joylink_cuiweidong
4413c17327 大铁线路 分路不良 代码调整 2022-09-05 17:27:47 +08:00
Yuan
f24d39b0d5 Merge branch 'yly' into test 2022-09-05 17:25:25 +08:00
Yuan
f67a43b92a 站存车管理页面 2022-09-05 17:25:07 +08:00
Yuan
eca2b2898c 站存车管理页面 2022-09-05 17:25:02 +08:00
joylink_cuiweidong
4a128b5f89 代码调整 2022-09-05 16:40:46 +08:00
joylink_cuiweidong
cd3c6e586a 大铁线路 现地 上电解锁代码调整 2022-09-05 16:35:42 +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
fan
0c626140ce Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-09-05 14:03:11 +08:00
fan
acc83c30be 点灯&&分路不良 2022-09-05 14:02:53 +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
ac6992c792 实训调整 2022-09-02 13:23:09 +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
f88500f4de 实训调整 2022-09-02 10:02:46 +08:00
fan
483536c721 实训调整 2022-09-02 10:00:44 +08:00
fan
d61b2fcbcd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-09-02 09:46:01 +08:00
fan
0b32f34af2 实训调整 2022-09-02 09:45:51 +08:00
dong
0c6c8f03ef 代码调整 2022-09-01 18:25:50 +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
Yuan
d0a9fc3fed Merge branch 'yly' into test 2022-09-01 16:00:40 +08:00
Yuan
642d1fb72d 区域批量设置 地图显示 2022-09-01 16:00:11 +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
656e7a13aa 占线板排列进路指令调整 2022-08-30 16:25:34 +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