diff --git a/SGGL/FineUIPro.Web/Controls/_3DLook.ascx b/SGGL/FineUIPro.Web/Controls/_3DLook.ascx index 84ad8315..74250878 100644 --- a/SGGL/FineUIPro.Web/Controls/_3DLook.ascx +++ b/SGGL/FineUIPro.Web/Controls/_3DLook.ascx @@ -31,8 +31,8 @@ if (ifm != null && subWeb != null) { // ifm.height = subWeb.body.scrollHeight; ifm.height = document.documentElement.clientHeight; - console.log(ifm.height); - console.log(document.documentElement.clientHeight); + //console.log(ifm.height); + //console.log(document.documentElement.clientHeight); } } diff --git a/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.cs b/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.cs index 4ccffd6e..c4633882 100644 --- a/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.cs @@ -383,7 +383,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery List Incomplete_weldjunctionList = new List(); foreach (var item in q1) { - Incomplete_weldjunctionList.Add("/" + item.PipelineCode); + Incomplete_weldjunctionList.Add("/" + item.WeldJointCode); } Incomplete_weldjunction = string.Join(",", Incomplete_weldjunctionList); }