Commit Graph

961 Commits

Author SHA1 Message Date
Yuan
59edcdbc74 道岔物理区段生成记录合并 2023-11-20 15:22:25 +08:00
dong
7c8264981e 列车管理调整 2023-11-20 15:17:36 +08:00
joylink_zhaoerwei
dee2aab4d4 一键生成计轴操作流程修改 2023-11-20 14:30:45 +08:00
fan
8fb22c9706 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-client 2023-11-20 14:08:30 +08:00
fan
2d1f6191e7 信标调整 2023-11-20 14:08:21 +08:00
joylink_zhaoerwei
454de4340e 断相保护器、ls组合、集中站下属的车站(是否有对于组合的设备) 2023-11-20 10:59:15 +08:00
dong
b0178947df 代码调整 2023-11-20 09:54:14 +08:00
Yuan
3c6c0bd956 订阅路径修改 2023-11-17 17:54:04 +08:00
fe6a6a6c1c 框架同步 2023-11-17 17:08:09 +08:00
joylink_zhaoerwei
4560e08d79 增加集中站管理的车站 2023-11-17 16:54:14 +08:00
joylink_zhaoerwei
c793a6bf95 一键生成继电器布置图 2023-11-17 15:23:27 +08:00
dong
feca14c57c 代码调整 2023-11-17 11:03:23 +08:00
fan
c17561a467 同步protoc 2023-11-17 11:00:05 +08:00
fan
17020acb33 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-client 2023-11-17 10:40:41 +08:00
fan
a33e3debf0 取消设备的索引index 2023-11-17 10:40:38 +08:00
dong
4005d43b71 自动折返按钮箱,显示控制调整 2023-11-17 10:28:40 +08:00
fan
c26ac42fd5 信号机所属车站增加label 2023-11-17 09:43:20 +08:00
dong
f6a2456ccb 自动折返按钮箱 2023-11-16 18:06:59 +08:00
ccfdba6eeb Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-client 2023-11-16 17:07:02 +08:00
74ec8ad3d2 同步并调整消息引擎使用 2023-11-16 17:06:53 +08:00
fan
91db8d19e6 信号机所属车站改为缩写 2023-11-16 16:57:04 +08:00
fan
97f195e03b 添加信号机所属车站 2023-11-16 16:55:02 +08:00
fan
65cba8d20c Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-client 2023-11-16 16:37:36 +08:00
fan
d0fe87d0a7 添加设备集中站调整 2023-11-16 16:37:31 +08:00
joylink_zhaoerwei
43fb623dd7 车站名简写 2023-11-16 16:36:26 +08:00
joylink_zhaoerwei
74c2c70ebc 车站增加车辆段和站名简写 2023-11-16 16:25:06 +08:00
fan
d12fcd43dd Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-client 2023-11-16 15:52:35 +08:00
fan
c04d76c00f 添加发车计时器&简化浙大网新ESB 2023-11-16 15:52:31 +08:00
joylink_zhaoerwei
4c57411745 一键生成继电器柜布置图代码备用 2023-11-16 15:45:33 +08:00
fan
741d7c0a12 esbCode可移动 2023-11-16 13:10:09 +08:00
fan
17bf2350f2 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-client 2023-11-16 11:13:46 +08:00
fan
b93037e7c2 信号机类型调整 2023-11-16 11:13:41 +08:00
dong
a137b807c7 代码调整 2023-11-16 09:57:17 +08:00
dong
8323b40a20 代码调整 2023-11-15 18:07:03 +08:00
dong
012b444f1c 显示控制调整 2023-11-15 18:04:30 +08:00
fan
64140b295d 取消区段操作成功提示 2023-11-15 17:11:01 +08:00
joylink_zhaoerwei
573325d5c1 线路图车站关联设备使用公共框选组件 2023-11-15 13:43:00 +08:00
joylink_zhaoerwei
db592de044 继电器组合使用公共框选组件 2023-11-14 17:30:58 +08:00
joylink_zhaoerwei
68398f8f58 抽取公共的框选方式的组件 2023-11-14 16:58:01 +08:00
Yuan
31e5048880 Merge branch 'master' of git.code.tencent.com:beijing-rtss-test/bj-rtss-client 2023-11-14 15:12:19 +08:00
Yuan
da34ea5829 框架更新 2023-11-14 15:12:17 +08:00
joylink_zhaoerwei
c9964df1de 微调 2023-11-14 11:15:14 +08:00
Yuan
e87a53d67e 同步 2023-11-14 11:11:03 +08:00
joylink_zhaoerwei
d3334c6037 微调 2023-11-14 11:06:51 +08:00
joylink_zhaoerwei
d93852affc 继电器状态面板调整 2023-11-14 10:37:36 +08:00
Yuan
759223119f Merge branch 'master' of git.code.tencent.com:beijing-rtss-test/bj-rtss-client 2023-11-14 10:29:53 +08:00
Yuan
5e58b5c87e 道岔占用显示调整 && 区段状态展示 2023-11-14 10:29:51 +08:00
dong
8f5fd5bd22 仿真状态socket调整 2023-11-14 10:28:44 +08:00
fan
cfe25d70a7 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-client 2023-11-13 17:46:06 +08:00
fan
6655cdf865 浙大网新esb调整 2023-11-13 17:45:55 +08:00
joylink_zhaoerwei
fa35538841 删除继电器柜图的组件挂载代码 2023-11-13 17:41:42 +08:00
Yuan
91984105e5 Merge branch 'master' of git.code.tencent.com:beijing-rtss-test/bj-rtss-client 2023-11-13 17:04:14 +08:00
Yuan
4ddcb5cccc bugfix - 公里标数据更新问题 2023-11-13 17:04:10 +08:00
dong
750e3736c8 代码调整 2023-11-13 16:51:52 +08:00
dong
fa80491484 列车轮径调整 2023-11-13 16:09:25 +08:00
dong
440e2c096e 列车轮径调整 2023-11-13 15:08:32 +08:00
dong
f81ef0204e 代码调整 2023-11-13 11:26:01 +08:00
dong
cd4701b55d 厂商调整 2023-11-13 11:23:27 +08:00
fan
0d7a80f399 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-client 2023-11-10 17:44:01 +08:00
fan
a828c9cd82 浙大网新esb 2023-11-10 17:43:53 +08:00
joylink_zhaoerwei
8c639ce242 微调 2023-11-10 17:38:07 +08:00
joylink_zhaoerwei
7a8b5c2eb4 增加指定的道岔组不生成计轴 2023-11-10 17:15:22 +08:00
joylink_zhaoerwei
b7ebddaaad 增加生成计轴配置 2023-11-10 15:08:12 +08:00
dong
598f44ea1c 运行环境配置调整 2023-11-10 14:22:18 +08:00
dong
2b3b0849cb 运行环境配置调整 2023-11-10 14:21:55 +08:00
dong
4fda27c284 道岔状态调整 2023-11-10 10:59:02 +08:00
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