diff --git a/SGGL/FineUIPro.Web/CQMS/Check/SpecialCheckList.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Check/SpecialCheckList.aspx.cs index 56b9fbd7..01f5e36d 100644 --- a/SGGL/FineUIPro.Web/CQMS/Check/SpecialCheckList.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Check/SpecialCheckList.aspx.cs @@ -285,9 +285,7 @@ namespace FineUIPro.Web.CQMS.Check var table = this.GetPagedDataTable(Grid1, tb); Grid1.DataSource = table; - Grid1.DataBind(); - - + Grid1.DataBind(); } diff --git a/SGGL/FineUIPro.Web/CQMS/Solution/ConstructSolution.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Solution/ConstructSolution.aspx.cs index 4c3aa010..0501f675 100644 --- a/SGGL/FineUIPro.Web/CQMS/Solution/ConstructSolution.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Solution/ConstructSolution.aspx.cs @@ -274,6 +274,11 @@ namespace FineUIPro.Web.CQMS.Solution } File.Copy(uploadfilepath, newUrl); Document doc = new Aspose.Words.Document(newUrl); + Bookmark bookmarkSolutionName = doc.Range.Bookmarks["SolutionName"]; + if (bookmarkSolutionName != null) + { + bookmarkSolutionName.Text = constructSolution.SolutionName; + } Bookmark bookmarkProjectName = doc.Range.Bookmarks["projectName"]; Bookmark bookmarkProjectName2 = doc.Range.Bookmarks["projectName2"]; Bookmark bookmarkprojectNum = doc.Range.Bookmarks["projectNum"]; @@ -468,6 +473,12 @@ namespace FineUIPro.Web.CQMS.Solution } File.Copy(uploadfilepath, newUrl); Document doc = new Aspose.Words.Document(newUrl); + + Bookmark bookmarkSolutionName = doc.Range.Bookmarks["SolutionName"]; + if (bookmarkSolutionName != null) + { + bookmarkSolutionName.Text = constructSolution.SolutionName; + } Bookmark bookmarkProjectName = doc.Range.Bookmarks["projectName"]; Bookmark bookmarkProjectName2 = doc.Range.Bookmarks["projectName2"]; Bookmark bookmarkprojectNum = doc.Range.Bookmarks["projectNum"]; diff --git a/SGGL/FineUIPro.Web/ErrLog.txt b/SGGL/FineUIPro.Web/ErrLog.txt index 231cc5ff..051c4786 100644 --- a/SGGL/FineUIPro.Web/ErrLog.txt +++ b/SGGL/FineUIPro.Web/ErrLog.txt @@ -1663,3 +1663,179 @@ IP地址:::1 出错时间:06/10/2023 11:29:19 出错时间:06/10/2023 11:29:19 + +错误信息开始=====> +错误类型:HttpCompileException +错误信息:d:\project\vs\sggl_cd\SGGL\FineUIPro.Web\ZHGL\ManagementReport\CQMSCheckSpecial.aspx(63): error CS1061: “ASP.zhgl_managementreport_cqmscheckspecial_aspx”不包含“btnQuery_Click”的定义，并且找不到可接受类型为“ASP.zhgl_managementreport_cqmscheckspecial_aspx”的第一个参数的扩展方法“btnQuery_Click”(是否缺少 using 指令或程序集引用?) +错误堆栈: + 在 System.Web.Compilation.BuildManager.CompileWebFile(VirtualPath virtualPath) + 在 System.Web.Compilation.BuildManager.GetVPathBuildResultInternal(VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate) + 在 System.Web.Compilation.BuildManager.GetVPathBuildResultWithNoAssert(HttpContext context, VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate) + 在 System.Web.Compilation.BuildManager.GetVirtualPathObjectFactory(VirtualPath virtualPath, HttpContext context, Boolean allowCrossApp, Boolean throwIfNotFound) + 在 System.Web.Compilation.BuildManager.CreateInstanceFromVirtualPath(VirtualPath virtualPath, Type requiredBaseType, HttpContext context, Boolean allowCrossApp) + 在 System.Web.UI.PageHandlerFactory.GetHandlerHelper(HttpContext context, String requestType, VirtualPath virtualPath, String physicalPath) + 在 System.Web.UI.PageHandlerFactory.GetHandler(HttpContext context, String requestType, String virtualPath, String path) + 在 System.Web.HttpApplication.MaterializeHandlerExecutionStep.System.Web.HttpApplication.IExecutionStep.Execute() + 在 System.Web.HttpApplication.ExecuteStepImpl(IExecutionStep step) + 在 System.Web.HttpApplication.ExecuteStep(IExecutionStep step, Boolean& completedSynchronously) +出错时间:06/10/2023 18:41:14 +出错文件:http://localhost:1295/ZHGL/ManagementReport/CQMSCheckSpecial.aspx +IP地址:::1 + +出错时间:06/10/2023 18:41:14 + + +错误信息开始=====> +错误类型:HttpCompileException +错误信息:d:\project\vs\sggl_cd\SGGL\FineUIPro.Web\ZHGL\ManagementReport\CQMSCheckSpecial.aspx(63): error CS1061: “ASP.zhgl_managementreport_cqmscheckspecial_aspx”不包含“btnQuery_Click”的定义，并且找不到可接受类型为“ASP.zhgl_managementreport_cqmscheckspecial_aspx”的第一个参数的扩展方法“btnQuery_Click”(是否缺少 using 指令或程序集引用?) +错误堆栈: + 在 System.Web.Compilation.BuildManager.PostProcessFoundBuildResult(BuildResult result, Boolean keyFromVPP, VirtualPath virtualPath) + 在 System.Web.Compilation.BuildManager.GetBuildResultFromCacheInternal(String cacheKey, Boolean keyFromVPP, VirtualPath virtualPath, Int64 hashCode, Boolean ensureIsUpToDate) + 在 System.Web.Compilation.BuildManager.GetVPathBuildResultFromCacheInternal(VirtualPath virtualPath, Boolean ensureIsUpToDate) + 在 System.Web.Compilation.BuildManager.GetVPathBuildResultInternal(VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate) + 在 System.Web.Compilation.BuildManager.GetVPathBuildResultWithNoAssert(HttpContext context, VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate) + 在 System.Web.Compilation.BuildManager.GetVirtualPathObjectFactory(VirtualPath virtualPath, HttpContext context, Boolean allowCrossApp, Boolean throwIfNotFound) + 在 System.Web.Compilation.BuildManager.CreateInstanceFromVirtualPath(VirtualPath virtualPath, Type requiredBaseType, HttpContext context, Boolean allowCrossApp) + 在 System.Web.UI.PageHandlerFactory.GetHandlerHelper(HttpContext context, String requestType, VirtualPath virtualPath, String physicalPath) + 在 System.Web.UI.PageHandlerFactory.GetHandler(HttpContext context, String requestType, String virtualPath, String path) + 在 System.Web.HttpApplication.MaterializeHandlerExecutionStep.System.Web.HttpApplication.IExecutionStep.Execute() + 在 System.Web.HttpApplication.ExecuteStepImpl(IExecutionStep step) + 在 System.Web.HttpApplication.ExecuteStep(IExecutionStep step, Boolean& completedSynchronously) +出错时间:06/10/2023 18:41:52 +出错文件:http://localhost:1295/ZHGL/ManagementReport/CQMSCheckSpecial.aspx +IP地址:::1 + +出错时间:06/10/2023 18:41:52 + + +错误信息开始=====> +错误类型:HttpCompileException +错误信息:d:\project\vs\sggl_cd\SGGL\FineUIPro.Web\ZHGL\ManagementReport\CQMSCheckSpecial.aspx(67): error CS1061: “ASP.zhgl_managementreport_cqmscheckspecial_aspx”不包含“btnIn_Click”的定义，并且找不到可接受类型为“ASP.zhgl_managementreport_cqmscheckspecial_aspx”的第一个参数的扩展方法“btnIn_Click”(是否缺少 using 指令或程序集引用?) +错误堆栈: + 在 System.Web.Compilation.BuildManager.CompileWebFile(VirtualPath virtualPath) + 在 System.Web.Compilation.BuildManager.GetVPathBuildResultInternal(VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate) + 在 System.Web.Compilation.BuildManager.GetVPathBuildResultWithNoAssert(HttpContext context, VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate) + 在 System.Web.Compilation.BuildManager.GetVirtualPathObjectFactory(VirtualPath virtualPath, HttpContext context, Boolean allowCrossApp, Boolean throwIfNotFound) + 在 System.Web.Compilation.BuildManager.CreateInstanceFromVirtualPath(VirtualPath virtualPath, Type requiredBaseType, HttpContext context, Boolean allowCrossApp) + 在 System.Web.UI.PageHandlerFactory.GetHandlerHelper(HttpContext context, String requestType, VirtualPath virtualPath, String physicalPath) + 在 System.Web.UI.PageHandlerFactory.GetHandler(HttpContext context, String requestType, String virtualPath, String path) + 在 System.Web.HttpApplication.MaterializeHandlerExecutionStep.System.Web.HttpApplication.IExecutionStep.Execute() + 在 System.Web.HttpApplication.ExecuteStepImpl(IExecutionStep step) + 在 System.Web.HttpApplication.ExecuteStep(IExecutionStep step, Boolean& completedSynchronously) +出错时间:06/10/2023 18:43:06 +出错文件:http://localhost:1295/ZHGL/ManagementReport/CQMSCheckSpecial.aspx +IP地址:::1 + +出错时间:06/10/2023 18:43:06 + + +错误信息开始=====> +错误类型:HttpCompileException +错误信息:d:\project\vs\sggl_cd\SGGL\FineUIPro.Web\ZHGL\ManagementReport\CQMSCheckSpecial.aspx(30): error CS1061: “ASP.zhgl_managementreport_cqmscheckspecial_aspx”不包含“Grid1_FilterChange”的定义，并且找不到可接受类型为“ASP.zhgl_managementreport_cqmscheckspecial_aspx”的第一个参数的扩展方法“Grid1_FilterChange”(是否缺少 using 指令或程序集引用?) +错误堆栈: + 在 System.Web.Compilation.BuildManager.CompileWebFile(VirtualPath virtualPath) + 在 System.Web.Compilation.BuildManager.GetVPathBuildResultInternal(VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate) + 在 System.Web.Compilation.BuildManager.GetVPathBuildResultWithNoAssert(HttpContext context, VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate) + 在 System.Web.Compilation.BuildManager.GetVirtualPathObjectFactory(VirtualPath virtualPath, HttpContext context, Boolean allowCrossApp, Boolean throwIfNotFound) + 在 System.Web.Compilation.BuildManager.CreateInstanceFromVirtualPath(VirtualPath virtualPath, Type requiredBaseType, HttpContext context, Boolean allowCrossApp) + 在 System.Web.UI.PageHandlerFactory.GetHandlerHelper(HttpContext context, String requestType, VirtualPath virtualPath, String physicalPath) + 在 System.Web.UI.PageHandlerFactory.GetHandler(HttpContext context, String requestType, String virtualPath, String path) + 在 System.Web.HttpApplication.MaterializeHandlerExecutionStep.System.Web.HttpApplication.IExecutionStep.Execute() + 在 System.Web.HttpApplication.ExecuteStepImpl(IExecutionStep step) + 在 System.Web.HttpApplication.ExecuteStep(IExecutionStep step, Boolean& completedSynchronously) +出错时间:06/10/2023 18:43:31 +出错文件:http://localhost:1295/ZHGL/ManagementReport/CQMSCheckSpecial.aspx +IP地址:::1 + +出错时间:06/10/2023 18:43:31 + + +错误信息开始=====> +错误类型:HttpParseException +错误信息:不能以声明的方式设置“AutoScroll”属性。 +错误堆栈: + 在 System.Web.UI.TemplateParser.ProcessException(Exception ex) + 在 System.Web.UI.TemplateParser.ParseStringInternal(String text, Encoding fileEncoding) + 在 System.Web.UI.TemplateParser.ParseString(String text, VirtualPath virtualPath, Encoding fileEncoding) +----错误类型:HttpException +----错误信息: +----不能以声明的方式设置“AutoScroll”属性。 +----错误堆栈: + 在 System.Web.UI.ControlBuilder.ValidatePersistable(PropertyInfo propInfo, Boolean usingSetAttribute, Boolean mainDirectiveMode, Boolean simplePropertyEntry, String filter) + 在 System.Web.UI.ControlBuilder.AddProperty(String filter, String name, String value, Boolean mainDirectiveMode) + 在 System.Web.UI.ControlBuilder.PreprocessAttribute(String filter, String attribname, String attribvalue, Boolean mainDirectiveMode, Int32 line, Int32 column) + 在 System.Web.UI.ControlBuilder.PreprocessAttributes(ParsedAttributeCollection attribs) + 在 System.Web.UI.ControlBuilder.Init(TemplateParser parser, ControlBuilder parentBuilder, Type type, String tagName, String id, IDictionary attribs) + 在 System.Web.UI.ControlBuilder.CreateBuilderFromType(TemplateParser parser, ControlBuilder parentBuilder, Type type, String tagName, String id, IDictionary attribs, Int32 line, String sourceFileName) + 在 System.Web.UI.ControlBuilder.CreateChildBuilder(String filter, String tagName, IDictionary attribs, TemplateParser parser, ControlBuilder parentBuilder, String id, Int32 line, VirtualPath virtualPath, Type& childType, Boolean defaultProperty) + 在 System.Web.UI.TemplateParser.ProcessBeginTag(Match match, String inputText) + 在 System.Web.UI.TemplateParser.ParseStringInternal(String text, Encoding fileEncoding) +出错时间:06/10/2023 18:50:57 +出错文件:http://localhost:1295/ZHGL/ManagementReport/CQMSCheckSpecial.aspx +IP地址:::1 + +出错时间:06/10/2023 18:50:57 + + +错误信息开始=====> +错误类型:HttpCompileException +错误信息:d:\project\vs\sggl_cd\SGGL\FineUIPro.Web\ZHGL\ManagementReport\CQMSCheckDaily.aspx(70): error CS1061: “ASP.zhgl_managementreport_cqmscheckdaily_aspx”不包含“btnQuery_Click”的定义，并且找不到可接受类型为“ASP.zhgl_managementreport_cqmscheckdaily_aspx”的第一个参数的扩展方法“btnQuery_Click”(是否缺少 using 指令或程序集引用?) +错误堆栈: + 在 System.Web.Compilation.BuildManager.CompileWebFile(VirtualPath virtualPath) + 在 System.Web.Compilation.BuildManager.GetVPathBuildResultInternal(VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate) + 在 System.Web.Compilation.BuildManager.GetVPathBuildResultWithNoAssert(HttpContext context, VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate) + 在 System.Web.Compilation.BuildManager.GetVirtualPathObjectFactory(VirtualPath virtualPath, HttpContext context, Boolean allowCrossApp, Boolean throwIfNotFound) + 在 System.Web.Compilation.BuildManager.CreateInstanceFromVirtualPath(VirtualPath virtualPath, Type requiredBaseType, HttpContext context, Boolean allowCrossApp) + 在 System.Web.UI.PageHandlerFactory.GetHandlerHelper(HttpContext context, String requestType, VirtualPath virtualPath, String physicalPath) + 在 System.Web.UI.PageHandlerFactory.GetHandler(HttpContext context, String requestType, String virtualPath, String path) + 在 System.Web.HttpApplication.MaterializeHandlerExecutionStep.System.Web.HttpApplication.IExecutionStep.Execute() + 在 System.Web.HttpApplication.ExecuteStepImpl(IExecutionStep step) + 在 System.Web.HttpApplication.ExecuteStep(IExecutionStep step, Boolean& completedSynchronously) +出错时间:06/10/2023 19:05:12 +出错文件:http://localhost:1295/ZHGL/ManagementReport/CQMSCheckDaily.aspx +IP地址:::1 + +出错时间:06/10/2023 19:05:12 + + +错误信息开始=====> +错误类型:HttpCompileException +错误信息:d:\project\vs\sggl_cd\SGGL\FineUIPro.Web\ZHGL\ManagementReport\CQMSCheckDaily.aspx(72): error CS1061: “ASP.zhgl_managementreport_cqmscheckdaily_aspx”不包含“btnRset_Click”的定义，并且找不到可接受类型为“ASP.zhgl_managementreport_cqmscheckdaily_aspx”的第一个参数的扩展方法“btnRset_Click”(是否缺少 using 指令或程序集引用?) +错误堆栈: + 在 System.Web.Compilation.BuildManager.CompileWebFile(VirtualPath virtualPath) + 在 System.Web.Compilation.BuildManager.GetVPathBuildResultInternal(VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate) + 在 System.Web.Compilation.BuildManager.GetVPathBuildResultWithNoAssert(HttpContext context, VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate) + 在 System.Web.Compilation.BuildManager.GetVirtualPathObjectFactory(VirtualPath virtualPath, HttpContext context, Boolean allowCrossApp, Boolean throwIfNotFound) + 在 System.Web.Compilation.BuildManager.CreateInstanceFromVirtualPath(VirtualPath virtualPath, Type requiredBaseType, HttpContext context, Boolean allowCrossApp) + 在 System.Web.UI.PageHandlerFactory.GetHandlerHelper(HttpContext context, String requestType, VirtualPath virtualPath, String physicalPath) + 在 System.Web.UI.PageHandlerFactory.GetHandler(HttpContext context, String requestType, String virtualPath, String path) + 在 System.Web.HttpApplication.MaterializeHandlerExecutionStep.System.Web.HttpApplication.IExecutionStep.Execute() + 在 System.Web.HttpApplication.ExecuteStepImpl(IExecutionStep step) + 在 System.Web.HttpApplication.ExecuteStep(IExecutionStep step, Boolean& completedSynchronously) +出错时间:06/10/2023 19:06:13 +出错文件:http://localhost:1295/ZHGL/ManagementReport/CQMSCheckDaily.aspx +IP地址:::1 + +出错时间:06/10/2023 19:06:13 + + +错误信息开始=====> +错误类型:HttpCompileException +错误信息:d:\project\vs\sggl_cd\SGGL\FineUIPro.Web\ZHGL\ManagementReport\CQMSCheckDaily.aspx(30): error CS1061: “ASP.zhgl_managementreport_cqmscheckdaily_aspx”不包含“Grid1_RowDataBound”的定义，并且找不到可接受类型为“ASP.zhgl_managementreport_cqmscheckdaily_aspx”的第一个参数的扩展方法“Grid1_RowDataBound”(是否缺少 using 指令或程序集引用?) +错误堆栈: + 在 System.Web.Compilation.BuildManager.CompileWebFile(VirtualPath virtualPath) + 在 System.Web.Compilation.BuildManager.GetVPathBuildResultInternal(VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate) + 在 System.Web.Compilation.BuildManager.GetVPathBuildResultWithNoAssert(HttpContext context, VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate) + 在 System.Web.Compilation.BuildManager.GetVirtualPathObjectFactory(VirtualPath virtualPath, HttpContext context, Boolean allowCrossApp, Boolean throwIfNotFound) + 在 System.Web.Compilation.BuildManager.CreateInstanceFromVirtualPath(VirtualPath virtualPath, Type requiredBaseType, HttpContext context, Boolean allowCrossApp) + 在 System.Web.UI.PageHandlerFactory.GetHandlerHelper(HttpContext context, String requestType, VirtualPath virtualPath, String physicalPath) + 在 System.Web.UI.PageHandlerFactory.GetHandler(HttpContext context, String requestType, String virtualPath, String path) + 在 System.Web.HttpApplication.MaterializeHandlerExecutionStep.System.Web.HttpApplication.IExecutionStep.Execute() + 在 System.Web.HttpApplication.ExecuteStepImpl(IExecutionStep step) + 在 System.Web.HttpApplication.ExecuteStep(IExecutionStep step, Boolean& completedSynchronously) +出错时间:06/10/2023 19:06:45 +出错文件:http://localhost:1295/ZHGL/ManagementReport/CQMSCheckDaily.aspx +IP地址:::1 + +出错时间:06/10/2023 19:06:45 + diff --git a/SGGL/FineUIPro.Web/File/Word/CQMS/Solution/施工组织设计或（专项）施工方案审批意见表.doc b/SGGL/FineUIPro.Web/File/Word/CQMS/Solution/施工组织设计或（专项）施工方案审批意见表.doc index 5eb9cd51..a04e29e2 100644 --- a/SGGL/FineUIPro.Web/File/Word/CQMS/Solution/施工组织设计或（专项）施工方案审批意见表.doc +++ b/SGGL/FineUIPro.Web/File/Word/CQMS/Solution/施工组织设计或（专项）施工方案审批意见表.doc @@ -1,5 +1,5 @@ - 大体积混凝土施工方案审批表 + 施工方案审批表 |文件编号| | |： | | |发布日期|年 月 | diff --git a/SGGL/FineUIPro.Web/File/Word/CQMS/Solution/施工组织设计或（专项）施工方案审批确认表.doc b/SGGL/FineUIPro.Web/File/Word/CQMS/Solution/施工组织设计或（专项）施工方案审批确认表.doc index d6a7aba3..49ce7c08 100644 --- a/SGGL/FineUIPro.Web/File/Word/CQMS/Solution/施工组织设计或（专项）施工方案审批确认表.doc +++ b/SGGL/FineUIPro.Web/File/Word/CQMS/Solution/施工组织设计或（专项）施工方案审批确认表.doc @@ -1,5 +1,5 @@ - 大体积混凝土施工方案审批表 + 施工方案审批表 |文件编号 | | |： | | |发布日期 |年 月 | diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index da70172e..5d95c5c5 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -1971,9 +1971,13 @@ + + + + @@ -16648,6 +16652,13 @@ WorkSummaryReportEdit.aspx + + CQMSCheckDaily.aspx + ASPXCodeBehind + + + CQMSCheckDaily.aspx + CheckDaily.aspx ASPXCodeBehind @@ -16655,6 +16666,13 @@ CheckDaily.aspx + + CQMSCheckSpecial.aspx + ASPXCodeBehind + + + CQMSCheckSpecial.aspx + CheckSpecial.aspx ASPXCodeBehind @@ -16669,6 +16687,20 @@ HiddenRectificationView.aspx + + CQMSMonthReport.aspx + ASPXCodeBehind + + + CQMSMonthReport.aspx + + + CQMSMonthReportProjectSum.aspx + ASPXCodeBehind + + + CQMSMonthReportProjectSum.aspx + HSSEMonthReportProjectSum.aspx ASPXCodeBehind diff --git a/SGGL/FineUIPro.Web/HSSE/EduTrain/TestStatistics.aspx b/SGGL/FineUIPro.Web/HSSE/EduTrain/TestStatistics.aspx index 86df27ad..2f70d760 100644 --- a/SGGL/FineUIPro.Web/HSSE/EduTrain/TestStatistics.aspx +++ b/SGGL/FineUIPro.Web/HSSE/EduTrain/TestStatistics.aspx @@ -51,7 +51,7 @@ HeaderText="参加次数" HeaderTextAlign="Center" TextAlign="Left"> + HeaderText="70分以上" HeaderTextAlign="Center" TextAlign="Left"> diff --git a/SGGL/FineUIPro.Web/HSSE/EduTrain/TestStatistics.aspx.cs b/SGGL/FineUIPro.Web/HSSE/EduTrain/TestStatistics.aspx.cs index 8dde887a..1c261d37 100644 --- a/SGGL/FineUIPro.Web/HSSE/EduTrain/TestStatistics.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/EduTrain/TestStatistics.aspx.cs @@ -45,7 +45,7 @@ namespace FineUIPro.Web.HSSE.EduTrain + @" LEFT JOIN Base_Depart AS Depart ON person.DepartId=Depart.DepartId" + @" LEFT JOIN (SELECT COUNT(TestRecordId) AS TestCount,TestManId FROM Training_TestRecord GROUP BY TestManId) AS TestCount" + @" ON person.PersonId=TestCount.TestManId" - + @" LEFT JOIN (SELECT COUNT(TestRecordId) AS TestQualifyCount,TestManId FROM Training_TestRecord WHERE TestScores>= 60 GROUP BY TestManId) AS TestQualifyCount" + + @" LEFT JOIN (SELECT COUNT(TestRecordId) AS TestQualifyCount,TestManId FROM Training_TestRecord WHERE TestScores>= 70 GROUP BY TestManId) AS TestQualifyCount" + @" ON person.PersonId=TestQualifyCount.TestManId" + @" WHERE PersonId <> '" + BLL.Const.sysglyId + "' and person.projectid='" + this.CurrUser.LoginProjectId + "'"; List listStr = new List(); diff --git a/SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationList.aspx.cs b/SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationList.aspx.cs index 4fa1dc3d..5a48a72c 100644 --- a/SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationList.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationList.aspx.cs @@ -144,8 +144,9 @@ namespace FineUIPro.Web.HSSE.HiddenInspection } if (!string.IsNullOrEmpty(this.txtEndTime.Text.Trim())) { - strSql += " AND CheckTime <= @EndTime"; - listStr.Add(new SqlParameter("@EndTime", this.txtEndTime.Text.Trim())); + strSql += " AND CheckTime < @EndTime"; + DateTime endTime = DateTime.Parse(this.txtEndTime.Text).AddDays(1); + listStr.Add(new SqlParameter("@EndTime", endTime.ToString("yyyy-MM-dd"))); } if (!string.IsNullOrEmpty(txtStartRectificationTime.Text.Trim())) { @@ -155,7 +156,8 @@ namespace FineUIPro.Web.HSSE.HiddenInspection if (!string.IsNullOrEmpty(this.txtEndRectificationTime.Text.Trim())) { strSql += " AND RectificationTime <= @EndRectificationTime"; - listStr.Add(new SqlParameter("@EndRectificationTime", this.txtEndRectificationTime.Text.Trim())); + DateTime endTime = DateTime.Parse(this.txtEndRectificationTime.Text).AddDays(1); + listStr.Add(new SqlParameter("@EndRectificationTime", endTime.ToString("yyyy-MM-dd"))); } if (this.drpProblemTypes.SelectedValue != BLL.Const._Null) { diff --git a/SGGL/FineUIPro.Web/ZHGL/ManagementReport/CQMSCheckDaily.aspx b/SGGL/FineUIPro.Web/ZHGL/ManagementReport/CQMSCheckDaily.aspx new file mode 100644 index 00000000..004f16d2 --- /dev/null +++ b/SGGL/FineUIPro.Web/ZHGL/ManagementReport/CQMSCheckDaily.aspx @@ -0,0 +1,178 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="CQMSCheckDaily.aspx.cs" Inherits="FineUIPro.Web.ZHGL.ManagementReport.CQMSCheckDaily" %> + + + + + + + 质量巡检 + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/ZHGL/ManagementReport/CQMSCheckDaily.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/ManagementReport/CQMSCheckDaily.aspx.cs new file mode 100644 index 00000000..d5063fe6 --- /dev/null +++ b/SGGL/FineUIPro.Web/ZHGL/ManagementReport/CQMSCheckDaily.aspx.cs @@ -0,0 +1,516 @@ +using BLL; +using System; +using System.Collections.Generic; +using System.Configuration; +using System.Data; +using System.Data.SqlClient; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using AspNet = System.Web.UI.WebControls; + +namespace FineUIPro.Web.ZHGL.ManagementReport +{ + public partial class CQMSCheckDaily : PageBase + { + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + ////权限按钮方法 + this.GetButtonPower(); + Funs.DropDownPageSize(this.ddlPageSize); + GetButtonPower(); + UnitService.InitUnitByProjectIdUnitTypeDropDownList(drpSponsorUnit, this.CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2, true); + UnitWorkService.InitUnitWorkDownList(drpUnitWork, this.CurrUser.LoginProjectId, true); + CNProfessionalService.InitCNProfessionalDownList(drpCNProfessional, true); + QualityQuestionTypeService.InitQualityQuestionTypeDownList(drpQuestionType, true); + Funs.FineUIPleaseSelect(this.dpHandelStatus); + // 绑定表格 + //BindGrid(); + InitTreeMenu(); + } + } + + private void InitTreeMenu() + { + this.tvControlItem.Nodes.Clear(); + TreeNode rootNode = new TreeNode(); + rootNode.Text = "项目"; + rootNode.NodeID = "0"; + rootNode.Expanded = true; + this.tvControlItem.Nodes.Add(rootNode); + + var project = (from x in Funs.DB.Base_Project + select new { x.ProjectId, x.ProjectName }).Distinct(); + if (project.Count() > 0) + { + foreach (var pro in project) + { + TreeNode tnProject = new TreeNode();//年节点 + tnProject.Text = SubStr(pro.ProjectName); + tnProject.NodeID = pro.ProjectId; + tnProject.ToolTip = pro.ProjectName; + tnProject.EnableClickEvent = true; + rootNode.Nodes.Add(tnProject); + } + } + + } + + protected void tvControlItem_NodeCommand(object sender, TreeCommandEventArgs e) + { + BindGrid(); + } + + + + public Task data() + { + Task task = new Task(() => + { + return ChecklistData(); + }); + task.Start(); + return task; + } + protected DataTable ChecklistData() + { + string strSql = @"SELECT chec.CheckControlCode,chec.CheckSite,chec.ProjectId,chec.unitId,cNProfessional.ProfessionalName," + + @" QualityQuestionType.QualityQuestionType as QuestionType," + + @" chec.checkman,chec.CheckDate,chec.DocCode,chec.submitman,chec.state,chec.CNProfessionalCode," + + @" unit.UnitName,unitWork.UnitWorkName+(case unitWork.ProjectType when '1' then '(建筑)' else '(安装)' end) as UnitWorkName,u.userName " + + @" FROM Check_CheckControl chec" + + @" left join Base_Unit unit on unit.unitId=chec.unitId" + + @" left join Base_CNProfessional cNProfessional on cNProfessional.CNProfessionalId=chec.CNProfessionalCode" + + @" left join WBS_UnitWork unitWork on unitWork.UnitWorkId = chec.UnitWorkId" + + @" left join Base_QualityQuestionType QualityQuestionType on QualityQuestionType.QualityQuestionTypeId = chec.QuestionType" + + @" left join sys_User u on u.userId = chec.CheckMan" + + @" where 1=1 "; + + List listStr = new List(); + if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId)) + { + strSql += " AND chec.ProjectId = @ProjectId"; + listStr.Add(new SqlParameter("@ProjectId", tvControlItem.SelectedNodeID)); + } + + strSql += " AND (chec.CheckDate>=@startTime or @startTime='') and (chec.CheckDate<=@endTime or @endTime='') "; + listStr.Add(new SqlParameter("@startTime", !string.IsNullOrEmpty(txtStartTime.Text.Trim()) ? txtStartTime.Text.Trim() + " 00:00:00" : "")); + listStr.Add(new SqlParameter("@endTime", !string.IsNullOrEmpty(txtEndTime.Text.Trim()) ? txtEndTime.Text.Trim() + " 23:59:59" : "")); + if (drpSponsorUnit.SelectedValue != BLL.Const._Null) + { + strSql += " AND chec.unitId=@unitId"; + listStr.Add(new SqlParameter("@unitId", drpSponsorUnit.SelectedValue)); + } + if (drpUnitWork.SelectedValue != Const._Null) + { + strSql += " AND chec.unitworkId=@unitworkId"; + listStr.Add(new SqlParameter("@unitworkId", drpUnitWork.SelectedValue)); + } + if (drpCNProfessional.SelectedValue != Const._Null) + { + strSql += " AND chec.CNProfessionalCode=@CNProfessionalCode"; + listStr.Add(new SqlParameter("@CNProfessionalCode", drpCNProfessional.SelectedValue)); + } + if (drpQuestionType.SelectedValue != Const._Null) + { + strSql += " AND chec.QuestionType=@QuestionType"; + listStr.Add(new SqlParameter("@QuestionType", drpQuestionType.SelectedValue)); + } + if (dpHandelStatus.SelectedValue != Const._Null) + { + if (dpHandelStatus.SelectedValue.Equals("1")) + { + strSql += " AND (chec.state='5' or chec.state='6')"; + } + else if (dpHandelStatus.SelectedValue.Equals("2")) + { + strSql += " AND chec.state='7'"; + } + else if (dpHandelStatus.SelectedValue.Equals("3")) + { + strSql += " AND DATEADD(day,1,chec.LimitDate)< GETDATE() and chec.state<>5 and chec.state<>6 and chec.state<>7"; + } + else if (dpHandelStatus.SelectedValue.Equals("4")) + { + strSql += " AND DATEADD(day,1,chec.LimitDate)> GETDATE() and chec.state<>5 and chec.state<>6 and chec.state<>7"; + } + } + SqlParameter[] parameter = listStr.ToArray(); + DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); + return tb; + } + /// + /// 把状态转换代号为文字形式 + /// + /// + /// + protected string ConvertState(object state) + { + if (state != null) + { + if (state.ToString() == BLL.Const.CheckControl_ReCompile) + { + return "重新编制"; + } + else if (state.ToString() == BLL.Const.CheckControl_Compile) + { + return "编制"; + } + else if (state.ToString() == BLL.Const.CheckControl_Audit1) + { + return "总包负责人审批"; + } + else if (state.ToString() == BLL.Const.CheckControl_Audit2) + { + return "分包专业工程师回复"; + } + else if (state.ToString() == BLL.Const.CheckControl_Audit3) + { + return "分包负责人审批"; + } + else if (state.ToString() == BLL.Const.CheckControl_Audit4) + { + return "总包专业工程师确认"; + } + else if (state.ToString() == BLL.Const.CheckControl_Audit5) + { + return "总包负责人确认"; + } + else if (state.ToString() == BLL.Const.CheckControl_Complete) + { + return "审批完成"; + } + else if (state.ToString() == BLL.Const.CheckControl_ReCompile2) + { + return "分包专业工程师重新回复"; + } + else + { + return ""; + } + } + return ""; + } + public string Convertstatus(Object code) + { + Model.Check_CheckControl checkControl = BLL.CheckControlService.GetCheckControl(code.ToString()); + if (checkControl.State.Equals("5") || checkControl.State.Equals("6")) + { + return "未确认"; + } + else if (checkControl.State == Const.CheckControl_Complete) + { //闭环 + return "已闭环"; + } + //else if( checkControl.LimitDate> ) + else if (Convert.ToDateTime(checkControl.LimitDate).AddDays(1) < DateTime.Now) //延期未整改 + { + return "超期未整改"; + + } + else //期内未整改 + { + return "未整改"; + + } + } + // + //获取办理人姓名 + // + // + // + protected string ConvertMan(object CheckControlCode) + { + if (CheckControlCode != null) + { + Model.Check_CheckControlApprove a = BLL.CheckControlApproveService.GetCheckControlApproveByCheckControlId(CheckControlCode.ToString()); + if (a != null) + { + if (a.ApproveMan != null) + { + return BLL.UserService.GetUserByUserId(a.ApproveMan).UserName; + } + } + else + { + return ""; + } + } + return ""; + } + protected string ConvertImageUrlByImage(object registrationId) + { + string url = string.Empty; + if (registrationId != null) + { + IList sourlist = AttachFileService.GetBeforeFileList(registrationId.ToString(), BLL.Const.CheckListMenuId); + + if (sourlist != null && sourlist.Count > 0) + { + string AttachUrl = ""; + foreach (var item in sourlist) + { + if (!string.IsNullOrEmpty(item.AttachUrl) && item.AttachUrl.ToLower().EndsWith(".jpg") || item.AttachUrl.ToLower().EndsWith(".jpeg") || item.AttachUrl.ToLower().EndsWith(".png")) + AttachUrl += item.AttachUrl.TrimEnd(',') + ","; + } + url = BLL.UploadAttachmentService.ShowImage(ConfigurationManager.AppSettings["SGGLUrl"], AttachUrl.TrimEnd(',')); + } + } + return url; + } + protected string ConvertImgUrlByImage(object registrationId) + { + string url = string.Empty; + if (registrationId != null) + { + IList sourlist = AttachFileService.Getfilelist(registrationId.ToString() + "r", BLL.Const.CheckListMenuId); + + if (sourlist != null && sourlist.Count > 0) + { + string AttachUrl = ""; + foreach (var item in sourlist) + { + if (!string.IsNullOrEmpty(item.AttachUrl) && item.AttachUrl.ToLower().EndsWith(".jpg") || item.AttachUrl.ToLower().EndsWith(".jpeg") || item.AttachUrl.ToLower().EndsWith(".png")) + AttachUrl += item.AttachUrl.TrimEnd(',') + ","; + } + url = BLL.UploadAttachmentService.ShowImage(ConfigurationManager.AppSettings["SGGLUrl"], AttachUrl.TrimEnd(',')); + } + } + return url; + } + + protected void btnQuery_Click(object sender, EventArgs e) + { + BindGrid(); + } + + + /// + /// 绑定数据 + /// + + public void BindGrid() + { + DataTable tb = ChecklistData(); + + // 2.获取当前分页数据 + //var table = this.GetPagedDataTable(Grid1, tb1); + + Grid1.RecordCount = tb.Rows.Count; + tb = GetFilteredTable(Grid1.FilteredData, tb); + var table = this.GetPagedDataTable(Grid1, tb); + + Grid1.DataSource = table; + Grid1.DataBind(); + + for (int i = 0; i < Grid1.Rows.Count; i++) + { + string rowID = Grid1.Rows[i].DataKeys[0].ToString(); + if (rowID.Count() > 0) + { + Model.Check_CheckControl checkControl = BLL.CheckControlService.GetCheckControl(rowID); + if (checkControl.State.Equals("5") || checkControl.State.Equals("6")) + { + Grid1.Rows[i].CellCssClasses[11] = "LightGreen";//未确认 + } + else if (checkControl.State == Const.CheckControl_Complete) + { //闭环 + Grid1.Rows[i].CellCssClasses[11] = "Green"; + + } + else if (Convert.ToDateTime(checkControl.LimitDate).AddDays(1) < DateTime.Now) //延期未整改 + { + Grid1.Rows[i].CellCssClasses[11] = "Red"; + } + else //期内未整改 + { + Grid1.Rows[i].CellCssClasses[11] = " Yellow "; + } + } + } + } + + + #region 查询 + /// + /// 查询 + /// + /// + /// + protected void TextBox_TextChanged(object sender, EventArgs e) + { + this.BindGrid(); + } + #endregion + + + + + + + + + /// + /// 排序 + /// + /// + /// + protected void Grid1_Sort(object sender, FineUIPro.GridSortEventArgs e) + { + BindGrid(); + } + + + + + + #region 获取按钮权限 + /// + /// 获取按钮权限 + /// + /// + /// + private void GetButtonPower() + { + if (Request.Params["value"] == "0") + { + return; + } + + } + #endregion + + private string SubStr(string str) + { + string reStr = str; + if (!string.IsNullOrEmpty(str) && str.Length > 16) + { + reStr = str.Substring(0, 14) + ".."; + } + return reStr; + } + + + + + + + #region 表排序、分页、关闭窗口 + /// + /// 分页 + /// + /// + /// + protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) + { + Grid1.PageIndex = e.NewPageIndex; + BindGrid(); + } + + + + + + /// + /// 关闭弹出窗 + /// + /// + /// + protected void Window1_Close(object sender, WindowCloseEventArgs e) + { + BindGrid(); + } + #endregion + + #region Grid双击事件 + /// + /// Grid行双击事件 + /// + /// + /// + protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e) + { + btnMenuSee_Click(null, null); + } + #endregion + + #region 查看 + /// + /// 查看按钮 + /// + /// + /// + protected void btnMenuSee_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning); + return; + } + string RegistrationId = Grid1.SelectedRowID; + var registration = BLL.HSSE_Hazard_HazardRegisterService.GetHazardRegisterByHazardRegisterId(RegistrationId); + if (registration != null) + { + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("HiddenRectificationView.aspx?HazardRegisterId={0}", RegistrationId, "查看 - "))); + } + } + #endregion + + #region 格式化字符串 + /// + /// 获取整改前图片 + /// + /// + /// + protected string ConvertImageUrl(object registrationId) + { + string url = string.Empty; + if (registrationId != null) + { + var registration = BLL.HSSE_Hazard_HazardRegisterService.GetHazardRegisterByHazardRegisterId(registrationId.ToString()); + if (registration != null) + { + url = BLL.UploadAttachmentService.ShowAttachment("../../", registration.ImageUrl); + } + } + return url; + } + protected string ConvertProblemTypes(object registrationId) + { + string url = string.Empty; + if (registrationId != null) + { + if (registrationId.ToString() == "1") + { + return "日常巡检"; + } + else if (registrationId.ToString() == "2") + { + return "专项检查"; + } + + } + return url; + } + + + + protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) + { + Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue); + BindGrid(); + } + + #endregion + + + + + + + + + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/ZHGL/ManagementReport/CQMSCheckDaily.aspx.designer.cs b/SGGL/FineUIPro.Web/ZHGL/ManagementReport/CQMSCheckDaily.aspx.designer.cs new file mode 100644 index 00000000..33898745 --- /dev/null +++ b/SGGL/FineUIPro.Web/ZHGL/ManagementReport/CQMSCheckDaily.aspx.designer.cs @@ -0,0 +1,260 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.ZHGL.ManagementReport +{ + + + public partial class CQMSCheckDaily + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// panelLeftRegion 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel panelLeftRegion; + + /// + /// tvControlItem 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Tree tvControlItem; + + /// + /// panelCenterRegion 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel panelCenterRegion; + + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// Toolbar1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// drpSponsorUnit 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpSponsorUnit; + + /// + /// drpUnitWork 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpUnitWork; + + /// + /// drpCNProfessional 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpCNProfessional; + + /// + /// drpQuestionType 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpQuestionType; + + /// + /// Toolbar2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar2; + + /// + /// dpHandelStatus 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList dpHandelStatus; + + /// + /// txtStartTime 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtStartTime; + + /// + /// txtEndTime 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtEndTime; + + /// + /// btnQuery 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnQuery; + + /// + /// labNumber 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label labNumber; + + /// + /// lbImageUrl 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label lbImageUrl; + + /// + /// lbImageUrl2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label lbImageUrl2; + + /// + /// labState 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label labState; + + /// + /// lbAuditMan 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label lbAuditMan; + + /// + /// lbState2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label lbState2; + + /// + /// ToolbarSeparator1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; + + /// + /// ToolbarText1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarText ToolbarText1; + + /// + /// ddlPageSize 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlPageSize; + + /// + /// Window1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window Window1; + } +} diff --git a/SGGL/FineUIPro.Web/ZHGL/ManagementReport/CQMSCheckSpecial.aspx b/SGGL/FineUIPro.Web/ZHGL/ManagementReport/CQMSCheckSpecial.aspx new file mode 100644 index 00000000..fc5d3ae8 --- /dev/null +++ b/SGGL/FineUIPro.Web/ZHGL/ManagementReport/CQMSCheckSpecial.aspx @@ -0,0 +1,182 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="CQMSCheckSpecial.aspx.cs" Inherits="FineUIPro.Web.ZHGL.ManagementReport.CQMSCheckSpecial" %> + + + + + + + 专项检查 + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/ZHGL/ManagementReport/CQMSCheckSpecial.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/ManagementReport/CQMSCheckSpecial.aspx.cs new file mode 100644 index 00000000..111cd534 --- /dev/null +++ b/SGGL/FineUIPro.Web/ZHGL/ManagementReport/CQMSCheckSpecial.aspx.cs @@ -0,0 +1,343 @@ +using System; +using System.Collections.Generic; +using System.Data; +using System.Data.SqlClient; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using BLL; + +namespace FineUIPro.Web.ZHGL.ManagementReport +{ + public partial class CQMSCheckSpecial : PageBase + { + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + ////权限按钮方法 + this.GetButtonPower(); + UnitService.InitUnitByProjectIdUnitTypeDropDownList(drpSponsorUnit, this.CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2, true); + UnitWorkService.InitUnitWorkDownList(drpUnitWork, this.CurrUser.LoginProjectId, true); + CNProfessionalService.InitCNProfessionalDownList(drpCNProfessional, true); + + // 绑定表格 + //BindGrid(); + InitTreeMenu(); + } + } + protected void btnQuery_Click(object sender, EventArgs e) + { + BindGrid(); + } + private void InitTreeMenu() + { + this.tvControlItem.Nodes.Clear(); + TreeNode rootNode = new TreeNode(); + rootNode.Text = "项目"; + rootNode.NodeID = "0"; + rootNode.Expanded = true; + this.tvControlItem.Nodes.Add(rootNode); + + var project = (from x in Funs.DB.Base_Project + select new { x.ProjectId, x.ProjectName }).Distinct(); + if (project.Count() > 0) + { + foreach (var pro in project) + { + TreeNode tnProject = new TreeNode();//年节点 + tnProject.Text = SubStr(pro.ProjectName); + tnProject.NodeID = pro.ProjectId; + tnProject.ToolTip = pro.ProjectName; + tnProject.EnableClickEvent = true; + rootNode.Nodes.Add(tnProject); + } + } + + } + + protected void tvControlItem_NodeCommand(object sender, TreeCommandEventArgs e) + { + BindGrid(); + } + + #region + /// + /// 整改状态 + /// + /// + protected IDictionary Handelstatus() + { + Dictionary dic = new Dictionary(); + dic.Add(1, "未确认"); + dic.Add(2, "已闭环"); + dic.Add(3, "超期未整改"); + dic.Add(4, "未整改"); + return dic; + } + public Task data() + { + Task task = new Task(() => + { + return ChecklistData(); + }); + task.Start(); + return task; + } + protected DataTable ChecklistData() + { + string strSql = @"SELECT * from Check_CheckSpecialDataIn chec + where 1=1 "; + + List listStr = new List(); + if (!string.IsNullOrEmpty(tvControlItem.SelectedNodeID)) + { + strSql += " AND chec.ProjectId = @ProjectId"; + listStr.Add(new SqlParameter("@ProjectId", tvControlItem.SelectedNodeID)); + } + strSql += " AND (chec.CheckTime>=@startTime or @startTime='') and (chec.CheckTime<=@endTime or @endTime='') "; + listStr.Add(new SqlParameter("@startTime", !string.IsNullOrEmpty(txtStartTime.Text.Trim()) ? txtStartTime.Text.Trim() + " 00:00:00" : "")); + listStr.Add(new SqlParameter("@endTime", !string.IsNullOrEmpty(txtEndTime.Text.Trim()) ? txtEndTime.Text.Trim() + " 23:59:59" : "")); + if (drpSponsorUnit.SelectedValue != BLL.Const._Null) + { + strSql += " AND chec.UnitId=@unitId"; + listStr.Add(new SqlParameter("@unitId", drpSponsorUnit.SelectedValue)); + } + if (drpUnitWork.SelectedValue != Const._Null) + { + strSql += " AND chec.WorkAreaId=@unitworkId"; + listStr.Add(new SqlParameter("@unitworkId", drpUnitWork.SelectedValue)); + } + if (drpCNProfessional.SelectedValue != Const._Null) + { + strSql += " AND chec.CNProfessionalCode=@CNProfessionalCode"; + listStr.Add(new SqlParameter("@CNProfessionalCode", drpCNProfessional.SelectedValue)); + } + + + SqlParameter[] parameter = listStr.ToArray(); + DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); + return tb; + } + protected string ConvertUnit(object unitId) + { + if (unitId != null) + { + var unit = UnitService.GetUnitByUnitId(unitId.ToString()); + if (unit != null) + { + return unit.UnitName; + } + } + return ""; + } + protected string ConvertUser(object userId) + { + if (userId != null) + { + var type = UserService.GetUserNameByUserId(userId.ToString()); + return type; + } + return ""; + } + protected string ConvertWorkArea(object WorkAreaId) + { + if (WorkAreaId != null) + { + var type = UnitWorkService.getUnitWorkByUnitWorkId(WorkAreaId.ToString()); + if (type != null) + { + return type.UnitWorkName; + } + } + return ""; + } + protected string ConvertCNProfessional(object WorkAreaId) + { + if (WorkAreaId != null) + { + var type = CNProfessionalService.GetCNProfessional(WorkAreaId.ToString()); + if (type != null) + { + return type.ProfessionalName; + } + } + return ""; + } + + + protected string ConvertImageUrlByImage(object registrationId) + { + string url = string.Empty; + if (registrationId != null) + { + IList sourlist = AttachFileService.GetBeforeFileList(registrationId.ToString(), BLL.Const.CheckListMenuId); + + if (sourlist != null && sourlist.Count > 0) + { + string AttachUrl = ""; + foreach (var item in sourlist) + { + if (!string.IsNullOrEmpty(item.AttachUrl) && item.AttachUrl.ToLower().EndsWith(".jpg") || item.AttachUrl.ToLower().EndsWith(".jpeg") || item.AttachUrl.ToLower().EndsWith(".png")) + AttachUrl += item.AttachUrl.TrimEnd(',') + ","; + } + url = BLL.UploadAttachmentService.ShowImage("../../", AttachUrl.TrimEnd(',')); + } + } + return url; + } + protected string ConvertImgUrlByImage(object registrationId) + { + string url = string.Empty; + if (registrationId != null) + { + IList sourlist = AttachFileService.Getfilelist(registrationId.ToString() + "r", BLL.Const.CheckListMenuId); + + if (sourlist != null && sourlist.Count > 0) + { + string AttachUrl = ""; + foreach (var item in sourlist) + { + if (!string.IsNullOrEmpty(item.AttachUrl) && item.AttachUrl.ToLower().EndsWith(".jpg") || item.AttachUrl.ToLower().EndsWith(".jpeg") || item.AttachUrl.ToLower().EndsWith(".png")) + AttachUrl += item.AttachUrl.TrimEnd(',') + ","; + } + url = BLL.UploadAttachmentService.ShowImage("../../", AttachUrl.TrimEnd(',')); + } + } + return url; + } + + public string Convertstatus(Object code) + { + Model.Check_CheckControl checkControl = BLL.CheckControlService.GetCheckControl(code.ToString()); + if (checkControl.State.Equals("5") || checkControl.State.Equals("6")) + { + return "未确认"; + } + else if (checkControl.State == Const.CheckControl_Complete) + { //闭环 + return "已闭环"; + } + //else if( checkControl.LimitDate> ) + else if (Convert.ToDateTime(checkControl.LimitDate).AddDays(1) < DateTime.Now) //延期未整改 + { + return "超期未整改"; + + } + else //期内未整改 + { + return "未整改"; + + } + } + + + /// + /// 绑定数据 + /// + + public void BindGrid() + { + DataTable tb = ChecklistData(); + + // 2.获取当前分页数据 + //var table = this.GetPagedDataTable(Grid1, tb1); + + Grid1.RecordCount = tb.Rows.Count; + tb = GetFilteredTable(Grid1.FilteredData, tb); + var table = this.GetPagedDataTable(Grid1, tb); + + Grid1.DataSource = table; + Grid1.DataBind(); + + } + #endregion + + #region 查询 + protected void TextBox_TextChanged(object sender, EventArgs e) + { + this.BindGrid(); + } + protected void rbStates_SelectedIndexChanged(object sender, EventArgs e) + { + this.BindGrid(); + } + + protected void drpSupCheckItemSet_SelectedIndexChanged(object sender, EventArgs e) + { + this.BindGrid(); + } + #endregion + + #region 表排序、分页、关闭窗口 + /// + /// 分页 + /// + /// + /// + protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) + { + Grid1.PageIndex = e.NewPageIndex; + BindGrid(); + } + + /// + /// 排序 + /// + /// + /// + protected void Grid1_Sort(object sender, GridSortEventArgs e) + { + BindGrid(); + } + + /// + /// 分页显示条数下拉框 + /// + /// + /// + protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) + { + Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue); + BindGrid(); + } + + /// + /// 关闭弹出窗 + /// + /// + /// + protected void Window1_Close(object sender, WindowCloseEventArgs e) + { + BindGrid(); + } + #endregion + + + #region 获取按钮权限 + /// + /// 获取按钮权限 + /// + /// + /// + private void GetButtonPower() + { + if (Request.Params["value"] == "0") + { + return; + } + + } + #endregion + + private string SubStr(string str) + { + string reStr = str; + if (!string.IsNullOrEmpty(str) && str.Length > 16) + { + reStr = str.Substring(0, 16) + ".."; + } + return reStr; + } + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/ZHGL/ManagementReport/CQMSCheckSpecial.aspx.designer.cs b/SGGL/FineUIPro.Web/ZHGL/ManagementReport/CQMSCheckSpecial.aspx.designer.cs new file mode 100644 index 00000000..a11685bf --- /dev/null +++ b/SGGL/FineUIPro.Web/ZHGL/ManagementReport/CQMSCheckSpecial.aspx.designer.cs @@ -0,0 +1,242 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.ZHGL.ManagementReport +{ + + + public partial class CQMSCheckSpecial + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// panelLeftRegion 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel panelLeftRegion; + + /// + /// tvControlItem 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Tree tvControlItem; + + /// + /// panelCenterRegion 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel panelCenterRegion; + + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// Toolbar1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// drpSponsorUnit 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpSponsorUnit; + + /// + /// drpUnitWork 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpUnitWork; + + /// + /// drpCNProfessional 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpCNProfessional; + + /// + /// Toolbar2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar2; + + /// + /// txtStartTime 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtStartTime; + + /// + /// txtEndTime 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtEndTime; + + /// + /// btnQuery 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnQuery; + + /// + /// Label2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label Label2; + + /// + /// Label3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label Label3; + + /// + /// Label4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label Label4; + + /// + /// Label1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label Label1; + + /// + /// Label5 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label Label5; + + /// + /// Label6 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label Label6; + + /// + /// Label7 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label Label7; + + /// + /// ToolbarSeparator1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; + + /// + /// ToolbarText1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarText ToolbarText1; + + /// + /// ddlPageSize 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlPageSize; + } +} diff --git a/SGGL/FineUIPro.Web/ZHGL/ManagementReport/CQMSMonthReport.aspx b/SGGL/FineUIPro.Web/ZHGL/ManagementReport/CQMSMonthReport.aspx new file mode 100644 index 00000000..47c901ef --- /dev/null +++ b/SGGL/FineUIPro.Web/ZHGL/ManagementReport/CQMSMonthReport.aspx @@ -0,0 +1,92 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="CQMSMonthReport.aspx.cs" Inherits="FineUIPro.Web.ZHGL.ManagementReport.CQMSMonthReport" %> + + + + + + 质量月报告 + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/ZHGL/ManagementReport/CQMSMonthReport.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/ManagementReport/CQMSMonthReport.aspx.cs new file mode 100644 index 00000000..7224452f --- /dev/null +++ b/SGGL/FineUIPro.Web/ZHGL/ManagementReport/CQMSMonthReport.aspx.cs @@ -0,0 +1,175 @@ +using System; +using System.Collections.Generic; +using System.Data; +using System.Data.SqlClient; +using System.Linq; +using System.Text; +using BLL; +using AspNet = System.Web.UI.WebControls; + +namespace FineUIPro.Web.ZHGL.ManagementReport +{ + public partial class CQMSMonthReport : PageBase + { + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + ////权限按钮方法 + this.GetButtonPower(); + + // 绑定表格 + //BindGrid(); + InitTreeMenu(); + } + } + + private void InitTreeMenu() + { + this.tvControlItem.Nodes.Clear(); + TreeNode rootNode = new TreeNode(); + rootNode.Text = "项目-年份"; + rootNode.NodeID = "0"; + rootNode.Expanded = true; + this.tvControlItem.Nodes.Add(rootNode); + + var project = (from x in Funs.DB.CQMS_MonthReport + join y in Funs.DB.Base_Project on x.ProjectId equals y.ProjectId + select new { x.ProjectId, y.ProjectName }).Distinct(); + if (project.Count() > 0) + { + foreach (var pro in project) + { + TreeNode tnProject = new TreeNode();//年节点 + tnProject.Text = SubStr(pro.ProjectName); + tnProject.NodeID = pro.ProjectId; + tnProject.ToolTip = pro.ProjectName; + rootNode.Nodes.Add(tnProject); + + var report = from x in Funs.DB.CQMS_MonthReport + where x.ProjectId == pro.ProjectId + orderby x.Years + select x; + foreach (var y in report) + { + TreeNode tnYear = new TreeNode();//年节点 + tnYear.Text = y.Years.HasValue ? y.Years.Value.ToString() : ""; + tnYear.NodeID = y.MonthReportId; + tnYear.EnableClickEvent = true; + tnProject.Nodes.Add(tnYear); + } + } + } + + } + + protected void tvControlItem_NodeCommand(object sender, TreeCommandEventArgs e) + { + BindGrid(); + } + + /// + /// 绑定数据 + /// + private void BindGrid() + { + string strSql = @"SELECT * FROM dbo.CQMS_MonthReportItem + WHERE MonthReportId=@MonthReportId + ORDER BY Sort"; + List listStr = new List(); + listStr.Add(new SqlParameter("@MonthReportId", tvControlItem.SelectedNodeID)); + + SqlParameter[] parameter = listStr.ToArray(); + DataTable dt = SQLHelper.GetDataTableRunText(strSql, parameter); + // 2.获取当前分页数据 + //var table = this.GetPagedDataTable(Grid1, tb1); + + Grid1.DataSource = dt; + Grid1.DataBind(); + + } + + private string SubStr(string str) + { + string reStr = str; + if (!string.IsNullOrEmpty(str) && str.Length > 16) + { + reStr = str.Substring(0, 16) + ".."; + } + return reStr; + } + + #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; + this.Grid1.PageSize = 500; + this.BindGrid(); + Response.Write(GetGridTableHtml(Grid1)); + Response.End(); + } + + /// + /// 导出方法 + /// + /// + /// + private string GetGridTableHtml(Grid grid) + { + StringBuilder sb = new StringBuilder(); + sb.Append(""); + sb.Append(""); + sb.Append(""); + 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("lblNumber") as AspNet.Label).Text; + } + sb.AppendFormat("", html); + } + + sb.Append(""); + } + + sb.Append("
{0}
{0}
"); + + return sb.ToString(); + } + #endregion + + #region 获取按钮权限 + /// + /// 获取按钮权限 + /// + /// + /// + private void GetButtonPower() + { + if (Request.Params["value"] == "0") + { + return; + } + + } + #endregion + + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/ZHGL/ManagementReport/CQMSMonthReport.aspx.designer.cs b/SGGL/FineUIPro.Web/ZHGL/ManagementReport/CQMSMonthReport.aspx.designer.cs new file mode 100644 index 00000000..3e28b9fd --- /dev/null +++ b/SGGL/FineUIPro.Web/ZHGL/ManagementReport/CQMSMonthReport.aspx.designer.cs @@ -0,0 +1,107 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.ZHGL.ManagementReport +{ + + + public partial class CQMSMonthReport + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// panelLeftRegion 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel panelLeftRegion; + + /// + /// tvControlItem 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Tree tvControlItem; + + /// + /// panelCenterRegion 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel panelCenterRegion; + + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// Toolbar2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar2; + + /// + /// ToolbarFill1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill1; + + /// + /// btnOut 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnOut; + } +} diff --git a/SGGL/FineUIPro.Web/ZHGL/ManagementReport/CQMSMonthReportProjectSum.aspx b/SGGL/FineUIPro.Web/ZHGL/ManagementReport/CQMSMonthReportProjectSum.aspx new file mode 100644 index 00000000..5c6b90ef --- /dev/null +++ b/SGGL/FineUIPro.Web/ZHGL/ManagementReport/CQMSMonthReportProjectSum.aspx @@ -0,0 +1,92 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="CQMSMonthReportProjectSum.aspx.cs" Inherits="FineUIPro.Web.ZHGL.ManagementReport.CQMSMonthReportProjectSum" %> + + + + + + HSE月报告 + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/ZHGL/ManagementReport/CQMSMonthReportProjectSum.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/ManagementReport/CQMSMonthReportProjectSum.aspx.cs new file mode 100644 index 00000000..5c420ff9 --- /dev/null +++ b/SGGL/FineUIPro.Web/ZHGL/ManagementReport/CQMSMonthReportProjectSum.aspx.cs @@ -0,0 +1,187 @@ +using System; +using System.Collections.Generic; +using System.Data; +using System.Data.SqlClient; +using System.Linq; +using System.Text; +using BLL; +using AspNet = System.Web.UI.WebControls; + +namespace FineUIPro.Web.ZHGL.ManagementReport +{ + public partial class CQMSMonthReportProjectSum : PageBase + { + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + ////权限按钮方法 + this.GetButtonPower(); + + // 绑定表格 + //BindGrid(); + InitTreeMenu(); + } + } + + private void InitTreeMenu() + { + this.tvControlItem.Nodes.Clear(); + TreeNode rootNode = new TreeNode(); + rootNode.Text = "年份"; + rootNode.NodeID = "0"; + rootNode.Expanded = true; + this.tvControlItem.Nodes.Add(rootNode); + var years=(from x in Funs.DB.CQMS_MonthReport select x.Years).Distinct(); + foreach (var year in years) + { + TreeNode tnYear = new TreeNode();//年节点 + tnYear.Text = year.ToString(); + tnYear.NodeID = year.ToString(); + tnYear.EnableClickEvent = true; + rootNode.Nodes.Add(tnYear); + + //var project = (from x in Funs.DB.HSSE_MonthReport + // join y in Funs.DB.Base_Project on x.ProjectId equals y.ProjectId + // where x.Years == year + // select new { x.ProjectId, y.ProjectName }).Distinct(); + //if (project.Count() > 0) + //{ + // foreach (var pro in project) + // { + // TreeNode tnProject = new TreeNode();//年节点 + // tnProject.Text = SubStr(pro.ProjectName); + // tnProject.NodeID = pro.ProjectId+"$"+year; + // tnProject.EnableClickEvent = true; + // tnProject.ToolTip = pro.ProjectName; + // tnYear.Nodes.Add(tnProject); + + // } + //} + } + + } + + protected void tvControlItem_NodeCommand(object sender, TreeCommandEventArgs e) + { + BindGrid(); + } + + /// + /// 绑定数据 + /// + private void BindGrid() + { + string strSql = @"SELECT NEWID() MonthReportItemId,ReportItem,Unit,AVG (Sort) Sort ,SUM (Month1) Month1,SUM (Month2) Month2,SUM (Month3) Month3,SUM (Month4)Month4,SUM (Month5)Month5,SUM (Month6)Month6,SUM (Month7)Month7,SUM (Month8)Month8,SUM (Month9)Month9,SUM (Month10)Month10,SUM (Month11)Month11,SUM (Month12)Month12,SUM (YearTotal)YearTotal,SUM(ProjectTotal)ProjectTotal + FROM dbo.CQMS_MonthReportItem a left join CQMS_MonthReport b on a.MonthReportId = b.MonthReportId + --WHERE MonthReportId=@MonthReportId + where b.Years = @Year and ( @ProjectId = '' or b.ProjectId = @ProjectId) + group by ReportItem,Unit + ORDER BY Sort"; + List listStr = new List(); + if (tvControlItem.SelectedNodeID.Contains("$")) + { + listStr.Add(new SqlParameter("@ProjectId", tvControlItem.SelectedNodeID.Split('$')[0])); + listStr.Add(new SqlParameter("@Year", tvControlItem.SelectedNodeID.Split('$')[1])); + } + else + { + listStr.Add(new SqlParameter("@ProjectId", "")); + listStr.Add(new SqlParameter("@Year", tvControlItem.SelectedNodeID)); + } + + + SqlParameter[] parameter = listStr.ToArray(); + DataTable dt = SQLHelper.GetDataTableRunText(strSql, parameter); + // 2.获取当前分页数据 + //var table = this.GetPagedDataTable(Grid1, tb1); + + Grid1.DataSource = dt; + Grid1.DataBind(); + + } + + private string SubStr(string str) + { + string reStr = string.Empty; + if (!string.IsNullOrEmpty(str) && str.Length > 16) + { + reStr = str.Substring(0, 16) + ".."; + } + return reStr; + } + + #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("管理月报B" + filename, System.Text.Encoding.UTF8) + ".xls"); + Response.ContentType = "application/excel"; + Response.ContentEncoding = System.Text.Encoding.UTF8; + this.Grid1.PageSize = 500; + this.BindGrid(); + Response.Write(GetGridTableHtml(Grid1)); + Response.End(); + } + + /// + /// 导出方法 + /// + /// + /// + private string GetGridTableHtml(Grid grid) + { + StringBuilder sb = new StringBuilder(); + sb.Append(""); + sb.Append(""); + sb.Append(""); + 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("lblNumber") as AspNet.Label).Text; + } + sb.AppendFormat("", html); + } + + sb.Append(""); + } + + sb.Append("
{0}
{0}
"); + + return sb.ToString(); + } + #endregion + + #region 获取按钮权限 + /// + /// 获取按钮权限 + /// + /// + /// + private void GetButtonPower() + { + if (Request.Params["value"] == "0") + { + return; + } + + } + #endregion + + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/ZHGL/ManagementReport/CQMSMonthReportProjectSum.aspx.designer.cs b/SGGL/FineUIPro.Web/ZHGL/ManagementReport/CQMSMonthReportProjectSum.aspx.designer.cs new file mode 100644 index 00000000..dd4eb6aa --- /dev/null +++ b/SGGL/FineUIPro.Web/ZHGL/ManagementReport/CQMSMonthReportProjectSum.aspx.designer.cs @@ -0,0 +1,107 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.ZHGL.ManagementReport +{ + + + public partial class CQMSMonthReportProjectSum + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// panelLeftRegion 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel panelLeftRegion; + + /// + /// tvControlItem 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Tree tvControlItem; + + /// + /// panelCenterRegion 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel panelCenterRegion; + + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// Toolbar2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar2; + + /// + /// ToolbarFill1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill1; + + /// + /// btnOut 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnOut; + } +} diff --git a/SGGL/FineUIPro.Web/ZHGL/ManagementReport/CheckSpecial.aspx b/SGGL/FineUIPro.Web/ZHGL/ManagementReport/CheckSpecial.aspx index a8657165..3cfd5026 100644 --- a/SGGL/FineUIPro.Web/ZHGL/ManagementReport/CheckSpecial.aspx +++ b/SGGL/FineUIPro.Web/ZHGL/ManagementReport/CheckSpecial.aspx @@ -29,7 +29,7 @@ diff --git a/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml b/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml index 7dea3eea..7d2e2471 100644 --- a/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml +++ b/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml @@ -29,13 +29,19 @@ - - + + + + + + - + + +