lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

20220923 焊接终版测试修改

Browse Source
This commit is contained in:
李鹏飞
2022-09-23 22:29:48 +08:00
parent 08c2646ef1
commit 5e4a7de2ac
18 changed files with 1521 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HJGL/DataImport/DrawingImport.aspx
+3 -3
View File
@@ -41,7 +41,7 @@
Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" Title="数据"
TitleToolTip="数据" AutoScroll="true">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="数据" ForceFit="true"
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="数据" ForceFit="true" MinColumnWidth="50px"
EnableCollapse="true" runat="server" BoxFlex="1" DataKeyNames="DataImportId"
AllowColumnLocking="true" EnableColumnLines="true" DataIDField="DataImportId"
AllowSorting="true" SortField="DataImportId" SortDirection="ASC" OnSort="Grid1_Sort"
@@ -132,9 +132,9 @@
</f:Panel>
<f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Bottom" RegionSplit="true" EnableCollapse="true" ShowBorder="true" RegionPercent="35%"
Layout="Fit" ShowHeader="false" RegionSplitWidth="20px" BodyPadding="1px" Height="400px" IconFont="PlusCircle" Title="历史记录"
TitleToolTip="历史记录" AutoScroll="true">
TitleToolTip="历史记录" AutoScroll="true" >
<Items>
<f:Grid ID="Grid2" ShowBorder="true" ShowHeader="false" Title="历史记录" ForceFit="true"
<f:Grid ID="Grid2" ShowBorder="true" ShowHeader="false" Title="历史记录" ForceFit="true" MinColumnWidth="50px"
EnableCollapse="true" runat="server" BoxFlex="1" DataKeyNames="DataImportId"
AllowColumnLocking="true" EnableColumnLines="true" DataIDField="DataImportId"
AllowSorting="true" SortField="Version" SortDirection="ASC" OnSort="Grid1_Sort" EnableCheckBoxSelect="true" EnableMultiSelect="false"
SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx
+1 -1
View File
@@ -5,7 +5,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>焊口信息</title>
<title>材料信息</title>
<link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
</head>
<body>
SGGL/FineUIPro.Web/HJGL/DataImport/TDMImport.aspx
+3 -3
View File
@@ -41,7 +41,7 @@
Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" Title="数据"
TitleToolTip="数据" AutoScroll="true">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="数据" ForceFit="true"
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="数据" ForceFit="true" MinColumnWidth="50px"
EnableCollapse="true" runat="server" BoxFlex="1" DataKeyNames="DataImportId"
AllowColumnLocking="true" EnableColumnLines="true" DataIDField="DataImportId"
AllowSorting="true" SortField="DataImportId" SortDirection="ASC" OnSort="Grid1_Sort"
@@ -133,9 +133,9 @@
</f:Panel>
<f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Bottom" RegionSplit="true" EnableCollapse="true" ShowBorder="true" RegionPercent="35%"
Layout="Fit" ShowHeader="false" RegionSplitWidth="20px" BodyPadding="1px" Height="400px" IconFont="PlusCircle" Title="历史记录"
TitleToolTip="历史记录" AutoScroll="true">
TitleToolTip="历史记录" AutoScroll="true" >
<Items>
<f:Grid ID="Grid2" ShowBorder="true" ShowHeader="false" Title="历史记录" ForceFit="true"
<f:Grid ID="Grid2" ShowBorder="true" ShowHeader="false" Title="历史记录" ForceFit="true" MinColumnWidth="50px"
EnableCollapse="true" runat="server" BoxFlex="1" DataKeyNames="DataImportId"
AllowColumnLocking="true" EnableColumnLines="true" DataIDField="DataImportId"
AllowSorting="true" SortField="Version" SortDirection="ASC" OnSort="Grid1_Sort" EnableCheckBoxSelect="true" EnableMultiSelect="false"