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 |
|
joylink_cuiweidong
|
8223c252fc
|
大铁项目 车务终端 固定列车经路更新加载到计划 代码调整
|
2022-08-25 14:04:25 +08:00 |
|
joylink_cuiweidong
|
2f87a19864
|
大铁项目 车务终端 固定列车经路从生效区更新、更新后的列表 代码调整
|
2022-08-25 11:29:02 +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
|
602b0a75a3
|
增加武汉项目
|
2022-08-24 11:13:56 +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 |
|
Yuan
|
0aeb991e86
|
封锁设备操作
|
2022-08-22 16:29:33 +08:00 |
|
Yuan
|
201f80d794
|
电力臂状态操作
|
2022-08-22 16:01:05 +08:00 |
|
joylink_cuiweidong
|
b69e2b77c5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-08-22 15:53:50 +08:00 |
|
joylink_cuiweidong
|
b3244ce77e
|
大铁线路 出入口增加 属性ioDirection（出入口类型）
|
2022-08-22 15:53:28 +08:00 |
|
Yuan
|
bf1cf2af65
|
Merge branch 'yly' into test
|
2022-08-22 14:46:38 +08:00 |
|
Yuan
|
e138bbf57b
|
股道视图显示设置
|
2022-08-22 14:46:19 +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
|
3ca13fcd27
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-08-19 17:12:36 +08:00 |
|
joylink_cuiweidong
|
434d028668
|
添加列车固定径路页面调整 列车固定径路发布生效区接口调整
|
2022-08-19 17:12:20 +08:00 |
|
Yuan
|
34618901a3
|
Merge branch 'yly' into test
|
2022-08-19 16:58:46 +08:00 |
|
Yuan
|
e8af1d813f
|
占线板视图设置
|
2022-08-19 16:58:27 +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 |
|
Yuan
|
515f51e578
|
Merge branch 'yly' into test
|
2022-08-18 18:09:11 +08:00 |
|
Yuan
|
03115a3d2b
|
staging 大铁菜单条
|
2022-08-18 18:08:46 +08:00 |
|
Yuan
|
5e5c63908d
|
staging 大铁菜单条
|
2022-08-18 18:08:27 +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
|
eba6f3c1e0
|
信号按钮层次调整
|
2022-08-18 09:49:35 +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 |
|
fan
|
46ec23934e
|
大铁卡斯柯线路调整
|
2022-08-17 13:57:33 +08:00 |
|
joylink_cuiweidong
|
b3da3ca56a
|
大铁线路 添加 车务终端管理界面
|
2022-08-17 13:47:23 +08:00 |
|
joylink_cuiweidong
|
e7926d28cf
|
代码调整
|
2022-08-17 13:20:41 +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
|
a5e441df47
|
缩放调整
|
2022-08-17 09:53:42 +08:00 |
|
fan
|
954f388c3a
|
卡斯柯线路调整
|
2022-08-16 17:31:21 +08:00 |
|
dong
|
4ffda4f614
|
添加实训设计和语音
|
2022-08-16 17:17:27 +08:00 |
|
joylink_cuiweidong
|
bdbd709824
|
代码调整
|
2022-08-16 16:43:23 +08:00 |
|
joylink_cuiweidong
|
49a5aec65b
|
代码调整
|
2022-08-16 15:13:49 +08:00 |
|
joylink_cuiweidong
|
e3e2493b55
|
大铁项目 按钮按下 弹起代码调整
|
2022-08-16 11:26:54 +08:00 |
|
joylink_cuiweidong
|
a55b94e4ab
|
代码调整
|
2022-08-15 17:27:31 +08:00 |
|
joylink_cuiweidong
|
bfe2401f0f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-08-15 16:49:24 +08:00 |
|
joylink_cuiweidong
|
b35107c1eb
|
大铁项目 添加 预警信息
|
2022-08-15 16:48:55 +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 |
|
fan
|
0228f45131
|
卡斯柯显示调整
|
2022-08-15 15:08:57 +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 |
|
joylink_cuiweidong
|
4b0b2fa156
|
大铁线路 信号机按钮添加边框
|
2022-08-15 14:25:36 +08:00 |
|
fan
|
fa53ac9a8b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls
|
2022-08-15 13:24:49 +08:00 |
|
fan
|
5ea947776d
|
画面显示位置调整
|
2022-08-15 13:24:30 +08:00 |
|
fan
|
61cb3a9957
|
卡斯柯大铁线路调整
|
2022-08-15 13:23:48 +08:00 |
|
joylink_cuiweidong
|
75fd967879
|
代码调整
|
2022-08-12 17:51:32 +08:00 |
|
joylink_cuiweidong
|
71a045bd14
|
大铁线路 密码输入框风格 代码调整
|
2022-08-12 17:17:00 +08:00 |
|
joylink_cuiweidong
|
e30c306e89
|
大铁线路 功能按钮代码调整
|
2022-08-12 15:29:51 +08:00 |
|
joylink_cuiweidong
|
2d4c5f8cf8
|
大铁线路:1.调车进路的总人解 问题修改 2.信号机和信号机按钮宽度调整
3.鼠标光标问题修改
|
2022-08-12 13:23:38 +08:00 |
|
joylink_cuiweidong
|
94504d03aa
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-08-11 16:30:30 +08:00 |
|
joylink_cuiweidong
|
75eca3b417
|
大铁项目 股道停稳代码调整
|
2022-08-11 16:29:57 +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
|
1a80ae7558
|
卡斯柯显示调整
|
2022-08-11 11:18:38 +08:00 |
|
fan
|
319cd60d6c
|
列车驾驶至操作调整
|
2022-08-11 11:18:01 +08:00 |
|
fan
|
61e517e317
|
综合演练页面行值刷新显示错误调整
|
2022-08-11 11:17:14 +08:00 |
|
joylink_cuiweidong
|
86d1268744
|
代码调整
|
2022-08-11 10:18:07 +08:00 |
|
joylink_cuiweidong
|
dd82df1b4a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-08-10 17:47:46 +08:00 |
|
joylink_cuiweidong
|
b085829a91
|
标准线线路 配置文件 代码调整
|
2022-08-10 17:47:33 +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
|
ac33c683a5
|
指令=》 操作调整
|
2022-08-10 11:22:24 +08:00 |
|
fan
|
91a0c7b92c
|
卡斯柯线路暂提
|
2022-08-10 10:22:40 +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
|
3af5629595
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-08-09 10:03:08 +08:00 |
|
joylink_cuiweidong
|
874cc248eb
|
剧本提示 代码调整
|
2022-08-09 10:02:52 +08:00 |
|
dong
|
77dab6087e
|
点击调度命令出弹窗
|
2022-08-09 09:59:42 +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
|
ffc8275e54
|
站间透明问题修复
|
2022-08-05 10:56:57 +08:00 |
|
fan
|
91175f2d57
|
鉴权接口走正式
|
2022-08-05 10:25:16 +08:00 |
|
fan
|
808ae31174
|
走画面管理没有设置集中站调整
|
2022-08-05 10:16:14 +08:00 |
|
fan
|
97966d1bec
|
簿册取消指令校验
|
2022-08-05 09:58:29 +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
|
0e858fb921
|
多选设备筛选逻辑调整
|
2022-08-04 16:17:46 +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 |
|
fan
|
d7c7b3ac9e
|
黄绿灯显示调整
|
2022-08-03 15:40:33 +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
|
f07596a30d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls
|
2022-08-03 10:04:44 +08:00 |
|
fan
|
6360e26c89
|
簿册车站传递调整
|
2022-08-03 10:04:31 +08:00 |
|
Yuan
|
9530acaa44
|
Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into test
|
2022-08-03 10:01:23 +08:00 |
|
Yuan
|
75025ed307
|
bugfix
|
2022-08-03 10:00:49 +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
|
5b75682471
|
大铁线路 联锁 菜单颜色 显示 调整
|
2022-08-01 13:50:04 +08:00 |
|
joylink_cuiweidong
|
a33556ce64
|
代码调整
|
2022-07-29 18:04:28 +08:00 |
|
joylink_cuiweidong
|
80ef093b10
|
代码调整
|
2022-07-29 17:57:08 +08:00 |
|
joylink_cuiweidong
|
d802a397ba
|
大铁线路 列车 添加 列车脱线故障
|
2022-07-29 17:28:54 +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
|
c8d4901149
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-07-29 11:00:51 +08:00 |
|
joylink_cuiweidong
|
70ec386b9d
|
大铁线路 剧本编制 车站扳道员 添加 道岔钩锁
|
2022-07-29 11:00:28 +08:00 |
|
dong
|
7c7099120c
|
代码调整
|
2022-07-29 10:16:46 +08:00 |
|
joylink_cuiweidong
|
129b1be713
|
代码调整
|
2022-07-28 13:37:00 +08:00 |
|
joylink_cuiweidong
|
d0dd19927b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-07-28 10:17:24 +08:00 |
|
joylink_cuiweidong
|
9a8d442d7f
|
大铁线路 剧本编制 司机 展示 对应指令
|
2022-07-28 10:17:08 +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
|
110d17436e
|
大铁线路 对信号机封锁操作，不影响信号显示
|
2022-07-27 14:12:34 +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 |
|
fan
|
93a4010ea8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls
|
2022-07-26 18:05:20 +08:00 |
|
fan
|
84c78ef8e4
|
列车 故障操作停车调整
|
2022-07-26 18:05:11 +08:00 |
|
joylink_cuiweidong
|
36f6b85e57
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-07-26 17:43:43 +08:00 |
|
joylink_cuiweidong
|
2548337fc7
|
车务终端 订阅ctc 代码调整
|
2022-07-26 17:43:10 +08:00 |
|
fan
|
d23037f4f3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls
|
2022-07-26 16:46:22 +08:00 |
|
fan
|
67071c8830
|
大铁02 列车故障操作驾驶调整
|
2022-07-26 16:46:10 +08:00 |
|
joylink_cuiweidong
|
246f204eb7
|
代码调整
|
2022-07-26 16:30:48 +08:00 |
|
joylink_cuiweidong
|
d79e95425b
|
代码调整
|
2022-07-26 16:11:31 +08:00 |
|
joylink_cuiweidong
|
c26c57930b
|
代码调整
|
2022-07-26 15:53:19 +08:00 |
|
joylink_cuiweidong
|
faea986734
|
大铁线路 添加 封锁/解封 指令
|
2022-07-26 15:51:12 +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
|
0fde576279
|
大铁02 点灯灭灯注释
|
2022-07-26 13:21:37 +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
|
2614802a12
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-07-26 10:41:25 +08:00 |
|
joylink_cuiweidong
|
7cd2ecc2dc
|
代码调整
|
2022-07-26 10:41:08 +08:00 |
|
fan
|
5e9964f705
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-07-26 10:38:57 +08:00 |
|
fan
|
12b3f904dc
|
大铁02 放开故障挤岔
|
2022-07-26 10:38:32 +08:00 |
|
joylink_cuiweidong
|
07d515e9ce
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-07-26 10:15:03 +08:00 |
|
joylink_cuiweidong
|
922d4641b7
|
剧本 添加设备管理员
|
2022-07-26 10:14:45 +08:00 |
|
weizhihong
|
cf76d48025
|
【增加设备管理员】
|
2022-07-26 09:34:50 +08:00 |
|
weizhihong
|
b4b61aa0cf
|
【大铁角色中文配置】
|
2022-07-26 08:45:58 +08:00 |
|
joylink_cuiweidong
|
636819e9a5
|
代码调整
|
2022-07-25 18:06:04 +08:00 |
|
joylink_cuiweidong
|
5f77691e8c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-07-25 17:50:04 +08:00 |
|
joylink_cuiweidong
|
5067f0132f
|
添加 剧本角色 站长、助理、信号员、客运员、扳道员 、引导员、工务工
|
2022-07-25 17:49:38 +08:00 |
|
fan
|
474bcacb8f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-07-25 16:47:30 +08:00 |
|
fan
|
472985e919
|
大铁02 放开限速指令
|
2022-07-25 16:47:13 +08:00 |
|
joylink_cuiweidong
|
3787289c32
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-07-25 16:33:17 +08:00 |
|
joylink_cuiweidong
|
856a5b676a
|
剧本切换角色 ctc 对应车站未更改bug 调整
|
2022-07-25 16:33:04 +08:00 |
|
fan
|
70ec2a6c79
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-07-25 16:15:26 +08:00 |
|
fan
|
45f1af2602
|
故障锁闭
|
2022-07-25 16:13:09 +08:00 |
|
dong
|
a97a2a7753
|
调度命令发送指令
|
2022-07-25 14:10:59 +08:00 |
|
joylink_cuiweidong
|
37b527d7cb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-07-25 13:57:45 +08:00 |
|
joylink_cuiweidong
|
2ff39c6c89
|
代码调整
|
2022-07-25 13:57:33 +08:00 |
|
fan
|
96c1fba89b
|
道岔钩锁调整
|
2022-07-25 13:18:58 +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
|
dc287775e8
|
道岔钩锁都走操作
|
2022-07-25 11:11:31 +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
|
7595c36413
|
大铁二号线灭灯操作调整
|
2022-07-22 13:57:03 +08:00 |
|
fan
|
f702119f07
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-07-22 11:20:42 +08:00 |
|
fan
|
3f7696e157
|
大铁二号线点灯灭灯调整
|
2022-07-22 11:20:24 +08:00 |
|
fan
|
a2ccd82208
|
画面切换处理不同线路私有属性
|
2022-07-22 10:16:30 +08:00 |
|
fan
|
2c770a5bcc
|
暂提
|
2022-07-21 18:12:28 +08:00 |
|
joylink_cuiweidong
|
a9bd7ef945
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-07-21 17:25:59 +08:00 |
|
joylink_cuiweidong
|
8279ea9b39
|
大铁线路III型 信号机 添加 总人解指令
|
2022-07-21 17:25:40 +08:00 |
|
dong
|
13df1ba98d
|
信号加封解封
|
2022-07-21 17:17:31 +08:00 |
|
joylink_cuiweidong
|
5909f738f7
|
大铁项目 ctc 修改 改方、闭塞等操作 调整
|
2022-07-21 16:57:09 +08:00 |
|
joylink_cuiweidong
|
1deb1e017d
|
代码调整
|
2022-07-21 15:08:07 +08:00 |
|
joylink_cuiweidong
|
891cf8761c
|
代码调整
|
2022-07-21 11:25:21 +08:00 |
|
fan
|
6794e6370f
|
大铁二号线故障名称调整
|
2022-07-21 11:08:48 +08:00 |
|
fan
|
f6a5512cfc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-07-21 10:15:12 +08:00 |
|
fan
|
15e8006f5a
|
ctc=>车务终端
|
2022-07-21 10:14:29 +08:00 |
|
joylink_cuiweidong
|
80408014fd
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-07-20 18:20:37 +08:00 |
|
joylink_cuiweidong
|
a63827cd62
|
大铁线路III型 信号机 延时解锁 状态调整
|
2022-07-20 18:20:26 +08:00 |
|
fan
|
43ae2bd1fb
|
语音合成调整
|
2022-07-20 17:20:32 +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
|
0c34aa9163
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-07-20 15:07:13 +08:00 |
|
fan
|
172415dccf
|
显示配置调整
|
2022-07-20 15:07:02 +08:00 |
|
joylink_cuiweidong
|
4ab68d8731
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-07-20 14:40:16 +08:00 |
|
joylink_cuiweidong
|
20cf7de453
|
大铁线路III型 道岔 设置分路不良 取消分路不良 区段故障解锁
|
2022-07-20 14:39:57 +08:00 |
|
fan
|
e332f91eae
|
ctc 非常站控下限制操作
|
2022-07-20 14:08:33 +08:00 |
|
fan
|
68bd166d27
|
车站发车预告语音播报
|
2022-07-20 13:14:08 +08:00 |
|
fan
|
3f07b9f554
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-07-20 10:05:52 +08:00 |
|
fan
|
b9ceb3a22a
|
长兴技术=》长兴技师
|
2022-07-20 10:05:22 +08:00 |
|
fan
|
ac6f16b360
|
语音播报暂提
|
2022-07-20 10:03:33 +08:00 |
|
joylink_cuiweidong
|
751733c450
|
大铁线路III型 道岔 道岔封锁 单锁 侧防 引导总锁 代码调整
|
2022-07-20 09:34:04 +08:00 |
|