Commit Graph

895 Commits

Author SHA1 Message Date
joylink_zhaoerwei
2ff70db160 信标只属于浙大网新 2023-11-10 09:41:34 +08:00
fan
d600578f0e Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-client 2023-11-10 09:24:01 +08:00
fan
4a864aa9c3 浙大网新增加信标 2023-11-10 09:23:52 +08:00
Yuan
871953642f 道岔占用显示 2023-11-09 18:11:06 +08:00
dong
f3cf633371 代码调整 2023-11-09 14:56:40 +08:00
dong
1747165bb3 显示控制添加选择 2023-11-09 14:01:14 +08:00
joylink_zhaoerwei
875d98e47e 同步框架 2023-11-09 10:23:40 +08:00
fan
215fc16318 浙大网新调整 2023-11-09 10:22:29 +08:00
fan
b3168a62db Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-client 2023-11-09 10:20:57 +08:00
fan
e33a988e47 添加浙大网新厂商 2023-11-09 10:20:54 +08:00
joylink_zhaoerwei
21a726313f 微调 2023-11-09 09:49:29 +08:00
dong
9eba288eea 代码调整 2023-11-08 17:47:36 +08:00
joylink_zhaoerwei
6d6e8a06ae bug待修复 2023-11-08 16:21:18 +08:00
joylink_zhaoerwei
8227e809b1 增加屏蔽门配置--子门和编组 2023-11-08 16:14:31 +08:00
Yuan
37d50c923f Merge branch 'master' of git.code.tencent.com:beijing-rtss-test/bj-rtss-client 2023-11-08 13:25:13 +08:00
Yuan
3ac8e7af8c 门控箱继电器状态显示调整 2023-11-08 13:24:09 +08:00
dong
b13a69092a Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-client 2023-11-08 13:10:35 +08:00
dong
7a321008ae 代码调整 2023-11-08 13:10:20 +08:00
joylink_zhaoerwei
0adbbfb1ba 删除组合类型列表+增加关联设备类型断路器和电源屏 2023-11-08 13:07:25 +08:00
dong
8d5a14dd35 显示区段码位索引 2023-11-08 13:05:28 +08:00
dong
a9edac4380 代码调整 2023-11-07 17:40:34 +08:00
joylink_zhaoerwei
814e8d4ea6 继电器面板增加状态变化监听 2023-11-07 16:58:58 +08:00
dong
5982bc957f 代码调整 2023-11-07 16:34:11 +08:00
dong
0343baabb6 环境配置调整 2023-11-07 16:29:14 +08:00
Yuan
5d1dfb4d0c 错误提示修改 2023-11-07 15:35:33 +08:00
Yuan
22dd8ae235 站台状态 2023-11-07 15:24:41 +08:00
Yuan
f39f2f41f7 ibp盘入口调整 2023-11-06 17:07:07 +08:00
Yuan
5e08c9250b message同步 2023-11-06 14:57:19 +08:00
Yuan
eeaa946e61 Merge branch 'master' of git.code.tencent.com:beijing-rtss-test/bj-rtss-client 2023-11-06 14:56:21 +08:00
Yuan
0b624b8f7f 公里标改为单个 2023-11-06 14:56:14 +08:00
fan
8f30c3cba8 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-client 2023-11-06 13:52:33 +08:00
fan
cd0081392d 屏蔽门故障操作添加&psl选中框调整&状态显示同步调整 2023-11-06 13:52:28 +08:00
Yuan
72f5f915c6 区段故障占用红色表示 2023-11-06 10:35:58 +08:00
dong
5664c875fb 道岔状态显示项调整 2023-11-03 17:47:28 +08:00
Yuan
4ebcbec618 Merge branch 'master' of git.code.tencent.com:beijing-rtss-test/bj-rtss-client 2023-11-03 14:20:27 +08:00
Yuan
e2f510bb07 spks开关状态 2023-11-03 14:20:25 +08:00
fan
8725b30e5f Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-client 2023-11-03 11:25:19 +08:00
fan
2f5851fee1 屏蔽门状态显示 2023-11-03 11:25:15 +08:00
joylink_zhaoerwei
b2fa3f9ccf 微调 2023-11-03 11:20:35 +08:00
joylink_zhaoerwei
4ac281cc78 屏蔽门状态字段调整 2023-11-03 11:11:31 +08:00
dong
04b7391fe1 列车添加公里标转换 2023-11-02 17:08:35 +08:00
fan
d742c4c569 host地址修改 2023-11-02 16:51:47 +08:00
fan
23bf0ee1a0 屏蔽门操作添加 2023-11-02 16:51:21 +08:00
Yuan
90332f389b esbButton 2023-11-02 15:43:20 +08:00
Yuan
788d6e7682 Merge branch 'master' of git.code.tencent.com:beijing-rtss-test/bj-rtss-client 2023-11-02 14:09:57 +08:00
Yuan
6e6875f23e IbpAlarm 2023-11-02 14:09:52 +08:00
joylink_zhaoerwei
ce1e912045 继电器4个列表框选设备居中 2023-11-02 14:09:17 +08:00
Yuan
a5b1004998 IbpAlarm 2023-11-02 14:03:54 +08:00
Yuan
3e962a6082 Merge branch 'master' of git.code.tencent.com:beijing-rtss-test/bj-rtss-client 2023-11-02 13:46:18 +08:00
Yuan
8c906a39c4 ibp灯状态 2023-11-02 13:46:16 +08:00
dong
376cb62ac4 列车运行方向调整 2023-11-02 11:09:28 +08:00
joylink_zhaoerwei
c110a716ed 微调 2023-11-02 10:26:08 +08:00
dong
47f0f93c0c 框架代码同步 2023-11-02 09:47:12 +08:00
dong
c83e682655 代码调整 2023-11-01 16:35:13 +08:00
dong
9afb470615 框架同步 2023-11-01 16:05:10 +08:00
Yuan
cdd14016ac 框架同步 2023-11-01 15:11:50 +08:00
Yuan
9bb34e73b4 区段状态 2023-11-01 13:59:02 +08:00
dong
f991d849fc 道岔状态调整 2023-10-31 17:33:05 +08:00
Yuan
c621454f18 url 2023-10-31 17:26:05 +08:00
Yuan
b51ef6ca4f Merge branch 'master' of git.code.tencent.com:beijing-rtss-test/bj-rtss-client 2023-10-31 16:51:05 +08:00
Yuan
50798d9d67 右侧面板调整 && 区段操作 2023-10-31 16:50:35 +08:00
dong
f0828fe323 代码调整 2023-10-31 13:34:49 +08:00
dong
82a312bc35 道岔状态调整 2023-10-31 13:33:38 +08:00
dong
841b0ec641 代码调整 2023-10-31 09:34:57 +08:00
dong
a33a4dc56f 区段操作 2023-10-30 16:13:31 +08:00
dong
7bfea1a651 代码调整 2023-10-27 17:54:24 +08:00
dong
d3b3d50150 运行环境配置 2023-10-27 16:54:16 +08:00
joylink_zhaoerwei
3cdeeffd34 驱采列表显示格式调整 2023-10-27 15:14:38 +08:00
joylink_zhaoerwei
4913c36b3c 微调 2023-10-27 11:22:08 +08:00
joylink_zhaoerwei
e6b1b0c63d 驱采列表加tooltip 2023-10-27 11:09:21 +08:00
joylink_zhaoerwei
9ec7f73ff2 驱采列表调整 2023-10-26 17:43:08 +08:00
dong
107c861004 代码调整 2023-10-26 16:00:17 +08:00
dong
cbaf4c4d1f 代码调整 2023-10-26 10:39:10 +08:00
joylink_zhaoerwei
5ed5273438 微调 2023-10-26 10:12:50 +08:00
dong
8eaeb2e1c1 代码调整 2023-10-26 09:56:51 +08:00
joylink_zhaoerwei
a027d373f7 驱采列表调整 2023-10-26 09:52:58 +08:00
joylink_zhaoerwei
7688aa6b0d 驱动采集列表增加数据校验和可变行列数 2023-10-25 17:26:07 +08:00
joylink_zhaoerwei
d829bd45d8 驱动继电器列表初提交 2023-10-25 14:38:36 +08:00
dong
a72b2e444e 代码调整 2023-10-25 11:31:30 +08:00
dong
e8e4919b08 代码调整 2023-10-25 10:55:16 +08:00
dong
678a50c24c 区段码位列表 2023-10-25 10:49:04 +08:00
joylink_zhaoerwei
afa8cb5e8c 信号机故障报警仪图形调整 2023-10-25 10:31:39 +08:00
joylink_zhaoerwei
eb0b8a9655 采集继电器列表初提交 2023-10-24 17:04:49 +08:00
Yuan
b41a25b95c Merge branch 'master' of git.code.tencent.com:beijing-rtss-test/bj-rtss-client 2023-10-23 16:47:28 +08:00
Yuan
6a6331f006 框架同步 2023-10-23 16:44:41 +08:00
Yuan
ce239b7257 ibp按钮和钥匙 2023-10-23 16:43:39 +08:00
joylink_zhaoerwei
7587264a11 添加信号机故障报警仪设备,组合里设备类型添加信号机故障报警仪 2023-10-23 16:33:13 +08:00
dong
c9c2478fcd 代码调整 2023-10-23 16:15:51 +08:00
dong
40061eef03 列车曲线图调整 2023-10-23 16:13:45 +08:00
fan
b5794cd854 批量添加集中站增加校验 2023-10-23 14:09:15 +08:00
fan
4d4169a6e6 门控箱spks开关调整 2023-10-23 13:33:10 +08:00
fan
8835059c0e Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-client 2023-10-23 11:04:41 +08:00
fan
3e8da3eec0 psl按钮调整 2023-10-23 11:04:36 +08:00
dong
c5e186911a 公里标转换按钮位置调整 2023-10-20 17:50:22 +08:00
dong
565900536a 打包环境调整 2023-10-20 17:33:30 +08:00
fan
6fd7e6191e psl按下抬起状态调整 2023-10-20 16:16:54 +08:00
fan
6eb227972c Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-client 2023-10-20 16:04:32 +08:00
fan
3bf6e09acb psl按钮接口重复调用调整 2023-10-20 16:04:27 +08:00
dong
0ca8662b0b 代码调整 2023-10-20 15:53:58 +08:00
dong
06850eb38a 列车曲线图调整 2023-10-20 14:36:56 +08:00
fan
62544cdafb Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-client 2023-10-20 13:19:40 +08:00
fan
78f7aa1faa 信号机添加数据 2023-10-20 13:19:34 +08:00
joylink_zhaoerwei
17fabb401a 屏蔽门状态调整 2023-10-20 13:17:57 +08:00
fan
ae8bb593d4 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-client 2023-10-20 11:04:09 +08:00
fan
9e0f9296ae pslButton状态调整 2023-10-20 11:04:03 +08:00
joylink_zhaoerwei
83a3a369b4 屏蔽门状态和车站名 2023-10-20 10:04:15 +08:00
fan
0451397be2 解析proto 2023-10-19 17:57:53 +08:00
fan
7fcda79b8c Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-client 2023-10-19 17:30:49 +08:00
fan
b82039db7e 信号机故障操作 2023-10-19 17:30:46 +08:00
joylink_zhaoerwei
6c9c3f9a40 增加地图主坐标系 2023-10-19 17:26:56 +08:00
fan
e08dfdefc1 同步代码 2023-10-19 17:00:31 +08:00
fan
a42a3e79c7 同步代码 2023-10-19 16:52:41 +08:00
fan
45ee7bae26 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-client 2023-10-19 16:44:47 +08:00
fan
5f622454ff psl流程调整 2023-10-19 16:44:39 +08:00
Yuan
d0c1764d35 wip - ibp状态 2023-10-19 14:43:30 +08:00
fan
02324f62d6 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-client 2023-10-19 10:36:06 +08:00
fan
1dad042c62 公里标系统放开填写 2023-10-19 10:36:00 +08:00
joylink_zhaoerwei
fa4d9a0a80 字段名字修改 2023-10-19 10:35:19 +08:00
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