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

7696 Commits

Author SHA1 Message Date
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
joylink_cuiweidong
808ce62c85 代码调整 2022-07-25 09:58:40 +08:00
fan
fdb071c9f6 取消鼠标悬浮消失 2022-07-22 18:04:12 +08:00
joylink_cuiweidong
7328ac596a 大铁线路 剧本调整 2022-07-22 16:56:59 +08:00
joylink_cuiweidong
4d8fbdf8c8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/views/newMap/displayNew/menuSchema.vue
 2022-07-22 16:04:28 +08:00
joylink_cuiweidong
7abc3b37db 大铁线路 剧本编制 页面代码调整 2022-07-22 15:56:59 +08:00
fan
2c6807debf 现地工作站添加路票簿册 2022-07-22 14:27:03 +08:00
fan
15e8006f5a ctc=>车务终端 2022-07-21 10:14:29 +08:00
Yuan
1c07eeef75 merge 2022-07-20 15:37:23 +08:00
Yuan
c4fc19c88e JD1A-信号按钮和表示状态修改 2022-07-20 15:35:55 +08:00
fan
172415dccf 显示配置调整 2022-07-20 15:07:02 +08:00
dong
e3c04e96a3 调度命令查询界面功能 2022-07-19 14:50:52 +08:00
fan
3d9419b809 指示灯关联必填调整 2022-07-19 13:41:55 +08:00
joylink_cuiweidong
d67b390b46 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-18 16:19:01 +08:00
joylink_cuiweidong
4583733127 大铁项目 切换角色 ctc 行车日志 数据切换 2022-07-18 16:17:53 +08:00
fan
46ab43aef3 车务终端分散自律亮灯&占线板默认选中 2022-07-18 15:01:35 +08:00
fan
e176823ec6 占线板&进路序列调整 2022-07-18 13:07:45 +08:00
Yuan
e947e50a0d 增加几个按钮类型 2022-07-15 18:08:39 +08:00
fan
2125809e41 长兴技校不展示设计平台&环境参数判断调整 2022-07-15 16:47:45 +08:00
fan
65cb35036d local-test打包调整 2022-07-15 16:23:38 +08:00
fan
c188d28caf Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-15 16:16:07 +08:00
fan
f43a29fd11 长兴技术学校登录页 2022-07-15 16:15:58 +08:00
fan
636803400a 画面调整 2022-07-15 15:55:03 +08:00
joylink_cuiweidong
bb193a7e5d 代码调整 2022-07-15 14:44:44 +08:00
Yuan
505c0ae95d resolve conflict 2022-07-15 10:21:21 +08:00
Yuan
acb63a1a8a stage 2022-07-15 10:19:15 +08:00
fan
1d6997db39 画面调整暂提 2022-07-15 09:57:03 +08:00
fan
b5a67f7fbe 车务终端非常站控模式下 不能操作 2022-07-14 18:13:46 +08:00
fan
dd935f0aec 添加地图功能配置项 2022-07-14 11:08:02 +08:00
fan
11d75a76a6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-13 17:31:23 +08:00
fan
6d34c5fde6 站间透明问题修复2 2022-07-13 17:31:10 +08:00
joylink_cuiweidong
e21ea808e1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-13 16:43:49 +08:00
joylink_cuiweidong
a049a67571 大铁项目 ctc 行车日志 代码调整 2022-07-13 16:43:15 +08:00
fan
a6ce3b106a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-13 16:41:06 +08:00
fan
e1b7f84ea6 站间透明问题修复 2022-07-13 16:40:49 +08:00
joylink_cuiweidong
f6bc53b0d9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-13 15:55:25 +08:00
joylink_cuiweidong
9a7fcd5697 大铁项目 行车日志 添加/修改 运行计划 2022-07-13 15:53:55 +08:00
fan
50921e2348 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-13 14:19:23 +08:00
fan
895b909e34 站间透明调整 2022-07-13 14:19:02 +08:00
dong
42cb9d6ee2 添加教学通用项目 2022-07-13 13:33:41 +08:00
joylink_cuiweidong
ed4d2f9e73 大铁项目 ctc 行车日志 将原来的【删除】 -> 改成【设置删除标识】 2022-07-12 14:42:52 +08:00
fan
e300d62896 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-08 17:45:21 +08:00
fan
e59e2ec8d4 股道视图调整 2022-07-08 17:45:07 +08:00
joylink_zhangsai
b1e052efea 修改股道视图删除数据bug -- by fan 2022-07-08 17:26:38 +08:00
fan
1bdfe33623 进路序列、股道视图调整 2022-07-08 17:16:04 +08:00
fan
d2f7edbda1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-08 16:32:01 +08:00
fan
7be2c6b614 进路序列调整&站间透明暂提 2022-07-08 16:31:42 +08:00
dong
c75d283389 调度命令添加校验功能 2022-07-08 14:56:33 +08:00
joylink_cuiweidong
d0f4c4b5cd 代码调整 2022-07-08 13:19:57 +08:00
dong
5b191b60b7 修改调度命令报错，添加中转识别号 2022-07-08 11:14:36 +08:00
dong
998f5dbced 调度命令调整 2022-07-07 17:28:26 +08:00
dong
8cd5789bae 调度命令代码调整 2022-07-07 16:32:18 +08:00
fan
8c978c25a0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-07 16:08:30 +08:00
fan
94f5c498c5 路票调整2 2022-07-07 16:08:04 +08:00
强 董
dafe5f75d3 调度命令下达提示修改 2022-07-07 16:00:03 +08:00
强 董
a22736f0f0 调度命令调整 2022-07-07 15:14:42 +08:00
强 董
9f425fad49 调度命令调整 2022-07-07 15:03:41 +08:00
joylink_cuiweidong
cf7915cef3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-07 13:59:47 +08:00
joylink_cuiweidong
651e7eceb5 大铁项目 调度台行车计划 列车类型 添加枚举 
大铁项目 衬托出 行车日志 实际时间添加颜色
 2022-07-07 13:58:57 +08:00
fan
607903c937 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-07 13:21:46 +08:00
fan
a692ae3aa7 路票调整 2022-07-07 13:21:27 +08:00
joylink_cuiweidong
cbe0203a66 大铁项目 调度台行车计划 修改到出入口 2022-07-06 18:00:48 +08:00
joylink_cuiweidong
5854fa5a60 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-06 17:16:16 +08:00
joylink_cuiweidong
58ba63a382 大铁项目 ctc 行车日志 初始化 清空数据 2022-07-06 17:15:54 +08:00
joylink_cuiweidong
1d2cf1c043 大铁项目 调度台行车计划 修改时间 2022-07-06 16:23:40 +08:00
fan
9ff73303c4 站间透明暂提 2022-07-06 15:47:23 +08:00
fan
deda8eaf7f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-06 11:19:46 +08:00
fan
1093b8982b 路票流程调整 2022-07-06 11:19:22 +08:00
joylink_cuiweidong
78c3e41f9c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-06 10:42:14 +08:00
joylink_cuiweidong
84a4192183 代码调整 2022-07-06 10:41:40 +08:00
fan
2d4b0708bd 路票流程调整暂提 2022-07-05 18:03:14 +08:00
fan
012c8e7137 修复：因无法打开麦克风等错误导致的无法挂断电话BUG 2022-07-05 13:22:36 +08:00
fan
662b7a2332 增加仿真成员 车站助理 STATION_ASSISTANT 2022-07-05 10:59:58 +08:00
fan
a5b4b096f2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-05 09:08:35 +08:00
fan
4779efbc23 代码调整&司机驾驶调整 2022-07-05 09:08:12 +08:00
强 董
8555ae081a 调度命令调整 2022-07-04 14:46:00 +08:00
强 董
e2b2f80e4d 调度命令代码调整 2022-07-04 14:28:06 +08:00
强 董
eb0dc56616 调度命令代码调整 2022-07-04 11:17:35 +08:00
强 董
1ab714dab9 调度命令弹窗代码调整 2022-07-04 09:59:15 +08:00
强 董
4d5cf7b92c 添加调度命令直接签收界面 2022-07-04 09:57:24 +08:00
强 董
5c078cdfbc 调度命令调整 2022-07-01 18:52:17 +08:00
强 董
f8c51df3c9 调度命令调整 2022-07-01 15:37:55 +08:00
强 董
95c739c342 行调命令调整 2022-07-01 13:58:44 +08:00
强 董
49593b2851 添加调度命令收令功能 2022-06-30 18:13:23 +08:00
fan
a30991a53f 占线板股道视图调整 2022-06-30 18:08:39 +08:00
fan
7cb0dc179a 问题调整：未获取到运行图信息 2022-06-30 15:32:58 +08:00
fan
d1f0210b1b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-06-30 14:55:35 +08:00
fan
28a09e0f21 大铁簿册调整 2022-06-30 14:55:18 +08:00
joylink_cuiweidong
927687aa9b 大铁项目 代码调整 2022-06-30 13:52:27 +08:00
fan
8048cfd34c 大铁簿册调整&合众title调整 2022-06-30 09:04:44 +08:00
fan
6b117a66e0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
 Conflicts:
	src/jmapNew/theme/components/utils/menuOperate.js
	src/scripts/cmdPlugin/CommandEnum.js
	src/scripts/cmdPlugin/OperationHandler.js
 2022-06-29 15:59:56 +08:00
fan
21e8785ecb 大铁 路票调整 2022-06-29 15:57:24 +08:00
joylink_cuiweidong
ec5c6f5ff4 大铁项目 调度台行车计划修改股道 删除计划 2022-06-29 13:53:35 +08:00
joylink_cuiweidong
47da7cfc43 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-06-29 10:59:32 +08:00
joylink_cuiweidong
933ecb9748 大铁 调度台 发布所有行车计划 车站签收行车计划 代码调整 2022-06-29 10:59:16 +08:00
强 董
371e090195 修改调度命令界面 2022-06-29 10:36:57 +08:00
joylink_cuiweidong
a7db35f139 代码调整 2022-06-28 18:13:01 +08:00
joylink_cuiweidong
78d67ad0ec 大铁 调度台 添加运行计划 代码调整 2022-06-28 17:23:52 +08:00
joylink_cuiweidong
ff3ae565bc 代码调整 2022-06-28 16:50:48 +08:00
fan
ebb204c475 大铁综合演练调整 2022-06-28 15:04:00 +08:00
fan
9248fd22ec Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
 Conflicts:
	src/views/newMap/displayNew/menuDemon.vue
 2022-06-28 13:07:51 +08:00
强 董
f934b70b3e 代码调整 2022-06-28 13:06:52 +08:00
fan
6724587aed 打铁综合演练 2022-06-28 13:06:21 +08:00
强 董
251c79a10a 添加调度台功能 2022-06-28 11:29:38 +08:00
fan
2fb45a7bfe 路票暂提1 2022-06-27 18:08:25 +08:00
joylink_cuiweidong
fa1004067e 大铁项目 调度台 运行图 消息订阅 和返回的数据 代码调整 2022-06-27 14:45:31 +08:00
fan
8b8bdec3db 子系统栏显示调整 2022-06-27 13:22:25 +08:00
fan
83702c4c22 路票暂提 2022-06-27 13:09:22 +08:00
fan
717a629ea2 子系统栏显示调整 2022-06-27 13:08:46 +08:00
joylink_cuiweidong
73bf18ad86 大铁项目 调度台 代码调整 2022-06-27 11:05:12 +08:00
fan
3f40d29731 JD_1A线路建立 2022-06-24 16:23:21 +08:00
fan
afd3c54df2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-06-24 14:57:38 +08:00
fan
8dd185cd9a 占线板闪烁调整 2022-06-24 14:57:20 +08:00
joylink_cuiweidong
985180eba7 代码调整 2022-06-23 16:52:51 +08:00
joylink_cuiweidong
caf5bca3c8 大铁项目 ctc 车务管理端 列车固定路径 删除路径 2022-06-23 16:48:16 +08:00
joylink_cuiweidong
ce67bb0a13 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-06-23 16:25:16 +08:00
joylink_cuiweidong
5cb096bfda 代码调整 2022-06-23 16:24:59 +08:00
fan
0931e54a40 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-06-23 15:52:09 +08:00
fan
a953bcff6c 注册增加来源 2022-06-23 15:51:49 +08:00
joylink_cuiweidong
4bbe980c21 大铁项目 ctc 车务管理端 样式调整 2022-06-23 14:22:42 +08:00
joylink_cuiweidong
0269ae8144 大铁项目 ctc 车务管理端 列车固定路径 代码调整 2022-06-23 14:00:47 +08:00
joylink_cuiweidong
9b4e93ae7c 代码调整 2022-06-21 17:20:12 +08:00
joylink_cuiweidong
e7edd338fd 代码调整 2022-06-21 16:13:01 +08:00
joylink_cuiweidong
6e779510a2 车务管理端 车站股道 代码调整 2022-06-21 16:10:17 +08:00
fan
e699ed2e9b ibp设备调整 2022-06-21 15:05:58 +08:00
fan
9247ccedf5 设备管理 找不到链接设备name 显示设备code 2022-06-21 14:35:49 +08:00
fan
80361b40a5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-06-21 13:21:33 +08:00
fan
4d89aef6b8 红河财经登录页调整 2022-06-21 13:21:18 +08:00
joylink_cuiweidong
06d4e8005b 大铁项目 ctc 车务管理端 车站股道 代码调整 2022-06-21 11:33:11 +08:00
fan
de47b74def 添加合众登录页面 && 成都工职院虚拟仿真中心跳转调整 2022-06-20 17:44:33 +08:00
fan
0a5ced4098 大铁ctc调整 增加端title 2022-06-17 14:16:54 +08:00
joylink_cuiweidong
5b4fb009a0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-06-17 13:16:36 +08:00
joylink_cuiweidong
ba4ed6e7c1 代码调整 2022-06-17 13:16:12 +08:00
fan
3843c01f40 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-06-17 13:08:23 +08:00
fan
ef22b07945 大铁ctc调整 2022-06-17 13:08:08 +08:00
joylink_cuiweidong
307600ec5e 大铁项目 代码调整 2022-06-17 13:01:51 +08:00
joylink_cuiweidong
8b475d497f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-06-17 11:34:22 +08:00
joylink_cuiweidong
7d7718c1a1 大铁项目 ctc 车务管理端 列车固定路径 增加 车次校验规则 
列表调整
 2022-06-17 11:34:09 +08:00
fan
db9ca50400 大铁ctc调整 2022-06-17 11:26:03 +08:00
joylink_cuiweidong
2da496887b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-06-17 10:17:09 +08:00
joylink_cuiweidong
eb7d096fe3 大铁项目 ctc 车务管理端 列车固定路径 订阅路径修改 
列车固定路径列表代码调整
 2022-06-17 10:16:49 +08:00
fan
ada089484d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-06-16 18:06:15 +08:00
fan
4f177ad7a3 大铁ctc调整 2022-06-16 18:06:01 +08:00
joylink_cuiweidong
667bca7aa2 大铁项目 ctc 车务管理端 列车固定路径 更新至ctc 导入 代码调整 2022-06-16 16:36:18 +08:00
joylink_cuiweidong
a48698877d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-06-16 15:21:04 +08:00
joylink_cuiweidong
746c54651a 大铁项目 ctc 车务管理端 列车固定路径 备份 订阅路径更改 2022-06-16 15:20:12 +08:00
fan
858f064a2e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-06-16 14:55:34 +08:00
fan
c0cf6e6077 大铁ctc调整 6/16 2022-06-16 14:55:17 +08:00
joylink_cuiweidong
41a22bae92 大铁项目 ctc 车务管理端 列车固定路径 增加指令代码调整 2022-06-16 14:18:04 +08:00
joylink_cuiweidong
52e4b911b4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/scripts/cmdPlugin/OperationHandler.js
 2022-06-16 10:20:33 +08:00
fan
e13a74d9f3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-06-15 17:47:32 +08:00
fan
6beeab667c 大铁ctc调整 占线板操作调整 2022-06-15 17:47:21 +08:00
joylink_cuiweidong
4d83303f23 大铁项目 ctc 车务管理端 列车固定路径 增加 页面调整 2022-06-15 17:38:23 +08:00
fan
006f789032 大铁ctc调整6/15 2022-06-15 15:39:11 +08:00
fan
00fd8a168b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
 Conflicts:
	src/views/newMap/displayNew/menuSchema.vue
 2022-06-15 09:20:26 +08:00
fan
e4fb05c1bf 打铁ctc调整 2022-06-15 09:18:36 +08:00
joylink_cuiweidong
389a700798 大铁项目 ctc 车务管理端 消息处理代码调整 2022-06-14 16:36:40 +08:00
joylink_cuiweidong
949e3c3feb 大铁项目 车务管理端 代码调整 2022-06-14 14:39:07 +08:00
joylink_cuiweidong
4cf019e10d 大铁项目 车务管理端消息 订阅信息 代码调整 2022-06-14 11:30:15 +08:00
joylink_cuiweidong
d45dc22212 大铁项目 代码调整 2022-06-13 17:44:07 +08:00
joylink_cuiweidong
be0ad85168 大铁项目 代码调整 2022-06-13 17:20:03 +08:00
joylink_cuiweidong
57b9d5cce6 大铁项目 代码调整 2022-06-13 16:02:33 +08:00
joylink_cuiweidong
c3685d12ac 大铁项目 管理终端 车站股道 页面调整 2022-06-13 14:31:31 +08:00
joylink_cuiweidong
16586b35f0 大铁项目 管理终端 车站股道页面添加 2022-06-13 10:45:15 +08:00
joylink_cuiweidong
66892862cb 代码调整 2022-06-10 16:48:23 +08:00
joylink_cuiweidong
dc7a117b0f 大铁项目 管理终端 页面 添加 2022-06-10 16:23:09 +08:00
fan
3b63d62eae Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-06-10 11:23:30 +08:00
fan
1ea7818c47 IBP盘调整 2022-06-10 11:23:16 +08:00
joylink_cuiweidong
2a27cf6f46 大铁项目 地图绘制 指示灯关联 增加名称属性 2022-06-10 10:09:30 +08:00
fan
d36ee77d00 ctc显示调整 2022-06-09 18:06:47 +08:00
fan
a0eaa636f9 实训双击问题调整 2022-06-06 16:43:11 +08:00
fan
d5e2e69965 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-06-06 16:30:38 +08:00
fan
19e70608a0 ctc显示调整 06/06 2022-06-06 16:29:42 +08:00
joylink_cuiweidong
942f728596 大铁项目 CTC 运行计划列表 代码调整 2022-06-02 15:13:59 +08:00
fan
270c32052c ctc显示调整 05/31 2022-05-31 18:09:34 +08:00
fan
81667572fc 实训仿真结束 退出实训界面 2022-05-30 17:34:44 +08:00
fan
85dac873de ctc界面调整2 2022-05-30 17:28:46 +08:00
fan
758b5b69e2 ctc界面调整1 2022-05-27 15:55:03 +08:00
fan
2d4a196dc8 区段增加方向运行端点 2022-05-27 15:54:14 +08:00
fan
5ebb0139ec Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-05-27 09:51:51 +08:00
fan
6149770821 指示灯关联调整 2022-05-27 09:51:29 +08:00
joylink_cuiweidong
8127b76cb6 大铁项目 仿真 不显示 时间 2022-05-25 14:18:55 +08:00
fan
7a7cbf9ae8 大铁调整 n5 2022-05-23 15:11:55 +08:00
fan
85fd48f700 大铁调整 n1 2022-05-11 14:56:08 +08:00
fan
88b21fc723 信号机增加类型 2022-05-09 09:12:48 +08:00
fan
826fbae799 大铁线路调整31 2022-05-06 14:22:26 +08:00
fan
aee6474645 大铁线路调整30 2022-05-05 17:08:17 +08:00
fan
7c8cbdf59c 大铁线路调整27 增加信号机类型 2022-04-29 16:32:23 +08:00
fan
7c2cddd441 大铁线路调整26 关联信号机调整 2022-04-28 13:34:17 +08:00
fan
7e8fdaf1a3 大铁线路调整25 2022-04-28 10:40:18 +08:00
fan
af2ffa23f3 大铁线路调整24 指示灯关联联锁数据调整 2022-04-28 10:35:41 +08:00
fan
1c04fd0bd6 大铁线路调整23 2022-04-27 17:35:36 +08:00
fan
0c57bdac50 大铁线路调整21 2022-04-24 17:06:21 +08:00
fan
9ed6c38a4e 大铁线路调整20 2022-04-24 15:20:12 +08:00
fan
b8a27f74aa 大铁线路调整19 2022-04-24 14:05:08 +08:00
fan
216166c572 大铁线路调整18 2022-04-24 14:03:48 +08:00
fan
279522f544 大铁线路调整17 precess调整 2022-04-24 13:17:57 +08:00
fan
e24b992ab9 大铁线路调整15 2022-04-24 11:14:44 +08:00
fan
a32a230ed8 大铁线路调整14 2022-04-24 11:04:04 +08:00
fan
3202fc1b40 大铁线路调整12 2022-04-22 19:13:44 +08:00
fan
93a3deb20c 大铁线路调整11 2022-04-22 17:55:42 +08:00
fan
3420059adf 大铁线路调整10 2022-04-22 16:34:34 +08:00
fan
daff80c19e 大铁线路调整9 2022-04-22 15:33:57 +08:00
fan
5e30c99d2c 大铁线路调整8 2022-04-22 14:40:31 +08:00
fan
140f6306ed 大铁线路调整7 2022-04-21 16:13:33 +08:00
fan
c5d60323e2 大铁线路调整6 联锁数据调整 2022-04-21 15:10:43 +08:00
fan
a90fbd6f67 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-04-21 10:02:32 +08:00
fan
a045d2c776 大铁线路调整5 2022-04-21 10:02:13 +08:00
joylink_cuiweidong
e191d0354d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-04-19 19:18:38 +08:00
joylink_cuiweidong
a7f24b860b 代码调整 2022-04-19 19:18:31 +08:00
fan
c0bbf35455 大铁线路调整4 2022-04-19 17:55:27 +08:00
fan
e07e06a3bf Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-04-19 16:14:41 +08:00
fan
0099c51a9d 大铁线路调整3 2022-04-19 16:14:17 +08:00
joylink_cuiweidong
4d694c459c 代码调整 2022-04-19 14:07:27 +08:00
joylink_cuiweidong
46fa576fa4 代码调整 2022-04-19 14:03:06 +08:00
joylink_cuiweidong
3b839937ac 代码调整 2022-04-19 13:45:00 +08:00
joylink_cuiweidong
4b86b7ac03 代码调整 2022-04-18 18:54:21 +08:00
joylink_cuiweidong
0312ebd77c 代码调整 2022-04-18 18:43:39 +08:00
joylink_cuiweidong
63ecb61501 代码调整 2022-04-18 17:13:54 +08:00
joylink_cuiweidong
377c1d34b6 代码调整 2022-04-18 17:10:12 +08:00
joylink_cuiweidong
955311e03c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-04-18 16:20:23 +08:00
joylink_cuiweidong
dfec35ff2c 代码调整 2022-04-18 15:41:37 +08:00
fan
1dcb5fe1dc 大铁线路调整2 
(cherry picked from commit 6ed22109af)
 2022-04-18 15:02:14 +08:00
fan
2f82b1729b 大铁线路调整 
(cherry picked from commit 7fbe309f70)
 2022-04-18 15:01:47 +08:00
joylink_cuiweidong
3c109157c7 成绩统计代码调整 2022-04-18 14:40:05 +08:00
joylink_cuiweidong
5793ba270d 学生统计信息代码调整 2022-04-18 09:28:37 +08:00
joylink_cuiweidong
9b094a9814 代码调整 2022-04-15 18:45:08 +08:00
joylink_cuiweidong
e3da35b4df 代码调整 2022-04-15 15:26:12 +08:00
joylink_cuiweidong
75314eb114 学生统计页面添加 2022-04-15 14:46:24 +08:00
joylink_cuiweidong
e3b0189705 成绩统计 代码调整 2022-04-15 13:12:45 +08:00
joylink_cuiweidong
643467f9d2 学生单次考试成绩 页面添加 2022-04-15 13:10:29 +08:00
fan
92d192cfe5 联系方式调整 2022-03-15 10:04:39 +08:00
“sunzy”
f459c01246 增加三位课程页面滚动条 2022-01-24 09:55:52 +08:00
“sunzy”
6723006d27 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-01-21 17:36:42 +08:00
“sunzy”
8cb833d38c 修改三位课程例子事件，修改第一人称视角初始方向，增加徐州课程 2022-01-21 17:36:03 +08:00
joylink_fanyuhong
e9638e2524 提示调整 2022-01-21 13:55:37 +08:00
joylink_fanyuhong
31b5e1631b iscs调整 
(cherry picked from commit 38b1beeef5)
 2022-01-20 19:08:05 +08:00
joylink_fanyuhong
4b3376ec27 iscs调整 2022-01-19 17:56:27 +08:00
joylink_fanyuhong
1945434421 iscs调整 2022-01-19 17:41:46 +08:00
joylink_fanyuhong
732c9de068 iscs调整 2022-01-19 17:35:52 +08:00
joylink_fanyuhong
12c3572807 iscs调整 2022-01-19 17:23:25 +08:00
joylink_fanyuhong
9b8fdc0c7e iscs调整 2022-01-19 14:31:18 +08:00
joylink_fanyuhong
77040e93f4 iscs调整 2022-01-19 14:03:07 +08:00
joylink_fanyuhong
8d3a20cc01 iscs调整 2022-01-19 11:21:58 +08:00
joylink_fanyuhong
bcf3188046 iscs调整 2022-01-19 10:09:51 +08:00
joylink_fanyuhong
be904acb58 iscs调整 2022-01-19 10:09:12 +08:00
joylink_fanyuhong
39a2a21b95 iscs调整 2022-01-18 17:42:58 +08:00
joylink_fanyuhong
f1c77eca34 iscs调整 2022-01-18 16:50:24 +08:00
joylink_fanyuhong
cca82978c7 iscs调整 2022-01-18 16:43:26 +08:00
joylink_fanyuhong
3e15722d05 iscs调整 2022-01-18 15:51:24 +08:00
joylink_fanyuhong
a3d388ec96 iscs调整 2022-01-18 14:43:51 +08:00
joylink_fanyuhong
5b8681a9ff iscs调整 2022-01-17 16:23:22 +08:00
joylink_fanyuhong
a1696e7f06 iscs调整 2022-01-17 15:08:34 +08:00
joylink_fanyuhong
8194c24f4d iscs调整 2022-01-17 14:43:17 +08:00