From 560d62a6d6043a1b9016809a610493a07ed30591 Mon Sep 17 00:00:00 2001 From: supercjj2023 Date: Mon, 20 Oct 2025 18:11:47 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E4=BA=86=E7=82=B9=E5=B0=8F=E5=9C=B0?= =?UTF-8?q?=E6=96=B9=EF=BC=8C=E4=B8=8D=E7=84=B6=E6=B2=A1=E6=9C=89=E6=88=BF?= =?UTF-8?q?=E9=97=B4=E5=8F=B7=E5=8F=AA=E6=9C=89=E8=82=8B=E4=BD=8D=E5=8F=B7?= =?UTF-8?q?=E7=9A=84=E4=BD=8D=E5=8F=B7=E5=87=BA=E4=B8=8D=E6=9D=A5=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppApi/PlotLayoutApiController.cs | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/Learun.Application.Web/AppApi/PlotLayoutApiController.cs b/Learun.Application.Web/AppApi/PlotLayoutApiController.cs index de74eb8e..29b154e7 100644 --- a/Learun.Application.Web/AppApi/PlotLayoutApiController.cs +++ b/Learun.Application.Web/AppApi/PlotLayoutApiController.cs @@ -244,10 +244,9 @@ namespace Learun.Application.Web.AppApi area = "ERR", }; basePoint.Tags.Add(layoutTagInfoInvalid); - foreach (var item in EquipPropAll) + foreach (var item in EquipPropAll.Where(x=>x.EngineDataID== matchPointTagId)) { - if (matchPointTagIdSet.Contains(item.EngineDataID)) - item.Marker = true; + item.Marker = true; } continue; } @@ -266,6 +265,11 @@ namespace Learun.Application.Web.AppApi { strRoom = matchedRoom.DataItemName; } + if(matchedRoom==null && basePoint.RoomNo!=string.Empty)//这里基点也要判断下，只有是基点带ROOMNO值的才不统计 + { + //如果房间号没有匹配的，肋位号有，则不打标记，而且应该把该位号放到只有肋位号的基点上去，没有这种基点则不统计 + continue; + } var Prop_FrameOff = tagProps.FirstOrDefault(x => x.PropertyName == GlobalObject.propName_FrameOff)?.PropertyValue; var Prop_YOff = tagProps.FirstOrDefault(x => x.PropertyName == GlobalObject.propName_YOff)?.PropertyValue; @@ -365,10 +369,9 @@ namespace Learun.Application.Web.AppApi RoomNo = strRoom }; basePoint.Tags.Add(layoutTagInfo); - foreach (var item in EquipPropAll) + foreach (var item in EquipPropAll.Where(x => x.EngineDataID == matchPointTagId)) { - if (matchPointTagIdSet.Contains(item.EngineDataID)) - item.Marker = true; + item.Marker = true; } } #endregion