From 3984e18e6c8ff182e7a68c811da9b6194cae03c9 Mon Sep 17 00:00:00 2001
From: xiaju <1784803958@qq.com>
Date: Thu, 5 Dec 2024 17:22:17 +0800
Subject: [PATCH] 1

---
 .../Transfer/Chart/Systemstatus.aspx          | 75 ++++++++++---------
 .../Transfer/Chart/Systemstatus.aspx.cs       | 12 ++-
 .../Chart/Systemstatus.aspx.designer.cs       |  9 +++
 3 files changed, 58 insertions(+), 38 deletions(-)

diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx b/SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx
index 4251ea7c..c90e8341 100644
--- a/SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx
@@ -12,19 +12,24 @@
         <f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="Panel1" />
         <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
             ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
-            <items>
+            <Items>
                 <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="移交统计表" EnableCollapse="true"
                     runat="server" BoxFlex="1" DataKeyNames="SubSysNo" AllowCellEditing="true" EnableColumnLines="true"
                     ClicksToEdit="2" DataIDField="SubSysNo" AllowSorting="true"
                     AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
                     EnableTextSelection="true" AllowColumnLocking="true">
-                    <toolbars>
+                    <Toolbars>
                         <f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
-                            <items>
+                            <Items>
                                 <f:DropDownList ID="ddlSubSysNo" runat="server" Label="Turnover System Code" AutoPostBack="true" EnableEdit="true"
                                     OnSelectedIndexChanged="ddlSubSysNo_SelectedIndexChanged" Width="400px" LabelWidth="200px">
                                 </f:DropDownList>
-
+                                <f:DropDownList ID="drpType" runat="server" Label="Type" LabelAlign="Right"
+                                    LabelWidth="80px">
+                                    <f:ListItem Value="" Text="" />
+                                    <f:ListItem Value="0" Text="工艺系统清单" />
+                                    <f:ListItem Value="1" Text="非工艺系统清单" />
+                                </f:DropDownList>
                                 <f:Button ID="btnSearch" Icon="SystemSearch" EnablePostBack="true" runat="server" OnClick="btnSearch_Click" ToolTip="查询">
                                 </f:Button>
 
@@ -32,15 +37,15 @@
                                 <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
                                     EnableAjax="false" DisableControlBeforePostBack="false">
                                 </f:Button>
-                            </items>
+                            </Items>
                         </f:Toolbar>
-                    </toolbars>
-                    <columns>
+                    </Toolbars>
+                    <Columns>
                         <f:TemplateField ColumnID="tfPageIndex" Width="50px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"
                             EnableLock="true" Locked="true">
-                            <itemtemplate>
+                            <ItemTemplate>
                                 <asp:Label ID="lblPageIndex" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
-                            </itemtemplate>
+                            </ItemTemplate>
                         </f:TemplateField>
                         <%-- <f:RenderField ColumnID="SN" DataField="SN" FieldType="String" HeaderText="SN" TextAlign="Center"
                             HeaderTextAlign="Center" MinWidth="50px">
@@ -64,7 +69,7 @@
                             FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" EnableLock="true" Locked="true" />
 
                         <f:GroupField HeaderText="Welding<br/>管道焊接信息" TextAlign="Center">
-                            <columns>
+                            <Columns>
                                 <f:RenderField MinWidth="30px" ColumnID="StrTotalFactor" DataField="StrTotalFactor"
                                     HeaderText="总达因数" TextAlign="Center" />
 
@@ -73,11 +78,11 @@
 
                                 <f:RenderField MinWidth="30px" ColumnID="StrCompleteProportion" DataField="StrCompleteProportion"
                                     HeaderText="完成率(%)" TextAlign="Center" />
-                            </columns>
+                            </Columns>
                         </f:GroupField>
 
                         <f:GroupField HeaderText="Piping<br/>管道试压包" TextAlign="Center">
-                            <columns>
+                            <Columns>
                                 <f:RenderField MinWidth="30px" ColumnID="StrPipingCount" DataField="StrPipingCount"
                                     HeaderText="总数" TextAlign="Center" />
 
@@ -86,11 +91,11 @@
 
                                 <f:RenderField MinWidth="30px" ColumnID="StrPipingPercent" DataField="StrPipingPercent"
                                     HeaderText="完成率(%)" TextAlign="Center" />
-                            </columns>
+                            </Columns>
                         </f:GroupField>
 
                         <f:GroupField HeaderText="Reinstate<br/>管道冲洗吹扫&复位信息" TextAlign="Center">
-                            <columns>
+                            <Columns>
                                 <f:RenderField MinWidth="30px" ColumnID="StrReinstateCount" DataField="StrReinstateCount"
                                     HeaderText="总数" TextAlign="Center" />
 
@@ -99,11 +104,11 @@
 
                                 <f:RenderField MinWidth="30px" ColumnID="StrReinstatePercent" DataField="StrReinstatePercent"
                                     HeaderText="完成率(%)" TextAlign="Center" />
-                            </columns>
+                            </Columns>
                         </f:GroupField>
 
                         <f:GroupField HeaderText="Equipment<br/>设备测试包" TextAlign="Center">
-                            <columns>
+                            <Columns>
                                 <f:RenderField MinWidth="30px" ColumnID="StrEqCount" DataField="StrEqCount"
                                     HeaderText="总数" TextAlign="Center" />
 
@@ -112,11 +117,11 @@
 
                                 <f:RenderField MinWidth="30px" ColumnID="StrEqPercent" DataField="StrEqPercent"
                                     HeaderText="完成率(%)" TextAlign="Center" />
-                            </columns>
+                            </Columns>
                         </f:GroupField>
 
                         <f:GroupField HeaderText="Electric<br/>电气测试包" TextAlign="Center">
-                            <columns>
+                            <Columns>
                                 <f:RenderField MinWidth="30px" ColumnID="StrTeCount" DataField="StrTeCount"
                                     HeaderText="总数" TextAlign="Center" />
 
@@ -125,11 +130,11 @@
 
                                 <f:RenderField MinWidth="30px" ColumnID="StrTePercent" DataField="StrTePercent"
                                     HeaderText="完成率(%)" TextAlign="Center" />
-                            </columns>
+                            </Columns>
                         </f:GroupField>
 
                         <f:GroupField HeaderText="instrument<br/>仪表测试包" TextAlign="Center">
-                            <columns>
+                            <Columns>
                                 <f:RenderField MinWidth="30px" ColumnID="StrTiCount" DataField="StrTiCount"
                                     HeaderText="总数" TextAlign="Center" />
 
@@ -138,11 +143,11 @@
 
                                 <f:RenderField MinWidth="30px" ColumnID="StrTiPercent" DataField="StrTiPercent"
                                     HeaderText="完成率(%)" TextAlign="Center" />
-                            </columns>
+                            </Columns>
                         </f:GroupField>
 
                         <f:GroupField HeaderText="Civil/Structure<br/>土建/建筑/结构测试包" TextAlign="Center">
-                            <columns>
+                            <Columns>
                                 <f:RenderField MinWidth="30px" ColumnID="StrTcsCount" DataField="StrTcsCount"
                                     HeaderText="总数" TextAlign="Center" />
 
@@ -151,7 +156,7 @@
 
                                 <f:RenderField MinWidth="30px" ColumnID="StrTcsPercent" DataField="StrTcsPercent"
                                     HeaderText="完成率(%)" TextAlign="Center" />
-                            </columns>
+                            </Columns>
                         </f:GroupField>
 
                         <%--  <f:GroupField HeaderText="Firefighting<br/>消防测试包" TextAlign="Center">
@@ -168,7 +173,7 @@
                         </f:GroupField>--%>
 
                         <f:GroupField HeaderText="Telecom<br/>电信测试包" TextAlign="Center">
-                            <columns>
+                            <Columns>
                                 <f:RenderField MinWidth="30px" ColumnID="StrTtCount" DataField="StrTtCount"
                                     HeaderText="总数" TextAlign="Center" />
 
@@ -177,7 +182,7 @@
 
                                 <f:RenderField MinWidth="30px" ColumnID="StrTtPercent" DataField="StrTtPercent"
                                     HeaderText="完成率(%)" TextAlign="Center" />
-                            </columns>
+                            </Columns>
                         </f:GroupField>
 
                         <%--<f:GroupField HeaderText="Plumbing<br/>地管测试包" TextAlign="Center" >
@@ -194,9 +199,9 @@
                         </f:GroupField>--%>
 
                         <f:TemplateField ColumnID="Count4" MinWidth="120px" HeaderText="Total<br/>completion<br/>总完成率（%）" HeaderTextAlign="Center" TextAlign="Right">
-                            <itemtemplate>
+                            <ItemTemplate>
                                 <asp:Label ID="Label5" runat="server" Text='<%# totalper(Eval("SubSysNo")) %>'></asp:Label>
-                            </itemtemplate>
+                            </ItemTemplate>
                         </f:TemplateField>
 
                         <f:RenderField MinWidth="120px" ColumnID="ElectricHeatTracing" DataField="ElectricHeatTracing"
@@ -277,11 +282,11 @@
                             HeaderText="Remark<br/>备注" TextAlign="Center"
                             FieldType="String" />
 
-                    </columns>
-                    <listeners>
+                    </Columns>
+                    <Listeners>
                         <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
-                    </listeners>
-                    <pageitems>
+                    </Listeners>
+                    <PageItems>
                         <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
                         </f:ToolbarText>
                         <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true" OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
@@ -291,19 +296,19 @@
                             <f:ListItem Text="25" Value="25" />
                             <f:ListItem Text="所有行" Value="100000" />
                         </f:DropDownList>
-                    </pageitems>
+                    </PageItems>
                 </f:Grid>
-            </items>
+            </Items>
         </f:Panel>
         <f:Window ID="Window1" Title="修改" Hidden="true" EnableIFrame="true" EnableMaximize="true"
             Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="1200px" OnClose="Window1_Close"
             Height="600px">
         </f:Window>
         <f:Menu ID="Menu1" runat="server">
-            <items>
+            <Items>
                 <f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Text="修改" Icon="Pencil" OnClick="btnMenuModify_Click">
                 </f:MenuButton>
-            </items>
+            </Items>
         </f:Menu>
     </form>
     <script type="text/javascript">
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx.cs
index af38dc5f..3d141719 100644
--- a/SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx.cs
@@ -86,7 +86,7 @@ else  CONVERT(DECIMAL(10,2),100*(ISNULL(TtScount,0)*1.0/ISNULL(TtCount,0)))  end
 ts.PlanPWD,PlanJWD,McPlan,SubmitPackage,ActualPWD,ActualJWD,ActualMC,Commissioning,IaQian,TcccQ,SystemStatus,TurnoverDescription,ts.Remark
 
 from(
-SELECT SubCommissioningsystem as SubSysNo,ProjectId FROM Transfer_LHCSystemList group by SubCommissioningsystem,ProjectId
+SELECT SubCommissioningsystem as SubSysNo,Type,ProjectId FROM Transfer_LHCSystemList where ProjectId = @ProjectId group by SubCommissioningsystem,Type,ProjectId
 ) f
 left join Transfer_SystemControl ts on f.ProjectId=ts.ProjectId and f.SubSysNo=ts.SystemNo
 --piping
@@ -160,7 +160,7 @@ left join (select count(*)as TtScount,ProjectId,Test_Package from Transfer_Telec
 group by ProjectId,Test_Package)
 Tt1 on f.ProjectId=Tt1.ProjectId and f.SubSysNo=Tt1.Test_Package 
 
-where f.ProjectId = @ProjectId";
+where f.ProjectId = @ProjectId ";
 
             List<SqlParameter> listStr = new List<SqlParameter>();
             listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
@@ -169,8 +169,14 @@ where f.ProjectId = @ProjectId";
             {
                 strSql += " AND f.SubSysNo='" + ddlSubSysNo.SelectedValue + "' ";
             }
+            if (!string.IsNullOrEmpty(drpType.SelectedValue))
+            {
+                strSql += " AND f.Type='" + drpType.SelectedValue + "' ";
+            }
 
-            strSql += " order by f.SubSysNo ";
+            //strSql += " order by f.Type ";
+            //strSql += " order by f.SubSysNo ";
+            strSql += " order by f.Type,f.SubSysNo ";
             SqlParameter[] parameter = listStr.ToArray();
             return SQLHelper.GetDataTableRunText(strSql, parameter);
         }
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx.designer.cs
index f5173c9d..279517c3 100644
--- a/SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx.designer.cs
@@ -68,6 +68,15 @@ namespace FineUIPro.Web.Transfer.Chart
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlSubSysNo;
 
+        /// <summary>
+        /// drpType 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpType;
+
         /// <summary>
         /// btnSearch 控件。
         /// </summary>