Commit Graph

1080 Commits

Author SHA1 Message Date
fan
9660338669 ibp&psl调整 2023-12-13 10:10:26 +08:00
fan
ee0c8001f8 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-client 2023-12-13 09:58:47 +08:00
fan
59092a4603 旧数据处理 2023-12-13 09:57:47 +08:00
joylink_zhaoerwei
7a0b650e52 车站关联的设备转int 2023-12-12 18:03:53 +08:00
joylink_zhaoerwei
7a069b955e int批处理 2023-12-12 17:49:20 +08:00
dong
144fedf110 环境配置调整 2023-12-12 14:54:12 +08:00
dong
2e17b4a71a 代码调整 2023-12-11 17:57:28 +08:00
dong
5da8ac60d0 环境配置调整 2023-12-11 17:55:38 +08:00
fan
4841900783 host调整 2023-12-08 17:33:48 +08:00
fan
ed7f879970 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-client 2023-12-08 17:30:07 +08:00
fan
dac8fdb79a 屏蔽门操作调整 2023-12-08 17:30:02 +08:00
dong
f044b0f956 列车显示公里标调整 2023-12-08 15:02:38 +08:00
dong
9e2580e063 列车显示公里标调整 2023-12-08 14:23:58 +08:00
joylink_zhaoerwei
c128d8b474 继电器图画布变大——场景使用 2023-12-08 13:09:45 +08:00
fan
664a085d92 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-client 2023-12-08 11:09:42 +08:00
fan
8bb6013b83 信号机调整 2023-12-08 11:09:36 +08:00
dong
a55de48c41 修改列车因区段边界计轴无法计算公里标问题 2023-12-08 11:07:06 +08:00
dong
12fba79149 修改列车因区段边界计轴无法计算公里标问题 2023-12-08 10:41:29 +08:00
Yuan
c0c9e869f5 emp继电器状态 2023-12-08 09:17:03 +08:00
joylink_zhaoerwei
0f4da5f62b 清空其它线设备的集中站 2023-12-07 18:16:42 +08:00
Yuan
0fd5aa1382 bugfix - 车站及站台状态面板 2023-12-07 17:58:29 +08:00
Yuan
5a41661008 站台状态 2023-12-07 17:21:21 +08:00
Yuan
57a8dca8be 车站状态面板增加ibp按钮 && 启动项目列表项目过长优化 2023-12-07 16:48:25 +08:00
joylink_zhaoerwei
729f0a9ec1 一键关联集中站调整 2023-12-07 15:35:21 +08:00
joylink_zhaoerwei
39235cbc6d 车辆段关联集中站特殊处理 2023-12-07 14:52:34 +08:00
joylink_zhaoerwei
f9fc9f058e 驱动列表bug修复 2023-12-07 13:14:30 +08:00
joylink_zhaoerwei
e5d0d37ac0 采集列表bug修复 2023-12-07 10:33:40 +08:00
joylink_zhaoerwei
d63d9dfa3d 屏蔽门配置修改 2023-12-07 10:13:11 +08:00
Yuan
1a6142861a ibp钥匙操作接口修改 2023-12-07 10:00:57 +08:00
Yuan
b9285d0f65 ibp按钮操作接口修改 2023-12-07 09:09:50 +08:00
joylink_zhaoerwei
72bd566c6c 微调 2023-12-06 17:00:19 +08:00
Yuan
34bfb15a22 bugfix - 计轴生成报错修改 2023-12-06 16:24:46 +08:00
joylink_zhaoerwei
8ce7c5994e 一键生成所有紧急停车按钮组合数据--过滤车辆段和删除旧数据 2023-12-06 15:39:52 +08:00
dong
a2c3748b85 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-client 2023-12-06 15:18:09 +08:00
dong
c3e7a1f1fe 处理修改属性时改变焦点导致图像消失问题 2023-12-06 15:17:53 +08:00
joylink_zhaoerwei
a341a2873c 一键生成所有紧急停车按钮组合数据 2023-12-06 15:15:48 +08:00
Yuan
7eda7c0271 ibp关联组合时可选灯 2023-12-06 15:03:02 +08:00
Yuan
a207716879 区段常规运行方向生成规则调整 2023-12-06 14:55:00 +08:00
Yuan
6f8ea46425 区段常规运行方向生成规则调整 2023-12-06 14:42:42 +08:00
joylink_zhaoerwei
165c77f1e8 车站关联继电器的code 2023-12-06 14:35:33 +08:00
joylink_zhaoerwei
c47bea57ce 一键生成继电器图的画布自动变大 2023-12-06 13:25:06 +08:00
fan
3a82d347e4 新增信号机上下行&批量设置信号机上下行 2023-12-06 11:11:53 +08:00
fan
22ed1f3b45 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-client 2023-12-06 09:53:09 +08:00
fan
e8e205f091 信号机新增上下行调整 2023-12-06 09:51:55 +08:00
joylink_zhaoerwei
767ab87f25 增加检查计轴可能有问题 2023-12-05 17:33:54 +08:00
joylink_zhaoerwei
ec2830e9c2 一键关联后计轴的关联关系显示 2023-12-05 15:50:24 +08:00
Yuan
14967d9a38 道岔和区段关联的位置容错增加 2023-12-05 15:47:27 +08:00
joylink_zhaoerwei
5b43f7f2aa 区段边界可关联道岔 2023-12-05 13:55:55 +08:00
Yuan
b174bc0fb2 区段常规运行方向生成规则修改 2023-12-05 13:37:03 +08:00
joylink_zhaoerwei
3e5dd10165 一键关联集中站可以不画左右边界 2023-12-05 13:18:11 +08:00
joylink_zhaoerwei
d58fb4efab 微调 2023-12-05 11:05:14 +08:00
Yuan
b683f45612 bugfix - 道岔保存 2023-12-05 10:42:32 +08:00
a83ec892c8 同步框架代码 2023-12-05 10:22:01 +08:00
joylink_zhaoerwei
9b73f9b502 集中分割线关联道岔、信号机特殊处理 2023-12-05 09:46:52 +08:00
Yuan
0d97067e0b 区段运行方向生成逻辑修改 2023-12-04 17:28:41 +08:00
Yuan
637616e30f 区段常规运行方向 && 是否折返区域 2023-12-04 16:23:59 +08:00
dong
6051da8d53 其他线路数据调整 2023-12-04 15:44:11 +08:00
dong
5a8639cbcc 其他线路数据 2023-12-04 14:54:48 +08:00
joylink_zhaoerwei
086bbe706a 集中区分割线绘制--多交点处理 2023-12-04 14:09:16 +08:00
joylink_zhaoerwei
1b4e4fcc71 集中区分割线关联数据增加端点 2023-12-04 11:27:57 +08:00
joylink_zhaoerwei
9677f87c96 站台增加上下行 2023-12-04 09:42:01 +08:00
joylink_zhaoerwei
a703786828 一键操作位置调整 2023-12-01 17:52:25 +08:00
Yuan
30974166c3 一键生成停车标成功提示 2023-12-01 16:50:56 +08:00
Yuan
5249c747fb 报错修复 2023-12-01 16:43:50 +08:00
joylink_zhaoerwei
b274d20525 通过集中区分割线一键关联集中站 2023-12-01 16:31:52 +08:00
Yuan
96c7c9212f 一键生成停车标 2023-12-01 16:26:17 +08:00
004e9e548c 同步框架代码
修改区段/道岔等端口辅助文字颜色
2023-12-01 15:45:48 +08:00
joylink_zhaoerwei
4cd7685d24 获取发布图的数据--去掉厂家 2023-12-01 10:53:46 +08:00
joylink_zhaoerwei
46fd7160d5 批量设置信号机型号 2023-12-01 10:32:11 +08:00
joylink_zhaoerwei
ac5c1a7bd4 集中区分割线构建关联关系 2023-11-30 17:34:38 +08:00
dong
9bab7e7f18 登录失败取消loading效果 2023-11-30 16:29:51 +08:00
joylink_zhaoerwei
5540961827 集中区分割线-线段绘制 2023-11-29 15:51:36 +08:00
joylink_zhaoerwei
44bb4e151c 集中区分割线变为通用的多边形绘制 2023-11-29 10:34:49 +08:00
joylink_zhaoerwei
f693995b43 微调 2023-11-28 17:09:07 +08:00
joylink_zhaoerwei
b6334a3d55 添加集中区分割线 2023-11-28 16:18:42 +08:00
fan
0b639a6bf7 删除批处理关联集中站数据操作 2023-11-28 14:39:37 +08:00
fan
5e1f7aa096 修改关联集中站 2023-11-28 14:20:18 +08:00
joylink_zhaoerwei
8d252c3a1c 修改继电器型号配置 2023-11-28 11:12:00 +08:00
joylink_zhaoerwei
5394fbecd6 一键生成屏蔽门编号和一键生成站台关联的继电器编号 2023-11-28 09:50:41 +08:00
joylink_zhaoerwei
f968984658 bug修复--无法修改计轴集中站 2023-11-27 17:47:56 +08:00
joylink_zhaoerwei
6e35319a3f 集中站关联的是stationName 2023-11-27 17:12:18 +08:00
dong
e917448edf 发布数据管理页面调整 2023-11-27 17:05:18 +08:00
dong
40d398b4f0 登录页添加loading效果 2023-11-27 16:49:42 +08:00
joylink_zhaoerwei
dd0fb84f0a 关联的集中站是站名stationName 2023-11-27 16:17:50 +08:00
joylink_zhaoerwei
6ef97dbcba 动态生成车站EMP和屏蔽门相关配置 2023-11-27 15:34:54 +08:00
joylink_zhaoerwei
8ac348b4ea 站台添加关联紧急停车继电器属性并添加到批量操作中 2023-11-24 16:01:59 +08:00
joylink_zhaoerwei
43b23e5131 批量操作代码结构调整 2023-11-24 14:35:18 +08:00
joylink_zhaoerwei
284d14a8f2 微调 2023-11-24 11:18:07 +08:00
joylink_zhaoerwei
ac0c51b337 批量设置修改 2023-11-24 10:52:33 +08:00
joylink_zhaoerwei
d82ed8c23e 批量设置相同的编号后缀-道岔、信号机、区段 2023-11-24 10:36:29 +08:00
joylink_zhaoerwei
b25fb2d973 去掉一键关联ibp和psl 2023-11-23 17:48:00 +08:00
joylink_zhaoerwei
0ab0bf013b 车站去掉简写和信号机去掉所属车站 2023-11-23 17:18:14 +08:00
joylink_zhaoerwei
017380fadd 批量操作初提交 2023-11-23 17:04:55 +08:00
dong
4412bb64b1 发布数据下架提示确认 2023-11-23 14:13:59 +08:00
dong
62fc54a216 应答器proto更新 2023-11-23 12:19:57 +08:00
dong
013da1472e 应答器类型调整 2023-11-23 12:08:51 +08:00
dong
1d4e8ecc79 发布数据管理界面调整 2023-11-23 10:21:17 +08:00
fan
ede59d575b Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-client 2023-11-23 10:09:23 +08:00
fan
a692c86289 发车计时器添加关联站台和运行方向 2023-11-23 10:09:19 +08:00
dong
5ec2589ec1 列车配置调整 2023-11-22 17:56:28 +08:00
dong
e6d6897a90 列车配置调整 2023-11-22 17:17:54 +08:00
dong
16f9f4b835 列车配置调整 2023-11-22 16:45:52 +08:00
dong
f27dbc8b41 发布数据调整 2023-11-22 15:35:52 +08:00
joylink_zhaoerwei
f0bb33b651 继电器布置图-一键生成驱动列表 2023-11-22 14:28:13 +08:00
joylink_zhaoerwei
c82d4a615d 屏蔽门配置确认后屏蔽门重绘 2023-11-22 10:46:55 +08:00
joylink_zhaoerwei
6e62edaaba 继电器布置图-一键生成采集列表 2023-11-22 10:17:05 +08:00
Yuan
c117d7bba8 IBP盘车站名称 2023-11-21 16:39:55 +08:00
dong
b0814bf7fd 发布数据管理列表类型显示 2023-11-21 15:16:37 +08:00
dong
29072e2bb1 添加列车数据 2023-11-21 14:51:17 +08:00
dong
2229f2fdd0 添加列车调整 2023-11-21 14:00:14 +08:00
dong
008dea45b9 草稿创建人调整 2023-11-21 13:28:51 +08:00
joylink_zhaoerwei
e86c927990 一键生成继电器图配置UniqueIdPrefix 2023-11-21 11:17:44 +08:00
dong
298e5070e4 列车配置调整 2023-11-21 10:58:57 +08:00
joylink_zhaoerwei
6eee3bf8d1 一键生成配置修改———断路器 2023-11-21 10:29:25 +08:00
joylink_zhaoerwei
555d201fdb 一键生成继电器图配置修改 2023-11-21 09:31:29 +08:00
fan
a8e27415f2 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-client 2023-11-20 15:53:16 +08:00
fan
cad442f590 Arrow调整 2023-11-20 15:52:56 +08:00
dong
5aaefe09e2 列车管理调整 2023-11-20 15:38:39 +08:00
dong
6a9ffdda28 列车管理调整 2023-11-20 15:38:25 +08:00
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