From f8ca109223630e06ca2680e4301b77808eca31ce Mon Sep 17 00:00:00 2001
From: xiaju <1784803958@qq.com>
Date: Wed, 5 Feb 2025 15:08:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=94=E7=8E=AF=E7=A7=BB=E4=BA=A4=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SGGL/FineUIPro.Web/FineUIPro.Web.csproj       |  2 +-
 .../Transfer/Chart/PunchlistFromChartNew.aspx |  6 ++---
 .../Chart/PunchlistFromChartNew.aspx.cs       |  2 +-
 .../FineUIPro.Web/Transfer/PunchlistFrom.aspx | 22 +++++++++----------
 .../Transfer/PunchlistFrom.aspx.cs            | 10 ++++-----
 .../Transfer/PunchlistFrom.aspx.designer.cs   | 13 +++++++++--
 SGGL/FineUIPro.Web/Web.config                 |  4 ++--
 SGGL/WebAPI/WebAPI.csproj.user                |  2 +-
 8 files changed, 35 insertions(+), 26 deletions(-)

diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
index b937cbb9..d84e1613 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -19357,7 +19357,7 @@
       </FlavorProperties>
     </VisualStudio>
   </ProjectExtensions>
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0\WebApplications\Microsoft.WebApplication.targets" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v17.0\WebApplications\Microsoft.WebApplication.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromChartNew.aspx b/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromChartNew.aspx
index ff9312a6..9d59f9c6 100644
--- a/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromChartNew.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromChartNew.aspx
@@ -221,7 +221,7 @@
                                 <f:Grid ID="Grid3" ShowBorder="true" ShowHeader="false" EnableCollapse="true"
                                     runat="server" BoxFlex="1" DataKeyNames="Sub_Sys_No" AllowCellEditing="true" EnableColumnLines="true"
                                     ClicksToEdit="2" DataIDField="Sub_Sys_No" AllowSorting="true" OnSort="Grid3_Sort"
-                                    AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid3_PageIndexChange"
+                                    AllowPaging="true" IsDatabasePaging="true" PageSize="25" OnPageIndexChange="Grid3_PageIndexChange"
                                     EnableRowDoubleClickEvent="true" EnableTextSelection="true"  EnableSummary="true">
                                     <Columns>
 
@@ -283,10 +283,10 @@
                                         <f:ToolbarText ID="ToolbarText3" runat="server" Text="每页记录数：">
                                         </f:ToolbarText>
                                         <f:DropDownList runat="server" ID="ddlPageSize3" Width="80px" AutoPostBack="true" OnSelectedIndexChanged="ddlPageSize3_SelectedIndexChanged">
-                                            <f:ListItem Text="10" Value="10" />
+                                            <f:ListItem Text="10" Value="10"  />
                                             <f:ListItem Text="15" Value="15" />
                                             <f:ListItem Text="20" Value="20" />
-                                            <f:ListItem Text="25" Value="25" />
+                                            <f:ListItem Text="25" Value="25" Selected="true"/>
                                             <f:ListItem Text="所有行" Value="100000" />
                                         </f:DropDownList>
                                     </PageItems>
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromChartNew.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromChartNew.aspx.cs
index 3ee821de..9210d4cc 100644
--- a/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromChartNew.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromChartNew.aspx.cs
@@ -727,7 +727,7 @@ namespace FineUIPro.Web.Transfer.Chart
             SqlParameter[] parameter = listStr.ToArray();
             DataTable tb = SQLHelper.GetDataTableRunText(strSql.ToString(), parameter);
             Grid3.RecordCount = tb.Rows.Count;
-            var table = this.GetPagedDataTable(Grid1, tb);
+            var table = this.GetPagedDataTable(Grid3, tb);
             Grid3.DataSource = table;
             Grid3.DataBind();
 
diff --git a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx
index c66ad357..be9f5ebe 100644
--- a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx
@@ -32,6 +32,12 @@
                                 </f:DropDownList>
                                 <f:TextBox runat="server" ID="txtRaised_By" Label="Raised By" LabelWidth="90px" LabelAlign="Right" Width="150px"></f:TextBox>
                                 <f:TextBox runat="server" ID="txtDisc" Label="Disc" LabelWidth="40px" LabelAlign="Right" Width="120px"></f:TextBox>
+                                <f:DropDownList ID="ddlPunchType" runat="server" Label="Punch Type" AutoPostBack="true" Width="170px" LabelWidth="100px">
+                                    <f:ListItem Value="" Text=""></f:ListItem>
+                                    <f:ListItem Value="PWD" Text="PWD"></f:ListItem>
+                                    <%--<f:ListItem Value="FWD" Text="FWD"></f:ListItem>--%>
+                                    <f:ListItem Value="JWD" Text="JWD"></f:ListItem>
+                                </f:DropDownList>
 
                                 <f:Button ID="btnSearch" Icon="SystemSearch" EnablePostBack="true" runat="server" OnClick="btnSearch_Click" ToolTip="查询">
                                 </f:Button>
@@ -46,16 +52,10 @@
                         </f:Toolbar>
                         <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
                             <Items>
-                                <f:DropDownList ID="ddlPunchType" runat="server" Label="Punch Type" AutoPostBack="true" Width="170px" LabelWidth="100px">
-                                    <f:ListItem Value="" Text=""></f:ListItem>
-                                    <f:ListItem Value="PWD" Text="PWD"></f:ListItem>
-                                    <%--<f:ListItem Value="FWD" Text="FWD"></f:ListItem>--%>
-                                    <f:ListItem Value="JWD" Text="JWD"></f:ListItem>
-                                </f:DropDownList>
-                                <%--<f:TextBox runat="server" ID="txtAction_By" Label="Action By" LabelWidth="80px" LabelAlign="Right" Width="180px"></f:TextBox>--%>
-                                <f:TextBox runat="server" ID="txtPIC" Label="责任人PIC" LabelWidth="90px" LabelAlign="Right" Width="180px"></f:TextBox>
-                                <f:TextBox runat="server" ID="txtPIC_WUH" Label="责任人-五环/PIC-WUH" LabelWidth="160px" LabelAlign="Right" Width="260px"></f:TextBox>
-                                <f:DropDownList ID="ddlStatus" runat="server" Label="状态/Status" AutoPostBack="true" Width="200px" LabelWidth="100px">
+                                <f:TextBox runat="server" ID="txtAction_By" Label="责任单位" LabelWidth="80px" LabelAlign="Right" Width="180px"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtPIC" Label="责任人PIC" LabelWidth="90px" LabelAlign="Right" Width="170px"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtPIC_WUH" Label="责任人-五环/PIC-WUH" LabelWidth="160px" LabelAlign="Right" Width="240px"></f:TextBox>
+                                <f:DropDownList ID="ddlStatus" runat="server" Label="状态/Status" AutoPostBack="true" Width="190px" LabelWidth="100px">
                                     <f:ListItem Value="" Text=""></f:ListItem>
                                     <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
                                     <f:ListItem Value="Not Start" Text="Not Start"></f:ListItem>
@@ -74,7 +74,7 @@
                                     <f:ListItem Value="N" Text="N"></f:ListItem>
                                 </f:DropDownList>
                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
-                                <f:RadioButtonList ID="rbOutType" Label="导出" runat="server" LabelWidth="50px">
+                                <f:RadioButtonList ID="rbOutType" Label="导出" runat="server" LabelWidth="50px" Width="180px">
                                     <f:RadioItem Text="无图" Value="0" Selected="true" />
                                     <f:RadioItem Text="有图" Value="1" />
                                 </f:RadioButtonList>
diff --git a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.cs b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.cs
index d40e559b..346b576a 100644
--- a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.cs
@@ -117,11 +117,11 @@ namespace FineUIPro.Web.Transfer
                 strSql += " AND Cat = @Cat";
                 listStr.Add(new SqlParameter("@Cat", ddlCat.SelectedValue.Trim()));
             }
-            //if (!string.IsNullOrEmpty(txtAction_By.Text.Trim()))
-            //{
-            //    strSql += " AND Action_By = @Action_By";
-            //    listStr.Add(new SqlParameter("@Action_By", txtAction_By.Text.Trim()));
-            //}
+            if (!string.IsNullOrEmpty(txtAction_By.Text.Trim()))
+            {
+                strSql += " AND Action_By = @Action_By";
+                listStr.Add(new SqlParameter("@Action_By", txtAction_By.Text.Trim()));
+            }
             if (!string.IsNullOrEmpty(txtPIC.Text.Trim()))
             {
                 strSql += " AND PIC = @PIC";
diff --git a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.designer.cs
index 66400c38..16021185 100644
--- a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.designer.cs
@@ -104,6 +104,15 @@ namespace FineUIPro.Web.Transfer
         /// </remarks>
         protected global::FineUIPro.TextBox txtDisc;
 
+        /// <summary>
+        /// ddlPunchType 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPunchType;
+
         /// <summary>
         /// btnSearch 控件。
         /// </summary>
@@ -141,13 +150,13 @@ namespace FineUIPro.Web.Transfer
         protected global::FineUIPro.Toolbar Toolbar2;
 
         /// <summary>
-        /// ddlPunchType 控件。
+        /// txtAction_By 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.DropDownList ddlPunchType;
+        protected global::FineUIPro.TextBox txtAction_By;
 
         /// <summary>
         /// txtPIC 控件。
diff --git a/SGGL/FineUIPro.Web/Web.config b/SGGL/FineUIPro.Web/Web.config
index 58dd68d6..6c177656 100644
--- a/SGGL/FineUIPro.Web/Web.config
+++ b/SGGL/FineUIPro.Web/Web.config
@@ -11,7 +11,7 @@
   <FineUIPro DebugMode="true" Theme="Cupertino"/>
   <appSettings>
     <!--连接字符串-->
-    <add key="ConnectionString" value="Server=.\SQL2012;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>
+    <add key="ConnectionString" value="Server=.;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>
     <!--<add key="ConnectionString" value="Server=.\MSSQLSERVER01;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>-->
     <!--系统名称-->
     <add key="SystemName" value="智慧施工管理信息系统V1.0"/>
@@ -77,7 +77,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="false" targetFramework="4.6.1"/>
+    <compilation debug="true" targetFramework="4.6.1"/>
     <httpRuntime requestValidationMode="2.0" maxRequestLength="2147483647" executionTimeout="36000"/>
     <authentication mode="Forms">
       <forms loginUrl="Login.aspx" name="PUBLISHERCOOKIE" protection="All" timeout="1440" path="/"/>
diff --git a/SGGL/WebAPI/WebAPI.csproj.user b/SGGL/WebAPI/WebAPI.csproj.user
index 59ad2199..d989db4f 100644
--- a/SGGL/WebAPI/WebAPI.csproj.user
+++ b/SGGL/WebAPI/WebAPI.csproj.user
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />
     <IISExpressSSLPort />