From e78dee144b149d4f2a2d475f9ccd66b4f360703d Mon Sep 17 00:00:00 2001 From: fly-l <1420031550@qq.com> Date: Thu, 15 Sep 2022 23:20:10 +0800 Subject: [PATCH] =?UTF-8?q?20220915=20=E7=84=8A=E6=8E=A5=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E7=84=8A=E5=B7=A5=E5=8A=9F=E6=95=88=E5=88=86=E6=9E=90=E7=95=8C?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DataBase/版本日志/SGGLDB_V2022-09-15.sql | 37 ++++ .../版本日志/SGGLDB_V2022-09-15修改明细.txt | 4 + .../1-5焊接管理（Menu_HJGL）.sql | 8 + SGGL/BLL/BLL.csproj | 31 ++++ SGGL/BLL/HJGL/DataImport/DataImportService.cs | 34 +++- SGGL/FineUIPro.Web/FineUIPro.Web.csproj | 8 + .../HJGL/DataImport/DrawingImportEdit.aspx | 2 +- .../HJGL/DataImport/DrawingImportEdit.aspx.cs | 25 ++- .../HJGL/DataImport/TDMImportEdit.aspx | 2 +- .../HJGL/DataImport/TDMImportEdit.aspx.cs | 26 ++- .../HJGL/WeldingReport/WelderEfficacy.aspx | 84 +++++++++ .../HJGL/WeldingReport/WelderEfficacy.aspx.cs | 167 ++++++++++++++++++ .../WelderEfficacy.aspx.designer.cs | 134 ++++++++++++++ SGGL/FineUIPro.Web/common/Menu_HJGL.xml | 1 + SGGL/FineUIPro.Web/common/Menu_HTGL.xml | 2 + 15 files changed, 551 insertions(+), 14 deletions(-) create mode 100644 DataBase/版本日志/SGGLDB_V2022-09-15.sql create mode 100644 DataBase/版本日志/SGGLDB_V2022-09-15修改明细.txt create mode 100644 SGGL/FineUIPro.Web/HJGL/WeldingReport/WelderEfficacy.aspx create mode 100644 SGGL/FineUIPro.Web/HJGL/WeldingReport/WelderEfficacy.aspx.cs create mode 100644 SGGL/FineUIPro.Web/HJGL/WeldingReport/WelderEfficacy.aspx.designer.cs diff --git a/DataBase/版本日志/SGGLDB_V2022-09-15.sql b/DataBase/版本日志/SGGLDB_V2022-09-15.sql new file mode 100644 index 00000000..d9a47697 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2022-09-15.sql @@ -0,0 +1,37 @@ + + INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) + VALUES('854C79DF-A1C0-4E3C-BCB4-7D5CD044F72B','Ч','HJGL/WeldingReport/WelderEfficacy.aspx',90,'F3B157B7-9BEE-4150-80CB-087828F1C51D','Menu_HJGL',0,1,1) + GO + INSERT INTO Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES('47A49DB1-4689-421A-A93E-DCBD7C34D917','854C79DF-A1C0-4E3C-BCB4-7D5CD044F72B','鿴',1) + GO + + +CREATE PROC [dbo].[sp_rpt_WelderEfficacy] + @unitcode NVARCHAR(50) = NULL, --λ + @projectId NVARCHAR(50) = NULL, + @JointAttribute NVARCHAR(50) = NULL + +AS +/*Ч*/ +select +Welder.PersonId, +Welder.WelderCode, +Welder.PersonName, +cast( SUM(ISNULL(jot.Size,0))AS DECIMAL(8,0) ) as TotalDin, +count(distinct daily.WeldingDailyId) as worktime, +cast(cast( SUM(ISNULL(jot.Size,0))AS DECIMAL(8,3) ) /count(distinct daily.WeldingDailyId) as DECIMAL(8,0)) as Effect +from SitePerson_Person Welder +left join HJGL_WeldJoint jot on jot.CoverWelderId=Welder.PersonId +left join HJGL_WeldingDaily daily on jot.WeldingDailyId=daily.WeldingDailyId +where Welder.WorkPostId='19B8F2A9-28D3-4F20-867A-1B2237C2E228' +AND (welder.ProjectId = @projectId OR @projectId IS NULL) +AND (welder.UnitId=@unitcode OR @unitcode IS NULL) +And (jot.JointAttribute=@JointAttribute OR @JointAttribute IS NULL) +group by Welder.PersonName,Welder.PersonId,Welder.WelderCode +having count(distinct daily.WeldingDailyId) !=0 + + + +GO + + \ No newline at end of file diff --git a/DataBase/版本日志/SGGLDB_V2022-09-15修改明细.txt b/DataBase/版本日志/SGGLDB_V2022-09-15修改明细.txt new file mode 100644 index 00000000..540be52d --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2022-09-15修改明细.txt @@ -0,0 +1,4 @@ +--ADD BY lipengfei 2022-09-15 +1,焊接增加焊工功效分析 +--END + \ No newline at end of file diff --git a/DataBase/菜单初始化脚本/1-5焊接管理（Menu_HJGL）.sql b/DataBase/菜单初始化脚本/1-5焊接管理（Menu_HJGL）.sql index ef10e48f..8e476cc9 100644 --- a/DataBase/菜单初始化脚本/1-5焊接管理（Menu_HJGL）.sql +++ b/DataBase/菜单初始化脚本/1-5焊接管理（Menu_HJGL）.sql @@ -534,6 +534,14 @@ GO GO INSERT INTO Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES('F17794E8-5ECC-4CCE-9BBF-0BC7A1E09CAF','EAD61207-E396-45B0-A1D2-7A5F0498AACC','鿴',1) GO + + INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) + VALUES('854C79DF-A1C0-4E3C-BCB4-7D5CD044F72B','Ч','HJGL/WeldingReport/WelderEfficacy.aspx',90,'F3B157B7-9BEE-4150-80CB-087828F1C51D','Menu_HJGL',0,1,1) + GO + INSERT INTO Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES('47A49DB1-4689-421A-A93E-DCBD7C34D917','854C79DF-A1C0-4E3C-BCB4-7D5CD044F72B','鿴',1) + GO + + --INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) --VALUES('CF3CB43C-4031-4CFD-905F-154DC1CB881E','ۺϢ','HJGL/WeldingReport/IsoCompreInfo.aspx',80,'F3B157B7-9BEE-4150-80CB-087828F1C51D','Menu_HJGL',0,1,1) --GO diff --git a/SGGL/BLL/BLL.csproj b/SGGL/BLL/BLL.csproj index a41b2ef0..9f4892c2 100644 --- a/SGGL/BLL/BLL.csproj +++ b/SGGL/BLL/BLL.csproj @@ -64,6 +64,9 @@ ..\FineUIPro\Reference BLL\Interop.WIA.dll True + + ..\packages\Microsoft.Bcl.AsyncInterfaces.5.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll + ..\packages\Microsoft.Office.Interop.Excel.15.0.4795.1000\lib\net20\Microsoft.Office.Interop.Excel.dll True @@ -96,7 +99,13 @@ True + + ..\packages\RestSharp.106.15.0\lib\net452\RestSharp.dll + + + ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll + @@ -104,9 +113,31 @@ + + ..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll + + + + ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll + + + ..\packages\System.Runtime.CompilerServices.Unsafe.5.0.0\lib\net45\System.Runtime.CompilerServices.Unsafe.dll + + + ..\packages\System.Text.Encodings.Web.5.0.0\lib\net461\System.Text.Encodings.Web.dll + + + ..\packages\System.Text.Json.5.0.0\lib\net461\System.Text.Json.dll + + + ..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll + + + ..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll + diff --git a/SGGL/BLL/HJGL/DataImport/DataImportService.cs b/SGGL/BLL/HJGL/DataImport/DataImportService.cs index b5300fcd..1eebb310 100644 --- a/SGGL/BLL/HJGL/DataImport/DataImportService.cs +++ b/SGGL/BLL/HJGL/DataImport/DataImportService.cs @@ -1,4 +1,5 @@ -using System.Collections.Generic; +using RestSharp; +using System.Collections.Generic; using System.Data; using System.IO; using System.Linq; @@ -91,10 +92,37 @@ namespace BLL }; } - public static void UploadFileToOa() + /// + /// + /// + /// 文件地址 + /// 主项 + /// 1模型2图纸 + public static bool UploadFileToOa(string file, string unitworkid, string fileType) { + bool result = true; + try + { + var client = new RestClient("http://sgglnet.sedin.com.cn:6060/file/uploadSingle"); + client.Timeout = -1; + var request = new RestRequest(Method.POST); + // client.UserAgent = "apifox/1.0.0 (https://www.apifox.cn)"; + //request.AddFile("file", @"E:\微信\WeChat\WeChat Files\wxid_9140361403112\FileStorage\File\2022-08\焊接管理尾项20220809.docx"); + request.AddFile("file", file); + string unitworkname = BLL.UnitWorkService.GetNameById(unitworkid); + request.AddParameter("subject", unitworkname); + request.AddParameter("fileType", fileType); + IRestResponse response = client.Execute(request); + var contentPost = response.Content; + } + catch (System.Exception) + { + + result =false; + } + return result; - } + } /// /// 获取当前文件新的版本号 /// diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index 3611a660..91482771 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -608,6 +608,7 @@ + @@ -8119,6 +8120,13 @@ WelderAvgPerformance.aspx + + WelderEfficacy.aspx + ASPXCodeBehind + + + WelderEfficacy.aspx + WelderPerformance.aspx ASPXCodeBehind diff --git a/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingImportEdit.aspx b/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingImportEdit.aspx index 881ed3d7..1bd5846f 100644 --- a/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingImportEdit.aspx +++ b/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingImportEdit.aspx @@ -47,7 +47,7 @@ - diff --git a/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingImportEdit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingImportEdit.aspx.cs index 368d4cb7..600ee8c2 100644 --- a/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingImportEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingImportEdit.aspx.cs @@ -54,13 +54,14 @@ namespace FineUIPro.Web.HJGL.DataImport } - public void Save() + public string Save() { + string result = ""; if (Session["AttachFile.webuploader"] == null) { ShowNotify("请先上传文件！", MessageBoxIcon.Error); - return; + return result; } List root = JsonConvert.DeserializeObject>(Session["AttachFile.webuploader"].ToString()); foreach (var item in root) @@ -82,13 +83,29 @@ namespace FineUIPro.Web.HJGL.DataImport dataImport.CreateDate = DateTime.Now; BLL.HJGL_DataImportService.AddHJGL_DataImport(dataImport); + if (!BLL.HJGL_DataImportService.UploadFileToOa(Funs.RootPath + dataImport.FilePath, dataImport.UnitWorkId, "2")) + { + string str =" "+ dataImport.FileName+"推送失败|"; + result += str; + } + + } Session.Remove("AttachFile.webuploader"); + return result; } protected void btnSave_Click(object sender, EventArgs e) { - Save(); - ShowNotify("保存成功！", MessageBoxIcon.Success); + string result= Save(); + if (result =="") + { + ShowNotify("保存成功！", MessageBoxIcon.Success); + } + else + { + ShowNotify(result, MessageBoxIcon.Warning); + + } PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference()); } diff --git a/SGGL/FineUIPro.Web/HJGL/DataImport/TDMImportEdit.aspx b/SGGL/FineUIPro.Web/HJGL/DataImport/TDMImportEdit.aspx index 385c8b30..42adc4cf 100644 --- a/SGGL/FineUIPro.Web/HJGL/DataImport/TDMImportEdit.aspx +++ b/SGGL/FineUIPro.Web/HJGL/DataImport/TDMImportEdit.aspx @@ -48,7 +48,7 @@ - diff --git a/SGGL/FineUIPro.Web/HJGL/DataImport/TDMImportEdit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/DataImport/TDMImportEdit.aspx.cs index 5d35fe2b..aecdb204 100644 --- a/SGGL/FineUIPro.Web/HJGL/DataImport/TDMImportEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/DataImport/TDMImportEdit.aspx.cs @@ -54,13 +54,14 @@ namespace FineUIPro.Web.HJGL.DataImport } - public void Save() + public string Save() { + string result = ""; if (Session["AttachFile.webuploader"] == null) { ShowNotify("请先上传文件！", MessageBoxIcon.Error); - return; + return result; } List root = JsonConvert.DeserializeObject>(Session["AttachFile.webuploader"].ToString()); foreach (var item in root) @@ -81,16 +82,31 @@ namespace FineUIPro.Web.HJGL.DataImport dataImport.CreateMan = this.CurrUser.PersonId; dataImport.CreateDate = DateTime.Now; BLL.HJGL_DataImportService.AddHJGL_DataImport(dataImport); - + if (!BLL.HJGL_DataImportService.UploadFileToOa(Funs.RootPath + dataImport.FilePath, dataImport.UnitWorkId, "1")) + { + string str = " " + dataImport.FileName + "推送失败|"; + result += str; + } } Session.Remove("AttachFile.webuploader"); + return result; + } protected void btnSave_Click(object sender, EventArgs e) { - Save(); - ShowNotify("保存成功！", MessageBoxIcon.Success); + string result = Save(); + if (result == "") + { + ShowNotify("保存成功！", MessageBoxIcon.Success); + } + else + { + ShowNotify(result, MessageBoxIcon.Warning); + + } PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference()); } + } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingReport/WelderEfficacy.aspx b/SGGL/FineUIPro.Web/HJGL/WeldingReport/WelderEfficacy.aspx new file mode 100644 index 00000000..52b56b1b --- /dev/null +++ b/SGGL/FineUIPro.Web/HJGL/WeldingReport/WelderEfficacy.aspx @@ -0,0 +1,84 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="WelderEfficacy.aspx.cs" Inherits="FineUIPro.Web.HJGL.WeldingReport.WelderEfficacy" %> + + + + + 焊工功效分析 + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingReport/WelderEfficacy.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingReport/WelderEfficacy.aspx.cs new file mode 100644 index 00000000..7330b966 --- /dev/null +++ b/SGGL/FineUIPro.Web/HJGL/WeldingReport/WelderEfficacy.aspx.cs @@ -0,0 +1,167 @@ +using BLL; +using System; +using System.Collections.Generic; +using System.Data; +using System.Data.SqlClient; +using System.Text; +using AspNet = System.Web.UI.WebControls; + + +namespace FineUIPro.Web.HJGL.WeldingReport +{ + public partial class WelderEfficacy : PageBase + { + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString(); + this.drpJointAttribute.DataTextField = "Text"; + this.drpJointAttribute.DataValueField = "Value"; + this.drpJointAttribute.DataSource = BLL.DropListService.HJGL_JointAttribute(); + this.drpJointAttribute.DataBind(); + Funs.FineUIPleaseSelect(drpJointAttribute); + + BLL.UnitService.InitUnitByProjectIdUnitTypeDropDownList(this.drpUnitId, this.CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2, true); + + } + } + + #region + /// + /// 绑定数据 + /// + private void BindGrid() + { + List listStr = new List(); + + listStr.Add(new SqlParameter("@projectId", this.CurrUser.LoginProjectId)); + if (this.drpUnitId.SelectedValue != BLL.Const._Null) + { + listStr.Add(new SqlParameter("@unitcode", this.drpUnitId.SelectedValue)); + } + else + { + listStr.Add(new SqlParameter("@unitcode", null)); + } + + if (drpJointAttribute.SelectedValue != Const._Null) + { + listStr.Add(new SqlParameter("@JointAttribute", drpJointAttribute.SelectedValue)); + } + else + { + listStr.Add(new SqlParameter("@JointAttribute", null)); + + } + + + SqlParameter[] parameter = listStr.ToArray(); + DataTable tb = SQLHelper.GetDataTableRunProc("sp_rpt_WelderEfficacy", parameter); + this.Grid1.RecordCount = tb.Rows.Count; + var table = this.GetPagedDataTable(Grid1, tb); + Grid1.DataSource = table; + Grid1.DataBind(); + } + + /// + /// 改变索引事件 + /// + /// + /// + protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) + { + BindGrid(); + } + + /// + /// 分页下拉选择事件 + /// + /// + /// + protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) + { + Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue); + BindGrid(); + } + + /// + /// 排序 + /// + /// + /// + protected void Grid1_Sort(object sender, FineUIPro.GridSortEventArgs e) + { + this.BindGrid(); + } + #endregion + + #region 统计按钮事件 + /// + /// 统计 + /// + /// + /// + protected void BtnAnalyse_Click(object sender, EventArgs e) + { + BindGrid(); + } + #endregion + + #region 导出按钮 + /// 导出按钮 + /// + /// + /// + protected void btnOut_Click(object sender, EventArgs e) + { + Response.ClearContent(); + string filename = Funs.GetNewFileName(); + Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("焊工功效分析" + filename, System.Text.Encoding.UTF8) + ".xls"); + Response.ContentType = "application/excel"; + Response.ContentEncoding = System.Text.Encoding.UTF8; + Response.Write(GetGridTableHtml(Grid1)); + Response.End(); + } + + /// + /// 导出方法 + /// + /// + /// + private string GetGridTableHtml(Grid grid) + { + StringBuilder sb = new StringBuilder(); + sb.Append(""); + sb.Append(""); + sb.Append(""); + grid.PageSize = 10000; + BindGrid(); + foreach (GridColumn column in grid.Columns) + { + sb.AppendFormat("", column.HeaderText); + } + sb.Append(""); + foreach (GridRow row in grid.Rows) + { + sb.Append(""); + foreach (GridColumn column in grid.Columns) + { + string html = row.Values[column.ColumnIndex].ToString(); + if (column.ColumnID == "tfNumber") + { + html = (row.FindControl("labNumber") as AspNet.Label).Text; + } + sb.AppendFormat("", html); + } + + sb.Append(""); + } + + sb.Append("
{0}
{0}
"); + + return sb.ToString(); + } + #endregion + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingReport/WelderEfficacy.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/WeldingReport/WelderEfficacy.aspx.designer.cs new file mode 100644 index 00000000..90b4bf43 --- /dev/null +++ b/SGGL/FineUIPro.Web/HJGL/WeldingReport/WelderEfficacy.aspx.designer.cs @@ -0,0 +1,134 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.HJGL.WeldingReport +{ + + + public partial class WelderEfficacy + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// Toolbar1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// drpUnitId 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpUnitId; + + /// + /// drpJointAttribute 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpJointAttribute; + + /// + /// ToolbarFill1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill1; + + /// + /// BtnAnalyse 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button BtnAnalyse; + + /// + /// btnOut 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnOut; + + /// + /// ToolbarSeparator1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; + + /// + /// ToolbarText1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarText ToolbarText1; + + /// + /// ddlPageSize 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlPageSize; + } +} diff --git a/SGGL/FineUIPro.Web/common/Menu_HJGL.xml b/SGGL/FineUIPro.Web/common/Menu_HJGL.xml index 902b5a0b..ed49650f 100644 --- a/SGGL/FineUIPro.Web/common/Menu_HJGL.xml +++ b/SGGL/FineUIPro.Web/common/Menu_HJGL.xml @@ -61,5 +61,6 @@ + \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/common/Menu_HTGL.xml b/SGGL/FineUIPro.Web/common/Menu_HTGL.xml index ee18d81b..2e0976fd 100644 --- a/SGGL/FineUIPro.Web/common/Menu_HTGL.xml +++ b/SGGL/FineUIPro.Web/common/Menu_HTGL.xml @@ -7,4 +7,6 @@ + + \ No newline at end of file