Commit Graph

467 Commits

Author SHA1 Message Date
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
869eff8bff message同步 2023-06-21 14:49:01 +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