From df83f9713ff80d10c70283bcdb77a01b1c89fd1e Mon Sep 17 00:00:00 2001
From: panhf <754998852@qq.com>
Date: Sun, 4 Feb 2024 11:11:43 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E4=BA=A4=E7=BB=9F=E8=AE=A1=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E9=99=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Transfer/Chart/Instrumentation.aspx       | 16 ++++++++---
 .../Transfer/Chart/Instrumentation.aspx.cs    | 26 ++++++++++++++++--
 .../Chart/Instrumentation.aspx.designer.cs    | 27 ++++++++++++-------
 3 files changed, 54 insertions(+), 15 deletions(-)

diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx b/SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx
index 8c21f332..fed1ca4d 100644
--- a/SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx
@@ -20,7 +20,7 @@
                     <Items>
                         <f:Form ID="Form2" ShowHeader="false" ShowBorder="false" runat="server">
                             <Rows>
-                                <f:FormRow>
+                                <f:FormRow ColumnWidths="20% 20% 20% 10% 10%">
                                     <Items>
                                         <f:DropDownList ID="drpdateType" runat="server" Label="日期类型" AutoPostBack="true"
                                             OnSelectedIndexChanged="drpdateType_SelectedIndexChanged" Width="100px" LabelWidth="80px">
@@ -28,7 +28,7 @@
                                             <f:ListItem Value="1" Text="按日期"></f:ListItem>
                                         </f:DropDownList>
 
-                                        <f:DatePicker runat="server" Label="时间" ID="txtStarTime" EnableEdit="true" LabelWidth="80px" DateFormatString="yyyy-MM" DisplayType="Month"></f:DatePicker>
+                                        <f:DatePicker runat="server" Label="时间" ID="txtStarTime" EnableEdit="true" LabelWidth="50px" DateFormatString="yyyy-MM" DisplayType="Month"></f:DatePicker>
 
                                         <f:DatePicker runat="server" ID="txtEndTime" EnableEdit="true" LabelWidth="80px" DateFormatString="yyyy-MM" DisplayType="Month"></f:DatePicker>
 
@@ -36,11 +36,11 @@
 
                                         <f:DatePicker runat="server" ID="txtEndTime1" EnableEdit="true" LabelWidth="80px" Hidden="true"></f:DatePicker>
 
-                                        <f:DropDownList ID="drpChartType" runat="server" Label="图形类型" AutoPostBack="true"
+                                        <%--<f:DropDownList ID="drpChartType" runat="server" Label="图形类型" AutoPostBack="true"
                                             OnSelectedIndexChanged="drpChartType_SelectedIndexChanged" Width="300px" LabelWidth="80px">
                                             <f:ListItem Value="Column" Text="柱形图"  Selected="true"></f:ListItem>
                                             <f:ListItem Value="Line" Text="折线图"></f:ListItem>
-                                        </f:DropDownList>
+                                        </f:DropDownList>--%>
 
                                         <%--<f:DropDownList ID="drpChartType" runat="server" LabelWidth="80px" Label="图形类型"
                                             AutoPostBack="true" OnSelectedIndexChanged="drpChartType_SelectedIndexChanged">
@@ -52,6 +52,9 @@
 
                                         <f:Button ID="BtnAnalyse" Text="统计" Icon="ChartPie" runat="server" OnClick="BtnAnalyse_Click"></f:Button>
 
+                                        <f:Button ID="btnAttachUrl" Text="附件" ToolTip="附件上传及查看" Icon="TableCell" runat="server"
+                                            OnClick="btnAttachUrl_Click" ValidateForms="SimpleForm1">
+                                        </f:Button>
 
                                     </Items>
                                 </f:FormRow>
@@ -98,6 +101,11 @@
                 </f:Region>
             </Regions>
         </f:RegionPanel>
+
+         <f:Window ID="WindowAtt" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+        Target="Parent" EnableResize="true" runat="server" IsModal="true" Width="700px"
+        Height="500px">
+    </f:Window>
     </form>
 </body>
 </html>
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx.cs
index 1a99e158..52903623 100644
--- a/SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx.cs
@@ -230,7 +230,7 @@ namespace FineUIPro.Web.Transfer.Chart
             }
             if (systemBol)
             {
-                this.ChartUc.CreateChart(BLL.ChartControlService.GetDataSourceChart(dtTime, "PROGRESS REPORT", this.drpChartType.SelectedValue, 1100, 600, false));
+                this.ChartUc.CreateChart(BLL.ChartControlService.GetDataSourceChart(dtTime, "PROGRESS REPORT", "Column", 1100, 600, false));
             }
             
 
@@ -476,11 +476,33 @@ namespace FineUIPro.Web.Transfer.Chart
                 }
                 if (systemBol)
                 {
-                    this.ChartUc.CreateChart(BLL.ChartControlService.GetDataSourceChart(dtTime, "SYSTEM PROGRESS REPORT", this.drpChartType.SelectedValue, 1100, 600, false));
+                    this.ChartUc.CreateChart(BLL.ChartControlService.GetDataSourceChart(dtTime, "SYSTEM PROGRESS REPORT", "Column", 1100, 600, false));
                 }
             }
 
         }
         #endregion
+
+        #region 附件上传
+        /// <summary>
+        /// 上传附件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnAttachUrl_Click(object sender, EventArgs e)
+        {
+            //必须点击系统
+            var SystemName = this.trRectify.SelectedNodeID;
+            if (SystemName=="ALL"|| SystemName=="")
+            {
+                Alert.ShowInTop("请选择系统。", MessageBoxIcon.Warning);
+                return;
+            }
+            var toKeyId = "D142B96F-4D36-429D-AB08-FA0D7C30BB69" + SystemName;
+            PageContext.RegisterStartupScript(WindowAtt.GetShowReference
+                (String.Format("~/AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/Trancfer&menuId={1}",
+                toKeyId, "E6F5125D-DD94-4978-B7EB-D9C26694D86D")));
+        }
+        #endregion
     }
 }
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx.designer.cs
index 7669478c..d6ed0495 100644
--- a/SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx.designer.cs
@@ -104,15 +104,6 @@ namespace FineUIPro.Web.Transfer.Chart
         /// </remarks>
         protected global::FineUIPro.DatePicker txtEndTime1;
 
-        /// <summary>
-        /// drpChartType 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.DropDownList drpChartType;
-
         /// <summary>
         /// BtnAnalyse 控件。
         /// </summary>
@@ -122,6 +113,15 @@ namespace FineUIPro.Web.Transfer.Chart
         /// </remarks>
         protected global::FineUIPro.Button BtnAnalyse;
 
+        /// <summary>
+        /// btnAttachUrl 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnAttachUrl;
+
         /// <summary>
         /// Region2 控件。
         /// </summary>
@@ -175,5 +175,14 @@ namespace FineUIPro.Web.Transfer.Chart
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Tree trRectify;
+
+        /// <summary>
+        /// WindowAtt 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window WindowAtt;
     }
 }