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 |
|
|
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 |
|