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 |
|
joylink_cuiweidong
|
b6f4fc611f
|
大铁线路III型 道岔 挤岔状态代码调整 道岔名称代码调整
|
2022-07-19 17:14:52 +08:00 |
|
joylink_cuiweidong
|
45e6c90be9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-07-19 16:53:54 +08:00 |
|
joylink_cuiweidong
|
dd1b7b934e
|
大铁线路III型 定反位 实心小圆圈 失表状态调整
|
2022-07-19 16:53:37 +08:00 |
|
dong
|
e3c04e96a3
|
调度命令查询界面功能
|
2022-07-19 14:50:52 +08:00 |
|
joylink_cuiweidong
|
226f0fd71b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-07-19 14:04:08 +08:00 |
|
joylink_cuiweidong
|
a6bed94153
|
修改 特殊侵限分隔符 的绘制代码
|
2022-07-19 14:03:48 +08:00 |
|
fan
|
3d9419b809
|
指示灯关联必填调整
|
2022-07-19 13:41:55 +08:00 |
|
fan
|
93930bb8c3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-07-19 10:09:07 +08:00 |
|
fan
|
19ff4db593
|
信号按钮调整
|
2022-07-19 10:08:40 +08:00 |
|
joylink_cuiweidong
|
efab2fb9f2
|
大铁项目 ctc 行车日志 代码调整
|
2022-07-18 17:49:13 +08:00 |
|
joylink_cuiweidong
|
deece104b1
|
大铁项目 ctc 运行图初始化信息 改完通过接口拉取
|
2022-07-18 17:18:55 +08:00 |
|
joylink_cuiweidong
|
4b1c1aae49
|
TYJL-III型 区段 添加 分路不良标记
|
2022-07-18 16:37:08 +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
|
fa3c110fbb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-07-18 15:05:49 +08:00 |
|
fan
|
46ab43aef3
|
车务终端分散自律亮灯&占线板默认选中
|
2022-07-18 15:01:35 +08:00 |
|
joylink_cuiweidong
|
953b63bd1a
|
代码调整
|
2022-07-18 13:49:24 +08:00 |
|
joylink_cuiweidong
|
b3e3dd7898
|
代码调整
|
2022-07-18 13:22:48 +08:00 |
|
fan
|
2011f1838c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-07-18 13:08:01 +08:00 |
|
fan
|
e176823ec6
|
占线板&进路序列调整
|
2022-07-18 13:07:45 +08:00 |
|
Yuan
|
3c82c261fa
|
Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into yly
|
2022-07-15 18:27:10 +08:00 |
|
Yuan
|
fbf6e5fa2c
|
resolve conflict
|
2022-07-15 18:10:37 +08:00 |
|
Yuan
|
e947e50a0d
|
增加几个按钮类型
|
2022-07-15 18:08:39 +08:00 |
|
Yuan
|
0943fc515d
|
bugfix
|
2022-07-15 17:19:35 +08:00 |
|
fan
|
bfc336fb4c
|
长兴技校三方登录配置
|
2022-07-15 17:12:49 +08:00 |
|
fan
|
470c223a59
|
环境参数判断调整
|
2022-07-15 16:57:17 +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 |
|
joylink_cuiweidong
|
898cadb72d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-07-15 11:34:32 +08:00 |
|
joylink_cuiweidong
|
9fe5f79092
|
代码调整
|
2022-07-15 11:32:43 +08:00 |
|
Yuan
|
d8e3ad4fcb
|
Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into test
|
2022-07-15 10:41:16 +08:00 |
|
Yuan
|
e6730ec264
|
stage
|
2022-07-15 10:40:37 +08:00 |
|
fan
|
e2480e28dc
|
打包调整
|
2022-07-15 10:39:57 +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
|
744385424e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-07-15 09:57:14 +08:00 |
|
fan
|
1d6997db39
|
画面调整暂提
|
2022-07-15 09:57:03 +08:00 |
|
fan
|
39369648bb
|
站间透明问题调整
|
2022-07-15 09:56:11 +08:00 |
|
dong
|
07ce9db767
|
教学通用项目隐藏设计平台入口
|
2022-07-15 09:33:59 +08:00 |
|
fan
|
97535872da
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-07-15 09:17:12 +08:00 |
|
fan
|
b5a67f7fbe
|
车务终端非常站控模式下 不能操作
|
2022-07-14 18:13:46 +08:00 |
|
joylink_cuiweidong
|
b1a546828d
|
代码调整
|
2022-07-14 13:52:20 +08:00 |
|
joylink_cuiweidong
|
cf10f19b96
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-07-14 13:20:29 +08:00 |
|
joylink_cuiweidong
|
68110a77c1
|
代码调整
|
2022-07-14 13:20:05 +08:00 |
|
fan
|
dd935f0aec
|
添加地图功能配置项
|
2022-07-14 11:08:02 +08:00 |
|
fan
|
cc285801f6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-07-14 09:46:50 +08:00 |
|
fan
|
6dc29405da
|
仿真缩放比例 增加0.3、0.5、0.7
|
2022-07-14 09:46:26 +08:00 |
|
dong
|
e348123ecb
|
文件管理只有管理员能看见
|
2022-07-13 18:00:52 +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
|
e9fc978c06
|
大铁项目 ctc 行车日志 设置超限
|
2022-07-12 15:49:02 +08:00 |
|
joylink_cuiweidong
|
ed4d2f9e73
|
大铁项目 ctc 行车日志 将原来的【删除】 -> 改成【设置删除标识】
|
2022-07-12 14:42:52 +08:00 |
|
Yuan
|
71ce383912
|
Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into test
|
2022-07-12 14:01:32 +08:00 |
|
Yuan
|
36c5e3c7db
|
WIP: JD1A 底部操作栏左侧显隐控制部分
|
2022-07-12 14:01:08 +08:00 |
|
joylink_cuiweidong
|
aaa2cdb557
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-07-12 11:29:27 +08:00 |
|
joylink_cuiweidong
|
5aed3a7c06
|
大铁项目 ctc 行车日志 设置始发 设置终到
|
2022-07-12 11:29:15 +08:00 |
|
weizhihong
|
03e8b90893
|
【运行计划时间自动变化】
|
2022-07-11 15:02:31 +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_cuiweidong
|
548e737cfd
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-07-08 17:39:06 +08:00 |
|
joylink_cuiweidong
|
553ac965ba
|
大铁项目 ctc 行车日志 设置/取消重点列车 设置允许股道与基本路径不一致 设置进出入口不一致 指令添加
|
2022-07-08 17:38:47 +08:00 |
|
|
b1e052efea
|
修改股道视图删除数据bug -- by fan
|
2022-07-08 17:26:38 +08:00 |
|
fan
|
0bf64a3bed
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-07-08 17:16:21 +08:00 |
|
fan
|
1bdfe33623
|
进路序列、股道视图调整
|
2022-07-08 17:16:04 +08:00 |
|
dong
|
9890752f84
|
修改拖拽窗口选中文本问题
|
2022-07-08 17:11:30 +08:00 |
|
joylink_cuiweidong
|
b437e9079a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-07-08 16:52:37 +08:00 |
|
joylink_cuiweidong
|
af992f8664
|
大铁项目 ctc 行车日志 取消到达 取消出发 取消闭塞 指令添加
|
2022-07-08 16:52:06 +08:00 |
|
Yuan
|
eb2447c69a
|
Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into test
|
2022-07-08 16:43:55 +08:00 |
|
Yuan
|
178d550db6
|
bugfix - 判断条件不完整
|
2022-07-08 16:43:52 +08:00 |
|
fan
|
19f2b8c290
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-07-08 16:34:27 +08:00 |
|
dong
|
04a22ee760
|
拖拽超出时限制位置
|
2022-07-08 16:34:02 +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 |
|
Yuan
|
d19e8eb3d9
|
Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into test
|
2022-07-08 15:30:58 +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 |
|
Yuan
|
9d086724fe
|
Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into yly
|
2022-07-07 18:14:11 +08:00 |
|
Yuan
|
8d38ee214e
|
JD1A 皮肤修改
|
2022-07-07 18:14:03 +08:00 |
|
dong
|
998f5dbced
|
调度命令调整
|
2022-07-07 17:28:26 +08:00 |
|
joylink_cuiweidong
|
2bb6a88076
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-07-07 17:09:54 +08:00 |
|
joylink_cuiweidong
|
7f6a331002
|
大铁项目 ctc 行车日志 代码调整
|
2022-07-07 17:09:40 +08:00 |
|
dong
|
8cd5789bae
|
调度命令代码调整
|
2022-07-07 16:32:18 +08:00 |
|
joylink_cuiweidong
|
22e4935310
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-07-07 16:23:17 +08:00 |
|
joylink_cuiweidong
|
4f01e767d7
|
代码调整
|
2022-07-07 16:22:00 +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 |
|
joylink_cuiweidong
|
1b564f5e6c
|
大铁项目 ctc 行车日志 代码调整
|
2022-07-07 15:44:13 +08:00 |
|
joylink_cuiweidong
|
5b171c0d51
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-07-07 15:29:49 +08:00 |
|
joylink_cuiweidong
|
9c9697d706
|
代码调整
|
2022-07-07 15:29:37 +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
|
1984dc807c
|
大铁项目 ctc 行车日志 清除闪烁
|
2022-07-06 17:26:59 +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
|
026395d982
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
Conflicts:
src/store/modules/socket.js
|
2022-07-06 15:50:08 +08:00 |
|
fan
|
9ff73303c4
|
站间透明暂提
|
2022-07-06 15:47:23 +08:00 |
|
joylink_cuiweidong
|
00f1d98829
|
大铁项目 ctc 行车日志 增加 修改股道 发送计划 取消红闪 指令
修改 发送计划按钮闪烁的标识
|
2022-07-06 13:45:41 +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 |
|
Yuan
|
0a4bfa82ae
|
Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into yly
|
2022-07-06 11:18:58 +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 |
|
Yuan
|
e0e64340fc
|
Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into yly
|
2022-07-06 09:30:27 +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 |
|
joylink_cuiweidong
|
2d89a10eae
|
铁科院 大铁线路 添加 区段故障解锁 指令
|
2022-07-04 16:09:08 +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 |
|
Yuan
|
ac9f9c7675
|
Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into yly
|
2022-07-04 09:49:30 +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 |
|
Yuan
|
b25c9bd9ad
|
Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into yly
|
2022-07-01 09:34:48 +08:00 |
|
强 董
|
49593b2851
|
添加调度命令收令功能
|
2022-06-30 18:13:23 +08:00 |
|
fan
|
98916ac312
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-06-30 18:08:51 +08:00 |
|
fan
|
a30991a53f
|
占线板股道视图调整
|
2022-06-30 18:08:39 +08:00 |
|
|
aa9e0fe265
|
修改local-test配置
|
2022-06-30 17:03:09 +08:00 |
|
fan
|
12d2f98e4a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-06-30 15:33:13 +08:00 |
|
fan
|
7cb0dc179a
|
问题调整:未获取到运行图信息
|
2022-06-30 15:32:58 +08:00 |
|
joylink_cuiweidong
|
599eaa5bd6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-06-30 15:21:45 +08:00 |
|
joylink_cuiweidong
|
057c39fb21
|
代码调整
|
2022-06-30 15:20:41 +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
|
8311b453bf
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-06-30 13:52:42 +08:00 |
|
joylink_cuiweidong
|
927687aa9b
|
大铁项目 代码调整
|
2022-06-30 13:52:27 +08:00 |
|
|
f950bf8536
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-06-30 13:09:56 +08:00 |
|
|
ed21d70bc4
|
local-test 打包配置
|
2022-06-30 13:09:40 +08:00 |
|
Yuan
|
f3e52724a3
|
大铁JD1A - 区段颜色修改
|
2022-06-30 10:55:51 +08:00 |
|
joylink_cuiweidong
|
f10a118132
|
大铁项目 代码调整
|
2022-06-30 10:40:36 +08:00 |
|
joylink_cuiweidong
|
64d98d84a4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-06-30 10:05:41 +08:00 |
|
joylink_cuiweidong
|
d4ad56e142
|
大铁项目 ctc 行车计划 签收 代码调整
|
2022-06-30 10:05:27 +08:00 |
|
fan
|
19b9803342
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-06-30 09:04:59 +08:00 |
|
fan
|
8048cfd34c
|
大铁簿册调整&合众title调整
|
2022-06-30 09:04:44 +08:00 |
|
joylink_cuiweidong
|
218cd5e2e5
|
代码调整
|
2022-06-29 17:55:40 +08:00 |
|
joylink_cuiweidong
|
889f3c60d0
|
代码调整
|
2022-06-29 17:41:36 +08:00 |
|
joylink_cuiweidong
|
1e2f294185
|
代码调整
|
2022-06-29 16:23:58 +08:00 |
|
joylink_cuiweidong
|
2ec521603c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-06-29 16:05:55 +08:00 |
|
joylink_cuiweidong
|
1f52b72eb5
|
代码调整
|
2022-06-29 16:05:29 +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
|
6d6c7c3074
|
大铁项目 ctc 行车日志 签收计划
|
2022-06-29 15:53:51 +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 |
|
joylink_cuiweidong
|
4ef0db920d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-06-28 16:19:44 +08:00 |
|
joylink_cuiweidong
|
ab24f99392
|
大铁 调度台 添加运行计划 删除运行计划 指令添加 代码调整
|
2022-06-28 16:18:57 +08:00 |
|
强 董
|
0c49120dd9
|
修改路由里的调度台地址
|
2022-06-28 15:28:51 +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
|
ffd1ab06b8
|
大铁项目 调度台 运行图 增加阶段计划
|
2022-06-27 16:19:52 +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 |
|
joylink_cuiweidong
|
6384208d93
|
代码调整
|
2022-06-24 16:51:17 +08:00 |
|
fan
|
8b3c7eadc5
|
JD_1A线路建立-调整
|
2022-06-24 16:37:42 +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
|
07e82fce24
|
铁科院 大铁线路 道岔 添加对应指令
|
2022-06-24 14:14:35 +08:00 |
|
joylink_cuiweidong
|
3e13058b3a
|
铁科院 大铁线路 道岔右键菜单添加
|
2022-06-24 13:59:23 +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
|
c58262a066
|
铁科院 大铁线路 信号机右键菜单添加
|
2022-06-23 13:44:39 +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
|
24cdeecb04
|
红河财经增加设备管理
|
2022-06-21 13:38:14 +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 |
|
joylink_cuiweidong
|
cf3a0f80ab
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-06-20 17:57:47 +08:00 |
|
joylink_cuiweidong
|
15f70ee501
|
铁科院 大铁线路 代码调整
|
2022-06-20 17:57:12 +08:00 |
|
fan
|
58427fb837
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-06-20 17:45:13 +08:00 |
|
fan
|
de47b74def
|
添加合众登录页面 && 成都工职院虚拟仿真中心跳转调整
|
2022-06-20 17:44:33 +08:00 |
|
joylink_cuiweidong
|
5973a3c1ee
|
大铁项目 行车日志 修改车次号(大铁CTC) 代码调整
|
2022-06-20 11:24:22 +08:00 |
|
joylink_cuiweidong
|
4f855c3836
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-06-17 17:29:54 +08:00 |
|
joylink_cuiweidong
|
fa65f53643
|
大铁项目 ctc 代码调整
|
2022-06-17 17:29:34 +08:00 |
|
fan
|
5da99fcd14
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-06-17 14:17:07 +08:00 |
|
fan
|
0a5ced4098
|
大铁ctc调整 增加端title
|
2022-06-17 14:16:54 +08:00 |
|
joylink_cuiweidong
|
893f1d0192
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-06-17 13:28:09 +08:00 |
|
joylink_cuiweidong
|
a18f5418e1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-06-17 13:27:41 +08:00 |
|
fan
|
e30836d323
|
大铁ctc调整 表调位置调整
|
2022-06-17 13:27:21 +08:00 |
|
joylink_cuiweidong
|
d6b42cc241
|
代码调整
|
2022-06-17 13:27:16 +08:00 |
|
fan
|
82e1378870
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-06-17 13:22:55 +08:00 |
|
fan
|
cb86c8477b
|
大铁ctc调整 进路序列表状态调整
|
2022-06-17 13:22:34 +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
|
37d984378c
|
大铁ctc调整
|
2022-06-17 11:30:10 +08:00 |
|
fan
|
db9ca50400
|
大铁ctc调整
|
2022-06-17 11:26:03 +08:00 |
|
fan
|
4ef230a4e4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-06-17 10:18:57 +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
|
36198b3945
|
大铁ctc调整
|
2022-06-17 10:10:28 +08:00 |
|
fan
|
8bcd522b74
|
大铁ctc调整
|
2022-06-16 18:24:28 +08:00 |
|
fan
|
fa3914ba76
|
大铁ctc调整
|
2022-06-16 18:15:50 +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 |
|
fan
|
7c924dcec5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-06-16 15:39:58 +08:00 |
|
fan
|
b82828afd3
|
大铁ctc调整
|
2022-06-16 15:39:46 +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 |
|
joylink_cuiweidong
|
387a92cb34
|
大铁项目 车务管理端 添加
|
2022-06-16 10:07:19 +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
|
b740955d7f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-06-15 15:39:37 +08:00 |
|
fan
|
006f789032
|
大铁ctc调整6/15
|
2022-06-15 15:39:11 +08:00 |
|
joylink_cuiweidong
|
a4d49ae7a9
|
大铁项目 代码调整
|
2022-06-15 14:46:03 +08:00 |
|
joylink_cuiweidong
|
6296ee141a
|
大铁项目 代码调整
|
2022-06-15 14:36:25 +08:00 |
|
joylink_cuiweidong
|
244f36842e
|
大铁项目 ctc 发送预告 代码调整
|
2022-06-15 14:18:35 +08:00 |
|
joylink_cuiweidong
|
e697233c6c
|
大铁项目 发送发车预告 代码调整
|
2022-06-15 13:32:42 +08:00 |
|
joylink_cuiweidong
|
30ca5c7cb1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-06-15 09:58:03 +08:00 |
|
joylink_cuiweidong
|
9e917f09eb
|
发送发车预告 同意发车预告 指令添加
|
2022-06-15 09:57:48 +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
|
e2ccfa8ca4
|
删除 修改股道 指令
|
2022-06-14 17:46:16 +08:00 |
|
joylink_cuiweidong
|
a885b634a6
|
大铁项目 行车日志 修改车次号调整
|
2022-06-14 17:39:59 +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
|
f715084708
|
代码调整
|
2022-06-10 17:26:18 +08:00 |
|
joylink_cuiweidong
|
94389e6d7c
|
代码调整
|
2022-06-10 17:21:55 +08:00 |
|
joylink_cuiweidong
|
66892862cb
|
代码调整
|
2022-06-10 16:48:23 +08:00 |
|
joylink_cuiweidong
|
dc7a117b0f
|
大铁项目 管理终端 页面 添加
|
2022-06-10 16:23:09 +08:00 |
|
joylink_cuiweidong
|
4b07b1c559
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-06-10 11:31:10 +08:00 |
|
joylink_cuiweidong
|
ca643604e1
|
代码调整
|
2022-06-10 11:30:56 +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
|
c2b3034cd1
|
大铁项目 删除行车日志 页面调整
|
2022-06-10 11:06:33 +08:00 |
|
joylink_cuiweidong
|
09e72ea133
|
代码调整
|
2022-06-10 10:38:43 +08:00 |
|
joylink_cuiweidong
|
2a27cf6f46
|
大铁项目 地图绘制 指示灯关联 增加名称属性
|
2022-06-10 10:09:30 +08:00 |
|
fan
|
0c620de1e6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-06-09 18:07:12 +08:00 |
|
fan
|
d36ee77d00
|
ctc显示调整
|
2022-06-09 18:06:47 +08:00 |
|
joylink_cuiweidong
|
ae86731795
|
代码调整
|
2022-06-09 17:17:00 +08:00 |
|
joylink_cuiweidong
|
c83cf31bf3
|
大铁项目 行车日志 修改车次号 代码调整
|
2022-06-09 17:16:01 +08:00 |
|
joylink_cuiweidong
|
602732bb6d
|
大铁项目 行车日志 修改行车计划邻站信息操作 代码调整
|
2022-06-09 15:36:05 +08:00 |
|
joylink_cuiweidong
|
23d72e7962
|
大铁项目 行车日志 删除行车日志操作 代码调整
|
2022-06-09 14:31:17 +08:00 |
|
joylink_cuiweidong
|
36069ec68e
|
代码调整
|
2022-06-09 11:31:02 +08:00 |
|
joylink_cuiweidong
|
9425ef8239
|
大铁项目 代码调整
|
2022-06-08 17:05:44 +08:00 |
|
joylink_cuiweidong
|
3167b551b9
|
大铁项目 增加 批量修改股道指令 代码调整
|
2022-06-08 16:37:30 +08:00 |
|
fan
|
ffcd9faab8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-06-08 13:06:16 +08:00 |
|
fan
|
9826b6b6f2
|
ctc调整 总人解
|
2022-06-08 13:05:54 +08:00 |
|
joylink_cuiweidong
|
aa056628a1
|
代码调整
|
2022-06-08 11:16:40 +08:00 |
|
joylink_cuiweidong
|
5b78c43b06
|
大铁项目 代码调整
|
2022-06-08 11:13:46 +08:00 |
|
joylink_cuiweidong
|
37644ef8fa
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-06-08 09:55:48 +08:00 |
|
joylink_cuiweidong
|
1da8364afa
|
代码调整
|
2022-06-08 09:55:31 +08:00 |
|
fan
|
5e7c67205e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-06-08 09:40:01 +08:00 |
|
fan
|
e5f484f3bb
|
ctc调整
|
2022-06-08 09:36:14 +08:00 |
|
joylink_cuiweidong
|
7a083b93a7
|
代码调整
|
2022-06-07 18:12:19 +08:00 |
|
joylink_cuiweidong
|
8e0062a33b
|
代码调整
|
2022-06-07 17:37:45 +08:00 |
|
joylink_cuiweidong
|
a7f6f51b57
|
代码调整
|
2022-06-07 17:18:39 +08:00 |
|
joylink_cuiweidong
|
74888dfdfe
|
大铁项目 修改股道 代码调整
|
2022-06-07 17:01:25 +08:00 |
|
joylink_cuiweidong
|
5fcd8d4830
|
大铁项目 行车日志 修改股道 页面调整
|
2022-06-07 15:18:13 +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
|
3f8d4d919a
|
大铁项目 CTC 运行计划列表 弹窗代码调整
|
2022-06-06 16:29:06 +08:00 |
|
joylink_cuiweidong
|
8294a217ed
|
代码调整
|
2022-06-02 16:57:55 +08:00 |
|
joylink_cuiweidong
|
942f728596
|
大铁项目 CTC 运行计划列表 代码调整
|
2022-06-02 15:13:59 +08:00 |
|
joylink_cuiweidong
|
eaafd6e041
|
代码调整
|
2022-06-02 11:02:42 +08:00 |
|
joylink_cuiweidong
|
0529b94a5b
|
代码调整
|
2022-06-01 18:15:26 +08:00 |
|
joylink_cuiweidong
|
fcd3110e9f
|
代码调整
|
2022-06-01 15:34:53 +08:00 |
|
joylink_cuiweidong
|
c1e7198fa8
|
代码调整
|
2022-06-01 13:18:17 +08:00 |
|
joylink_cuiweidong
|
3adb71b96a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-05-31 18:13:47 +08:00 |
|
joylink_cuiweidong
|
2976889742
|
代码调整
|
2022-05-31 18:12:47 +08:00 |
|
fan
|
2d041bd676
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-05-31 18:09:57 +08:00 |
|
fan
|
270c32052c
|
ctc显示调整 05/31
|
2022-05-31 18:09:34 +08:00 |
|
joylink_cuiweidong
|
90428b6f8e
|
代码调整
|
2022-05-31 14:28:15 +08:00 |
|
joylink_cuiweidong
|
0c0b907433
|
ctc 添加 阶段计划相关页面
|
2022-05-31 11:31:21 +08:00 |
|
joylink_cuiweidong
|
6e6c548d73
|
代码调整
|
2022-05-30 18:06:03 +08:00 |
|
fan
|
93c5bc4fb6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-05-30 17:34:58 +08:00 |
|
fan
|
81667572fc
|
实训仿真结束 退出实训界面
|
2022-05-30 17:34:44 +08:00 |
|
fan
|
85dac873de
|
ctc界面调整2
|
2022-05-30 17:28:46 +08:00 |
|
joylink_cuiweidong
|
669650f8d7
|
代码调整
|
2022-05-30 15:44:45 +08:00 |
|
joylink_cuiweidong
|
4647e6530b
|
代码调整
|
2022-05-30 15:17:31 +08:00 |
|
fan
|
6c5c2b8d4f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-05-27 15:55:22 +08:00 |
|
fan
|
758b5b69e2
|
ctc界面调整1
|
2022-05-27 15:55:03 +08:00 |
|
fan
|
2d4a196dc8
|
区段增加方向运行端点
|
2022-05-27 15:54:14 +08:00 |
|
joylink_cuiweidong
|
a53798ebbe
|
代码调整
|
2022-05-27 13:08:39 +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
|
e4af19e155
|
添加 删车次号 指令
修改操作的名称
增加备用车 -》 增加车次
删除列车 -》 删车次号
修改车次 -》 变更车次号
|
2022-05-26 16:41:40 +08:00 |
|
joylink_cuiweidong
|
56f6c6923c
|
大铁 把【修改车次】【添加备用车】放到普通模式下
|
2022-05-25 15:22:26 +08:00 |
|
joylink_cuiweidong
|
8127b76cb6
|
大铁项目 仿真 不显示 时间
|
2022-05-25 14:18:55 +08:00 |
|
joylink_cuiweidong
|
83832344e0
|
大铁项目 修改车次 页面代码调整
|
2022-05-25 14:10:14 +08:00 |
|
joylink_cuiweidong
|
df872fc852
|
大铁线路 添加 修改车次号指令
|
2022-05-25 09:56:57 +08:00 |
|
joylink_cuiweidong
|
c1880fad4b
|
大铁线路 增加备用车 输入车次号【自动判别上下行】,无需人工输入上下行 单号是下行
|
2022-05-24 17:43:11 +08:00 |
|
joylink_cuiweidong
|
d3041dc121
|
添加 停止行驶 指令(右键列车->停车,普通模式也可以操作)
|
2022-05-24 17:13:37 +08:00 |
|
fan
|
0668dc181d
|
大铁取消 橙光带故障和 驾驶至
|
2022-05-23 15:50:22 +08:00 |
|
fan
|
bc15cb8d12
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-05-23 15:12:07 +08:00 |
|
fan
|
7a7cbf9ae8
|
大铁调整 n5
|
2022-05-23 15:11:55 +08:00 |
|
joylink_cuiweidong
|
2de695cea3
|
修改分路不良状态字段
|
2022-05-23 09:47:37 +08:00 |
|
joylink_cuiweidong
|
e6876ee7f4
|
代码调整
|
2022-05-19 14:29:16 +08:00 |
|
joylink_cuiweidong
|
6dc2afe158
|
大铁线路 分路不良 指令代码调整
|
2022-05-19 14:23:46 +08:00 |
|
joylink_cuiweidong
|
ca534acac6
|
大铁项目 分路不良 弹窗页面调整
|
2022-05-19 13:33:21 +08:00 |
|
joylink_cuiweidong
|
fc8359273d
|
分路不良 界面代码调整
|
2022-05-18 17:42:16 +08:00 |
|
joylink_cuiweidong
|
90e26a800c
|
大铁线路 添加 上电解锁操作
|
2022-05-18 17:09:51 +08:00 |
|
joylink_cuiweidong
|
4da6ce092d
|
大铁项目 添加 非常站控 指令
允许自律 状态代码调整
|
2022-05-17 16:32:39 +08:00 |
|
joylink_cuiweidong
|
8b2bb77c12
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-05-17 10:12:31 +08:00 |
|
joylink_cuiweidong
|
81cdaafa58
|
大铁线路 列车 车次号显示 调整
|
2022-05-17 10:10:06 +08:00 |
|
fan
|
0253210cf6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-05-17 09:24:34 +08:00 |
|
fan
|
45975a34ee
|
大铁调整 n4
|
2022-05-17 09:23:34 +08:00 |
|
joylink_cuiweidong
|
6e9ca25459
|
代码调整
|
2022-05-16 18:23:44 +08:00 |
|
joylink_cuiweidong
|
9a3a4242fc
|
代码调整
|
2022-05-16 18:15:47 +08:00 |
|
joylink_cuiweidong
|
0353d4dfa2
|
代码调整
|
2022-05-16 17:47:49 +08:00 |
|
joylink_cuiweidong
|
5fa8169d43
|
代码调整
|
2022-05-16 17:41:55 +08:00 |
|
joylink_cuiweidong
|
fe71d218a9
|
代码调整
|
2022-05-16 17:39:43 +08:00 |
|
joylink_cuiweidong
|
62c2a3dbda
|
大铁项目 添加 模拟车次输入 操作、
大铁小敏 车身显示车次号
|
2022-05-16 17:35:31 +08:00 |
|
joylink_cuiweidong
|
e0f39c9f3d
|
大铁线路 列车添加发车指令
|
2022-05-16 15:07:25 +08:00 |
|
Yuan
|
53a2a1478d
|
信号机灯状态增加RW
|
2022-05-12 11:29:55 +08:00 |
|
fan
|
a69e27f434
|
大铁调整 n3
|
2022-05-11 16:10:54 +08:00 |
|
fan
|
3f35cfab91
|
大铁调整 n2
|
2022-05-11 16:02:14 +08:00 |
|
fan
|
54d73107cc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-05-11 14:56:20 +08:00 |
|
fan
|
85fd48f700
|
大铁调整 n1
|
2022-05-11 14:56:08 +08:00 |
|
joylink_cuiweidong
|
6b28de5174
|
闭塞、还原的口令验证删除
事故的pressDown删除
|
2022-05-11 14:29:35 +08:00 |
|
fan
|
2612a71b08
|
大铁调整 列车显示问题调整1
|
2022-05-10 15:30:55 +08:00 |
|
fan
|
5057180826
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-05-10 14:18:54 +08:00 |
|
fan
|
4a98985e75
|
大铁调整 列车显示问题调整
|
2022-05-10 14:18:32 +08:00 |
|
joylink_cuiweidong
|
f07ce67081
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-05-09 11:27:15 +08:00 |
|
joylink_cuiweidong
|
2499d6139d
|
添加 事故指令
|
2022-05-09 11:26:52 +08:00 |
|
fan
|
88b21fc723
|
信号机增加类型
|
2022-05-09 09:12:48 +08:00 |
|
fan
|
4552ac568b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-05-07 10:26:23 +08:00 |
|
fan
|
cca1c4f5e1
|
大铁线路调整35
|
2022-05-07 10:25:55 +08:00 |
|
joylink_cuiweidong
|
3d4b2eeec1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-05-06 18:08:58 +08:00 |
|
joylink_cuiweidong
|
0a57b5343f
|
代码调整
|
2022-05-06 18:08:42 +08:00 |
|
fan
|
52a304ef95
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-05-06 17:42:59 +08:00 |
|
fan
|
e2179ba453
|
大铁线路调整34
|
2022-05-06 17:42:05 +08:00 |
|
joylink_cuiweidong
|
d91c6cbbfd
|
代码调整
|
2022-05-06 16:55:50 +08:00 |
|
joylink_cuiweidong
|
310abf5778
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-05-06 16:36:23 +08:00 |
|
joylink_cuiweidong
|
25dc683c81
|
代码调整
|
2022-05-06 16:36:09 +08:00 |
|
fan
|
5b8a672342
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-05-06 16:27:53 +08:00 |
|
fan
|
9cce0ba353
|
大铁线路调整33
|
2022-05-06 16:27:30 +08:00 |
|
joylink_cuiweidong
|
08a08646ac
|
代码调整
|
2022-05-06 16:17:50 +08:00 |
|
joylink_cuiweidong
|
663d542e55
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-05-06 16:06:00 +08:00 |
|
joylink_cuiweidong
|
4d575c84cb
|
代码调整
|
2022-05-06 16:05:40 +08:00 |
|
fan
|
050df85465
|
大铁线路调整32
|
2022-05-06 15:09:55 +08:00 |
|
fan
|
9cd2b9b2d2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-05-06 14:22:52 +08:00 |
|
fan
|
826fbae799
|
大铁线路调整31
|
2022-05-06 14:22:26 +08:00 |
|
joylink_cuiweidong
|
5ecdf0cb86
|
代码调整
|
2022-05-06 11:14:27 +08:00 |
|
joylink_cuiweidong
|
90b6f6d6f9
|
代码调整
|
2022-05-06 11:07:16 +08:00 |
|
joylink_cuiweidong
|
50c0f3abaf
|
闭塞状态 代码调整
|
2022-05-06 10:32:28 +08:00 |
|
joylink_cuiweidong
|
c01e352610
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-05-06 09:39:48 +08:00 |
|
joylink_cuiweidong
|
0544fc753c
|
添加 阻塞 复原指令
|
2022-05-06 09:39:21 +08:00 |
|
fan
|
aee6474645
|
大铁线路调整30
|
2022-05-05 17:08:17 +08:00 |
|
fan
|
86b955698b
|
大铁线路调整29
|
2022-05-05 15:08:34 +08:00 |
|
fan
|
12dda78b7b
|
大铁线路调整28 控制模式调整
|
2022-05-05 13:54:29 +08:00 |
|
fan
|
b164e99a77
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-04-29 16:32:40 +08:00 |
|
fan
|
7c8cbdf59c
|
大铁线路调整27 增加信号机类型
|
2022-04-29 16:32:23 +08:00 |
|
joylink_cuiweidong
|
67ac268077
|
代码调整
|
2022-04-29 16:07:45 +08:00 |
|
joylink_cuiweidong
|
a7cad4ab2e
|
总辅助 接辅助指令 发辅助指令 代码调整
|
2022-04-29 15:46:57 +08:00 |
|
joylink_cuiweidong
|
0212d2c0de
|
状态代码调整
|
2022-04-29 15:29:25 +08:00 |
|
joylink_cuiweidong
|
204d14e57c
|
代码调整
|
2022-04-29 14:02:43 +08:00 |
|
joylink_cuiweidong
|
06b954eca0
|
接发车状态 辅助灯状态 区间灯状态 具体颜色前端判断
|
2022-04-29 11:34:09 +08:00 |
|
joylink_cuiweidong
|
20c5f0ebfe
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-04-28 14:46:20 +08:00 |
|
joylink_cuiweidong
|
59be3f8fcc
|
改方按钮 加参数pressDown 1按下、0弹起
|
2022-04-28 14:46:08 +08:00 |
|
fan
|
c14c484152
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-04-28 13:34:36 +08:00 |
|
fan
|
7c2cddd441
|
大铁线路调整26 关联信号机调整
|
2022-04-28 13:34:17 +08:00 |
|
joylink_cuiweidong
|
a7e9638d4f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-04-28 11:24:51 +08:00 |
|
joylink_cuiweidong
|
55b435c805
|
代码调整
|
2022-04-28 11:24:11 +08:00 |
|
fan
|
7e8fdaf1a3
|
大铁线路调整25
|
2022-04-28 10:40:18 +08:00 |
|
fan
|
48fcadb40e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-04-28 10:36:03 +08:00 |
|
fan
|
af2ffa23f3
|
大铁线路调整24 指示灯关联联锁数据调整
|
2022-04-28 10:35:41 +08:00 |
|
joylink_cuiweidong
|
6a51b9e626
|
大铁 接发车状态 区间占用状态 辅助状态 代码调整
|
2022-04-27 17:51:28 +08:00 |
|
fan
|
89642964bf
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/jmapNew/theme/datie_02/menus/menuButton.vue
|
2022-04-27 17:37:08 +08:00 |
|
fan
|
1c04fd0bd6
|
大铁线路调整23
|
2022-04-27 17:35:36 +08:00 |
|
joylink_cuiweidong
|
ce1d6527ed
|
代码调整
|
2022-04-27 16:57:03 +08:00 |
|
joylink_cuiweidong
|
6fb7296348
|
代码调整
|
2022-04-25 10:22:00 +08:00 |
|
fan
|
e65abe322a
|
大铁线路调整22
|
2022-04-24 17:40:55 +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
|
6d5276d95f
|
大铁线路调整16
|
2022-04-24 11:26:49 +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
|
cd326ea8f6
|
大铁线路调整13 - 修改接发车箭头大小
|
2022-04-24 09:18:18 +08:00 |
|
fan
|
3202fc1b40
|
大铁线路调整12
|
2022-04-22 19:13:44 +08:00 |
|
fan
|
e155975b43
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-04-22 17:56:01 +08:00 |
|
fan
|
93a3deb20c
|
大铁线路调整11
|
2022-04-22 17:55:42 +08:00 |
|
joylink_cuiweidong
|
3772012be2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-04-22 17:23:27 +08:00 |
|
joylink_cuiweidong
|
cc08d0f51b
|
代码调整
|
2022-04-22 17:23:12 +08:00 |
|
fan
|
3e5ad8b05f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-04-22 16:34:55 +08:00 |
|
fan
|
3420059adf
|
大铁线路调整10
|
2022-04-22 16:34:34 +08:00 |
|
joylink_cuiweidong
|
6115eaa54e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-04-22 15:50:40 +08:00 |
|
joylink_cuiweidong
|
aad698880e
|
代码调整
|
2022-04-22 15:50:27 +08:00 |
|
fan
|
82aaeee2cf
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-04-22 15:34:18 +08:00 |
|
fan
|
daff80c19e
|
大铁线路调整9
|
2022-04-22 15:33:57 +08:00 |
|
joylink_cuiweidong
|
0d6be6e129
|
添加改方指令
|
2022-04-22 15:23:50 +08:00 |
|
joylink_cuiweidong
|
de4f4d2aa6
|
区段占用,辅助状态,接发车箭头 状态代码调整
|
2022-04-22 15:08:36 +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
|
adc9f3816e
|
佛山非通信车占用颜色调整
|
2022-03-25 13:53:43 +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”
|
9ffd5d774b
|
baseurl
|
2022-01-21 17:36:38 +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 |
|
joylink_fanyuhong
|
e8fb8abcf2
|
iscs调整
|
2022-01-17 14:19:03 +08:00 |
|
joylink_fanyuhong
|
02a499a26c
|
iscs调整
|
2022-01-14 17:23:25 +08:00 |
|
joylink_fanyuhong
|
7372eb5897
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-01-13 16:14:28 +08:00 |
|
joylink_fanyuhong
|
b084600199
|
福州ISCS显示调整&音频资源管理&ISCS设备管理&ISCS资源管理
|
2022-01-13 16:08:23 +08:00 |
|
“sunzy”
|
e3f5ff363b
|
修改三维课程bug
|
2022-01-12 11:11:25 +08:00 |
|
“sunzy”
|
fbcef50f40
|
修改徐州三维课程排序,修改课程模式获取
|
2022-01-12 11:08:27 +08:00 |
|
“sunzy”
|
6acf6c7bbc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-01-10 18:13:14 +08:00 |
|
“sunzy”
|
b34d46bd15
|
修改三位课程播放器动画,增加课程
|
2022-01-10 18:13:06 +08:00 |
|
joylink_fanyuhong
|
a6a9522cd4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-01-10 14:35:55 +08:00 |
|
joylink_fanyuhong
|
79bd987a38
|
网页加载显示调整
|
2022-01-10 14:35:46 +08:00 |
|
“sunzy”
|
4affc37803
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-01-07 17:40:57 +08:00 |
|
“sunzy”
|
9974d6bc8a
|
修改徐州三维课程界面,三位课程播放器增加粒子效果
|
2022-01-07 17:40:51 +08:00 |
|
joylink_fanyuhong
|
62f22d0c73
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-01-05 13:53:39 +08:00 |
|
joylink_fanyuhong
|
29a12d4980
|
url调整
|
2022-01-05 13:53:12 +08:00 |
|
“sunzy”
|
a08dc3c847
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-12-31 10:19:21 +08:00 |
|
“sunzy”
|
92a4fba1e3
|
修改三位课程界面
|
2021-12-31 10:19:17 +08:00 |
|
joylink_fanyuhong
|
3834766080
|
域名项目 增加 TEST 测试
|
2021-12-31 10:13:02 +08:00 |
|
joylink_fanyuhong
|
838c32df01
|
merge
|
2021-12-31 10:04:58 +08:00 |
|
joylink_fanyuhong
|
9dcb9669aa
|
单位二维码生成调整
|
2021-12-31 10:03:18 +08:00 |
|
“sunzy”
|
d9b7ef8a6f
|
修改三位课程页面
|
2021-12-30 23:53:16 +08:00 |
|
“sunzy”
|
f2f2878a99
|
修改配置地址
|
2021-12-30 19:36:26 +08:00 |
|
“sunzy”
|
23d5c662dd
|
修改三维课程地址配置
|
2021-12-30 19:30:52 +08:00 |
|
“sunzy”
|
706d911c84
|
merge
|
2021-12-30 17:22:23 +08:00 |
|
“sunzy”
|
ff7187f58f
|
merge
|
2021-12-30 17:21:40 +08:00 |
|
“sunzy”
|
f9375c0726
|
修改三位沙盘驾驶位置更新,修改三位课程页面
|
2021-12-30 17:19:59 +08:00 |
|
joylink_fanyuhong
|
a7c56b3592
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-12-30 09:35:11 +08:00 |
|
joylink_fanyuhong
|
5816fbf205
|
baseUrl 调整
|
2021-12-30 09:34:50 +08:00 |
|
joylink_fanyuhong
|
c4e9ab2341
|
扬州工业展示修改
|
2021-12-29 14:01:28 +08:00 |
|
joylink_fanyuhong
|
3c2563e3d1
|
暂提
|
2021-12-29 13:44:05 +08:00 |
|
joylink_fanyuhong
|
68b9524cce
|
zanti
|
2021-12-29 10:20:23 +08:00 |
|
joylink_fanyuhong
|
ba80caeb82
|
域名管理调整
|
2021-12-29 09:14:09 +08:00 |
|
joylink_fanyuhong
|
b3fb8bff0a
|
试卷管理调整--增加校验和重新生成
|
2021-12-28 09:37:14 +08:00 |
|
joylink_fanyuhong
|
d7886eeb3f
|
试卷管理调整--规则置灰调整
|
2021-12-23 13:53:57 +08:00 |
|
joylink_fanyuhong
|
d24cee6377
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-12-23 10:07:52 +08:00 |
|
joylink_fanyuhong
|
321fe3c076
|
试卷管理调整---新
|
2021-12-23 10:07:29 +08:00 |
|
“sunzy”
|
090c57aa5d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-12-22 19:16:07 +08:00 |
|
“sunzy”
|
66def8c0ca
|
修改上传模型配置,修改三位课程联控成员
|
2021-12-22 19:16:03 +08:00 |
|
joylink_fanyuhong
|
f906fe891f
|
试卷管理调整new11
|
2021-12-22 17:23:34 +08:00 |
|
joylink_fanyuhong
|
e15460322b
|
试卷管理调整new
|
2021-12-22 16:25:51 +08:00 |
|
joylink_fanyuhong
|
c4af4ee996
|
试卷管理调整
|
2021-12-22 13:34:52 +08:00 |
|
“sunzy”
|
72034ece10
|
merge
|
2021-12-20 12:38:59 +08:00 |
|
“sunzy”
|
9029407378
|
“修改oss配置”
|
2021-12-20 12:38:28 +08:00 |
|
joylink_fanyuhong
|
151251a693
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-12-20 11:19:10 +08:00 |
|
joylink_fanyuhong
|
48e49334eb
|
Merge branch 'master' into test
|
2021-12-20 11:17:34 +08:00 |
|
“sunzy”
|
8b0f62ca39
|
修改徐州三位沙盘模型配置
|
2021-12-20 10:46:20 +08:00 |
|
“sunzy”
|
99305b1f48
|
修改徐州三位沙盘模型配置
|
2021-12-20 10:39:24 +08:00 |
|
fan
|
88939d83ec
|
备案号调整
|
2021-12-17 13:55:38 +08:00 |
|
fan
|
294ac516f1
|
草稿课程编辑添加实训调整&编辑运行图loading调整
|
2021-12-17 13:34:03 +08:00 |
|
fan
|
acd799b1d6
|
南京二号线道岔区段锁闭显示调整
|
2021-12-17 10:24:48 +08:00 |
|
fan
|
4b4b98003c
|
Merge remote-tracking branch 'origin/test'
|
2021-12-16 18:10:04 +08:00 |
|
fan
|
27de47bc18
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-12-16 17:45:19 +08:00 |
|
fan
|
68153921b0
|
道岔故障灯闪烁判断逻辑调整
|
2021-12-16 17:44:50 +08:00 |
|
sunzhenyu
|
7fa204b700
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-12-14 17:26:16 +08:00 |
|
sunzhenyu
|
72eebe0388
|
增加三维沙盘第一人称漫游,修改三维沙盘天气
|
2021-12-14 17:26:10 +08:00 |
|
fan
|
d9aaf08f3b
|
添加线路配置:站台折返策略不生效standTbStrategyIsInvalid,根据服务号更新车次计划updateTripPlanByServiceNumber;删除西安三 zc故障
|
2021-12-14 15:08:30 +08:00 |
|
fan
|
53dc950093
|
调整西安一三号线 折返显示颜色
|
2021-12-14 14:25:10 +08:00 |
|
fan
|
cf397fa9a0
|
取消登录进入 全屏
|
2021-12-14 10:06:01 +08:00 |
|
fan
|
c98fd9e0e0
|
批量设置停车点偏移量增加停车轨设置
|
2021-12-13 18:06:29 +08:00 |
|
fan
|
31767eea23
|
列车显示详情:最高ATP模式&最高信号系统控制
|
2021-12-10 17:52:40 +08:00 |
|
fan
|
fe5450fb08
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-12-10 17:20:40 +08:00 |
|
fan
|
25ba9a047e
|
列车详情显示调整
|
2021-12-10 17:20:10 +08:00 |
|
joylink_cuiweidong
|
d8902f3db9
|
运行图编制 代码调整
|
2021-12-10 15:41:16 +08:00 |
|
joylink_cuiweidong
|
4bd0afbb44
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-12-10 14:17:27 +08:00 |
|
joylink_cuiweidong
|
cc431582e7
|
运行图编制 修改任务 代码调整
|
2021-12-10 14:16:25 +08:00 |
|
fan
|
04c57cda86
|
列车详情显示调整
|
2021-12-10 13:36:59 +08:00 |
|
fan
|
f2ceea6567
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-12-10 10:17:43 +08:00 |
|
fan
|
cfdae77620
|
project错误 提示调整
|
2021-12-10 10:17:22 +08:00 |
|
sunzhenyu
|
a28d49e40c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-12-09 18:10:48 +08:00 |
|
sunzhenyu
|
37b23d54b0
|
修改三维沙盘天气
|
2021-12-09 18:10:42 +08:00 |
|
joylink_cuiweidong
|
bc89210894
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-12-09 17:57:41 +08:00 |
|
joylink_cuiweidong
|
a97f83ef45
|
运行图代码调整
|
2021-12-09 17:56:54 +08:00 |
|
fan
|
66b72b101f
|
增加江苏安全技术职业学院登录页面
|
2021-12-09 17:54:19 +08:00 |
|
fan
|
afeec55025
|
延续保护 增加 保护区段ctc
|
2021-12-09 16:53:40 +08:00 |
|
fan
|
7b854e717e
|
显示配置车次窗设备修正=》判断调整
|
2021-12-09 14:57:55 +08:00 |
|
fan
|
27a56355dd
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-12-09 13:48:41 +08:00 |
|
fan
|
17e7467edf
|
显示配置增加车次窗设备修正&加载备用车close时清除数据
|
2021-12-09 13:48:15 +08:00 |
|
joylink_cuiweidong
|
8b86a8ddeb
|
运行图编制 添加计划/修改计划号码 代码调整
|
2021-12-09 13:23:24 +08:00 |
|
joylink_cuiweidong
|
3ee1dd21e5
|
运行图编制 新增计划 根据配置文件 设置服务号长度
|
2021-12-09 10:57:28 +08:00 |
|
fan
|
0bbf9667fb
|
merge
|
2021-12-08 15:43:19 +08:00 |
|
fan
|
fd03433df2
|
node-sass版本调整
|
2021-12-08 15:40:38 +08:00 |
|
sunzhenyu
|
32b785280e
|
merge
|
2021-12-08 15:11:48 +08:00 |
|
sunzhenyu
|
2d6be9aa56
|
baseurl
|
2021-12-08 15:11:25 +08:00 |
|
sunzhenyu
|
1ef4810214
|
修改开发模式下三维模型存储配置,添加沙盘天气图标
|
2021-12-08 15:09:54 +08:00 |
|
fan
|
e942f94c25
|
增加线路配置:tripNumberIsUnique:运行图中车次号是否唯一
|
2021-12-08 14:53:14 +08:00 |
|
fan
|
8c3c7e0f75
|
车辆翻转 运行时显示调整
|
2021-12-08 13:18:16 +08:00 |
|
fan
|
5a5dd046eb
|
仿真右侧列车显示过滤&加载备用车置灰已上线车辆
|
2021-12-07 14:10:07 +08:00 |
|
|
9631685998
|
Merge remote-tracking branch 'origin/test'
|
2021-12-06 21:19:18 +08:00 |
|
fan
|
2e0ba39171
|
车头翻转=》 停车状态时调整车头翻转显示
|
2021-12-06 13:09:17 +08:00 |
|
fan
|
830a630155
|
停车轨左右停车偏移放开
|
2021-12-03 17:50:37 +08:00 |
|
fan
|
84c4dd8ca1
|
批量翻转车头&车辆段仿真开放按计划行车和故障操作
|
2021-12-03 17:44:02 +08:00 |
|
fan
|
5ca3ca93ab
|
车辆段调整=》区段增加parkingTrack&列车增加stationCode&联锁配置项增加handleDepot
|
2021-12-03 13:25:20 +08:00 |
|
fan
|
573a489fea
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-12-02 10:27:24 +08:00 |
|
fan
|
c4226ad607
|
道岔显示调整
|
2021-12-02 10:26:53 +08:00 |
|
sunzhenyu
|
8923a888c8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-12-02 10:00:49 +08:00 |
|
sunzhenyu
|
fd10d6532f
|
修改三维驾驶设备柜
|
2021-12-02 10:00:41 +08:00 |
|
fan
|
80dbc39850
|
请求服务调整
|
2021-12-01 14:17:17 +08:00 |
|
fan
|
2f84cd6482
|
三方登录调整
|
2021-12-01 14:06:28 +08:00 |
|
fan
|
cca12938a4
|
Merge remote-tracking branch 'origin/test_baseUrl' into test
|
2021-12-01 13:11:26 +08:00 |
|
fan
|
cc9f59de13
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-12-01 13:11:00 +08:00 |
|
fan
|
46509c1e62
|
延时解锁字段调整
|
2021-12-01 13:10:36 +08:00 |
|
fan
|
7cc99b0a08
|
请求服务器域名调整&增减管理界面
|
2021-11-30 16:27:35 +08:00 |
|
sunzhenyu
|
1be02437ea
|
修改徐州三维演示icon
|
2021-11-30 16:24:31 +08:00 |
|
sunzhenyu
|
a541853b8f
|
merge
|
2021-11-30 16:23:24 +08:00 |
|
sunzhenyu
|
8bf9d272d5
|
merge
|
2021-11-30 16:22:43 +08:00 |
|
sunzhenyu
|
87631b1fdb
|
修改徐州三维演示Icon
|
2021-11-30 16:22:06 +08:00 |
|
fan
|
068e0df43c
|
请求服务器域名调整
|
2021-11-30 11:13:25 +08:00 |
|
fan
|
c33502b31a
|
岔芯列车占用显示逻辑调整
|
2021-11-30 09:36:17 +08:00 |
|
yuan
|
fdae91c6d7
|
标准线增加PSL盘
|
2021-11-29 18:15:13 +08:00 |
|
fan
|
e3da721faf
|
baseUrl
|
2021-11-29 16:31:18 +08:00 |
|
fan
|
4aac8ad03d
|
Revert "Revert "道岔短闪(4次恢复)=》 短闪(转动后恢复)""
This reverts commit b69d36a9
|
2021-11-29 15:26:53 +08:00 |
|
fan
|
49e9353673
|
项目登录 增加三方登录配置
|
2021-11-29 15:26:36 +08:00 |
|
fan
|
6811cbcb75
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-11-29 14:41:12 +08:00 |
|
fan
|
690989cf75
|
南京二号线道岔问题调整
|
2021-11-29 14:41:03 +08:00 |
|
yuan
|
6380c3d11b
|
标准线增加PSL盘
|
2021-11-29 14:12:35 +08:00 |
|
fan
|
054db072cf
|
Merge remote-tracking branch 'origin/test'
|
2021-11-29 13:38:44 +08:00 |
|
fan
|
b69d36a963
|
Revert "道岔短闪(4次恢复)=》 短闪(转动后恢复)"
This reverts commit f44bcfab
|
2021-11-29 13:37:35 +08:00 |
|
fan
|
7d4ef8048b
|
扬州工业项目登录参数调整
|
2021-11-29 13:20:10 +08:00 |
|
fan
|
6014c6253e
|
扬州工业项目登录参数调整
|
2021-11-29 13:15:52 +08:00 |
|
fan
|
4c9d9b6705
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-11-26 17:38:32 +08:00 |
|
fan
|
0788172481
|
南京二号线问题调整
|
2021-11-26 17:37:22 +08:00 |
|
sunzhenyu
|
fc0393ff08
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-11-26 17:24:05 +08:00 |
|
sunzhenyu
|
7d734bc554
|
修改展示线路三维车站加载,修改徐州三维课程
|
2021-11-26 17:23:56 +08:00 |
|
fan
|
f44bcfabcb
|
道岔短闪(4次恢复)=》 短闪(转动后恢复)
|
2021-11-26 09:30:22 +08:00 |
|
fan
|
27914f3334
|
南京二 岔心操作调整
|
2021-11-25 17:53:13 +08:00 |
|
fan
|
07025e79e5
|
岔芯=》岔心&南京二岔芯实训增加强行消限、预复位&南二日记报错处理
|
2021-11-25 16:37:44 +08:00 |
|
fan
|
04ed7005e1
|
挤岔恢复实训提示调整&岔心灰显、故障锁闭显示调整
|
2021-11-25 15:44:53 +08:00 |
|
fan
|
909bb2d9a0
|
南京二号线生成进路实训配置调整
|
2021-11-25 14:25:33 +08:00 |
|
fan
|
2ecb963027
|
调整实训中传输信号机的替代问题
|
2021-11-25 14:16:37 +08:00 |
|
fan
|
2286a66766
|
调低区段故障锁闭优先级
|
2021-11-25 13:55:18 +08:00 |
|
fan
|
eee7c9fae4
|
南京二号线设置车站中心增加偏移
|
2021-11-25 13:48:50 +08:00 |
|
|
a09ec3dd13
|
Merge remote-tracking branch 'origin/test'
|
2021-11-25 12:11:19 +08:00 |
|
fan
|
a5e0e4b671
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-11-25 10:47:32 +08:00 |
|
fan
|
034bb7e185
|
南京二号线列车右键操作不出列监
|
2021-11-25 10:47:12 +08:00 |
|
fan
|
d39a551142
|
南京二连续扣车参数调整&&南京二troDetail禁止拖动&&增加南京二行调故障按钮
|
2021-11-25 10:41:43 +08:00 |
|
joylink_cuiweidong
|
22a23ba70a
|
南京二号线 计轴受扰 区段编号 红闪
|
2021-11-24 17:47:13 +08:00 |
|
joylink_cuiweidong
|
776a19406e
|
南京二号线
区段 添加 无数据故障
区段故障 修改 红光带/通信车占用/橙光带 为 紫光带故障/红光带故障/计轴受扰
|
2021-11-24 15:55:50 +08:00 |
|
joylink_cuiweidong
|
8fcc22cb6f
|
屏蔽门开关影响 车站颜色灰显 bug 调整
|
2021-11-24 15:13:36 +08:00 |
|
joylink_cuiweidong
|
99e846b593
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-11-24 13:58:33 +08:00 |
|
joylink_cuiweidong
|
68d85d3dc6
|
ATP重启 由故障 变为操作
|
2021-11-24 13:58:14 +08:00 |
|
fan
|
064c7c74f6
|
南京二实训调整
|
2021-11-23 18:09:26 +08:00 |
|
fan
|
79591e1339
|
南京二实训调整
|
2021-11-23 17:53:34 +08:00 |
|
fan
|
c65049a84d
|
重启联锁机后禁止大部分操作&信号机故障编号闪和机头闪显示调整
|
2021-11-23 16:34:50 +08:00 |
|
fan
|
cdb907819f
|
南京二故障显示调整& 实训调整
|
2021-11-23 15:21:08 +08:00 |
|
fan
|
15cf2838da
|
南京二故障显示调整& 实训调整
|
2021-11-23 14:04:11 +08:00 |
|
fan
|
c59d1c4103
|
终止站停 上下合并
|
2021-11-22 16:27:32 +08:00 |
|
fan
|
a0e6c1c70a
|
南二虚拟传输信号机显示调整
|
2021-11-22 16:17:01 +08:00 |
|
fan
|
b4107c89de
|
调整南京二实训调整&南二虚拟信号机显示调整
|
2021-11-22 16:02:54 +08:00 |
|
fan
|
5412bb8ff0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-11-22 14:09:42 +08:00 |
|
fan
|
a617144386
|
调整南京二实训配置
|
2021-11-22 14:08:47 +08:00 |
|
|
d2217734e0
|
Merge remote-tracking branch 'origin/test'
|
2021-11-19 21:04:03 +08:00 |
|
sunzhenyu
|
94de3ba762
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-11-19 15:05:23 +08:00 |
|
sunzhenyu
|
343d71fdab
|
增加徐州三维课程案例
|
2021-11-19 15:05:16 +08:00 |
|
joylink_cuiweidong
|
a0cdca405a
|
代码调整
|
2021-11-15 18:13:35 +08:00 |
|
joylink_cuiweidong
|
b2a5e3723c
|
指令字典 添加 指令
|
2021-11-15 17:29:10 +08:00 |
|
fan
|
35ee7a245b
|
进路自排开自排关问题调整
|
2021-11-15 13:22:50 +08:00 |
|
fan
|
dd83568d04
|
地图绘制设置运行等级激活起始区段调整
|
2021-11-15 09:50:37 +08:00 |
|
fan
|
ab87adabb3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-11-15 09:41:17 +08:00 |
|
fan
|
99088c9c4f
|
地图绘制设置运行等级报错调整
|
2021-11-15 09:41:00 +08:00 |
|
|
36630fd2ce
|
Merge branch 'test'
|
2021-11-13 20:46:59 +08:00 |
|
sunzhenyu
|
c1ef47929a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-11-12 14:40:02 +08:00 |
|
sunzhenyu
|
beb96905e5
|
修改三维课程组件,增加点击提示音
|
2021-11-12 14:39:43 +08:00 |
|
fan
|
fa9d0bb152
|
上饶沙盘&江西工贸 行调界面 不展示 chatView
|
2021-11-12 09:46:51 +08:00 |
|
fan
|
f5cca2da38
|
上饶沙盘&江西工贸 行调界面 不展示 chatView
|
2021-11-12 09:43:16 +08:00 |
|
fan
|
f270cbfb3b
|
道岔钩锁操作结束清除operation
|
2021-11-11 15:08:13 +08:00 |
|
fan
|
ba7b9f39eb
|
增加江西工贸登录页面
|
2021-11-11 14:32:58 +08:00 |
|
fan
|
71270fbb43
|
和利时项目仿真报错调整&上饶列车操作调整
|
2021-11-10 13:45:12 +08:00 |
|
|
dcdff0dfdf
|
Merge remote-tracking branch 'origin/test' into test
|
2021-11-09 19:44:59 +08:00 |
|
|
7cdf99a699
|
修改列车控制bug、添加列车识别号只有人工车
|
2021-11-09 19:44:48 +08:00 |
|
sunzhenyu
|
a46018cdbe
|
修改三维驾驶托管
|
2021-11-09 18:11:15 +08:00 |
|
sunzhenyu
|
f443d0031b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-11-09 17:52:41 +08:00 |
|
sunzhenyu
|
6766df5693
|
恢复三维驾驶托管接口
|
2021-11-09 17:52:33 +08:00 |
|
fan
|
b84e54591c
|
车次窗显示调整
|
2021-11-09 16:20:13 +08:00 |
|
fan
|
8b9e1876e2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-11-09 15:28:30 +08:00 |
|