From 594c85b083c651efc7d482cda9535882a513a7f9 Mon Sep 17 00:00:00 2001
From: geh <1923421292@qq.com>
Date: Mon, 21 Apr 2025 17:44:59 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E9=A1=B9=E7=9B=AE=E6=A0=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CQMS/Check/JointCheckChartStatistics.aspx | 124 ++++++++++--------
 .../Check/JointCheckChartStatistics.aspx.cs   |  46 ++++++-
 ...JointCheckChartStatistics.aspx.designer.cs |  45 +++++++
 3 files changed, 161 insertions(+), 54 deletions(-)
diff --git a/SUBQHSE/FineUIPro.Web/CQMS/Check/JointCheckChartStatistics.aspx b/SUBQHSE/FineUIPro.Web/CQMS/Check/JointCheckChartStatistics.aspx
index c450aae..d55d605 100644
--- a/SUBQHSE/FineUIPro.Web/CQMS/Check/JointCheckChartStatistics.aspx
+++ b/SUBQHSE/FineUIPro.Web/CQMS/Check/JointCheckChartStatistics.aspx
@@ -1,5 +1,6 @@
 ﻿<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="JointCheckChartStatistics.aspx.cs"
     Inherits="FineUIPro.Web.CQMS.Check.JointCheckChartStatistics" %>
+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %> 
 
 <%@ Register Src="~/Controls/ChartControl.ascx" TagName="ChartControl" TagPrefix="uc1" %>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@@ -12,58 +13,77 @@
 </head>
 <body>
     <form id="form1" runat="server">
-    <f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="RegionPanel1" AjaxAspnetControls="divAccidentUnit,divAccidentTime" />
-    <f:Panel ID="Panel3" CssClass="blockpanel" runat="server" EnableCollapse="false"
-        BodyPadding="10px" ShowBorder="true" ShowHeader="false">
-        <Items>
-            <f:Form ID="Form2" ShowHeader="false" ShowBorder="false" runat="server">
-                <Rows>
-                    <f:FormRow ColumnWidths="20% 3% 20% 30% 15% 10%">
-                        <Items>
-                            <f:DatePicker ID="txtStartRectificationTime" runat="server" Label="检查时间" LabelAlign="Right"
-                                LabelWidth="80px">
-                            </f:DatePicker>
-                            <f:Label ID="Label3" runat="server" Text="至" Width="5px">
-                            </f:Label>
-                            <f:DatePicker ID="txtEndRectificationTime" runat="server">
-                            </f:DatePicker>
-                              <f:RadioButtonList ID="rblState" runat="server" Label="分析类型" LabelWidth="80px" Width="250px"
-                                AutoPostBack="true" OnSelectedIndexChanged="drpChartType_SelectedIndexChanged">
-                                <f:RadioItem Value="0" Selected="true" Text="按责任单位" />
-                                <f:RadioItem Value="1" Text="按问题类别" />
-                            </f:RadioButtonList>
-                            <f:Button ID="BtnAnalyse" Text="统计" Icon="ChartPie" runat="server" OnClick="BtnAnalyse_Click">
-                            </f:Button>
-                        </Items>
-                    </f:FormRow>
-                    
-                </Rows>
-            </f:Form>
-        </Items>
-    </f:Panel>
-    <f:Panel ID="Panel4" CssClass="blockpanel" runat="server"  EnableCollapse="false" MarginTop="10px"
-        BodyPadding="10px" ShowBorder="true" ShowHeader="false">
-        <Items>
-            <f:TabStrip ID="TabStrip1" CssClass="f-tabstrip-theme-simple" Height="400px" ShowBorder="true"
-                TabPosition="Top" MarginBottom="5px" EnableTabCloseMenu="false" runat="server">
-                <Tabs>
-                    <f:Tab ID="Tab2" Title="图表" BodyPadding="5px" Layout="Fit" IconFont="Bookmark"     runat="server"
-                        TitleToolTip="图表">
-                        <Items>
-                            <f:ContentPanel ShowHeader="false" runat="server" ID="cpAccidentTime" Margin="0 0 0 0"  >
-                                
-                                    <div id="divAccidentTime" style="width: 1000px; height: 300px;">
-                                   
-                                    </div>
-                                
-                              
-                            </f:ContentPanel>
-                        </Items>
-                    </f:Tab>
-                </Tabs>
-            </f:TabStrip>
-        </Items>
-    </f:Panel>
+        <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server"/>
+        <f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
+            <Items>
+                <f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
+                         EnableCollapse="true" Width="380" Title="公司-项目" TitleToolTip="公司-项目" ShowBorder="true"
+                         ShowHeader="true" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft" Layout="Fit">
+                    <Items>
+                        <f:ContentPanel ID="ContentPanel1" runat="server" ShowHeader="false" EnableCollapse="true" AutoScroll="true"
+                                        BodyPadding="0px">
+                            <uc1:UnitProjectTControl ID="ucTree" runat="server" Onchange="changeTree"/>
+                        </f:ContentPanel>
+                    </Items>
+                </f:Panel>
+                <f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
+                         Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" AutoScroll="true">
+                    <Items>
+                        <f:Panel ID="Panel3" CssClass="blockpanel" runat="server" EnableCollapse="false"
+                                 BodyPadding="10px" ShowBorder="true" ShowHeader="false">
+                            <Items>
+                                <f:Form ID="Form2" ShowHeader="false" ShowBorder="false" runat="server">
+                                    <Rows>
+                                        <f:FormRow ColumnWidths="20% 3% 20% 30% 15% 10%">
+                                            <Items>
+                                                <f:DatePicker ID="txtStartRectificationTime" runat="server" Label="检查时间" LabelAlign="Right"
+                                                              LabelWidth="80px">
+                                                </f:DatePicker>
+                                                <f:Label ID="Label3" runat="server" Text="至" Width="5px">
+                                                </f:Label>
+                                                <f:DatePicker ID="txtEndRectificationTime" runat="server">
+                                                </f:DatePicker>
+                                                <f:RadioButtonList ID="rblState" runat="server" Label="分析类型" LabelWidth="80px" Width="250px"
+                                                                   AutoPostBack="true" OnSelectedIndexChanged="drpChartType_SelectedIndexChanged">
+                                                    <f:RadioItem Value="0" Selected="true" Text="按责任单位"/>
+                                                    <f:RadioItem Value="1" Text="按问题类别"/>
+                                                </f:RadioButtonList>
+                                                <f:Button ID="BtnAnalyse" Text="统计" Icon="ChartPie" runat="server" OnClick="BtnAnalyse_Click">
+                                                </f:Button>
+                                            </Items>
+                                        </f:FormRow>
+
+                                    </Rows>
+                                </f:Form>
+                            </Items>
+                        </f:Panel>
+                        <f:Panel ID="Panel4" CssClass="blockpanel" runat="server" EnableCollapse="false" MarginTop="10px"
+                                 BodyPadding="10px" ShowBorder="true" ShowHeader="false">
+                            <Items>
+                                <f:TabStrip ID="TabStrip1" CssClass="f-tabstrip-theme-simple" Height="400px" ShowBorder="true"
+                                            TabPosition="Top" MarginBottom="5px" EnableTabCloseMenu="false" runat="server">
+                                    <Tabs>
+                                        <f:Tab ID="Tab2" Title="图表" BodyPadding="5px" Layout="Fit" IconFont="Bookmark" runat="server"
+                                               TitleToolTip="图表">
+                                            <Items>
+                                                <f:ContentPanel ShowHeader="false" runat="server" ID="cpAccidentTime" Margin="0 0 0 0">
+
+                                                    <div id="divAccidentTime" style="width: 1000px; height: 300px;">
+
+                                                    </div>
+
+
+                                                </f:ContentPanel>
+                                            </Items>
+                                        </f:Tab>
+                                    </Tabs>
+                                </f:TabStrip>
+                            </Items>
+                        </f:Panel>
+                    </Items>
+                </f:Panel>
+            </Items>
+        </f:Panel>
     </form>
 </body>
 <script  language="javascript">
diff --git a/SUBQHSE/FineUIPro.Web/CQMS/Check/JointCheckChartStatistics.aspx.cs b/SUBQHSE/FineUIPro.Web/CQMS/Check/JointCheckChartStatistics.aspx.cs
index b9a40cc..9b05a5b 100644
--- a/SUBQHSE/FineUIPro.Web/CQMS/Check/JointCheckChartStatistics.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/CQMS/Check/JointCheckChartStatistics.aspx.cs
@@ -9,6 +9,33 @@ namespace FineUIPro.Web.CQMS.Check
 {
     public partial class JointCheckChartStatistics : PageBase
     {
+        #region 定义项
+        /// <summary>
+        /// 项目主键
+        /// </summary>
+        public string ProjectId
+        {
+            get
+            {
+                return (string)ViewState["ProjectId"];
+            }
+            set
+            {
+                ViewState["ProjectId"] = value;
+            }
+        }
+        #endregion
+        
+        /// <summary>
+        /// 公司级树加载
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void changeTree(object sender, EventArgs e)
+        {
+            this.ProjectId = this.ucTree.ProjectId;
+            this.AnalyseData();
+        }
         #region 加载页面
         /// <summary>
         /// 加载页面
@@ -19,6 +46,17 @@ namespace FineUIPro.Web.CQMS.Check
         {
             if (!IsPostBack)
             {
+                this.ProjectId = this.CurrUser.LoginProjectId;
+                if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId)
+                {
+                    this.ProjectId = Request.Params["projectId"];
+                }
+                this.ucTree.UnitId = this.CurrUser.UnitId;
+                this.ucTree.ProjectId = this.ProjectId;
+                if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId) )
+                {
+                    this.panelLeftRegion.Hidden = true;
+                }
                 this.txtStartRectificationTime.Text = DateTime.Now.AddDays(-7).ToString("yyyy-MM-dd");
                 this.txtEndRectificationTime.Text = DateTime.Now.ToString("yyyy-MM-dd");
             }
@@ -48,6 +86,10 @@ namespace FineUIPro.Web.CQMS.Check
         /// </summary>
         private void AnalyseData()
         {
+            if (string.IsNullOrEmpty(this.ProjectId))
+            {
+                return;
+            }
             if (this.rblState.SelectedValue == "0")
             {
 
@@ -68,7 +110,7 @@ namespace FineUIPro.Web.CQMS.Check
                 }
                 strSql += " group by UnitId,unitName ";
                 List<SqlParameter> listStr = new List<SqlParameter>();
-                listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
+                listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
 
                 SqlParameter[] parameter = listStr.ToArray();
                 DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
@@ -140,7 +182,7 @@ namespace FineUIPro.Web.CQMS.Check
                 }
                 strSql += " group by QuestionDef,QuestionTypeStr ";
                 List<SqlParameter> listStr = new List<SqlParameter>();
-                listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
+                listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
 
                 SqlParameter[] parameter = listStr.ToArray();
                 DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
diff --git a/SUBQHSE/FineUIPro.Web/CQMS/Check/JointCheckChartStatistics.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/CQMS/Check/JointCheckChartStatistics.aspx.designer.cs
index 80ba88c..2eaf2e8 100644
--- a/SUBQHSE/FineUIPro.Web/CQMS/Check/JointCheckChartStatistics.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/CQMS/Check/JointCheckChartStatistics.aspx.designer.cs
@@ -32,6 +32,51 @@ namespace FineUIPro.Web.CQMS.Check
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
 
+        /// <summary>
+        /// Panel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+
+        /// <summary>
+        /// panelLeftRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelLeftRegion;
+
+        /// <summary>
+        /// ContentPanel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ContentPanel ContentPanel1;
+
+        /// <summary>
+        /// ucTree 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Web.Controls.UnitProjectTControl ucTree;
+
+        /// <summary>
+        /// panelCenterRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelCenterRegion;
+
         /// <summary>
         /// Panel3 控件。
         /// </summary>
