Commit Graph

439 Commits

Author SHA1 Message Date
xzb
b86f21606e Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-message into HEAD
# Conflicts:
#	protos/device_state.proto
2023-10-13 15:57:29 +08:00
xzb
0b44d2adad 信号机 2023-10-13 15:56:47 +08:00
xzb
d5ef2b4d1b Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-message 2023-10-13 15:53:44 +08:00
xzb
62c82bd041 信号机状态推送 2023-10-13 15:53:32 +08:00
Yuan
cc23df9076 Merge branch 'master' of git.code.tencent.com:beijing-rtss-test/bj-rtss-message 2023-10-13 15:22:23 +08:00
Yuan
2f5db03f59 ibp灯 2023-10-13 15:22:20 +08:00
xzb
bbead938bb Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-message 2023-10-13 15:18:27 +08:00
xzb
8c5cf8f0d5 信号机状态推送 2023-10-13 15:18:12 +08:00
xzb
ad518abef0 信号机 2023-10-13 14:56:23 +08:00
Yuan
7d027a7e5e ibp 2023-10-13 14:02:12 +08:00
Yuan
3c13e9122b merge 2023-10-13 13:59:35 +08:00
Yuan
593a7c477e ibp 2023-10-13 13:58:53 +08:00
fan
b33cc6eee0 proto文件调整 2023-10-13 13:36:39 +08:00
fan
3179930523 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-message 2023-10-13 13:32:46 +08:00
fan
9eedbdd555 proto文件调整 2023-10-13 13:32:41 +08:00
xzb
7a24c7aae2 信号机显示枚举定义 2023-10-13 10:47:46 +08:00
xzb
e92189e023 信号机显示枚举定义 2023-10-13 10:34:39 +08:00
xzb
b14d5add8a 信号机显示枚举定义 2023-10-13 10:18:30 +08:00
Yuan
5604ad84ed Merge branch 'master' of git.code.tencent.com:beijing-rtss-test/bj-rtss-message 2023-10-12 16:21:18 +08:00
Yuan
9041048e5a ibp 2023-10-12 16:21:12 +08:00
fan
608836a628 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-message 2023-10-12 15:47:25 +08:00
fan
4867ce05a6 门控箱数据调整 2023-10-12 15:47:20 +08:00
joylink_zhaoerwei
23160cc746 屏蔽门增加编组列表数据管理 2023-10-12 15:14:03 +08:00
fan
6a2a393bf0 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-message 2023-10-12 13:22:32 +08:00
fan
25a46b7963 地图数据调整 2023-10-12 13:22:26 +08:00
joylink_zhaoerwei
0a58cc6327 设备关联关系增加类型 2023-10-12 10:14:38 +08:00
fan
85290a8ba9 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-message 2023-10-12 10:12:08 +08:00
fan
2b6e6b32a2 psl数据调整 2023-10-12 10:12:02 +08:00
joylink_zhaoerwei
c772733535 屏蔽门 2023-10-11 17:35:10 +08:00
fan
a8fa6fec18 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-message 2023-10-11 10:36:52 +08:00
fan
44feb5e6e2 关联站台调整 2023-10-11 10:36:46 +08:00
joylink_zhaoerwei
43b8a965ff 站台增加关联车站和子屏蔽门数量可变 2023-10-10 15:38:45 +08:00
fan
6a27f93fe9 psl调整 2023-10-09 18:24:22 +08:00
Yuan
9945a2001a 新增ibp盘界面 2023-10-09 16:45:26 +08:00
fan
da65562e42 psl数据调整 2023-10-08 15:48:51 +08:00
fan
8403e90692 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-message 2023-10-08 10:31:45 +08:00
fan
d46d0c8197 psl设备数据调整 2023-10-08 10:31:38 +08:00
weizhihong
b25e7d6d34 【增加加速度字段】 2023-10-07 16:49:22 +08:00
weizhihong
6702c9ad58 【道岔逻辑】 2023-10-07 15:38:52 +08:00
weizhihong
62bbe3a0de 【失表状态】 2023-10-07 09:32:07 +08:00
weizhihong
19514bc550 【增加增量继电器属性】 2023-09-28 10:14:39 +08:00
weizhihong
35e347cd89 【添加继电器状态】 2023-09-27 17:04:13 +08:00
weizhihong
60ea471ebf 【增加道岔转动状态】 2023-09-27 14:52:59 +08:00
dong
8c5f325dbc 添加公里标转换列表 2023-09-26 09:23:00 +08:00
joylink_zhaoerwei
14730acd01 断相保护器 2023-09-25 17:34:55 +08:00
0495b44dfc 增加公里标转换proto message;修改部分bug 2023-09-25 10:34:21 +08:00
joylink_zhaoerwei
79d14ba8e8 继电器注掉字段 2023-09-22 17:55:06 +08:00
joylink_zhaoerwei
87f8129766 继电器类型枚举加unknow 2023-09-22 15:56:34 +08:00
joylink_zhaoerwei
38b3c74776 继电器相关字段修改--枚举 2023-09-22 15:19:46 +08:00
fan
071f751068 站台删除集中站数据 2023-09-22 10:08:21 +08:00