From 2c639499f352d4e71853d155004ff9674a278a0c Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Mon, 26 May 2025 10:20:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../HJGL/WeldingReport/WelderPerformance.aspx |  3 +-
 .../WeldingReport/WelderPerformance.aspx.cs   | 29 +++++++++++++++++--
 .../WelderPerformance.aspx.designer.cs        |  9 ++++++
 3 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WelderPerformance.aspx b/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WelderPerformance.aspx
index edbc1bc..231a741 100644
--- a/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WelderPerformance.aspx
+++ b/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WelderPerformance.aspx
@@ -45,7 +45,8 @@
                                     </f:Label>
                                     <f:ToolbarFill ID="ToolbarFill1" runat="server">
                                     </f:ToolbarFill>
-                                    <f:Button ID="BtnAnalyse3" Text="按部门统计" Icon="ChartPie" runat="server" OnClick="BtnAnalyse3_Click"></f:Button>
+                                    <f:HiddenField runat="server" ID="hdType"></f:HiddenField>
+                                    <f:Button ID="BtnAnalyse3" Text="按部门统计" Icon="ChartPie" Hidden="true" runat="server" OnClick="BtnAnalyse3_Click"></f:Button>
                                     <f:Button ID="BtnAnalyse2" Text="按焊工统计" Icon="ChartPie" runat="server" OnClick="BtnAnalyse2_Click"></f:Button> 
                                     <f:Button ID="BtnAnalyse" Text="按项目统计" Icon="ChartPie" runat="server" OnClick="BtnAnalyse_Click"></f:Button>  
                                     <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" Text="导出" Icon="TableGo"
diff --git a/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WelderPerformance.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WelderPerformance.aspx.cs
index b62caac..4dd2ac2 100644
--- a/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WelderPerformance.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WelderPerformance.aspx.cs
@@ -444,7 +444,18 @@
         /// <param name="e"></param>
         protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
         {
-            this.BindGrid();
+            if (this.hdType.Text == "1")
+            {
+                this.BindGrid();
+            }
+            else if (this.hdType.Text == "2")
+            {
+                this.BindGrid2();
+            }
+            else if (this.hdType.Text == "3")
+            {
+                this.BindGrid3();
+            }
         }
 
         /// <summary>
@@ -455,7 +466,18 @@
         protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
         {
             this.Grid1.PageSize = Convert.ToInt32(this.ddlPageSize.SelectedValue);
-            this.BindGrid();
+            if (this.hdType.Text == "1")
+            {
+                this.BindGrid();
+            }
+            else if (this.hdType.Text == "2")
+            {
+                this.BindGrid2();
+            }
+            else if (this.hdType.Text == "3")
+            {
+                this.BindGrid3();
+            }
         }
 
         /// <summary>
@@ -477,6 +499,7 @@
         /// <param name="e"></param>
         protected void BtnAnalyse_Click(object sender, EventArgs e)
         {
+            this.hdType.Text = "1";
             this.Grid1.Columns[1].Hidden = false;
             BindGrid();
             OutputSummaryData();
@@ -489,6 +512,7 @@
         /// <param name="e"></param>
         protected void BtnAnalyse2_Click(object sender, EventArgs e)
         {
+            this.hdType.Text = "2";
             this.Grid1.Columns[1].Hidden = true;
             BindGrid2();
             this.Grid1.SummaryData = null;
@@ -502,6 +526,7 @@
         /// <param name="e"></param>
         protected void BtnAnalyse3_Click(object sender, EventArgs e)
         {
+            this.hdType.Text = "3";
             this.Grid1.Columns[1].Hidden = true;
             BindGrid3();
             this.Grid1.SummaryData = null;
diff --git a/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WelderPerformance.aspx.designer.cs b/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WelderPerformance.aspx.designer.cs
index 07d01f4..a9c6421 100644
--- a/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WelderPerformance.aspx.designer.cs
+++ b/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WelderPerformance.aspx.designer.cs
@@ -147,6 +147,15 @@ namespace FineUIPro.Web.HJGL.WeldingReport {
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
         
+        /// <summary>
+        /// hdType 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.HiddenField hdType;
+        
         /// <summary>
         /// BtnAnalyse3 控件。
         /// </summary>