提交代码

2024-10-28 14:54:44 +08:00 · 2024-10-28 14:54:44 +08:00 · 9fa458d406
parent cec4000396
commit 9fa458d406
6 changed files with 3 additions and 3 deletions
--- a/HJGL_ZH/FineUIPro.Web/FineUIPro.Web.csproj.user
+++ b/HJGL_ZH/FineUIPro.Web/FineUIPro.Web.csproj.user
@ -2,7 +2,7 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <ProjectView>ProjectFiles</ProjectView>
-    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>
    <Use64BitIISExpress />
    <IISExpressSSLPort />
--- a/HJGL_ZH/FineUIPro.Web/HJGL/HotHardManage/HardTestReport.aspx
+++ b/HJGL_ZH/FineUIPro.Web/HJGL/HotHardManage/HardTestReport.aspx
@ -145,7 +145,7 @@
                    <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="硬度检测报告" EnableCollapse="true"
                        runat="server" BoxFlex="1" DataKeyNames="HardTestReportItemId" AllowCellEditing="true"
                        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"
                        EnableTextSelection="True" AutoScroll="true">
                        <Toolbars>
--- a/HJGL_ZH/FineUIPro.Web/Web.config
+++ b/HJGL_ZH/FineUIPro.Web/Web.config
@ -40,7 +40,7 @@
      <add verb="GET" path="res.axd" type="FineUIPro.ResourceHandler, FineUIPro" validate="false"/>
      <add path="ChartImg.axd" verb="GET,POST,HEAD" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="false"/>
    </httpHandlers>
-    <compilation debug="true" targetFramework="4.0">
+    <compilation debug="false" targetFramework="4.0">
      <assemblies>
        <add assembly="System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
      </assemblies>
--- a/HJGL_ZH/Model/bin/Release/Model.dll
+++ b/HJGL_ZH/Model/bin/Release/Model.dll
--- a/HJGL_ZH/Model/bin/Release/Model.pdb
+++ b/HJGL_ZH/Model/bin/Release/Model.pdb
--- a/HJGL_ZH/Model/obj/Release/Model.csprojAssemblyReference.cache
+++ b/HJGL_ZH/Model/obj/Release/Model.csprojAssemblyReference.cache