From d9e2a00010bdfe1eac66b4254a0694e647336780 Mon Sep 17 00:00:00 2001 From: fly-l <1420031550@qq.com> Date: Fri, 28 Oct 2022 18:10:36 +0800 Subject: [PATCH] =?UTF-8?q?2022-10-28=20=E7=84=8A=E6=8E=A5=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SGGL/FineUIPro.Web/Controls/_3DLook.ascx | 4 ++-- SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.cs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) 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); }