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

7246 Commits

Author SHA1 Message Date
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
dong
a61c51d5c5 代码调整 2022-08-24 16:09:16 +08:00
dong
7b94333a16 代码调整 2022-08-24 14:54:46 +08:00
fan
0452a4fee7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-08-24 11:14:12 +08:00
fan
7df2e4a404 代码调整 2022-08-24 11:02:17 +08:00
dong
d96678e7c4 代码调整 2022-08-23 18:16:12 +08:00
fan
a2e0f543bb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-08-23 18:07:39 +08:00
fan
b66d899285 代码调整 2022-08-23 18:07:28 +08:00
joylink_cuiweidong
d0c3ca304d 大铁项目 车务管理终端 批量增加列车固定径路 代码调整 2022-08-23 17:59:04 +08:00
dong
5443e46708 实训代码调整 2022-08-23 17:42:44 +08:00
joylink_cuiweidong
86c0b72802 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-08-23 16:24:22 +08:00
joylink_cuiweidong
624a3a11f9 大铁项目 车务管理终端 列车固定径路增加/修改 代码调整 2022-08-23 16:24:11 +08:00
dong
1d128f92eb 代码调整 2022-08-23 15:42:24 +08:00
dong
806f20dc9f 代码调整 2022-08-23 15:29:13 +08:00
dong
546029e4ad 实训编制功能 2022-08-23 15:17:21 +08:00
joylink_cuiweidong
831cb965d9 大铁项目 车务管理终端 修改出入口 代码调整 2022-08-23 14:08:51 +08:00
joylink_cuiweidong
6d8f209cbb 大铁项目 车务管理终端 获取出入口列表 代码调整 2022-08-23 10:25:04 +08:00
fan
5939dc773f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-08-23 09:24:57 +08:00
fan
0664688a5c 代码调整 2022-08-23 09:24:36 +08:00
joylink_cuiweidong
2e7a2cab70 大铁项目 车务管理终端 出入口发布生效区 代码调整 2022-08-22 17:24:56 +08:00
joylink_cuiweidong
b3244ce77e 大铁线路 出入口增加 属性ioDirection（出入口类型） 2022-08-22 15:53:28 +08:00
joylink_cuiweidong
ac620e5607 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-08-22 14:44:27 +08:00
joylink_cuiweidong
2cca3e1bd4 代码调整 2022-08-22 14:44:09 +08:00
dong
a128496ef6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-08-22 13:44:08 +08:00
dong
ba81b37ca0 实训功能 2022-08-22 13:43:40 +08:00
joylink_cuiweidong
c88319f4c0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-08-22 13:40:43 +08:00
joylink_cuiweidong
9d850f9653 大铁项目 车务管理终端 修改股道 代码调整 2022-08-22 13:40:29 +08:00
fan
dd43337d50 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-08-22 10:44:42 +08:00
fan
1bf1776be7 卡斯柯显示调整 2022-08-22 10:44:26 +08:00
joylink_cuiweidong
109b46b41b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-08-22 10:33:04 +08:00
joylink_cuiweidong
718953a8f7 大铁项目 车务管理终端 获取股道列表 代码调整 2022-08-22 10:32:49 +08:00
fan
0d5efd0941 实训预览暂提 2022-08-22 09:24:56 +08:00
dong
f1ffae48ef 实训管理 2022-08-19 18:03:30 +08:00
joylink_cuiweidong
434d028668 添加列车固定径路页面调整 列车固定径路发布生效区接口调整 2022-08-19 17:12:20 +08:00
joylink_cuiweidong
b7b5f0150c 大铁项目 车务管理终端 (删除/清空)固定列车径路 2022-08-19 15:52:00 +08:00
joylink_cuiweidong
22d2dd16f8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-08-19 13:47:04 +08:00
joylink_cuiweidong
b07d8303a4 大铁项目 车务管理终端 获取固定列车径路列表 2022-08-19 13:46:49 +08:00
fan
a2b5b7bdda Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-08-18 18:02:05 +08:00
fan
8c4a0e3266 发布实训管理 2022-08-18 18:01:53 +08:00
joylink_cuiweidong
3efdd6b316 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-08-18 16:10:55 +08:00
joylink_cuiweidong
3c7768c970 大铁项目 车务管理终端 获取股道列表 指令 代码调整 2022-08-18 16:10:22 +08:00
dong
b3652b84b0 实训设计列表功能 2022-08-18 15:35:10 +08:00
joylink_cuiweidong
fda477c08b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-08-18 11:05:13 +08:00
joylink_cuiweidong
7d473aba6c 大铁项目 车务管理终端 代码调整 2022-08-18 11:04:57 +08:00
fan
b1638adeec 调整画面管理 2022-08-18 09:36:45 +08:00
fan
da5f1a3fcf Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-08-17 15:47:10 +08:00
fan
0c553124dc 代码调整 2022-08-17 15:46:55 +08:00
joylink_cuiweidong
d76532bd2c 大铁线路代码调整 2022-08-17 15:24:35 +08:00
joylink_cuiweidong
b3da3ca56a 大铁线路 添加 车务终端管理界面 2022-08-17 13:47:23 +08:00
joylink_cuiweidong
0719a2031e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-08-17 11:29:34 +08:00
joylink_cuiweidong
c34ecffd04 大铁线路 区段添加停车点偏移坐标 2022-08-17 11:29:13 +08:00
fan
4822e0fa00 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-08-17 09:53:57 +08:00
fan
954f388c3a 卡斯柯线路调整 2022-08-16 17:31:21 +08:00
dong
4ffda4f614 添加实训设计和语音 2022-08-16 17:17:27 +08:00
fan
6b4b63fc40 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-08-15 15:09:52 +08:00
fan
66230e8cbf 画面管理问题调整 2022-08-15 15:09:40 +08:00
joylink_cuiweidong
7d67fb18dd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/jmapNew/shape/graph/SignalButton/index.js
 2022-08-15 14:27:46 +08:00
fan
5ea947776d 画面显示位置调整 2022-08-15 13:24:30 +08:00
fan
61cb3a9957 卡斯柯大铁线路调整 2022-08-15 13:23:48 +08:00
fan
9d64437c03 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 
 Conflicts:
	src/jmapNew/shape/graph/SignalButton/index.js
 2022-08-11 11:29:16 +08:00
fan
61e517e317 综合演练页面行值刷新显示错误调整 2022-08-11 11:17:14 +08:00
dong
6ea8aca49a 区段占用与信号 2022-08-10 15:16:06 +08:00
fan
7096511b46 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-08-10 11:22:41 +08:00