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

7549 Commits

Author SHA1 Message Date
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
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
fan
8b573304e6 bug:初始化按钮不显示调整 2022-08-10 09:30:10 +08:00
fan
6a79626a34 指令转操作 2022-08-09 13:59:23 +08:00
joylink_cuiweidong
9bbe93590c 代码调整 2022-08-09 11:03:00 +08:00
joylink_cuiweidong
874cc248eb 剧本提示 代码调整 2022-08-09 10:02:52 +08:00
joylink_cuiweidong
52a9aa7b61 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-08-08 11:13:36 +08:00
joylink_cuiweidong
ac77a2fd36 代码调整 2022-08-08 11:12:11 +08:00
fan
808ae31174 走画面管理没有设置集中站调整 2022-08-05 10:16:14 +08:00
fan
082e296e38 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-08-04 17:26:50 +08:00
fan
55d4ff6e69 画面新建 bug调整 2022-08-04 17:26:38 +08:00
joylink_cuiweidong
9341b3f807 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-08-04 17:25:54 +08:00
joylink_cuiweidong
9480cd310b 代码调整 2022-08-04 17:25:34 +08:00
fan
5344ea5788 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-08-04 16:05:10 +08:00
fan
78aeeddee0 簿册 施工 交接班注释 2022-08-04 16:04:58 +08:00
fan
22c0b57624 簿册剧本编制显示调整 2022-08-04 16:03:09 +08:00
joylink_cuiweidong
425a350d07 去掉断点 2022-08-04 15:50:39 +08:00
joylink_cuiweidong
3d0782952c 剧本提示代码调整 2022-08-04 15:39:58 +08:00
joylink_cuiweidong
e6ffe9d087 代码调整 2022-08-04 15:14:08 +08:00
joylink_cuiweidong
85f7844788 代码调整 2022-08-04 14:50:32 +08:00
joylink_cuiweidong
130703e0c5 代码调整 2022-08-04 14:32:00 +08:00
fan
e20e212536 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-08-04 11:05:04 +08:00
fan
8c7cd5d495 簿册暂提 2022-08-04 11:04:47 +08:00
fan
8262b24698 车次窗批量生成时可调整距离 2022-08-04 10:34:42 +08:00
joylink_cuiweidong
2fb83cd34e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-08-03 15:41:07 +08:00
joylink_cuiweidong
6cb94046c8 代码调整 2022-08-03 15:40:51 +08:00
dong
ae5d53e9e0 代码调整 2022-08-03 15:33:03 +08:00
fan
d115c4975d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-08-03 14:38:12 +08:00
fan
5c63dafaa4 簿册显示调整 2022-08-03 14:37:59 +08:00
dong
5a072c7236 修改进路 2022-08-03 14:13:14 +08:00
dong
71480564f7 修改进路 2022-08-03 13:31:07 +08:00
fan
f3a1e22e65 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-08-03 11:22:04 +08:00
fan
024f1c8963 接受会话后同账户清除响铃 2022-08-03 11:21:52 +08:00
joylink_cuiweidong
01b44ccccf 代码调整 2022-08-03 11:02:35 +08:00
joylink_cuiweidong
ecb9287adf Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-08-03 11:00:48 +08:00
joylink_cuiweidong
f1dc88be33 场景编辑代码调整 2022-08-03 11:00:31 +08:00
fan
6360e26c89 簿册车站传递调整 2022-08-03 10:04:31 +08:00
fan
c5d11595cf Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-08-03 09:23:58 +08:00
Yuan
d1680c32e5 Merge branch 'yly' into test 2022-08-02 18:12:34 +08:00
Yuan
df174615ba jd1A调整，信号按钮调整 2022-08-02 18:12:03 +08:00
fan
3e105c3f8b 代码调整 2022-08-02 18:01:42 +08:00
dong
f81e76fa20 代码调整 2022-08-02 16:36:20 +08:00
dong
a65afc6cab 代码调整 2022-08-02 16:15:47 +08:00
dong
de71dc5c91 代码调整 2022-08-02 15:06:50 +08:00
dong
9d68eac471 进路修改 2022-08-02 14:38:39 +08:00
dong
0998fdffbe 进路修改 2022-08-02 14:10:18 +08:00
joylink_cuiweidong
7c0d160c68 大铁线路 剧本编制 添加 修改系统时间 2022-08-02 11:28:20 +08:00
joylink_cuiweidong
ba4f2efc6b 去除断点 2022-08-02 11:01:57 +08:00
joylink_cuiweidong
91e572ca1e 代码调整 2022-08-02 11:00:18 +08:00
joylink_cuiweidong
3131edd93b 代码调整 2022-08-02 10:33:35 +08:00
joylink_cuiweidong
9067b54e97 代码调整 2022-08-02 09:57:11 +08:00
joylink_cuiweidong
f7dbb557c7 代码调整 2022-08-02 09:44:39 +08:00
joylink_cuiweidong
75f268cf21 添加 车务段段长 仿真角色 2022-08-01 17:48:03 +08:00
joylink_cuiweidong
553aa18f3d 代码调整 2022-08-01 17:26:16 +08:00
joylink_cuiweidong
b404adfbed 代码调整 2022-08-01 16:54:33 +08:00
joylink_cuiweidong
ec72904bef 剧本预览提示代码调整 2022-08-01 16:37:04 +08:00
fan
b9cd660a7e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls 2022-08-01 15:39:39 +08:00
fan
1bc2342172 哈尔滨盈达科技大铁项目 2022-08-01 15:39:12 +08:00
joylink_cuiweidong
67bedb3245 剧本预览添加 倍速功能 2022-08-01 15:27:51 +08:00
joylink_cuiweidong
80ef093b10 代码调整 2022-07-29 17:57:08 +08:00
joylink_cuiweidong
028ded01e3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-29 17:10:43 +08:00
joylink_cuiweidong
5132d43595 大铁线路 剧本 道岔钩锁和换端指令添加 2022-07-29 17:09:15 +08:00
dong
d835c074dd 代码调整 2022-07-29 15:15:14 +08:00
dong
24561974d6 代码调整 2022-07-29 14:54:58 +08:00
dong
2bc1ae8cf3 代码调整 2022-07-29 14:41:36 +08:00
Yuan
2e79ca8d27 Merge branch 'yly' into test 2022-07-29 13:56:29 +08:00
Yuan
838559280d merge 2022-07-29 13:56:02 +08:00
dong
aa344631ff 代码调整 2022-07-29 13:37:09 +08:00
Yuan
10eba07da8 JD1A风格改造 2022-07-29 13:33:44 +08:00
joylink_cuiweidong
129b1be713 代码调整 2022-07-28 13:37:00 +08:00
dong
d099b7f577 修改剧本调度命令提示 2022-07-28 09:53:17 +08:00
joylink_cuiweidong
55bb88cb19 代码调整 2022-07-27 18:28:17 +08:00
joylink_cuiweidong
8295b811d4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-27 18:21:57 +08:00
joylink_cuiweidong
ccf640c492 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/views/newMap/displayNew/scriptDisplay/component/covertOperation.js
 2022-07-27 18:21:37 +08:00
dong
592a40c7cd 查询调度命令参数修改 2022-07-27 18:19:09 +08:00
joylink_cuiweidong
6588b454a0 代码调整 2022-07-27 18:14:38 +08:00
dong
a7163cb437 剧本调度命令指令参数提示 2022-07-27 18:14:22 +08:00
joylink_cuiweidong
b40038910e 代码调整 2022-07-27 16:23:01 +08:00
joylink_cuiweidong
523d0a111e 代码调整 2022-07-27 13:43:13 +08:00
joylink_cuiweidong
6fa3e9dec6 地图线路公共配置项 添加 对信号机封锁操作，是否影响信号显示 2022-07-27 13:14:46 +08:00
joylink_cuiweidong
d28803292e 添加 修改系统时间接口 
剧本编制 添加角色 代码调整
 2022-07-27 11:28:18 +08:00
dong
f8b83fc4e6 剧本行调命令指令 2022-07-26 18:10:14 +08:00
joylink_cuiweidong
2548337fc7 车务终端 订阅ctc 代码调整 2022-07-26 17:43:10 +08:00
joylink_cuiweidong
246f204eb7 代码调整 2022-07-26 16:30:48 +08:00
joylink_cuiweidong
c92d77fb69 给 信号员 添加 现地权限 2022-07-26 13:55:26 +08:00
joylink_cuiweidong
50bf7d7a63 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-26 13:30:59 +08:00
joylink_cuiweidong
2e48ac5cc6 代码调整 2022-07-26 13:30:27 +08:00
fan
8d69e59d80 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-26 13:03:36 +08:00
fan
7998e3de92 大铁02 放开驾驶 线路配置 增加 区故解只能应用于故障锁闭区段 2022-07-26 13:03:20 +08:00
joylink_cuiweidong
82f44d3499 剧本编制 放开会话和指令的删除 
修改剧本 角色的名称
 2022-07-26 11:21:58 +08:00
joylink_cuiweidong
7cd2ecc2dc 代码调整 2022-07-26 10:41:08 +08:00
joylink_cuiweidong
922d4641b7 剧本 添加设备管理员 2022-07-26 10:14:45 +08:00
joylink_cuiweidong
636819e9a5 代码调整 2022-07-25 18:06:04 +08:00
joylink_cuiweidong
5067f0132f 添加 剧本角色 站长、助理、信号员、客运员、扳道员 、引导员、工务工 2022-07-25 17:49:38 +08:00
joylink_cuiweidong
856a5b676a 剧本切换角色 ctc 对应车站未更改bug 调整 2022-07-25 16:33:04 +08:00
joylink_cuiweidong
2ff39c6c89 代码调整 2022-07-25 13:57:33 +08:00
fan
e1031b47b1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-25 11:12:00 +08:00
fan
e9785184dd 画面切换 2022-07-25 11:01:01 +08:00
dong
78d263562d 添加剧本调度命令指令 2022-07-25 10:11:19 +08:00