This commit is contained in:
佘春生 2024-11-28 10:27:30 +08:00
commit 82f4d9a425
4 changed files with 5 additions and 3 deletions

2
.gitignore vendored
View File

@ -124,3 +124,5 @@ HJGL_ZH/BLL/bin/Release/NPOI.OpenXmlFormats.dll
/HJGL_ZH/Model/obj/Debug/Model.pdb /HJGL_ZH/Model/obj/Debug/Model.pdb
/HJGL_ZH/Model/obj/Release/Model.csproj.AssemblyReference.cache /HJGL_ZH/Model/obj/Release/Model.csproj.AssemblyReference.cache
/HJGL_ZH/Model/Model.cs /HJGL_ZH/Model/Model.cs
/HJGL_ZH/Model/bin/Release/Model.dll
/HJGL_ZH/Model/bin/Release/Model.pdb

View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<ProjectView>ShowAllFiles</ProjectView> <ProjectView>ProjectFiles</ProjectView>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig> <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress> <UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress /> <Use64BitIISExpress />
<IISExpressSSLPort /> <IISExpressSSLPort />

View File

@ -145,7 +145,7 @@
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="硬度检测报告" EnableCollapse="true" <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="硬度检测报告" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="HardTestReportItemId" AllowCellEditing="true" runat="server" BoxFlex="1" DataKeyNames="HardTestReportItemId" AllowCellEditing="true"
AllowColumnLocking="true" EnableColumnLines="true" ClicksToEdit="2" DataIDField="HardTestReportItemId" AllowColumnLocking="true" EnableColumnLines="true" ClicksToEdit="2" DataIDField="HardTestReportItemId"
AllowSorting="true" SortField="Sort1,Sort2,Sort3,Sort4,Sort5,SortIndex" SortDirection="ASC" OnSort="Grid1_Sort" AllowSorting="true" SortField="Sort1,Sort2,Sort3,Sort4,Sort5,JOT_JointNo,SortIndex" SortDirection="ASC" OnSort="Grid1_Sort"
AllowPaging="true" IsDatabasePaging="true" PageSize="100" OnPageIndexChange="Grid1_PageIndexChange" AllowPaging="true" IsDatabasePaging="true" PageSize="100" OnPageIndexChange="Grid1_PageIndexChange"
EnableTextSelection="True" AutoScroll="true"> EnableTextSelection="True" AutoScroll="true">
<Toolbars> <Toolbars>