Commit Graph

677 Commits

Author SHA1 Message Date
joylink_zhaoerwei
5985af6ac5 站台关联字段调整 2023-10-19 08:59:32 +08:00
dong
596161900d 列车信息调整 2023-10-18 16:50:54 +08:00
dong
3517652ac1 列车信息调整 2023-10-18 15:55:18 +08:00
dong
34be287b13 protos同步 2023-10-18 15:18:14 +08:00
fan
10f25f4d18 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-client 2023-10-18 14:42:05 +08:00
fan
edd5a97872 pslButton按钮数据调整 2023-10-18 14:42:00 +08:00
Yuan
d1010ad5f6 ibp按钮灯 2023-10-18 11:09:15 +08:00
fan
3e414e0d8a 删除日志 2023-10-17 18:03:49 +08:00
fan
18ad189de7 psl订阅 2023-10-17 18:02:30 +08:00
Yuan
7d7e092786 ibp Button 2023-10-17 18:00:09 +08:00
Yuan
6fe5d6b98c message 2023-10-17 17:24:10 +08:00
Yuan
7a4fb14c5b Merge branch 'master' of git.code.tencent.com:beijing-rtss-test/bj-rtss-client 2023-10-17 17:23:36 +08:00
Yuan
05b62058b1 ibp 2023-10-17 17:23:32 +08:00
joylink_zhaoerwei
e2165a0a35 站台关联关系调整 2023-10-17 16:42:31 +08:00
Yuan
cdb02a8e20 bugfix - ibp组合数据判断 2023-10-17 15:39:35 +08:00
Yuan
cded929022 Merge branch 'master' of git.code.tencent.com:beijing-rtss-test/bj-rtss-client 2023-10-17 15:30:51 +08:00
Yuan
a9ddb014a5 bugfix - ibp删除组合错误 2023-10-17 15:30:46 +08:00
fan
4600e93a38 pslbutton按钮调整 2023-10-17 14:46:55 +08:00
fan
6365821b3b Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-client 2023-10-17 14:21:05 +08:00
fan
ee81d9b553 门控箱&SPKS调整 2023-10-17 14:21:01 +08:00
dong
112223b150 列车曲线图限制5分钟 2023-10-17 10:28:27 +08:00
fan
4572e2b9de 报错信息调整 2023-10-17 10:13:30 +08:00
fan
cd433e70dc 增加报错信息提示 2023-10-17 09:58:01 +08:00
fan
6057c20f1f proto解析 2023-10-17 09:37:38 +08:00
fan
f2f1fba358 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-client 2023-10-17 09:35:59 +08:00
fan
ac8f6c17cf 注释日志&psl出现 2023-10-17 09:35:53 +08:00
dong
dbdfe17037 代码调整 2023-10-16 16:17:26 +08:00
fan
1d0337189f Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-client 2023-10-16 15:48:08 +08:00
fan
ec07d43813 信号机操作调整 2023-10-16 15:47:09 +08:00
dong
5f64273d90 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-client 2023-10-16 14:35:15 +08:00
dong
c314ab66e6 代码调整 2023-10-16 14:34:55 +08:00
joylink_zhaoerwei
8002875146 代码调整 2023-10-16 14:34:13 +08:00
dong
ac6e3cb9cb 道岔操作调整 2023-10-16 13:42:17 +08:00
dong
26754f054f 列车曲线图调整 2023-10-16 13:38:31 +08:00
joylink_zhaoerwei
bdbc96d3bc 微调 2023-10-16 10:28:26 +08:00
joylink_zhaoerwei
b8004529f4 继电器操作代码优化 2023-10-16 10:25:26 +08:00
Yuan
38456227fc message同步 2023-10-16 09:27:18 +08:00
joylink_zhaoerwei
5bbdf209f4 仿真继电器操作调整 2023-10-13 17:51:22 +08:00
fan
1aa6514809 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-client 2023-10-13 17:12:51 +08:00
fan
ed5f5e4735 ibp组合调整 2023-10-13 17:12:47 +08:00
dong
b34d9bda43 道岔操作调整 2023-10-13 16:25:17 +08:00
dong
0795ab58d9 代码调整 2023-10-13 16:24:19 +08:00
fan
c2989e538f Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-client 2023-10-13 16:12:30 +08:00
fan
ae63b1ddc8 spks增加属性 2023-10-13 16:12:25 +08:00
Yuan
4a410b5918 erge branch 'master' of git.code.tencent.com:beijing-rtss-test/bj-rtss-client 2023-10-13 16:08:18 +08:00
Yuan
726131a38f ibp关联组合 2023-10-13 16:08:14 +08:00
fan
daab07ed90 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-client 2023-10-13 15:58:19 +08:00
fan
a5b927cd42 psl组合调整 2023-10-13 15:58:15 +08:00
Yuan
bc56ed8276 ibp灯 2023-10-13 15:22:53 +08:00
dong
802d3ae469 列车曲线图调整 2023-10-13 14:59:01 +08:00
fan
4152b922b4 proto解析 2023-10-13 14:32:17 +08:00
fan
53a35ab177 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-client 2023-10-13 14:31:56 +08:00
fan
7d8ab9c0b1 关联门控箱地图&关联IBP地图 2023-10-13 14:25:40 +08:00
joylink_zhaoerwei
43d919e784 仿真场景增加屏蔽门 2023-10-13 14:18:35 +08:00
Yuan
2bd2911b6e Merge branch 'master' of git.code.tencent.com:beijing-rtss-test/bj-rtss-client 2023-10-13 14:02:57 +08:00
Yuan
c0b1d057ec ibp绘制增加关联设备管理 2023-10-13 14:02:52 +08:00
joylink_zhaoerwei
175cd631be 属性面板--公里标调整 2023-10-13 11:28:28 +08:00
dong
0790a7326e 列车曲线图调整 2023-10-13 10:14:31 +08:00
joylink_zhaoerwei
b0dbbc4d53 icon调整 2023-10-13 10:01:13 +08:00
dong
74c045f890 列车曲线图调整 2023-10-13 09:56:33 +08:00
dong
dfbb1caca5 列车曲线图 2023-10-13 09:40:33 +08:00
fan
7a3b0c1603 icon显示调整 2023-10-12 17:19:00 +08:00
fan
b6fe12a81f 校验调整 2023-10-12 16:54:55 +08:00
joylink_zhaoerwei
9126ce8dbd 设备关联继电器加表单校验 2023-10-12 16:48:55 +08:00
fan
64d6132fc1 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-client 2023-10-12 16:39:28 +08:00
fan
a28a1c7eec 门控箱关联屏蔽门调整 2023-10-12 16:39:21 +08:00
joylink_zhaoerwei
c8e55abd71 站台关联区段修改 2023-10-12 16:24:17 +08:00
Yuan
56d857a7b1 Merge branch 'master' of git.code.tencent.com:beijing-rtss-test/bj-rtss-client 2023-10-12 16:22:00 +08:00
Yuan
7f96abf20e ibp编辑UniqueID 2023-10-12 16:21:55 +08:00
fan
e8142b63a6 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-client 2023-10-12 15:47:56 +08:00
fan
2a179c61c1 门控箱数据调整 2023-10-12 15:47:51 +08:00
joylink_zhaoerwei
1044de72bd 屏蔽门增加编组列表数据管理 2023-10-12 15:15:35 +08:00
fan
b639a1df60 站场图组合调整 2023-10-12 14:13:48 +08:00
fan
4939a196e4 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-client 2023-10-12 13:23:09 +08:00
fan
a269851c53 地图数据添加组合暂提 2023-10-12 13:23:04 +08:00
fan
3d7b75fb78 ibpKey图片调整 2023-10-12 13:21:28 +08:00
joylink_zhaoerwei
423daf9f86 1.继电器设备组合添加设备类型:车站、屏蔽门
2.站台关联车站、屏蔽门关联站台、站台关联轨道区段
2023-10-12 11:07:18 +08:00
fan
948f2b8ceb psl组合调整 2023-10-12 10:30:35 +08:00
fan
30eaf3d5f2 psl调整 2023-10-12 10:22:03 +08:00
fan
7f05058cb4 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-client 2023-10-12 10:12:29 +08:00
fan
e04d76a9b3 psl调整 2023-10-12 10:12:24 +08:00
joylink_zhaoerwei
f00e391f57 屏蔽门和站台--代码备用 2023-10-11 17:36:36 +08:00
fan
05d72039bd Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-client 2023-10-11 10:37:47 +08:00
fan
f7d0242873 关联站台调整&IBP问题修复 2023-10-11 10:37:41 +08:00
dong
50460cee55 调整新建列车 2023-10-11 10:33:00 +08:00
joylink_zhaoerwei
83bfbf1c19 子屏蔽门数量调整 2023-10-11 10:29:38 +08:00
dong
1ab6b07f5d 仿真销毁提示退出 2023-10-10 17:38:15 +08:00
Yuan
056d4959d1 Merge branch 'master' of git.code.tencent.com:beijing-rtss-test/bj-rtss-client 2023-10-10 17:08:27 +08:00
Yuan
908d8094d6 ibp按钮 2023-10-10 17:08:24 +08:00
joylink_zhaoerwei
2d93b7ff6a 站台增加关联车站和子屏蔽门数量可变 2023-10-10 15:39:40 +08:00
dong
9183c50135 切换场景和结束样式调整 2023-10-10 15:16:58 +08:00
fan
355a8d4c4b Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-client 2023-10-10 13:49:59 +08:00
fan
71105aa7fb psl弹窗调整 2023-10-10 13:49:55 +08:00
Yuan
d75f020bde ibp草稿保存 2023-10-10 11:22:35 +08:00
fan
0119db9891 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-client 2023-10-10 10:36:45 +08:00
fan
40f5b6d06c ibp调整 2023-10-10 10:36:41 +08:00
Yuan
df6e3cb9ab ibp工具栏 2023-10-10 10:24:47 +08:00
fan
af08d1ae10 箭头设备调整 2023-10-10 09:53:22 +08:00
fan
4f09b99366 ibp设备添加 2023-10-09 18:24:40 +08:00
fan
c2e8f1c92f Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-client 2023-10-09 17:31:51 +08:00