Commit Graph

609 Commits

Author SHA1 Message Date
fan
c48925d314 暂时注释订阅 2023-08-01 10:50:39 +08:00
fan
f9c8594253 恢复测试内容 2023-08-01 10:30:19 +08:00
fan
a12929f048 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-client 2023-08-01 10:23:14 +08:00
dong
f0a891510c 应答器添加公里标 2023-08-01 10:23:10 +08:00
fan
d95f62d683 测试1 2023-08-01 10:23:09 +08:00
fan
f0026f307c 测试 2023-08-01 10:20:53 +08:00
fan
f3ef2bb9d1 同步代码 2023-08-01 10:06:43 +08:00
fan
83245fc7ef url 2023-08-01 10:03:54 +08:00
dong
98134737f3 应答器加公里标 2023-08-01 09:57:04 +08:00
dong
390b29599e 代码调整 2023-07-31 17:56:31 +08:00
dong
c28a721940 用户管理调整 2023-07-31 17:51:59 +08:00
dong
9511d7807c 代码调整 2023-07-31 17:40:00 +08:00
dong
22534c623a 代码调整 2023-07-31 17:32:41 +08:00
dong
2edb0b5d06 道岔正反位调整 2023-07-31 17:28:33 +08:00
fan
35ddeb91c4 代码同步 2023-07-31 16:58:06 +08:00
fan
4adaffd770 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-client 2023-07-31 15:47:02 +08:00
fan
b7d16ed501 登录调整1 2023-07-31 15:46:57 +08:00
dong
131461e7a6 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-client 2023-07-31 15:42:51 +08:00
dong
2b49cb15e5 草稿发布接口调整 2023-07-31 15:42:41 +08:00
fan
a47a0730ea Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-client 2023-07-31 15:42:29 +08:00
fan
8f73f81875 登录调整 2023-07-31 15:42:22 +08:00
dong
08c57ae47e 销毁仿真接口调整 2023-07-31 15:03:27 +08:00
dong
3aadf898e2 注释掉角色编辑按钮 2023-07-31 14:17:10 +08:00
dong
68327454f2 代码调整 2023-07-31 14:03:49 +08:00
dong
c710978afd socket订阅调整 2023-07-31 13:54:16 +08:00
dong
5c14bd47d0 发布列表字段调整 2023-07-31 11:02:03 +08:00
dong
14ccfd1d9b 另存调整 2023-07-31 10:59:57 +08:00
dong
f02781bd0b 草稿列表字段调整 2023-07-31 10:56:32 +08:00
dong
52f8258753 登录接口返回调整 2023-07-31 10:40:25 +08:00
dong
ce04e7694a Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-client 2023-07-31 10:15:22 +08:00
dong
62da0fde67 调整接口url 2023-07-31 10:15:08 +08:00
fan
4a0d42f97e Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-client 2023-07-31 09:22:25 +08:00
fan
0a0095e351 订阅调整 2023-07-31 09:22:19 +08:00
dong
4c0378c597 代码调整 2023-07-28 15:42:12 +08:00
dong
4eb7bb4ebd 应答器调整 2023-07-28 15:29:11 +08:00
fan
7fc10b5ece Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-client 2023-07-27 17:48:30 +08:00
fan
677ec64620 关闭后重置notify 2023-07-27 17:48:23 +08:00
dong
7a9e75e935 发布图显示应答器 2023-07-27 17:39:32 +08:00
dong
f85d4a9782 列车信息调整 2023-07-27 14:43:36 +08:00
fan
779b39d1fc Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-client 2023-07-27 10:15:12 +08:00
fan
3eae46dd30 绘制右键调整 2023-07-27 10:15:06 +08:00
dong
242d26bb4f 应答器调整 2023-07-27 10:00:14 +08:00
fan
62b5164904 spks开关添加名称修改 2023-07-27 09:35:55 +08:00
fan
81857d1087 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-client 2023-07-27 09:28:55 +08:00
fan
fd8eba13c7 正式地图添加新设备 2023-07-27 09:28:50 +08:00
joylink_zhaoerwei
a4462bfe98 微调 2023-07-26 18:09:44 +08:00
fan
3a4871a318 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-client 2023-07-26 17:49:08 +08:00
fan
569c4d8438 添加紧急关闭按钮 2023-07-26 17:47:50 +08:00
dong
d8c12510f9 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-client 2023-07-26 17:47:22 +08:00
dong
df294d817d 添加应答器 2023-07-26 17:47:08 +08:00
joylink_zhaoerwei
6a5e158f19 站台30个屏蔽门 2023-07-26 17:45:05 +08:00
fan
76eac675ee 新增GateBox、SpksSwitch、StopPosition 2023-07-26 17:00:52 +08:00
fan
1ce3c83451 同步protoc 2023-07-26 10:58:40 +08:00
fan
047b06643b Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-client 2023-07-26 09:57:19 +08:00
fan
f598db1dd6 socket断链提示 2023-07-26 09:57:12 +08:00
joylink_zhaoerwei
86d37f6146 图层-物理区段 2023-07-26 09:32:37 +08:00
dong
7a8bf4cce1 退出按钮样式调整 2023-07-25 15:30:14 +08:00
fan
0d64cc8185 添加为查找到提示 2023-07-25 11:22:10 +08:00
fan
2a5888912b 添加搜索功能 2023-07-25 10:40:07 +08:00
fan
e1c9a9af6e 删除注释 2023-07-25 09:33:58 +08:00
fan
e567a4dfe3 link增加AB端点显示 2023-07-25 09:33:19 +08:00
fan
b9f857b526 状态显示 2023-07-24 17:51:35 +08:00
fan
ddc560c287 状态管理暂提 2023-07-24 11:19:06 +08:00
fan
66ca2e9687 框架代码同步后菜单调整 2023-07-21 16:03:55 +08:00
fan
26bdaa0e0a 框架同步 2023-07-21 15:54:03 +08:00
fan
6db77f7668 增加app销毁 2023-07-21 15:52:53 +08:00
fan
3e489a9a20 报错调整 2023-07-21 15:20:13 +08:00
fan
d74b8ce9c3 报错调整 2023-07-21 15:12:38 +08:00
fan
a36e2c7d5d 右键菜单处理调整 2023-07-21 15:07:43 +08:00
fan
32a1fb6b9a Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-client 2023-07-21 14:04:49 +08:00
fan
5890ca71c4 右键菜单置灰调整 2023-07-21 14:04:29 +08:00
Yuan
61b439341a Merge branch 'master' of git.code.tencent.com:beijing-rtss-test/bj-rtss-client 2023-07-21 11:29:32 +08:00
Yuan
6c3356450c 道岔定反位设置 2023-07-21 11:29:27 +08:00
fan
293adda0d7 文件删除 2023-07-21 11:25:04 +08:00
dong
ebe06adac5 列车信息调整 2023-07-21 10:57:07 +08:00
dong
1dac72be9d 列车状态添加 2023-07-20 17:21:11 +08:00
fan
9407e855e9 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-client 2023-07-20 16:57:08 +08:00
fan
7712047ba4 页面监听大小变化 2023-07-20 16:57:03 +08:00
dong
566904cc5c 同步列车信息 2023-07-20 16:38:24 +08:00
fan
bb63f66114 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-client 2023-07-20 15:41:14 +08:00
fan
12b41f932d 上下行方向调整 2023-07-20 15:41:04 +08:00
Yuan
72266db5ea wss 2023-07-20 15:26:28 +08:00
Yuan
1230ca8787 test 2023-07-20 14:34:52 +08:00
Yuan
a6631b8458 233 2023-07-20 13:50:48 +08:00
Yuan
b36a0774d5 Merge branch 'master' of git.code.tencent.com:beijing-rtss-test/bj-rtss-client 2023-07-20 13:50:02 +08:00
Yuan
8459353c59 道岔状态 2023-07-20 13:49:56 +08:00
dong
1c30a77c43 列车显示调整 2023-07-20 10:14:16 +08:00
Yuan
95aff4919e 区段存计轴数据 2023-07-20 09:35:27 +08:00
dong
e85c27aefb 代码调整 2023-07-19 17:55:32 +08:00
dong
b3011f2fb6 代码调整 2023-07-19 16:13:49 +08:00
dong
1f44f1cb51 用户信息和登出功能 2023-07-19 15:04:54 +08:00
fan
5e8f423ae8 添加列车显示调整 2023-07-19 13:54:50 +08:00
fan
0925973df8 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-client 2023-07-19 13:53:51 +08:00
fan
f3b83793c8 列车显示调整 2023-07-19 13:53:46 +08:00
dong
141fbaa604 列车信息调整 2023-07-19 13:24:36 +08:00
fan
253f7fb780 类型调整 2023-07-19 11:12:30 +08:00
fan
e0e6ad2a07 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-client 2023-07-19 10:42:40 +08:00
fan
b7302e3cfe 添加数据校验 2023-07-19 10:42:35 +08:00
dong
cad30db0a7 代码调整 2023-07-19 10:42:33 +08:00
dong
16d38a4a6c 同步proto 2023-07-19 10:18:29 +08:00
dong
0244b6775a 添加列车信息 2023-07-19 10:17:00 +08:00
fan
9a74810fac link点击调整 2023-07-19 09:30:57 +08:00
fan
5cf84d4472 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-client 2023-07-19 09:20:15 +08:00
fan
83437255e5 baseUrl修正 2023-07-19 09:20:09 +08:00
joylink_zhaoerwei
99978dc23d 车站去控制 2023-07-18 18:10:34 +08:00
fan
67f65c36bd 添加列车移除列车 2023-07-18 13:44:06 +08:00
fan
76733a8b26 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-client 2023-07-17 16:30:09 +08:00
fan
b9831451bc 添加列车暂提 2023-07-17 16:30:04 +08:00
dong
dd2467900c 代码调整 2023-07-17 15:19:44 +08:00
dong
427e713470 图层调整 2023-07-17 14:49:58 +08:00
fan
48a4874a94 各设备增加索引 2023-07-14 17:53:29 +08:00
fan
d52c6e3732 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-client 2023-07-14 15:36:49 +08:00
fan
32c382db53 protoc 2023-07-14 15:36:43 +08:00
dong
ee2177cd59 索引调整 2023-07-14 15:08:23 +08:00
fan
5857d594d4 link调整 2023-07-14 14:57:03 +08:00
fan
b6979421e8 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-client 2023-07-14 14:44:56 +08:00
fan
3062690fc8 link调整 2023-07-14 14:44:49 +08:00
dong
e02581b1de 调整proto对应的数据 2023-07-14 14:20:12 +08:00
dong
507ddc5c45 proto同步和注释掉多余的 2023-07-14 14:07:20 +08:00
joylink_zhaoerwei
bcc7f6d718 微调 2023-07-14 08:48:21 +08:00
dong
b18b7b3674 创建仿真 2023-07-13 18:21:24 +08:00
joylink_zhaoerwei
d23b57ec9a 计轴区段一键生成逻辑修改--按搜索路径 2023-07-13 17:57:13 +08:00
Yuan
0be7df6558 Merge branch 'master' of git.code.tencent.com:beijing-rtss-test/bj-rtss-client 2023-07-13 17:13:15 +08:00
Yuan
f9b8d6cd49 去除console.log 2023-07-13 17:13:11 +08:00
dong
2e25173706 注销线路类型 2023-07-13 16:20:57 +08:00
dong
7bb103838d 逻辑区段调整 2023-07-13 15:40:14 +08:00
dong
e0625843d2 代码调整 2023-07-13 15:20:25 +08:00
joylink_zhaoerwei
7aacacaa99 计轴删除后的计轴区段 2023-07-12 18:42:52 +08:00
dong
bcb235ccaf 逻辑区段调整 2023-07-12 17:43:39 +08:00
fan
f34c4a9da0 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-client 2023-07-12 17:25:45 +08:00
fan
c8b15ae0d9 一键创建link不再删除原有link 2023-07-12 17:25:39 +08:00
dong
55693eecd9 逻辑区段调整 2023-07-12 17:16:12 +08:00
fan
1619eb05b6 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-client 2023-07-12 16:40:31 +08:00
fan
8b763fa671 sectionLink编号颜色&拖动调整 2023-07-12 16:40:23 +08:00
joylink_zhaoerwei
9469a20225 微调 2023-07-12 15:57:08 +08:00
joylink_zhaoerwei
8e15d22360 计轴区段名称显示 2023-07-12 15:51:33 +08:00
dong
b53e27640a 代码调整 2023-07-12 15:12:37 +08:00
dong
437fd3edbe 代码调整 2023-07-12 15:08:04 +08:00
dong
2981a131ce 逻辑区段调整 2023-07-12 14:53:04 +08:00
Yuan
ee3de04ae5 Merge branch 'master' of git.code.tencent.com:beijing-rtss-test/bj-rtss-client 2023-07-12 14:14:42 +08:00
Yuan
ac6c8cc137 道岔和物理区段的联动拖动 2023-07-12 14:14:38 +08:00
joylink_zhaoerwei
831960b031 微调 2023-07-12 14:04:45 +08:00
fan
072b44be90 sectionLink代码调整 2023-07-12 14:03:35 +08:00
fan
76d9ae204b Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-client 2023-07-12 13:59:23 +08:00
fan
cd95df7eea sectionlink代码调整 2023-07-12 13:59:16 +08:00
dong
e212a0dc1d Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-client 2023-07-12 13:57:26 +08:00
dong
17343541bc 分隔符调整 2023-07-12 13:57:13 +08:00
joylink_zhaoerwei
980e5dfbd2 计轴生成修改--不拆物理区段 2023-07-12 13:54:38 +08:00
dong
28dc36b679 当前选中的逻辑区段不能删除 2023-07-12 13:20:16 +08:00
dong
1a74406d05 同步框架代码 2023-07-12 13:10:17 +08:00
fan
9db9816ef7 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-client 2023-07-12 13:05:50 +08:00
fan
e7fbcc3e3b sectionLInk逻辑关系调整 2023-07-12 13:05:42 +08:00
Yuan
6bd8bf17b9 Merge branch 'master' of git.code.tencent.com:beijing-rtss-test/bj-rtss-client 2023-07-12 11:24:35 +08:00
Yuan
fa599de542 物理区段 2023-07-12 11:23:22 +08:00
dong
de6b1a70cc 同步框架代码 2023-07-12 10:51:06 +08:00
joylink_zhaoerwei
4427c51410 计轴区段关联关系管理中添加道岔位置关系 2023-07-12 10:41:28 +08:00
dong
37d73efc9d 逻辑区段调整 2023-07-12 10:26:07 +08:00
joylink_zhaoerwei
bc0844523b 计轴和计轴区段的code显示 2023-07-12 10:12:15 +08:00
joylink_zhaoerwei
e73fe0ede6 计轴区段增量添加 2023-07-11 17:42:04 +08:00
dong
dbd01d71a3 逻辑区段调整 2023-07-11 17:35:11 +08:00
dong
d4bc0f6648 逻辑区段拆分 2023-07-11 17:09:49 +08:00
dong
c23fdb4cbf 逻辑区段调整 2023-07-11 16:44:04 +08:00
joylink_zhaoerwei
1c11f4eb0d 计轴和计轴的索引编号 2023-07-11 16:18:02 +08:00
joylink_zhaoerwei
8c717d45dd 计轴区段与道岔位置关系 2023-07-11 15:35:35 +08:00
joylink_zhaoerwei
34ac0ac03c 微调 2023-07-10 17:01:08 +08:00
fan
a785296c3b Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-client 2023-07-10 16:54:59 +08:00
fan
88c16a240e link生成逻辑调整 2023-07-10 16:54:49 +08:00
dong
5573f7ea42 添加逻辑区段 2023-07-10 16:34:33 +08:00
dong
338d7132b3 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-client 2023-07-10 16:22:45 +08:00
joylink_zhaoerwei
6bd0951baf link图层和计轴区段图层 2023-07-10 15:45:07 +08:00
joylink_zhaoerwei
4bea3397fe 微调 2023-07-10 15:29:46 +08:00
dong
8b5730e9ee Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-client 2023-07-10 15:14:27 +08:00
joylink_zhaoerwei
b23c0902b0 微调 2023-07-10 15:10:06 +08:00
joylink_zhaoerwei
1247e1cc6f 增量生成计轴区段 2023-07-10 15:03:47 +08:00
fan
274a7b46b4 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-client 2023-07-10 14:46:46 +08:00
fan
9f04d5825a link生成逻辑调整 2023-07-10 14:45:50 +08:00
joylink_zhaoerwei
744de6a8d9 计轴区段的图层 2023-07-10 14:02:56 +08:00
dong
3aec34fd59 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-client 2023-07-10 13:39:59 +08:00
joylink_zhaoerwei
580045045a 去除多生成的计轴区段 2023-07-10 13:37:13 +08:00
dong
459426f483 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-client 2023-07-10 10:09:43 +08:00
joylink_zhaoerwei
0df2fd6fac 计轴区段补线 2023-07-10 10:04:53 +08:00
Yuan
658ab9efb1 子模块同步 2023-07-10 10:03:26 +08:00
Yuan
2273218dfb Merge branch 'master' of git.code.tencent.com:beijing-rtss-test/bj-rtss-client 2023-07-10 09:57:11 +08:00
Yuan
44d4acb739 道岔正反位 2023-07-10 09:57:07 +08:00
dong
2d2723ea5b Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-client 2023-07-10 09:27:47 +08:00
joylink_zhaoerwei
021d683829 计轴位置在端点 2023-07-07 17:25:51 +08:00
joylink_zhaoerwei
27c48d04d5 计轴区段初提交--待完善 2023-07-07 17:15:53 +08:00
fan
6ab4415b55 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-client 2023-07-07 16:05:23 +08:00
fan
6e38d31bd2 增加link 2023-07-07 16:05:17 +08:00
dong
5236853d1e 列车调整 2023-07-07 14:34:26 +08:00
dong
1aaf0f6da0 代码调整 2023-07-07 09:27:18 +08:00
fan
3ed7b25f57 Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-client 2023-07-07 09:25:49 +08:00
fan
55b650e349 message同步 2023-07-07 09:25:37 +08:00
joylink_zhaoerwei
627dcea9fd 图层代码备用 2023-07-06 17:14:49 +08:00
joylink_zhaoerwei
bd4ee6a5a6 线路图同步计轴和车次窗数据 2023-07-06 14:37:38 +08:00
joylink_zhaoerwei
cdb7ee59ac 车站控制状态--待后端字段完善 2023-07-06 14:05:38 +08:00
joylink_zhaoerwei
2ecde4e1c8 站台紧急关闭动画 2023-07-06 13:19:38 +08:00
joylink_zhaoerwei
20c03dc4be 站台状态 2023-07-06 09:44:42 +08:00
joylink_zhaoerwei
537cc9981a 站台调整 2023-07-05 18:00:23 +08:00
joylink_zhaoerwei
1cd542dbaf 车站修改 2023-07-05 16:03:25 +08:00
Yuan
e1f8677bbb 道岔和区段功能同步 2023-07-05 15:50:24 +08:00
joylink_zhaoerwei
29c7f9d2bd 同步站台更改 2023-07-05 13:39:38 +08:00
fan
fcb75e3adb 代码调整 2023-07-04 11:14:13 +08:00
fan
580053e113 区段问题调整 2023-07-04 11:13:02 +08:00
fan
dc442425b3 代码调整 2023-07-03 16:42:47 +08:00
fan
f25d303f5e 代码调整 2023-07-03 16:11:16 +08:00
fan
65a142cced 代码调整 2023-07-03 14:35:37 +08:00
fan
477087064c 部分代码删除 2023-07-03 13:37:58 +08:00
fan
2e1b7d5c8a 代码提交 2023-07-03 13:16:08 +08:00