Commit Graph

961 Commits

Author SHA1 Message Date
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
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
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