Commit Graph

500 Commits

Author SHA1 Message Date
Yuan
81dd9ed450 Merge branch 'master' of git.code.tencent.com:xian-ncc-da/xian-ncc-da-client 2023-06-29 17:33:54 +08:00
Yuan
10a2c9de27 四道岔共点关系处理 2023-06-29 17:33:19 +08:00
fan
ddbf5936be Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-06-29 17:22:02 +08:00
fan
6726da6a39 线路线网跳转 2023-06-29 17:21:55 +08:00
joylink_zhaoerwei
2f1dafe83b 计轴名称加默认 2023-06-29 17:18:16 +08:00
dong
4121dde0d2 分隔符调整 2023-06-29 17:10:53 +08:00
joylink_zhaoerwei
04c4b8908e 公里标--车站和计轴 2023-06-29 16:51:53 +08:00
dong
3f7014066d 分隔符调整 2023-06-29 16:34:11 +08:00
dong
47005eb430 添加分隔符 2023-06-29 16:29:48 +08:00
fan
9df36d7706 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-06-29 15:39:28 +08:00
fan
5c0b0fc40f 公里标系统 2023-06-29 15:39:23 +08:00
joylink_zhaoerwei
f8d0dc8b39 计轴优化 2023-06-29 15:35:18 +08:00
joylink_zhaoerwei
3f54c6c010 计轴--增量添加 2023-06-29 14:49:54 +08:00
fan
5022d73b58 proto同步 2023-06-29 14:11:23 +08:00
fan
166825266a Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-06-29 14:08:38 +08:00
fan
344371c3fa 信号机公里标 2023-06-29 14:08:33 +08:00
fan
331eaf042b 轨迹线公里标点生成逻辑调整 2023-06-29 11:18:01 +08:00
joylink_zhaoerwei
1ff4a3e60f 由道岔关系生成计轴 2023-06-29 11:09:25 +08:00
Yuan
8be43e6331 Merge branch 'master' of git.code.tencent.com:xian-ncc-da/xian-ncc-da-client 2023-06-29 10:38:19 +08:00
Yuan
48d117fdab 区段和道岔关系 2023-06-29 10:38:16 +08:00
joylink_zhaoerwei
99f0987b15 由区段的关联关系生成计轴--道岔待优化 2023-06-29 10:09:00 +08:00
fan
180712d9c4 运行线生成关联车站调整again 2023-06-29 10:05:02 +08:00
fan
2f5a932c58 运行线生成关联车站限制增加 2023-06-29 09:59:16 +08:00
fan
632371b64c Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-06-28 17:59:15 +08:00
fan
886e16fd03 信号机公里标 2023-06-28 17:59:10 +08:00
Yuan
798a348ac9 Merge branch 'master' of git.code.tencent.com:xian-ncc-da/xian-ncc-da-client 2023-06-28 17:28:11 +08:00
Yuan
5ec1dcc745 道岔和区段表单更新问题 2023-06-28 17:28:08 +08:00
joylink_zhaoerwei
ea2e929822 由区段生成的计轴以及关联关系 2023-06-28 15:20:00 +08:00
fan
124eb1f758 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-06-28 13:54:32 +08:00
fan
ce48819652 轨迹线注释坐标 2023-06-28 13:54:26 +08:00
Yuan
c5d9661337 Merge branch 'master' of git.code.tencent.com:xian-ncc-da/xian-ncc-da-client 2023-06-28 13:49:26 +08:00
Yuan
63738bae43 bugfix - 区段道岔关系数据 2023-06-28 13:49:22 +08:00
fan
8f8ce56c87 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-06-28 13:42:02 +08:00
fan
4e7d373031 轨迹线调整 2023-06-28 13:41:18 +08:00
joylink_zhaoerwei
36ea9427e5 计轴不删 2023-06-28 13:07:44 +08:00
joylink_zhaoerwei
4559914091 计轴 2023-06-28 11:02:17 +08:00
joylink_zhaoerwei
ad331085b4 计轴图形--待完善 2023-06-27 14:31:43 +08:00
fan
16f535514d Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-06-27 14:14:46 +08:00
fan
4529277fb5 暂提 2023-06-27 14:14:41 +08:00
dong
ef8f31ffe3 列车调整 2023-06-27 14:11:30 +08:00
dong
62bb6bd323 列车调整 2023-06-27 13:50:16 +08:00
fan
faa462f980 proto调整 2023-06-27 13:19:42 +08:00
fan
47753510e2 proto文件修改 2023-06-27 13:15:02 +08:00
fan
9789157b86 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-06-27 13:14:40 +08:00
fan
d328f89463 代码调整 2023-06-27 13:12:41 +08:00
Yuan
ae4fab38f9 Merge branch 'master' of git.code.tencent.com:xian-ncc-da/xian-ncc-da-client 2023-06-27 09:57:14 +08:00
Yuan
c47933e4d2 wip - 区段拆分 2023-06-27 09:57:10 +08:00
fan
153b1ec567 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-06-26 17:23:18 +08:00
fan
abc1cfa7e0 message同步 2023-06-26 17:23:10 +08:00
fan
5970b33047 运行线车站关系构建 2023-06-26 17:22:42 +08:00