Commit Graph

677 Commits

Author SHA1 Message Date
fan
01a518f3e7 psl暂提 2023-10-09 17:31:40 +08:00
Yuan
0995c51dc1 Merge branch 'master' of git.code.tencent.com:beijing-rtss-test/bj-rtss-client 2023-10-09 16:46:44 +08:00
Yuan
c41a81ce77 ibp盘 2023-10-09 16:46:40 +08:00
dong
35acad2b83 列车调整 2023-10-09 15:00:36 +08:00
fan
767cf32a9f Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-client 2023-10-09 14:33:22 +08:00
fan
c9393abba8 ibp添加设备蜂鸣器钥匙箭头 2023-10-09 14:32:30 +08:00
joylink_zhaoerwei
24a9726cb6 场景切换右键bug修复调整 2023-10-09 14:29:13 +08:00
joylink_zhaoerwei
5cf29df992 切换场景,右键bug修复 2023-10-09 13:08:29 +08:00
joylink_zhaoerwei
decd348c04 继电器相关调整 2023-10-09 10:09:50 +08:00
joylink_zhaoerwei
6075ba474f 继电器右键调整 2023-10-08 17:20:41 +08:00
fan
f646bc0840 psl调整2 2023-10-08 15:54:03 +08:00
fan
7fbbe51486 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-client 2023-10-08 15:50:00 +08:00
fan
33ee1eba02 psl调整 2023-10-08 15:49:54 +08:00
dong
80c16035f7 道岔操作名称修改 2023-10-08 13:43:30 +08:00
dong
da2c50675c 列车调整 2023-10-08 13:28:28 +08:00
fan
c2a1a2edfe Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-client 2023-10-08 10:43:23 +08:00
fan
8a995bf63b psl调整 2023-10-08 10:43:17 +08:00
joylink_zhaoerwei
f26124de26 继电器起落名字修改 2023-10-08 10:37:57 +08:00
Yuan
6c1490b3a8 Merge branch 'master' of git.code.tencent.com:beijing-rtss-test/bj-rtss-client 2023-10-08 10:21:29 +08:00
Yuan
12dd782630 bugfix - 表单更新问题 2023-10-08 10:21:25 +08:00
joylink_zhaoerwei
d20395bf87 修改继电器状态 2023-10-08 10:07:52 +08:00
dong
8f142b9ba7 道岔失表调整 2023-10-07 15:55:35 +08:00
dong
c89f7bde68 列车方向调整 2023-10-07 14:47:01 +08:00
dong
07174d8fc8 道岔失表状态 2023-10-07 10:52:53 +08:00
joylink_zhaoerwei
971929e867 场景添加继电器关联设备显示 2023-10-07 09:32:33 +08:00
dong
fd68a78bf6 代码调整 2023-09-28 18:04:53 +08:00
dong
8129c1222b 代码调整 2023-09-28 17:49:43 +08:00
dong
8590226c29 列车调整 2023-09-28 17:45:20 +08:00
dong
53b160e65c 代码调整 2023-09-28 17:10:39 +08:00
dong
8533a71dbc 道岔转动动画 2023-09-28 17:00:17 +08:00
fan
2b31e14d90 转辙机型号不能修改调整 2023-09-28 16:39:30 +08:00
fan
bda0231bc7 转辙机型号无法修改调整 2023-09-28 16:28:54 +08:00
joylink_zhaoerwei
b433c7d52f 微调 2023-09-28 14:27:35 +08:00
dong
4924dd48fe 加载场景调整 2023-09-28 14:26:31 +08:00
joylink_zhaoerwei
d80c354c35 场景添加断相保护器 2023-09-28 13:26:40 +08:00
joylink_zhaoerwei
6c7ec1b2e1 场景调整 2023-09-28 11:30:39 +08:00
joylink_zhaoerwei
712a415245 继电器状态 2023-09-28 10:43:31 +08:00
dong
fe0cd20114 状态显示id 2023-09-28 10:42:48 +08:00
dong
017b71bbde socket状态按照id更新 2023-09-28 10:34:06 +08:00
joylink_zhaoerwei
5d7c206aa9 继电器关联列表加key 2023-09-27 15:17:36 +08:00
joylink_zhaoerwei
cda3e8041c 继电器markRaw 2023-09-26 17:20:07 +08:00
dong
f07fd83895 代码调整 2023-09-26 16:28:29 +08:00
dong
322240f7a7 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-client 2023-09-26 16:21:23 +08:00
dong
78838dd258 场景名称调整 2023-09-26 16:21:13 +08:00
joylink_zhaoerwei
fc547d40ca 继电器柜联动拖动 2023-09-26 15:25:46 +08:00
joylink_zhaoerwei
5a6747131c 微调 2023-09-26 14:21:34 +08:00
joylink_zhaoerwei
3deae968ae 组合类型列表 2023-09-26 13:51:11 +08:00
dong
cd3e30c831 添加轨道区段、轨道逻辑区段 2023-09-26 11:24:44 +08:00
dong
89a47f6644 公里标转换调整 2023-09-26 09:59:10 +08:00
dong
c9bbbb9ee2 代码调整 2023-09-26 09:29:41 +08:00
dong
a7a8e59edf 添加公里标转换 2023-09-25 18:25:48 +08:00
joylink_zhaoerwei
3df4622900 断相保护器 2023-09-25 17:36:06 +08:00
joylink_zhaoerwei
87e715569e 继电器注掉字段 2023-09-22 17:55:54 +08:00
Yuan
2372ab1db1 信号机关联规则修改 2023-09-22 17:44:31 +08:00
Yuan
70d0e4ac56 Merge branch 'master' of git.code.tencent.com:beijing-rtss-test/bj-rtss-client 2023-09-22 17:37:40 +08:00
Yuan
40d053a639 应答器关联规则修改 2023-09-22 17:37:38 +08:00
joylink_zhaoerwei
66cce194de 继电器调整 2023-09-22 17:17:02 +08:00
Yuan
215dab15c7 Merge branch 'master' of git.code.tencent.com:beijing-rtss-test/bj-rtss-client 2023-09-22 17:15:41 +08:00
Yuan
1744d6a0d6 列表时间显示修改 2023-09-22 17:15:35 +08:00
dong
ef26bf1638 修改列车位置问题 2023-09-22 16:22:55 +08:00
joylink_zhaoerwei
abc0992d3a 继电器类型枚举加unknow 2023-09-22 15:57:36 +08:00
joylink_zhaoerwei
7d368c58f6 继电器相关字段修改--枚举 2023-09-22 15:22:54 +08:00
fan
913e8d3c88 同步框架 2023-09-22 11:05:02 +08:00
fan
6568d5bbe7 单独设置集中站调整 2023-09-22 10:19:53 +08:00
fan
5bebc66ee2 站台删除集中站数据 2023-09-22 10:08:44 +08:00
fan
ddd83305f0 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-client 2023-09-22 09:58:39 +08:00
fan
c6814bdf37 计轴添加集中站 2023-09-22 09:58:25 +08:00
Yuan
6dcce310e5 bugfix 公里标 2023-09-22 09:38:25 +08:00
Yuan
ae04a6ada7 公里标 2023-09-21 17:27:46 +08:00
Yuan
3fa8c54334 Merge branch 'master' of git.code.tencent.com:beijing-rtss-test/bj-rtss-client 2023-09-21 17:23:36 +08:00
Yuan
1b2d4f46ea 道岔公里标 2023-09-21 17:22:30 +08:00
dong
41ec1a763f 仿真订阅和操作添加mapId 2023-09-21 15:57:43 +08:00
fan
da66269b90 Id查找调整 2023-09-21 14:40:55 +08:00
fan
1acef65697 删除日志 2023-09-21 14:35:23 +08:00
fan
1682a10668 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-client 2023-09-21 14:32:47 +08:00
fan
075f96e51c 设置设备集中站(+) 2023-09-21 14:20:33 +08:00
fan
da5ef1a045 设置设备集中站 2023-09-21 14:20:13 +08:00
joylink_zhaoerwei
e324039f79 微调 2023-09-21 13:10:06 +08:00
joylink_zhaoerwei
794d6c692d uniqueId字段修改 2023-09-21 11:04:32 +08:00
joylink_zhaoerwei
1d608c5177 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-client 2023-09-21 09:09:47 +08:00
joylink_zhaoerwei
5f999bd8f8 uniqueId信号布置图 2023-09-21 09:09:29 +08:00
dong
7f23998d5a 代码调整 2023-09-20 16:06:29 +08:00
joylink_zhaoerwei
235de94f46 微调 2023-09-20 15:41:50 +08:00
joylink_zhaoerwei
5399615e05 继电器柜uniqueId配置 2023-09-20 15:32:59 +08:00
Yuan
f17284d3a8 merge 2023-09-20 14:57:26 +08:00
joylink_zhaoerwei
850e79c28a 去除虚拟计轴 2023-09-20 14:37:17 +08:00
dong
16cf9af1ae 修改启动项目的发布图 2023-09-20 10:36:50 +08:00
Yuan
be51cae29f 公里标bugfix 2023-09-19 17:53:47 +08:00
Yuan
5da2d6a6e2 表单改动 2023-09-19 16:39:01 +08:00
fan
61f6848dc8 删除日志 2023-09-19 09:58:26 +08:00
fan
9b969a8f54 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-client 2023-09-19 09:38:51 +08:00
fan
3449811e05 重复加载警告调整 2023-09-19 09:38:44 +08:00
Yuan
717e5388bc Merge branch 'master' of git.code.tencent.com:beijing-rtss-test/bj-rtss-client 2023-09-19 09:17:10 +08:00
Yuan
c63eb88248 formUtil 2023-09-19 09:17:08 +08:00
Yuan
7c22360197 轨道区段code生成规则修复 2023-09-19 09:15:10 +08:00
dong
ddd2f9a1d6 绘制绑定form表单对象 2023-09-18 17:34:11 +08:00
dong
a5a43b0430 场景切换功能 2023-09-18 16:10:20 +08:00
dong
9263bf7715 代码调整 2023-09-18 15:07:59 +08:00
dong
bc70e8fc1e 应答器绑定表单对象 2023-09-18 15:04:50 +08:00
Yuan
21267f8e13 框架更新 2023-09-18 14:35:04 +08:00
dong
ea085f6efd 角色列表限制编辑和删除 2023-09-18 09:25:34 +08:00
dong
0fec84ebbe 路由权限调整 2023-09-15 13:08:28 +08:00
dong
0383a83860 添加权限接口管理、角色管理调整、路由权限调整 2023-09-15 11:28:02 +08:00
joylink_zhaoerwei
cd28b8e6f2 一键生成计轴时过滤已生成过计轴的区段 2023-09-15 09:31:02 +08:00
Yuan
c97af4fdd8 Merge branch 'master' of git.code.tencent.com:beijing-rtss-test/bj-rtss-client 2023-09-15 09:21:06 +08:00
Yuan
a39f2120ab 区段与计轴关系读取 2023-09-15 09:21:03 +08:00
dong
87d276c73d 修改生成link报错问题 2023-09-14 17:14:59 +08:00
dong
d6e8d8a7e8 修改列车在区段定位错误问题 2023-09-14 15:35:19 +08:00
dong
6456b819d5 修改列车在区段定位错误问题 2023-09-14 15:06:09 +08:00
joylink_zhaoerwei
b02f57d1f8 生成计轴不过滤计轴 2023-09-14 14:55:32 +08:00
joylink_zhaoerwei
ff2f7655bf 增加删除组合类型 2023-09-14 09:27:01 +08:00
dong
0445149a7e Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-client 2023-09-13 18:01:57 +08:00
dong
52047eeee5 修改显示控制无效的问题 2023-09-13 18:01:47 +08:00
joylink_zhaoerwei
e501099ffd 关联继电器编辑修复 2023-09-13 18:00:51 +08:00
joylink_zhaoerwei
616b75805f 关联继电器增加组合类型 2023-09-13 17:28:57 +08:00
dong
4d31604015 测试管理socket订阅调整 2023-09-13 17:25:14 +08:00
Yuan
40ae549484 Merge branch 'master' of git.code.tencent.com:beijing-rtss-test/bj-rtss-client 2023-09-13 15:33:47 +08:00
Yuan
879897d4a8 道岔增加转辙机型号字段 2023-09-13 15:33:44 +08:00
dong
638eca3ab4 列车信息添加公里标 2023-09-13 14:46:15 +08:00
dong
10b5e4fade 同步protos 2023-09-13 13:50:05 +08:00
Yuan
8c9f548342 bugfix - 道岔编辑 2023-09-13 10:39:47 +08:00
Yuan
d3f95a78fb bugfix - 数据保存和关系构建 2023-09-13 09:51:00 +08:00
Yuan
06034826e9 轨道区段支持曲线 2023-09-12 15:41:38 +08:00
Yuan
4c87bd7819 Merge branch 'master' of git.code.tencent.com:beijing-rtss-test/bj-rtss-client 2023-09-12 14:58:28 +08:00
Yuan
604523d837 物理区段 2023-09-12 14:58:25 +08:00
dong
c5d79ff45b 列车信息调整 2023-09-12 14:49:46 +08:00
joylink_zhaoerwei
95765f648e 关联继电器列表调整 2023-09-11 18:00:29 +08:00
joylink_zhaoerwei
c5beb6fd6f 设备关联继电器修改--增删改查只保存一次+集中站属性 2023-09-11 17:47:41 +08:00
joylink_zhaoerwei
fe199940a1 微调 2023-09-11 14:11:09 +08:00
joylink_zhaoerwei
1e49ffa356 设备关联继电器 2023-09-11 14:01:17 +08:00
joylink_zhaoerwei
fef305bfa8 设备关联继电器初提交 2023-09-08 17:58:05 +08:00
dong
cfa3a7bdf1 另存后刷新报错处理 2023-09-08 17:13:44 +08:00
Yuan
8ad2e9116f Merge branch 'master' of git.code.tencent.com:beijing-rtss-test/bj-rtss-client 2023-09-08 16:11:04 +08:00
Yuan
87ced13cd9 道岔区段生成判重 2023-09-08 16:11:00 +08:00
joylink_zhaoerwei
462c58d367 app增加打印保存数据和快捷键保存修复 2023-09-08 15:54:34 +08:00
Yuan
1321437f02 bugfix - 道岔物理区段与计轴关系 2023-09-08 15:47:36 +08:00
Yuan
6d68372f2e 道岔物理区段与计轴关系 2023-09-08 10:21:11 +08:00
Yuan
22085a33a8 Merge branch 'master' of git.code.tencent.com:beijing-rtss-test/bj-rtss-client 2023-09-07 16:55:23 +08:00
Yuan
2f79317d95 区段曲线 2023-09-07 16:55:21 +08:00
dong
7e571d5cee 图形属性名称调整 2023-09-07 15:08:39 +08:00
joylink_zhaoerwei
7e09f3d892 左侧功能按钮结构调整 2023-09-06 16:26:38 +08:00
joylink_zhaoerwei
f40b4a904d 微调 2023-09-06 15:35:29 +08:00
joylink_zhaoerwei
25beaf35cf app结构修改,增加各自厂家的app 2023-09-06 14:43:53 +08:00
joylink_zhaoerwei
54f15a959f 修改继电器柜的proto 2023-09-06 09:32:49 +08:00
joylink_zhaoerwei
816b0a6824 区段边界生成的计轴关联关系调整 2023-09-05 17:04:24 +08:00
dong
e18c605818 列车信息调整 2023-09-05 16:27:22 +08:00
dong
fcae20651a Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-client 2023-09-05 16:01:28 +08:00
dong
1386980d32 列车箭头调整 2023-09-05 16:01:15 +08:00
joylink_zhaoerwei
111c206a1b 计轴公里标-重置显示 2023-09-05 15:45:12 +08:00
dong
5ad860befe 列车信息调整 2023-09-05 15:29:30 +08:00
dong
6103863d70 列车信息调整 2023-09-05 15:24:34 +08:00
Yuan
88230487d5 reszie 2023-09-05 15:01:47 +08:00
Yuan
3221a7a694 Merge branch 'master' of git.code.tencent.com:beijing-rtss-test/bj-rtss-client 2023-09-05 14:29:42 +08:00
Yuan
cb1783cd29 轨道区段生成逻辑修复: 位置调整 && 道岔物理区段不生成 2023-09-05 14:29:36 +08:00
dong
536aa4f9bc 发布和草稿图列表显示厂家 2023-09-05 14:10:30 +08:00
Yuan
bcf4e9ee7f 道岔和区段去除联动拖动 2023-09-05 14:03:16 +08:00
joylink_zhaoerwei
cebf98c6f1 计轴增加区段边界 2023-09-05 13:18:37 +08:00
dong
68d5648050 字段调整 2023-09-05 11:31:42 +08:00
dong
beb94c765b 计轴关联区段关系调整 2023-09-05 11:23:47 +08:00
dong
5d7f341d62 草稿图按照厂商类型显示不同区段 2023-09-04 17:21:19 +08:00
Yuan
b34c01c57b Merge branch 'master' of git.code.tencent.com:beijing-rtss-test/bj-rtss-client 2023-09-04 16:52:36 +08:00
Yuan
a6081670e4 物理区段取消拆分功能 2023-09-04 16:52:33 +08:00
joylink_zhaoerwei
4872a86f52 代码优化+继电器多选操作 2023-09-04 14:43:25 +08:00
Yuan
81bd2dc4fc bugfix - 区段拆分 2023-09-04 14:26:33 +08:00
joylink_zhaoerwei
6e292f3290 微调 2023-09-04 09:25:54 +08:00
dong
02df4b5da3 用户信息显示角色 2023-09-01 18:08:25 +08:00
joylink_zhaoerwei
98abaf3f91 批量生成逻辑修改 2023-09-01 17:58:37 +08:00
joylink_zhaoerwei
226b3b3b66 继电器柜网状结构 2023-09-01 17:39:08 +08:00
fan
fa1eb4bef1 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-client 2023-09-01 17:16:48 +08:00
fan
0d4da80136 同步框架代码 2023-09-01 17:16:42 +08:00
dong
a7c35d55d2 生成link信息接口调整 2023-09-01 16:55:34 +08:00
fan
d1424a8ac8 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-client 2023-09-01 16:32:38 +08:00
fan
5abf9cc63d 同步框架代码 2023-09-01 16:32:31 +08:00
joylink_zhaoerwei
bb6e9fbcee 隐藏滚动条 2023-09-01 14:03:26 +08:00
dong
2b1c7b235c 草稿图显示控制及滚动条隐藏 2023-09-01 13:39:39 +08:00
joylink_zhaoerwei
f8778ab7fb 同步框架代码 2023-09-01 13:27:12 +08:00
joylink_zhaoerwei
2c0db082a0 批量生成继电器操作方式修改 2023-09-01 13:19:41 +08:00
dong
b60f870bc2 代码调整 2023-09-01 11:13:35 +08:00
fan
ddd636acd2 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-client 2023-09-01 10:38:02 +08:00
fan
a31f47743a 订阅处理调整 2023-09-01 10:37:57 +08:00
dong
ac63a172c6 发布管理取消创建仿真 2023-09-01 10:36:47 +08:00
dong
4b9120545a 测试管理添加socket 2023-09-01 10:35:10 +08:00
dong
47a1c58f48 代码调整 2023-09-01 10:33:47 +08:00
dong
6f65060cde 显示控制调整 2023-09-01 10:25:13 +08:00
fan
4db8ff4095 框架代码同步 2023-08-31 17:49:31 +08:00
fan
372249dcfb 代码调整 2023-08-31 17:46:51 +08:00
fan
b9162cd059 代码同步 2023-08-31 15:59:01 +08:00
dong
daa601e9cb proto数据同步 2023-08-31 14:32:24 +08:00
dong
b956dc786d 测试管理调整 2023-08-31 10:36:22 +08:00
dong
57307fb8fb 添加角色管理和测试管理 2023-08-30 17:30:27 +08:00
joylink_zhaoerwei
0bacb7bb0c 联动拖动增加操作记录,可撤销 2023-08-30 14:49:58 +08:00
joylink_zhaoerwei
1e4390912a 微调 2023-08-30 14:06:11 +08:00
joylink_zhaoerwei
76a2927480 继电器和继电器柜联动拖动 2023-08-30 13:40:25 +08:00
joylink_zhaoerwei
4f261c9097 微调 2023-08-30 13:12:30 +08:00
joylink_zhaoerwei
79b2aa189e 继电器柜调整 2023-08-30 11:26:39 +08:00
dong
8104f348ab 代码调整 2023-08-29 18:05:34 +08:00
dong
b080e825ed 项目管理、发布管理、列车管理组件调整 2023-08-29 17:59:57 +08:00
fan
c9940f6ef7 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-client 2023-08-29 17:42:53 +08:00
fan
156c6887df psl代码调整 2023-08-29 17:42:47 +08:00
joylink_zhaoerwei
9118eae00f 增加一键生成继电器 2023-08-29 14:50:54 +08:00