gaofei
/
HJGL_DS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

展示

This commit is contained in:
李超 2026-04-19 10:13:03 +08:00
parent c4348c467b
commit 2f78f1b480
9 changed files with 19 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
DataBase/版本日志/HJGLDB_DS_2026-04-19_lc.sql Normal file
View File

Binary file not shown.

1
HJGL_DS/FineUIPro.Web/File/PDF/Pipe/25-P112191210-1-B1P-N(021)/25-P112191210-1-B1P-N(021)-1.pdf Normal file
View File

@ -0,0 +1 @@

1
HJGL_DS/FineUIPro.Web/File/PDF/Pipe/25-P112191210-2-B1P-N(021)/25-P112191210-2-B1P-N(021)-1.pdf Normal file
View File

@ -0,0 +1 @@

12
HJGL_DS/FineUIPro.Web/HJGL/JoinMarking/JointShow.aspx
View File

@ -5,7 +5,7 @@
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server"> <head runat="server">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title><asp:Literal runat="server" Text="<%$ Resources:Lan,TestPackageImport_title%>"/></title> <title><asp:Literal runat="server" Text="轴测图"/></title>
</head> </head>
<body> <body>
<form id="form1" runat="server"> <form id="form1" runat="server">
@ -13,19 +13,19 @@
<f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region"> <f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
<Items> <Items>
<f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true" <f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
EnableCollapse="true" Width="300px" Title="<%$ Resources:Lan,PipelineManage_IsoPic_Label%>" ShowBorder="true" Layout="VBox" EnableCollapse="true" Width="300px" Title="JointShow.aspx" ShowBorder="true" Layout="VBox"
ShowHeader="true" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft"> ShowHeader="true" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft">
<Toolbars> <Toolbars>
<f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left"> <f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
<Items> <Items>
<f:TextBox ID="txtIsono" runat="server" Label="<%$ Resources:Lan,ASPXSC_2149%>" EmptyText="<%$ Resources:Lan,TCC_RE_CQMS_788%>" AutoPostBack="true" <f:TextBox ID="txtIsono" runat="server" Label="单线图号" EmptyText="请输入" AutoPostBack="true"
OnTextChanged="Tree_TextChanged" Width="250px" LabelWidth="70px" LabelAlign="Right"> OnTextChanged="Tree_TextChanged" Width="250px" LabelWidth="70px" LabelAlign="Right">
</f:TextBox> </f:TextBox>
</Items> </Items>
</f:Toolbar> </f:Toolbar>
</Toolbars> </Toolbars>
<Items> <Items>
<f:Tree ID="tvControlItem" ShowHeader="false" Height="500px" Title="<%$ Resources:Lan,PmiMaterialTemplate_tvControlItem_Title%>" OnNodeCommand="tvControlItem_NodeCommand" <f:Tree ID="tvControlItem" ShowHeader="false" Height="500px" Title="管线" OnNodeCommand="tvControlItem_NodeCommand"
runat="server" ShowBorder="false" EnableCollapse="true" EnableSingleClickExpand="true" runat="server" ShowBorder="false" EnableCollapse="true" EnableSingleClickExpand="true"
AutoLeafIdentification="true" EnableSingleExpand="true" EnableTextSelection="true" AutoLeafIdentification="true" EnableSingleExpand="true" EnableTextSelection="true"
OnNodeExpand="tvControlItem_TreeNodeExpanded"> OnNodeExpand="tvControlItem_TreeNodeExpanded">
@ -39,10 +39,6 @@
</Items> </Items>
</f:Panel> </f:Panel>
<f:Window ID="WindowAtt" Title="<%$ Resources:Lan,TCC_RE_CQMS_059%>" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px"
Height="500px">
</f:Window>
</form> </form>

17
HJGL_DS/FineUIPro.Web/HJGL/JoinMarking/JointShow.aspx.cs
View File

@ -1,16 +1,17 @@
using BLL; using BLL;
using FastReport.Editor;
using Newtonsoft.Json.Linq;
using NPOI.SS.UserModel;
using NPOI.XSSF.UserModel;
using System; using System;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Configuration;
using System.Data; using System.Data;
using System.Data.SqlClient; using System.Data.SqlClient;
using System.Linq;
using Newtonsoft.Json.Linq;
using System.IO; using System.IO;
using NPOI.XSSF.UserModel; using System.Linq;
using NPOI.SS.UserModel;
using System.Runtime.Serialization; using System.Runtime.Serialization;
using System.Configuration;
namespace FineUIPro.Web.HJGL.JoinMarking namespace FineUIPro.Web.HJGL.JoinMarking
{ {
@ -69,7 +70,13 @@ namespace FineUIPro.Web.HJGL.JoinMarking
newNode.Text = q.ISO_IsoNo; newNode.Text = q.ISO_IsoNo;
newNode.ToolTip = "管线"; newNode.ToolTip = "管线";
newNode.EnableClickEvent = true; newNode.EnableClickEvent = true;
newNode.EnableExpandEvent = true;
rootNode.Nodes.Add(newNode); rootNode.Nodes.Add(newNode);
TreeNode newNodeTemp = new TreeNode();
newNodeTemp.Text = "加载中...";
newNodeTemp.NodeID = Guid.NewGuid().ToString();
newNode.Nodes.Add(newNodeTemp);
} }
} }
} }

9
HJGL_DS/FineUIPro.Web/HJGL/JoinMarking/JointShow.aspx.designer.cs generated
View File

@ -85,14 +85,5 @@ namespace FineUIPro.Web.HJGL.JoinMarking
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.Panel mainPanel; protected global::FineUIPro.Panel mainPanel;
/// <summary>
/// WindowAtt 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window WindowAtt;
} }
} }

5
HJGL_DS/FineUIPro.Web/HJGL/JoinMarking/PDFShow.aspx
View File

@ -33,9 +33,6 @@
</Items> </Items>
</f:Panel> </f:Panel>
</form> </form>
<f:Window ID="Window1" Title="<%$ Resources:Lan,CheckManageImport_Window1_Title%>" Hidden="true" EnableIFrame="true"
EnableMaximize="true" Target="Top" EnableResize="true" runat="server" OnClose="Window1_Close"
IsModal="true" Width="1200px" Height="600px">
</f:Window>
</body> </body>
</html> </html>

3
HJGL_DS/FineUIPro.Web/HJGL/JoinMarking/PDFShow.aspx.cs
View File

@ -183,10 +183,7 @@ namespace FineUIPro.Web.HJGL.JoinMarking
protected void Window1_Close(object sender, WindowCloseEventArgs e)
{
}
} }

9
HJGL_DS/FineUIPro.Web/HJGL/JoinMarking/PDFShow.aspx.designer.cs generated
View File

@ -76,14 +76,5 @@ namespace FineUIPro.Web.HJGL.JoinMarking
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.ContentPanel contentPanel; protected global::FineUIPro.ContentPanel contentPanel;
/// <summary>
/// Window1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window1;
} }
} }