Commit Graph

419 Commits

Author SHA1 Message Date
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
5970b33047 运行线车站关系构建 2023-06-26 17:22:42 +08:00
joylink_zhaoerwei
95981e5153 车站状态数据 2023-06-26 17:13:31 +08:00
joylink_zhaoerwei
14a349aace 微调 2023-06-26 16:01:55 +08:00
joylink_zhaoerwei
3a51b0697c 车站--站控中控 2023-06-26 15:13:25 +08:00
Yuan
ca173798e2 道岔和区段关联关系显示对应的端口 2023-06-26 14:42:44 +08:00
fan
4efb620b42 路由导入调整 2023-06-26 13:56:06 +08:00
fan
ead291543a Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-06-26 13:51:31 +08:00
fan
db881556a7 主页面调整 2023-06-26 13:51:27 +08:00
joylink_zhaoerwei
c240b81de8 站台调整 2023-06-26 13:45:18 +08:00
fan
beb4704912 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-06-26 13:13:58 +08:00
fan
3fe9f9e92c 添加监控 2023-06-26 13:13:52 +08:00
joylink_zhaoerwei
7863cfb71b 站台状态数据 2023-06-26 11:00:48 +08:00
joylink_zhaoerwei
db143530c1 车次窗一键生成辅助线 2023-06-26 10:05:53 +08:00
dong
e049c6cd39 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-06-25 17:40:32 +08:00
dong
ed825ab1ed 草稿发布调整 2023-06-25 17:40:17 +08:00
joylink_zhaoerwei
9b06b1301e 站台状态数据 2023-06-25 17:37:52 +08:00
fan
93432b76fb 信号机名称子元素拖拽 2023-06-25 15:48:32 +08:00
fan
7a51145aa3 信号机名称调整 2023-06-25 15:45:48 +08:00
fan
e45e329bb5 信号机调整 2023-06-25 15:40:20 +08:00
fan
6e728a6265 信号机调整 2023-06-25 15:38:36 +08:00
fan
add93ac439 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-06-25 15:06:51 +08:00
fan
58ed710688 框架代码同步 2023-06-25 15:06:47 +08:00
fan
4035943936 信号机代码调整暂提 2023-06-25 15:05:59 +08:00
Yuan
27615aec8f 区段标签移动 && 区段AB端标识修复 2023-06-25 14:30:31 +08:00
Yuan
6e365adecd bugfix - 道岔增删点 2023-06-25 14:04:00 +08:00
joylink_zhaoerwei
4e6f241b7f 公里标显示格式修改 2023-06-25 13:32:32 +08:00
Yuan
b281550e96 bugfix - 道岔增点数据保存 2023-06-25 10:44:20 +08:00
fan
5f80694d93 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-06-21 17:35:07 +08:00
fan
a4ae7c9c3c 状态调整 2023-06-21 17:35:01 +08:00
joylink_zhaoerwei
5a07e8dcaa 微调 2023-06-21 16:57:24 +08:00
joylink_zhaoerwei
f53dc1bec8 车次窗一键生成--改为需要选择一条区段作为基准 2023-06-21 16:30:09 +08:00
Yuan
018c8eb66f Merge branch 'master' of git.code.tencent.com:xian-ncc-da/xian-ncc-da-client 2023-06-21 16:23:42 +08:00
Yuan
1385cae2ed bugfix - 区段取消选中时ab端标识不消失 2023-06-21 16:23:27 +08:00
joylink_zhaoerwei
624956b7d1 车站和站台右键菜单初提交,待配置 2023-06-21 16:23:23 +08:00
Yuan
7d72c33ab2 Merge branch 'master' of git.code.tencent.com:xian-ncc-da/xian-ncc-da-client 2023-06-21 16:11:14 +08:00
Yuan
a8fa8d24c4 道岔区段增删节点 2023-06-21 16:11:10 +08:00
fan
c84d6d92e8 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-06-21 14:48:21 +08:00
fan
b896c3169c 信号机闪烁动画 2023-06-21 14:48:11 +08:00
dong
eb9b564adc 代码调整 2023-06-21 14:37:57 +08:00
dong
0a209a963a 列车调整 2023-06-21 10:07:16 +08:00
joylink_zhaoerwei
a3617b30a5 车次窗一键生成修改 2023-06-21 09:48:07 +08:00
Yuan
53044aeb5a 道岔辅助线增加斜45度 2023-06-21 09:39:12 +08:00
Yuan
e2d2999967 message 2023-06-21 09:33:13 +08:00
Yuan
be3e2d9511 Merge branch 'master' of git.code.tencent.com:xian-ncc-da/xian-ncc-da-client 2023-06-20 17:38:30 +08:00
Yuan
f22953f3f2 区段变换数据 2023-06-20 17:38:27 +08:00
fan
e77765111b lineApp调整 2023-06-20 17:36:39 +08:00
fan
f52bc51759 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-06-20 17:32:12 +08:00
fan
5a3ccf5413 信号机状态调整 2023-06-20 17:32:05 +08:00
Yuan
13bbc1a7e6 Merge branch 'master' of git.code.tencent.com:xian-ncc-da/xian-ncc-da-client 2023-06-20 17:25:41 +08:00
Yuan
51f724bab6 道岔和区段修改 2023-06-20 17:24:28 +08:00
fan
5e12d9a2e5 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-06-20 17:15:03 +08:00
fan
f77edafdfe 信号机状态调整 2023-06-20 17:14:56 +08:00
joylink_zhaoerwei
4af86c2886 车站和站台引入状态数据 2023-06-20 17:00:16 +08:00
fan
3d78dec574 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-06-20 16:22:14 +08:00
fan
b87eb4f326 信号机状态流程 2023-06-20 16:22:10 +08:00
joylink_zhaoerwei
676710cfb8 车站和站台的状态数据 2023-06-20 16:15:05 +08:00
fan
c53c2df847 状态调整 2023-06-20 14:52:19 +08:00
fan
2ffd39f70a Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-06-20 14:00:09 +08:00
fan
eb7163cf64 代码同步 2023-06-20 14:00:01 +08:00
Yuan
1bbff9661d Merge branch 'master' of git.code.tencent.com:xian-ncc-da/xian-ncc-da-client 2023-06-20 13:50:34 +08:00
Yuan
6a8abaa990 框架更新报错修改 2023-06-20 13:48:23 +08:00
joylink_zhaoerwei
44074dd798 代码调整 2023-06-20 13:43:43 +08:00
fan
2e849d8893 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-06-20 11:28:45 +08:00
fan
bd671ada7d 代码调整 2023-06-20 11:28:41 +08:00
joylink_zhaoerwei
4a233987e0 多边形备用 2023-06-20 11:22:03 +08:00
fan
d57b7bdbfa 同步代码 2023-06-20 11:06:00 +08:00
fan
8082948b65 link路径点菜单调整 2023-06-20 10:09:55 +08:00
fan
98c213dab1 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-06-20 10:08:33 +08:00
fan
bea612c8ba 路径编辑调整 2023-06-20 10:08:29 +08:00
joylink_zhaoerwei
5de5b79e04 去除多边形 2023-06-20 09:40:18 +08:00
fan
8f8ad4cd6a 同步代码 2023-06-20 09:20:02 +08:00
fan
924790bf64 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-06-20 09:17:14 +08:00
fan
45709b918d 信号机大小调整 2023-06-20 09:17:10 +08:00
joylink_zhaoerwei
3b337a7834 车次窗方向 2023-06-20 09:10:58 +08:00
Yuan
553bcb4307 bugfix 2023-06-20 08:48:49 +08:00
Yuan
357085e7fd bugfix - deviceType比较 2023-06-19 17:40:27 +08:00
Yuan
bcb0a1da98 Merge branch 'master' of git.code.tencent.com:xian-ncc-da/xian-ncc-da-client 2023-06-19 17:37:21 +08:00
Yuan
aa584dd3bb 框架更新, 道岔和区段吸附修改 2023-06-19 17:37:16 +08:00
fan
d28b9c94d1 代码同步 2023-06-19 17:28:04 +08:00
fan
134b1dd700 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-06-19 17:27:19 +08:00
fan
1d1dbade47 线网添加设备 2023-06-19 17:27:06 +08:00
Yuan
98f768cc9f Merge branch 'master' of git.code.tencent.com:xian-ncc-da/xian-ncc-da-client 2023-06-19 17:18:38 +08:00
Yuan
1d317a452a 道岔和区段关联关系 2023-06-19 17:18:32 +08:00
joylink_zhaoerwei
5570e88878 车站和站台绘制辅助线 2023-06-19 16:40:39 +08:00
fan
6b735a094c Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-06-19 16:19:44 +08:00
fan
2e5527d5f7 右键菜单迁移 2023-06-19 16:19:38 +08:00
joylink_zhaoerwei
76444b896a 微调 2023-06-19 16:01:22 +08:00
joylink_zhaoerwei
63052c4617 微调 2023-06-19 15:29:44 +08:00
joylink_zhaoerwei
932409e700 车次窗bug修复 2023-06-19 14:42:31 +08:00
joylink_zhaoerwei
8b46178f57 一键生成车次窗--初提交 2023-06-19 14:18:09 +08:00
fan
b3c31c2a54 预览界面调整 2023-06-19 14:09:09 +08:00
fan
415db453e4 框架代码同步 2023-06-19 11:14:54 +08:00
fan
a28dad6c03 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-06-19 11:14:18 +08:00
fan
ea2c874341 发布预览 2023-06-19 11:14:09 +08:00
Yuan
cf61120362 bugfix - 区段保存错误数据 2023-06-16 17:49:30 +08:00
joylink_zhaoerwei
af2ac45426 车次窗辅助线和自动生成多个车次窗 2023-06-16 17:15:04 +08:00
joylink_zhaoerwei
0064742aa1 微调 2023-06-16 15:53:09 +08:00
joylink_zhaoerwei
683dc43c8e Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-06-16 15:46:29 +08:00
joylink_zhaoerwei
18a24d898c 公里标 2023-06-16 15:45:21 +08:00
Yuan
61e9b9dcf7 Merge branch 'master' of git.code.tencent.com:xian-ncc-da/xian-ncc-da-client 2023-06-16 15:44:49 +08:00
Yuan
2429d7a348 修改道岔和区段吸附 2023-06-16 15:44:45 +08:00
fan
3239e8862e 镜像处理逻辑调整 2023-06-16 14:49:15 +08:00
fan
a116149775 镜像复值调整 2023-06-16 14:31:05 +08:00
fan
3d8e203e9d 镜像代码调整 2023-06-16 14:08:04 +08:00
fan
59721814af Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-06-16 13:46:04 +08:00
fan
aa805d8f84 信号机添加吸附&镜像 2023-06-16 13:45:58 +08:00
joylink_zhaoerwei
3e7b9936b4 车次窗初提交--车站增加集中站属性 2023-06-16 13:15:46 +08:00
fan
f4535563be 线网图车站字体调小 2023-06-16 10:48:20 +08:00
fan
b401a1ffcd 工具方法提出 2023-06-16 10:45:58 +08:00
fan
41c562451a 代码同步 2023-06-16 10:28:39 +08:00
fan
f777be3d47 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-06-16 09:27:23 +08:00
fan
34df6dc145 代码调整 2023-06-16 09:27:14 +08:00