diff --git a/DataBase/版本日志/HJGLDB_DS_2026-04-18_lc.sql b/DataBase/版本日志/HJGLDB_DS_2026-04-18_lc.sql index 795d19b..666a723 100644 --- a/DataBase/版本日志/HJGLDB_DS_2026-04-18_lc.sql +++ b/DataBase/版本日志/HJGLDB_DS_2026-04-18_lc.sql @@ -3,4 +3,4 @@ Alter TABLE [dbo].[HJGL_PW_JointInfo] add [x] [nvarchar](50) NULL, [y] [nvarchar](50) NULL, [x2] [nvarchar](50) NULL, - [y2] [nvarchar] + [y2] [nvarchar] (50) NULL diff --git a/DataBase/版本日志/HJGLDB_DS_2026-04-19_lc.sql b/DataBase/版本日志/HJGLDB_DS_2026-04-19_lc.sql new file mode 100644 index 0000000..1ff64b1 Binary files /dev/null and b/DataBase/版本日志/HJGLDB_DS_2026-04-19_lc.sql differ diff --git a/HJGL_DS/FineUIPro.Web/File/PDF/Pipe/25-P112191210-1-B1P-N(021)/25-P112191210-1-B1P-N(021)-1.pdf b/HJGL_DS/FineUIPro.Web/File/PDF/Pipe/25-P112191210-1-B1P-N(021)/25-P112191210-1-B1P-N(021)-1.pdf new file mode 100644 index 0000000..548f9ec --- /dev/null +++ b/HJGL_DS/FineUIPro.Web/File/PDF/Pipe/25-P112191210-1-B1P-N(021)/25-P112191210-1-B1P-N(021)-1.pdf @@ -0,0 +1 @@ + diff --git a/HJGL_DS/FineUIPro.Web/File/PDF/Pipe/25-P112191210-2-B1P-N(021)/25-P112191210-2-B1P-N(021)-1.pdf b/HJGL_DS/FineUIPro.Web/File/PDF/Pipe/25-P112191210-2-B1P-N(021)/25-P112191210-2-B1P-N(021)-1.pdf new file mode 100644 index 0000000..480b466 --- /dev/null +++ b/HJGL_DS/FineUIPro.Web/File/PDF/Pipe/25-P112191210-2-B1P-N(021)/25-P112191210-2-B1P-N(021)-1.pdf @@ -0,0 +1 @@ + diff --git a/HJGL_DS/FineUIPro.Web/HJGL/JoinMarking/JointShow.aspx b/HJGL_DS/FineUIPro.Web/HJGL/JoinMarking/JointShow.aspx index 34ddb68..c955fff 100644 --- a/HJGL_DS/FineUIPro.Web/HJGL/JoinMarking/JointShow.aspx +++ b/HJGL_DS/FineUIPro.Web/HJGL/JoinMarking/JointShow.aspx @@ -5,7 +5,7 @@ - <asp:Literal runat="server" Text="<%$ Resources:Lan,TestPackageImport_title%>"/> + <asp:Literal runat="server" Text="轴测图"/>
@@ -13,19 +13,19 @@ - - @@ -38,11 +38,7 @@ - - + diff --git a/HJGL_DS/FineUIPro.Web/HJGL/JoinMarking/JointShow.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/JoinMarking/JointShow.aspx.cs index 2057bb1..19ba878 100644 --- a/HJGL_DS/FineUIPro.Web/HJGL/JoinMarking/JointShow.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/HJGL/JoinMarking/JointShow.aspx.cs @@ -1,16 +1,17 @@ using BLL; +using FastReport.Editor; +using Newtonsoft.Json.Linq; +using NPOI.SS.UserModel; +using NPOI.XSSF.UserModel; using System; using System; using System.Collections.Generic; +using System.Configuration; using System.Data; using System.Data.SqlClient; -using System.Linq; -using Newtonsoft.Json.Linq; using System.IO; -using NPOI.XSSF.UserModel; -using NPOI.SS.UserModel; +using System.Linq; using System.Runtime.Serialization; -using System.Configuration; namespace FineUIPro.Web.HJGL.JoinMarking { @@ -69,7 +70,13 @@ namespace FineUIPro.Web.HJGL.JoinMarking newNode.Text = q.ISO_IsoNo; newNode.ToolTip = "管线"; newNode.EnableClickEvent = true; + newNode.EnableExpandEvent = true; rootNode.Nodes.Add(newNode); + TreeNode newNodeTemp = new TreeNode(); + newNodeTemp.Text = "加载中..."; + newNodeTemp.NodeID = Guid.NewGuid().ToString(); + newNode.Nodes.Add(newNodeTemp); + } } } diff --git a/HJGL_DS/FineUIPro.Web/HJGL/JoinMarking/JointShow.aspx.designer.cs b/HJGL_DS/FineUIPro.Web/HJGL/JoinMarking/JointShow.aspx.designer.cs index 9d9584f..5654c7e 100644 --- a/HJGL_DS/FineUIPro.Web/HJGL/JoinMarking/JointShow.aspx.designer.cs +++ b/HJGL_DS/FineUIPro.Web/HJGL/JoinMarking/JointShow.aspx.designer.cs @@ -85,14 +85,5 @@ namespace FineUIPro.Web.HJGL.JoinMarking /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel mainPanel; - - /// - /// WindowAtt 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Window WindowAtt; } } diff --git a/HJGL_DS/FineUIPro.Web/HJGL/JoinMarking/PDFShow.aspx b/HJGL_DS/FineUIPro.Web/HJGL/JoinMarking/PDFShow.aspx index 671051b..7fd3b18 100644 --- a/HJGL_DS/FineUIPro.Web/HJGL/JoinMarking/PDFShow.aspx +++ b/HJGL_DS/FineUIPro.Web/HJGL/JoinMarking/PDFShow.aspx @@ -33,9 +33,6 @@
- + diff --git a/HJGL_DS/FineUIPro.Web/HJGL/JoinMarking/PDFShow.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/JoinMarking/PDFShow.aspx.cs index a2ca513..50cd2d0 100644 --- a/HJGL_DS/FineUIPro.Web/HJGL/JoinMarking/PDFShow.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/HJGL/JoinMarking/PDFShow.aspx.cs @@ -183,10 +183,7 @@ namespace FineUIPro.Web.HJGL.JoinMarking - protected void Window1_Close(object sender, WindowCloseEventArgs e) - { - - } + } diff --git a/HJGL_DS/FineUIPro.Web/HJGL/JoinMarking/PDFShow.aspx.designer.cs b/HJGL_DS/FineUIPro.Web/HJGL/JoinMarking/PDFShow.aspx.designer.cs index 2d8f710..ba77354 100644 --- a/HJGL_DS/FineUIPro.Web/HJGL/JoinMarking/PDFShow.aspx.designer.cs +++ b/HJGL_DS/FineUIPro.Web/HJGL/JoinMarking/PDFShow.aspx.designer.cs @@ -76,14 +76,5 @@ namespace FineUIPro.Web.HJGL.JoinMarking /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ContentPanel contentPanel; - - /// - /// Window1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Window Window1; } }