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