提交代码

.gitignore

@@ -32,3 +32,4 @@
 /SGGL/FineUIPro.Web/FileUpload/TestRun/DriverRun
 /SGGL/FineUIPro.Web/FileUpload/Solution/2024-02
 /SGGL/FineUIPro.Web/FileUpload/Solution/2024-03
+/SGGL/FineUIPro.Web/FileUpload/TestRun/TestRunMonthSummary/2024-03

DataBase/版本日志/SGGLDB_WH_2024-03-29-gaofei.sql

@@ -0,0 +1,254 @@
+alter table [dbo].[Person_TestRunMonthSummary] add Major nvarchar(50) null
+GO
+
+
+ALTER PROCEDURE [dbo].[Sp_GJSX_getlist] 
+	-- Add the parameters for the stored procedure here
+	 @ProjectId nvarchar(max),
+	 @sql_where varchar(max)	
+AS
+BEGIN
+		--IF EXISTS(select * from tempdb..sysobjects where id=object_id('tempdb..#GJSX_List'))
+		--BEGIN
+		--	DROP TABLE #GJSX_List
+		--END
+		--DECLARE @Sql NVARCHAR(200)
+		--select * into  #GJSX_List  from(
+		--			select  
+		--a.GJSXID  
+		--,a.ProjectId 
+		--,a.detail
+		--,b.username
+		--,a.createDate 
+		--,User_ReceiveID=STUFF(( SELECT ',' + p2.UserName  FROM dbo.Sys_User  as p2  where  PATINDEX('%,' + RTRIM(p2.UserId) + ',%',',' +a.User_ReceiveID  + ',') >0  FOR XML PATH('')), 1, 1,'')   
+		--, CNProfessionalId=STUFF(( SELECT ',' + Base_CNProfessional.ProfessionalName  FROM dbo.Base_CNProfessional     where  PATINDEX('%,' + RTRIM(Base_CNProfessional.CNProfessionalId) + ',%',',' +a.CNProfessional_ID  + ',') >0  FOR XML PATH('')), 1, 1,'')
+		--,Base_Project.ProjectName
+		--,Base_Unit.unitname 
+		--,a.CloseDate
+		--,case a.state when  2 then '正在进行' when 0 then '关闭'  when  1 then '开放' end  as state 
+		--,QuestionTypeName=STUFF(( SELECT ',' + Base_QuestionType.QuestionTypeName  FROM dbo.Base_QuestionType     where  PATINDEX('%,' + RTRIM(Base_QuestionType.QuestionTypeID) + ',%',',' +a.QuestionTypeID  + ',') >0  FOR XML PATH('')), 1, 1,'')
+		--,a.IsManypeople
+		--,a.CompleteDate
+		--,a.AttachUrl 
+		--,user_Acceptance =STUFF(( SELECT ',' + p2.UserName  FROM dbo.Sys_User  as p2  where  PATINDEX('%,' + RTRIM(p2.UserId) + ',%',',' +a.user_Acceptance  + ',') >0  FOR XML PATH('')), 1, 1,'')    
+		--from GJSX  as   a  left join   Sys_User  as  b   on   a.UserId=b.UserId
+		--left join [dbo].[Base_Project]  on a.ProjectId =Base_Project.ProjectId
+		--left join [dbo].[Base_Unit] on  a.UnitId=Base_Unit.UnitId
+		--left join [dbo].[Base_QuestionType] on a.QuestionTypeID=Base_QuestionType.QuestionTypeID  ) as a
+                         
+		--set @Sql ='select * from  #GJSX_List  where  ProjectId='''+@ProjectId+'''  ' +@sql_where  
+
+		--exec(@Sql) 
+
+		select  
+		a.GJSXID  
+		,a.ProjectId 
+		,a.detail
+		,b.username
+		,a.createDate 
+		,User_ReceiveID=STUFF(( SELECT ',' + p2.UserName  FROM dbo.Sys_User  as p2  where  PATINDEX('%,' + RTRIM(p2.UserId) + ',%',',' +a.User_ReceiveID  + ',') >0  FOR XML PATH('')), 1, 1,'')   
+		, CNProfessionalId=STUFF(( SELECT ',' + Base_CNProfessional.ProfessionalName  FROM dbo.Base_CNProfessional     where  PATINDEX('%,' + RTRIM(Base_CNProfessional.CNProfessionalId) + ',%',',' +a.CNProfessional_ID  + ',') >0  FOR XML PATH('')), 1, 1,'')
+		,Base_Project.ProjectName
+		,Base_Unit.unitname 
+		,a.CloseDate
+		,case a.state when  2 then '正在进行' when 0 then '关闭'  when  1 then '开放' end  as state 
+		,QuestionTypeName=STUFF(( SELECT ',' + Base_QuestionType.QuestionTypeName  FROM dbo.Base_QuestionType     where  PATINDEX('%,' + RTRIM(Base_QuestionType.QuestionTypeID) + ',%',',' +a.QuestionTypeID  + ',') >0  FOR XML PATH('')), 1, 1,'')
+		,a.IsManypeople
+		,a.CompleteDate
+		,a.AttachUrl 
+		,user_Acceptance =STUFF(( SELECT ',' + p2.UserName  FROM dbo.Sys_User  as p2  where  PATINDEX('%,' + RTRIM(p2.UserId) + ',%',',' +a.user_Acceptance  + ',') >0  FOR XML PATH('')), 1, 1,'')    
+		from GJSX  as   a  left join   Sys_User  as  b   on   a.UserId=b.UserId
+		left join [dbo].[Base_Project]  on a.ProjectId =Base_Project.ProjectId
+		left join [dbo].[Base_Unit] on  a.UnitId=Base_Unit.UnitId
+		left join [dbo].[Base_QuestionType] on a.QuestionTypeID=Base_QuestionType.QuestionTypeID 
+		where a.ProjectId=@ProjectId
+END
+
+
+
+GO
+
+
+--cd C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.8 Tools
+--SqlMetal /views  /server:wq /database:SGGLDB_WH /code:C:\Model.cs /namespace:Model
+
+delete Sys_Menu where MenuId='AC5BC922-FA5E-4141-8458-7DE89434A8E7'
+delete Sys_Menu where MenuId='BEAE1E66-5783-489B-A268-F46491AE1257'
+delete Sys_Menu where MenuId='D8DF6DDB-3CDD-41C0-B374-1AAE40802B68'
+delete Sys_Menu where MenuId='C2E827C4-6E04-4EB6-8E51-B43FCBD3753F'
+delete Sys_Menu where MenuId='AF4EEC31-73E9-4F36-BEA7-2A92468F324E'
+delete Sys_Menu where MenuId='7400F47B-3F45-4142-B21F-3BECCABBB202'
+delete Sys_Menu where MenuId='F2D170C3-6CA5-439D-8CC7-81E4FB906B1F'
+delete Sys_Menu where MenuId='A7BBF5F1-F145-43D1-9227-7EC24099BBEC'
+INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Icon,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)VALUES('AC5BC922-FA5E-4141-8458-7DE89434A8E7','检查表模板',null,'TestRun/Produce/InspectTemplate.aspx',2,'F4827DE7-FDA6-42B6-A495-616EEFC4C8A5','Menu_TestRun',0,1,1)
+INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Icon,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)VALUES('BEAE1E66-5783-489B-A268-F46491AE1257','投料试车管理',null,'TestRun/Produce/SubInspectTerm.aspx',3,'F4827DE7-FDA6-42B6-A495-616EEFC4C8A5','Menu_TestRun',0,1,1)
+INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Icon,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)VALUES('D8DF6DDB-3CDD-41C0-B374-1AAE40802B68','投料试车确认',null,'TestRun/Produce/SubWorkInspect.aspx',4,'F4827DE7-FDA6-42B6-A495-616EEFC4C8A5','Menu_TestRun',0,1,1)
+INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Icon,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)VALUES('C2E827C4-6E04-4EB6-8E51-B43FCBD3753F','检查表尾项管理',null,'TestRun/Produce/InspectTailTermList.aspx',5,'F4827DE7-FDA6-42B6-A495-616EEFC4C8A5','Menu_TestRun',0,1,1)
+INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Icon,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)VALUES('AF4EEC31-73E9-4F36-BEA7-2A92468F324E','尾项处理',null,'TestRun/Produce/TailTermHandleList.aspx',6,'F4827DE7-FDA6-42B6-A495-616EEFC4C8A5','Menu_TestRun',0,1,1)
+INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Icon,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)VALUES('7400F47B-3F45-4142-B21F-3BECCABBB202','尾项审核',null,'TestRun/Produce/TailTermApproveList.aspx',7,'F4827DE7-FDA6-42B6-A495-616EEFC4C8A5','Menu_TestRun',0,1,1)
+INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Icon,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)VALUES('F2D170C3-6CA5-439D-8CC7-81E4FB906B1F','检查表会签',null,'TestRun/Produce/InspectWanderAboutList.aspx',8,'F4827DE7-FDA6-42B6-A495-616EEFC4C8A5','Menu_TestRun',0,1,1)
+INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Icon,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)VALUES('A7BBF5F1-F145-43D1-9227-7EC24099BBEC','检查表流转全部通过',null,'TestRun/Produce/InspectWanderAboutAllPassList.aspx',9,'F4827DE7-FDA6-42B6-A495-616EEFC4C8A5','Menu_TestRun',0,1,1)
+go
+
+--==生产性能考核条件检查模板信息表
+if object_id(N'ProduceRun_WorkInspectTemplate',N'U') is not null
+drop table dbo.ProduceRun_WorkInspectTemplate
+CREATE TABLE dbo.ProduceRun_WorkInspectTemplate(
+	WorkInspectId varchar(50) NOT NULL,--主键
+	WorkInspectName varchar(500) NULL,--检查事项名称
+	Remark nvarchar(150) NULL,--备注
+	AddUser varchar(50) NULL,--添加人
+	AddTime datetime NULL,--添加日期
+	Sort int NULL,--排序
+ CONSTRAINT PK_ProduceRun_WorkInspectTemplate PRIMARY KEY CLUSTERED 
+(
+	WorkInspectId ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+GO
+
+--==生产性能考核条件检查表
+delete ProduceRun_WorkInspectTemplate where WorkInspectId='A95825BD-709E-46DB-AEFD-1E7C9C1BF524'
+delete ProduceRun_WorkInspectTemplate where WorkInspectId='55CB964B-A82A-4BBC-BC2D-040E31C7CC36'
+delete ProduceRun_WorkInspectTemplate where WorkInspectId='EE35FF88-6E30-4797-AE46-0623B9BD3E81'
+delete ProduceRun_WorkInspectTemplate where WorkInspectId='C679A7B8-4244-42E5-96C8-B5A941FF5130'
+delete ProduceRun_WorkInspectTemplate where WorkInspectId='30470FF1-0BA2-4DE0-8CDB-DF812C0AC4B8'
+delete ProduceRun_WorkInspectTemplate where WorkInspectId='E369582C-25FB-49EF-B3ED-4A7EDF8CA61C'
+delete ProduceRun_WorkInspectTemplate where WorkInspectId='2255D8C6-B12D-4035-B56A-11A5815B7C4F'
+delete ProduceRun_WorkInspectTemplate where WorkInspectId='015D647D-ECB4-4252-BA9E-C60190D63F0A'
+delete ProduceRun_WorkInspectTemplate where WorkInspectId='6CDFE6DD-E113-4A07-B5F4-083343672A9E'
+INSERT INTO dbo.ProduceRun_WorkInspectTemplate(WorkInspectId,WorkInspectName,Remark,AddUser,AddTime,Sort) 
+VALUES('A95825BD-709E-46DB-AEFD-1E7C9C1BF524','在规定的负荷条件下暴露出的问题已经解决，各项工艺指标已处于稳定状态。','','',GETDATE(),1)
+INSERT INTO dbo.ProduceRun_WorkInspectTemplate(WorkInspectId,WorkInspectName,Remark,AddUser,AddTime,Sort) 
+VALUES('55CB964B-A82A-4BBC-BC2D-040E31C7CC36','全厂相关装置处于稳定运行状态。','','',GETDATE(),2)
+INSERT INTO dbo.ProduceRun_WorkInspectTemplate(WorkInspectId,WorkInspectName,Remark,AddUser,AddTime,Sort) 
+VALUES('EE35FF88-6E30-4797-AE46-0623B9BD3E81','生产考核方案已制定，并经审核批准。','','',GETDATE(),3)
+INSERT INTO dbo.ProduceRun_WorkInspectTemplate(WorkInspectId,WorkInspectName,Remark,AddUser,AddTime,Sort) 
+VALUES('C679A7B8-4244-42E5-96C8-B5A941FF5130','测试专用工具和仪表齐备，调校合格，处于有效期内。','','',GETDATE(),4)
+INSERT INTO dbo.ProduceRun_WorkInspectTemplate(WorkInspectId,WorkInspectName,Remark,AddUser,AddTime,Sort) 
+VALUES('30470FF1-0BA2-4DE0-8CDB-DF812C0AC4B8','测试人员的组织、任务已明确、落实。','','',GETDATE(),5)
+INSERT INTO dbo.ProduceRun_WorkInspectTemplate(WorkInspectId,WorkInspectName,Remark,AddUser,AddTime,Sort) 
+VALUES('E369582C-25FB-49EF-B3ED-4A7EDF8CA61C','测试项目、分析项目、分析方法已确定。','','',GETDATE(),6)
+INSERT INTO dbo.ProduceRun_WorkInspectTemplate(WorkInspectId,WorkInspectName,Remark,AddUser,AddTime,Sort) 
+VALUES('2255D8C6-B12D-4035-B56A-11A5815B7C4F','原料、燃料、化学药品等物质数量、规格、质量符合设计文件的要求。','','',GETDATE(),7)
+INSERT INTO dbo.ProduceRun_WorkInspectTemplate(WorkInspectId,WorkInspectName,Remark,AddUser,AddTime,Sort) 
+VALUES('015D647D-ECB4-4252-BA9E-C60190D63F0A','水、电、气（汽）、原料、燃料、化学药品等确保连续稳定供应。','','',GETDATE(),8)
+INSERT INTO dbo.ProduceRun_WorkInspectTemplate(WorkInspectId,WorkInspectName,Remark,AddUser,AddTime,Sort) 
+VALUES('6CDFE6DD-E113-4A07-B5F4-083343672A9E','自控仪表、报警和联锁装置已投入稳定运行。','','',GETDATE(),9)
+go
+
+--==工作包检查表
+if object_id(N'ProduceRun_SubInspectTerm',N'U') is not null
+drop table dbo.ProduceRun_SubInspectTerm
+CREATE TABLE dbo.ProduceRun_SubInspectTerm(
+	SubInspectId varchar(50) NOT NULL,--主键
+	ProjectId varchar(50) NULL,--项目主键
+	Contractor varchar(50) null,--承包商
+	Owner varchar(50) null,--业主
+	ProcessPatent varchar(50) null,--工艺专利商
+	ContractorIsAllPass int NULL,--承包商是否通过0/null:未通过 1:通过
+	OwnerIsAllPass int NULL,--业主是否通过0/null:未通过 1:通过
+	ProcessPatentIsAllPass int NULL,--工艺专利商是否通过0/null:未通过 1:通过
+	ContractorAllPassData datetime null,--承包商通过日期
+	OwnerAllPassData datetime null,--业主通过日期
+	ProcessPatentAllPassData datetime null,--工艺专利商通过日期
+	InspectionIsAllPass int NULL,--检查结果0/null:未通过 1:通过
+	WanderIsComplete int null,--检查表流转是否全部通过0:未通过1:通过
+	WanderCompleteData datetime null,--检查表流转完成日期
+	IsUnifyWanderAbout int null,--是否统一流转0:否1:是
+	UnifyWanderAboutData datetime null,--统一流转时间
+	UnifyWanderAboutOpinion varchar(max) null,--统一流转备注	
+	InspectIsClose int null,--任务单是否关闭0:未关闭1:已关闭
+	InspectCloseData datetime null,--任务单关闭日期
+	InspectTime datetime NULL,--检查时间
+	AddUser varchar(50) NULL,--添加人
+	AddTime datetime NULL,--添加日期
+ CONSTRAINT PK_ProduceRun_SubInspectTerm PRIMARY KEY CLUSTERED 
+(
+	SubInspectId ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+GO
+
+--==工作包检查项表
+if object_id(N'ProduceRun_SubInspectTermItem',N'U') is not null
+drop table dbo.ProduceRun_SubInspectTermItem
+CREATE TABLE dbo.ProduceRun_SubInspectTermItem(
+	TermItemId varchar(50) NOT NULL,--主键
+	ProjectId varchar(50) NULL,--项目主键
+	SubInspectId varchar(50) NULL,--检查表主键
+	GroupName varchar(50) NULL,--分组名称
+	WorkInspectId varchar(50) NOT NULL,--工作包模板项主键
+	WorkInspectName varchar(500) NULL,--检查事项名称
+	InspectedUser varchar(50) NULL,--检查人主键
+	InspectionResults int NULL,--检查结果0:未通过 1:通过
+	InspectionIllustrate varchar(200) NULL,--检查说明
+	Contractor varchar(50) null,--承包商
+	Owner varchar(50) null,--业主
+	ProcessPatent varchar(50) null,--工艺专利商
+    ContractorIsPass int NULL,--承包商是否通过0/null:未通过 1:通过
+    OwnerIsPass int NULL,--业主是否通过0/null:未通过 1:通过
+    ProcessPatentIsPass int NULL,--工艺专利商是否通过0/null:未通过 1:通过
+	ContractorRemark varchar(1000) NULL,--承包商备注
+	OwnerRemark varchar(1000) NULL,--业主备注
+	ProcessPatentRemark varchar(1000) NULL,--工艺专利商备注
+	Remark varchar(200) NULL,--备注
+	AddUser varchar(50) NULL,--添加人
+	AddTime datetime NULL,--添加日期
+	Sort int NULL,--排序
+ CONSTRAINT PK_ProduceRun_SubInspectTermItem PRIMARY KEY CLUSTERED 
+(
+	TermItemId ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+GO
+
+--==检查表尾项管理
+if object_id(N'ProduceRun_InspectTailTerm',N'U') is not null
+drop table dbo.ProduceRun_InspectTailTerm
+CREATE TABLE dbo.ProduceRun_InspectTailTerm(
+	TailTermId varchar(50) NOT NULL,--主键
+	ProjectId varchar(50) NULL,--项目主键
+	ProjectName varchar(50) NULL,--项目名称
+	TailTermCode varchar(50) NULL,--巡检编号
+	ConstructionUnit varchar(50) NULL,--施工单位
+	SubInspectId varchar(50) NULL,--工作包检查表主键
+	TermItemId varchar(50) NULL,--检查项主键
+	QuestionDesc varchar(max) NULL,--问题描述
+	RectifyOpinion varchar(max) NULL,--整改意见
+	RectifyTime datetime NULL,--尾项提出时间
+	InspectUser varchar(50) NULL,--检查人
+	HandleUser varchar(50) NULL,--处理人
+	ApproveUser varchar(50) NULL,--审核人
+	AdjustCompleteTime datetime NULL,--要求整改完成时间
+	ApproveState int NULL,--0:待提交处理1:待处理2:处理退回3:审核退回4:待审核5:审核通过
+	AddUser varchar(50) NULL,--添加人
+	AddTime datetime NULL,--添加日期
+ CONSTRAINT PK_ProduceRun_InspectTailTerm PRIMARY KEY CLUSTERED 
+(
+	TailTermId ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+GO
+
+--==检查项处理/审核记录
+if object_id(N'ProduceRun_InspectTermApproveRecords',N'U') is not null
+drop table dbo.ProduceRun_InspectTermApproveRecords
+CREATE TABLE dbo.ProduceRun_InspectTermApproveRecords(
+	InspectTermId varchar(50) NOT NULL,--主键
+	ProjectId varchar(50) NULL,--项目主键
+	TermItemId varchar(50) NULL,--检查项主键
+	TailTermId varchar(50) NULL,--尾项主键
+	ApproveOpinion varchar(max) NULL,--审核意见
+	ApproveTime datetime NULL,--操作时间
+	ApproveUser varchar(50) NULL,--操作人
+	ApproveType int NULL,--记录类型0:处理记录1:审核记录
+	ApproveState int NULL,--0:退回1:通过
+	AddUser varchar(50) NULL,--添加人
+	AddTime datetime NULL,--添加日期
+ CONSTRAINT PK_ProduceRun_InspectTermApproveRecords PRIMARY KEY CLUSTERED 
+(
+	InspectTermId ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+GO

SGGL/BLL/Common/AttachFileService.cs

@@ -92,6 +92,17 @@ namespace BLL
             return fileUrl;
         }
 
+        /// <summary>
+        /// 根据对应主键和菜单获取文件信息
+        /// </summary>
+        /// <param name="toKey">对应主键</param>
+        /// <param name="menuId">对应菜单</param>
+        /// <returns>文件信息</returns>
+        public static Model.AttachFile GetAttachFileByToKeyId(string toKey)
+        {
+            return Funs.DB.AttachFile.FirstOrDefault(e => e.ToKeyId == toKey);
+        }
+
         /// <summary>
         /// 
         /// </summary>

SGGL/BLL/Person/Person_TestRunMonthSummaryService.cs

@@ -30,6 +30,7 @@ namespace BLL
                 TestRunMonthSummaryId = TestRunMonthSummary.TestRunMonthSummaryId,
                 ProjectId = TestRunMonthSummary.ProjectId,
                 UserId = TestRunMonthSummary.UserId,
+                Major = TestRunMonthSummary.Major,
                 ProcessName = TestRunMonthSummary.ProcessName,
                 RaiseDate = TestRunMonthSummary.RaiseDate,
                 ProblemDescription = TestRunMonthSummary.ProblemDescription,
@@ -50,6 +51,7 @@ namespace BLL
             Model.Person_TestRunMonthSummary newTestRunMonthSummary = db.Person_TestRunMonthSummary.FirstOrDefault(e => e.TestRunMonthSummaryId == TestRunMonthSummary.TestRunMonthSummaryId);
             if (newTestRunMonthSummary != null)
             {
+                newTestRunMonthSummary.Major = TestRunMonthSummary.Major;
                 newTestRunMonthSummary.ProcessName = TestRunMonthSummary.ProcessName;
                 newTestRunMonthSummary.RaiseDate = TestRunMonthSummary.RaiseDate;
                 newTestRunMonthSummary.ProblemDescription = TestRunMonthSummary.ProblemDescription;

SGGL/FineUIPro.Web/ErrLog.txt

@@ -259,3 +259,132 @@ IP地址:::1
 
 出错时间:03/26/2024 10:58:48
 
+
+错误信息开始=====>
+错误类型:HttpParseException
+错误信息:基类包括字段“txtProcessName”，但其类型(FineUIPro.TextArea)与控件(FineUIPro.TextBox)的类型不兼容。
+错误堆栈:
+   在 System.Web.Compilation.BaseTemplateCodeDomTreeGenerator.BuildFieldDeclaration(ControlBuilder builder)
+   在 System.Web.Compilation.BaseTemplateCodeDomTreeGenerator.BuildSourceDataTreeFromBuilder(ControlBuilder builder, Boolean fInTemplate, Boolean topLevelControlInTemplate, PropertyEntry pse)
+   在 System.Web.Compilation.BaseTemplateCodeDomTreeGenerator.BuildSourceDataTreeFromBuilder(ControlBuilder builder, Boolean fInTemplate, Boolean topLevelControlInTemplate, PropertyEntry pse)
+   在 System.Web.Compilation.BaseTemplateCodeDomTreeGenerator.BuildSourceDataTreeFromBuilder(ControlBuilder builder, Boolean fInTemplate, Boolean topLevelControlInTemplate, PropertyEntry pse)
+   在 System.Web.Compilation.BaseTemplateCodeDomTreeGenerator.BuildSourceDataTreeFromBuilder(ControlBuilder builder, Boolean fInTemplate, Boolean topLevelControlInTemplate, PropertyEntry pse)
+   在 System.Web.Compilation.BaseTemplateCodeDomTreeGenerator.BuildSourceDataTreeFromBuilder(ControlBuilder builder, Boolean fInTemplate, Boolean topLevelControlInTemplate, PropertyEntry pse)
+   在 System.Web.Compilation.BaseTemplateCodeDomTreeGenerator.BuildSourceDataTreeFromBuilder(ControlBuilder builder, Boolean fInTemplate, Boolean topLevelControlInTemplate, PropertyEntry pse)
+   在 System.Web.Compilation.BaseTemplateCodeDomTreeGenerator.BuildSourceDataTreeFromBuilder(ControlBuilder builder, Boolean fInTemplate, Boolean topLevelControlInTemplate, PropertyEntry pse)
+   在 System.Web.Compilation.TemplateControlCodeDomTreeGenerator.BuildMiscClassMembers()
+   在 System.Web.Compilation.PageCodeDomTreeGenerator.BuildMiscClassMembers()
+   在 System.Web.Compilation.BaseCodeDomTreeGenerator.BuildSourceDataTree()
+   在 System.Web.Compilation.BaseCodeDomTreeGenerator.GetCodeDomTree(CodeDomProvider codeDomProvider, StringResourceBuilder stringResourceBuilder, VirtualPath virtualPath)
+   在 System.Web.Compilation.BaseTemplateBuildProvider.GenerateCode(AssemblyBuilder assemblyBuilder)
+   在 System.Web.Compilation.AssemblyBuilder.AddBuildProvider(BuildProvider buildProvider)
+出错时间:03/28/2024 15:18:32
+出错文件:http://localhost:8579/Personal/TestRunMonthSummaryEdit.aspx?TestRunMonthSummaryId=85881239-5093-461d-b96f-863374ea0928
+IP地址:::1
+
+出错时间:03/28/2024 15:18:32
+
+
+错误信息开始=====>
+错误类型:ArgumentException
+错误信息:提供的 URI 方案“http”无效，应为“https”。
+参数名: via
+错误堆栈:
+   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
+   在 System.ServiceModel.ClientBase`1.get_Channel()
+   在 BLL.CNCECHSSEService.HSSEServiceClient.GetSupervise_SubUnitReportListToSUB() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 14204
+   在 BLL.CNCECHSSEWebService.getSupervise_SubUnitReport() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2181
+出错时间:03/29/2024 12:56:24
+出错时间:03/29/2024 12:56:24
+
+
+错误信息开始=====>
+错误类型:ArgumentException
+错误信息:提供的 URI 方案“http”无效，应为“https”。
+参数名: via
+错误堆栈:
+   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
+   在 System.ServiceModel.ClientBase`1.get_Channel()
+   在 BLL.CNCECHSSEService.HSSEServiceClient.GetCheck_CheckInfo_Table8ItemListToSUB(String unitId) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 14228
+   在 BLL.CNCECHSSEWebService.getCheck_CheckInfo_Table8Item() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2046
+出错时间:03/29/2024 12:56:24
+出错时间:03/29/2024 12:56:24
+
+
+错误信息开始=====>
+错误类型:ArgumentException
+错误信息:提供的 URI 方案“http”无效，应为“https”。
+参数名: via
+错误堆栈:
+   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
+   在 System.ServiceModel.ClientBase`1.get_Channel()
+   在 BLL.CNCECHSSEService.HSSEServiceClient.GetCheck_CheckRectifyListToSUB(String unitId) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 14220
+   在 BLL.CNCECHSSEWebService.getCheck_CheckRectify() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1942
+出错时间:03/29/2024 12:56:24
+出错时间:03/29/2024 12:56:24
+
+
+错误信息开始=====>
+错误类型:ArgumentException
+错误信息:提供的 URI 方案“http”无效，应为“https”。
+参数名: via
+错误堆栈:
+   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
+   在 System.ServiceModel.ClientBase`1.get_Channel()
+   在 BLL.CNCECHSSEService.HSSEServiceClient.GetInformation_UrgeReportToSUB(String unitId) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 14020
+   在 BLL.CNCECHSSEWebService.getInformation_UrgeReport() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1884
+出错时间:03/29/2024 12:56:24
+出错时间:03/29/2024 12:56:24
+

SGGL/FineUIPro.Web/Personal/TestRunMonthSummary.aspx

@@ -5,16 +5,36 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
     <title>开车月技术总结</title>
-    <link href="../res/css/common.css" rel="stylesheet" type="text/css" />
+    <link href="~/res/css/common.css" rel="stylesheet" type="text/css" />
+    <script src="~/res/js/jquery-3.4.1.min.js"></script>
     <style type="text/css">
-        .f-grid-row.noEdit {
-            pointer-events: none;
-        }
-
         .f-grid-colheader-text {
             white-space: normal;
             word-break: break-all;
         }
+
+        .imgPreview {
+            display: none;
+            top: 0;
+            left: 0;
+            width: 100%; /*容器占满整个屏幕*/
+            height: 100%;
+            position: fixed;
+            background: rgba(0, 0, 0, 0.5);
+        }
+
+        .imgPreview img {
+            z-index: 100;
+            width: 60%;
+            position: fixed;
+            top: 50%;
+            left: 50%;
+            transform: translate(-50%,-50%);
+        }
+        /*添加鼠标移入图片效果*/
+        .img {
+            cursor: url("ico/放大镜.png"), auto;
+        }
     </style>
 </head>
 <body>
@@ -42,22 +62,40 @@
                 </Toolbars>
                 <Columns>
                     <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center" TextAlign="Center"/>
-                    <f:RenderField Width="200px" ColumnID="ProjectName" DataField="ProjectName" 
+                    <f:RenderField Width="100px" ColumnID="UserName" DataField="UserName" 
-                          FieldType="String" HeaderText="项目名称/项目号或本部" HeaderTextAlign="Center" TextAlign="Center">                      
+                          FieldType="String" HeaderText="填报人" HeaderTextAlign="Center" TextAlign="Center">                      
-                    </f:RenderField>
-                     <f:RenderField Width="130px" ColumnID="ProcessName" DataField="ProcessName" 
-                         FieldType="String" HeaderText="工序名称" HeaderTextAlign="Center" TextAlign="Center">
                     </f:RenderField>
                     <f:RenderField Width="130px" ColumnID="RaiseDate" DataField="RaiseDate" 
-                        FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="提出时间"
+                        FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="填报日期"
                          HeaderTextAlign="Center" TextAlign="Center">
                     </f:RenderField>  
+                    <f:RenderField Width="200px" ColumnID="ProjectName" DataField="ProjectName" 
+                          FieldType="String" HeaderText="项目名称" HeaderTextAlign="Center" TextAlign="Center">                      
+                    </f:RenderField>
+                    <f:RenderField Width="110px" ColumnID="Major" DataField="Major" 
+                         FieldType="String" HeaderText="填报专业" HeaderTextAlign="Center" TextAlign="Center">
+                    </f:RenderField>
+                     <f:RenderField Width="130px" ColumnID="ProcessName" DataField="ProcessName" 
+                         FieldType="String" HeaderText="装置" HeaderTextAlign="Center" TextAlign="Center">
+                    </f:RenderField>
                     <f:RenderField Width="400px" ColumnID="ProblemDescription" DataField="ProblemDescription" 
-                         FieldType="String" HeaderText="问题描述" HeaderTextAlign="Center" TextAlign="Center">
+                         FieldType="String" HeaderText="案例描述" HeaderTextAlign="Center" TextAlign="Center">
                     </f:RenderField> 
                     <f:RenderField Width="400px" ColumnID="HandleMethod" DataField="HandleMethod" 
-                         FieldType="String" HeaderText="处理方法" HeaderTextAlign="Center" TextAlign="Center">
+                         FieldType="String" HeaderText="案例分析及解决方案" HeaderTextAlign="Center" TextAlign="Center">
                     </f:RenderField> 
+                    <f:TemplateField ColumnID="tfImageUrl1" Width="180px" HeaderText="问题图片" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                    <ItemTemplate>
+                                        <asp:Label ID="lbImageUrl1" runat="server"   Text='<%# ConvertImageUrlByImage(Eval("TestRunMonthSummaryId")) %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <f:TemplateField ColumnID="tfImageUrl2" Width="180px" HeaderText="处理后图片" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                    <ItemTemplate>
+                                        <asp:Label ID="lbImageUrl2" runat="server" Text='<%# ConvertImageUrlByImage2(Eval("TestRunMonthSummaryId")) %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
                     <f:RenderField Width="400px" ColumnID="ExperienceOrSuggestion" DataField="ExperienceOrSuggestion" 
                          FieldType="String" HeaderText="体会或建议" HeaderTextAlign="Center" TextAlign="Center">
                     </f:RenderField> 
@@ -91,6 +129,9 @@
             </f:MenuButton>
         </f:Menu>
     </form>
+    <div class="imgPreview">
+    <img src="#" alt="" id="imgPreview" />
+    </div>
     <script type="text/jscript">
         var menuID = '<%= Menu1.ClientID %>';
         // 返回false，来阻止浏览器右键菜单
@@ -99,9 +140,30 @@
             return false;
         }
 
-        function reloadGrid() {
+        var imgID = '<%=Grid1.ClientID %>';
-            __doPostBack(null, 'reloadGrid');
+        F.ready(function () {
-        }
+            var $wrap = $("#" + imgID)
+            $wrap.find('img').on('click', function () {
+                var src = $(this).attr('src');
+                console.log(src);
+                $('.imgPreview img').attr('src', src);
+               
+                $('.imgPreview').show()
+            });
+            $('.imgPreview').on('click', function () {
+                $('.imgPreview').hide()
+            });
+           /* $wrap.find('img').hover(function (e) {
+                console.log($(this).offset())
+                var top = $(this).offset().top;
+                var left = $(this).offset().left - 200;
+                var src = $(this).attr('src')
+                console.log('src', src, top, left)
+                $('#imgID1').css("left", left).css("top", top).show().find('img').attr('src', src)
+            }, function () {
+                $('#imgID1').hide()
+            })*/
+        })
     </script>
 </body>
 </html>

SGGL/FineUIPro.Web/Personal/TestRunMonthSummary.aspx.cs

@@ -36,7 +36,7 @@ namespace FineUIPro.Web.Personal
         /// </summary>
         private void BindGrid()
         {
-            string strSql = @"SELECT summary.TestRunMonthSummaryId,summary.ProjectId,summary.UserId,summary.RaiseDate,summary.ProcessName,summary.ProblemDescription,summary.HandleMethod,summary.ExperienceOrSuggestion,Users.UserName,case when summary.ProjectId='0' then '本部' else Project.ProjectName end as ProjectName  "
+            string strSql = @"SELECT summary.TestRunMonthSummaryId,summary.ProjectId,summary.UserId,summary.RaiseDate,summary.Major,summary.ProcessName,summary.ProblemDescription,summary.HandleMethod,summary.ExperienceOrSuggestion,Users.UserName,case when summary.ProjectId='0' then '本部' else Project.ProjectName end as ProjectName  "
                           + @" From dbo.Person_TestRunMonthSummary AS summary"
                           + @" LEFT JOIN Sys_User AS Users ON Users.UserId=summary.UserId"
                           + @" LEFT JOIN Base_Project AS Project ON Project.ProjectId=summary.ProjectId"
@@ -200,5 +200,45 @@ namespace FineUIPro.Web.Personal
         {
             BindGrid();
         }
+
+        /// <summary>
+        /// 获取整改前图片(放于Img中)
+        /// </summary>
+        /// <param name="TestRunMonthSummaryId"></param>
+        /// <returns></returns>
+        protected string ConvertImageUrlByImage(object TestRunMonthSummaryId)
+        {
+            string url = string.Empty;
+            string httpUrl = string.Empty;
+            if (TestRunMonthSummaryId != null)
+            {
+                var file = BLL.AttachFileService.GetAttachFileByToKeyId(TestRunMonthSummaryId.ToString());
+                if (file != null)
+                {
+                    url = BLL.UploadAttachmentService.ShowImage(Funs.SGGLUrl, file.AttachUrl);
+                }
+            }
+            return url;
+        }
+
+        /// <summary>
+        /// 获取整改前图片(放于Img中)
+        /// </summary>
+        /// <param name="TestRunMonthSummaryId"></param>
+        /// <returns></returns>
+        protected string ConvertImageUrlByImage2(object TestRunMonthSummaryId)
+        {
+            string url = string.Empty;
+            string httpUrl = string.Empty;
+            if (TestRunMonthSummaryId != null)
+            {
+                var file = BLL.AttachFileService.GetAttachFileByToKeyId(TestRunMonthSummaryId.ToString() + "R");
+                if (file != null)
+                {
+                    url = BLL.UploadAttachmentService.ShowImage(Funs.SGGLUrl, file.AttachUrl);
+                }
+            }
+            return url;
+        }
     }
 }

SGGL/FineUIPro.Web/Personal/TestRunMonthSummary.aspx.designer.cs

@@ -84,6 +84,24 @@ namespace FineUIPro.Web.Personal {
         /// </remarks>
         protected global::FineUIPro.Button btnNew;
         
+        /// <summary>
+        /// lbImageUrl1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label lbImageUrl1;
+        
+        /// <summary>
+        /// lbImageUrl2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label lbImageUrl2;
+        
         /// <summary>
         /// ToolbarSeparator1 控件。
         /// </summary>

SGGL/FineUIPro.Web/Personal/TestRunMonthSummaryEdit.aspx

@@ -15,30 +15,27 @@
             <Rows>
                 <f:FormRow>
                     <Items>
-                        <f:DatePicker runat="server" Label="提出时间" ID="txtRaiseDate" LabelWidth="170px" LabelAlign="Right" DateFormatString="yyyy-MM-dd"></f:DatePicker>
+                        <f:DatePicker runat="server" Label="填报日期" ID="txtRaiseDate" LabelWidth="170px" LabelAlign="Right" DateFormatString="yyyy-MM-dd"></f:DatePicker>
-                        <f:Label ID="lbUserName" runat="server" Label="姓名" LabelWidth="100px" LabelAlign="Right"></f:Label>
+                        <f:TextBox runat="server" ID="txtMajor" Label="填报专业" LabelWidth="100px" LabelAlign="Right"></f:TextBox>
+                        <f:TextBox runat="server" ID="txtProcessName" Label="装置" LabelWidth="100px" LabelAlign="Right"></f:TextBox>
+                        <f:Label ID="lbUserName" runat="server" Label="填报人" LabelWidth="100px" LabelAlign="Right"></f:Label>
                     </Items>
                 </f:FormRow>
                 <f:FormRow>
                     <Items>
-                        <f:DropDownList ID="drpProject" runat="server" Label="项目名称/项目号或本部" Width="300px" LabelWidth="170px" LabelAlign="Right"
+                        <f:DropDownList ID="drpProject" runat="server" Label="项目名称" Width="300px" LabelWidth="170px" LabelAlign="Right"
                             EnableEdit="true">
                         </f:DropDownList>
                     </Items>
                 </f:FormRow>
                 <f:FormRow>
                     <Items>
-                        <f:TextArea runat="server" ID="txtProcessName" Label="工序名称" LabelWidth="170px" LabelAlign="Right"></f:TextArea>
+                        <f:TextArea runat="server" ID="txtProblemDescription" Label="案例描述" LabelWidth="170px" LabelAlign="Right"></f:TextArea>
                     </Items>
                 </f:FormRow>
                 <f:FormRow>
                     <Items>
-                        <f:TextArea runat="server" ID="txtProblemDescription" Label="问题描述" LabelWidth="170px" LabelAlign="Right"></f:TextArea>
+                        <f:TextArea runat="server" ID="txtHandleMethod" Label="案例分析及解决方案" LabelWidth="170px" LabelAlign="Right"></f:TextArea>
-                    </Items>
-                </f:FormRow>
-               <f:FormRow>
-                    <Items>
-                        <f:TextArea runat="server" ID="txtHandleMethod" Label="处理方法" LabelWidth="170px" LabelAlign="Right"></f:TextArea>
                     </Items>
                 </f:FormRow>
                 <f:FormRow>
@@ -46,10 +43,25 @@
                         <f:TextArea runat="server" ID="txtExperienceOrSuggestion" Label="体会或建议" LabelWidth="170px" LabelAlign="Right"></f:TextArea>
                     </Items>
                 </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:Panel ShowHeader="false" ShowBorder="false" Layout="Column" runat="server">
+                            <Items>
+
+                                <f:Label runat="server" Text="" EncodeText="false" Label="附件" Width="170px" LabelAlign="Right"></f:Label>
+                                <f:Button ID="btnAttach" Text="问题图片" ToolTip="问题图片上传及查看" Icon="TableCell" OnClick="btnAttach_Click" runat="server">
+                                </f:Button>
+                                <f:Button ID="btnAttachR" Text="处理后图片" ToolTip="处理后图片上传及查看" Icon="TableCell" OnClick="btnAttachR_Click" runat="server">
+                                </f:Button>
+                            </Items>
+                        </f:Panel>
+                    </Items>
+                </f:FormRow>
             </Rows>
             <Toolbars>
                 <f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
                     <Items>
+                        <f:HiddenField runat="server" ID="hdId"></f:HiddenField>
                         <f:Button ID="btnSave" Icon="SystemSave" runat="server" ValidateForms="SimpleForm1"
                             OnClick="btnSave_Click">
                         </f:Button>
@@ -59,6 +71,10 @@
                 </f:Toolbar>
             </Toolbars>
         </f:Form>
+        <f:Window ID="WindowAtt" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px" OnClose="WindowAtt_Close"
+            Height="500px">
+        </f:Window>
     </form>
 </body>
 </html>

SGGL/FineUIPro.Web/Personal/TestRunMonthSummaryEdit.aspx.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Data;
 using System.Linq;
 using System.Web;
 using System.Web.UI;
@@ -43,6 +44,7 @@ namespace FineUIPro.Web.Personal
                     var MonthSummary = BLL.Person_TestRunMonthSummaryService.GetPersonTestRunMonthSummaryById(this.TestRunMonthSummaryId);
                     if (MonthSummary != null)
                     {
+                        this.hdId.Text = this.TestRunMonthSummaryId;
                         if (MonthSummary.RaiseDate != null)
                         {
                             this.txtRaiseDate.Text = string.Format("{0:yyyy-MM-dd}", MonthSummary.RaiseDate);
@@ -52,6 +54,7 @@ namespace FineUIPro.Web.Personal
                         {
                             this.drpProject.SelectedValue = MonthSummary.ProjectId;
                         }
+                        this.txtMajor.Text = MonthSummary.Major;
                         this.txtProcessName.Text = MonthSummary.ProcessName;
                         this.txtProblemDescription.Text = MonthSummary.ProblemDescription;
                         this.txtHandleMethod.Text = MonthSummary.HandleMethod;
@@ -60,6 +63,7 @@ namespace FineUIPro.Web.Personal
                 }
                 else
                 {
+                    this.txtMajor.Text = "开车";
                     this.lbUserName.Text = this.CurrUser.UserName;
                 }
             }
@@ -87,6 +91,7 @@ namespace FineUIPro.Web.Personal
                 RaiseDate = Funs.GetNewDateTimeOrNow(this.txtRaiseDate.Text.Trim()),
                 UserId = this.CurrUser.UserId,
                 ProjectId = this.drpProject.SelectedValue,
+                Major = this.txtMajor.Text.Trim(),
                 ProcessName = this.txtProcessName.Text.Trim(),
                 ProblemDescription = this.txtProblemDescription.Text.Trim(),
                 HandleMethod = this.txtHandleMethod.Text.Trim(),
@@ -100,7 +105,14 @@ namespace FineUIPro.Web.Personal
             }
             else
             {
-                newMonthSummary.TestRunMonthSummaryId = SQLHelper.GetNewID();
+                if (!string.IsNullOrEmpty(this.hdId.Text))
+                {
+                    newMonthSummary.TestRunMonthSummaryId = this.hdId.Text;
+                }
+                else
+                {
+                    newMonthSummary.TestRunMonthSummaryId = SQLHelper.GetNewID();
+                }
                 BLL.Person_TestRunMonthSummaryService.AddPersonTestRunMonthSummary(newMonthSummary);
                 BLL.LogService.AddSys_Log(this.CurrUser, null, newMonthSummary.TestRunMonthSummaryId, BLL.Const.TestRunMonthSummaryMenuId, BLL.Const.BtnModify);
             }
@@ -108,5 +120,61 @@ namespace FineUIPro.Web.Personal
             ShowNotify("保存成功！", MessageBoxIcon.Success);
             PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
         }
+
+        #region 附件上传
+        /// <summary>
+        /// 附件上传
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnAttach_Click(object sender, EventArgs e)
+        {
+            if (string.IsNullOrEmpty(this.hdId.Text))   //新增记录
+            {
+                this.hdId.Text = SQLHelper.GetNewID();
+            }
+            if (!string.IsNullOrEmpty(Request.Params["type"]))
+            {
+                PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?type=-1&toKeyId={0}&path=FileUpload/TestRun/TestRunMonthSummary&menuId={1}", this.hdId.Text, BLL.Const.TestRunMonthSummaryMenuId)));
+            }
+            else
+            {
+                PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/TestRun/TestRunMonthSummary&menuId={1}", this.hdId.Text, BLL.Const.TestRunMonthSummaryMenuId)));
+            }
+        }
+
+        /// <summary>
+        /// 附件上传
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnAttachR_Click(object sender, EventArgs e)
+        {
+            if (string.IsNullOrEmpty(this.hdId.Text))   //新增记录
+            {
+                this.hdId.Text = SQLHelper.GetNewID();
+            }
+            if (!string.IsNullOrEmpty(Request.Params["type"]))
+            {
+                PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?type=-1&toKeyId={0}&path=FileUpload/TestRun/TestRunMonthSummary&menuId={1}", this.hdId.Text + "R", BLL.Const.TestRunMonthSummaryMenuId)));
+            }
+            else
+            {
+                PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/TestRun/TestRunMonthSummary&menuId={1}", this.hdId.Text + "R", BLL.Const.TestRunMonthSummaryMenuId)));
+            }
+        }
+        #endregion
+
+        #region 关闭弹出窗口
+        /// <summary>
+        /// 关闭弹出窗口
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void WindowAtt_Close(object sender, WindowCloseEventArgs e)
+        {
+      
+        }
+        #endregion
     }
 }

SGGL/FineUIPro.Web/Personal/TestRunMonthSummaryEdit.aspx.designer.cs

@@ -48,6 +48,24 @@ namespace FineUIPro.Web.Personal {
         /// </remarks>
         protected global::FineUIPro.DatePicker txtRaiseDate;
         
+        /// <summary>
+        /// txtMajor 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtMajor;
+        
+        /// <summary>
+        /// txtProcessName 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtProcessName;
+        
         /// <summary>
         /// lbUserName 控件。
         /// </summary>
@@ -66,15 +84,6 @@ namespace FineUIPro.Web.Personal {
         /// </remarks>
         protected global::FineUIPro.DropDownList drpProject;
         
-        /// <summary>
-        /// txtProcessName 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.TextArea txtProcessName;
-        
         /// <summary>
         /// txtProblemDescription 控件。
         /// </summary>
@@ -102,6 +111,24 @@ namespace FineUIPro.Web.Personal {
         /// </remarks>
         protected global::FineUIPro.TextArea txtExperienceOrSuggestion;
         
+        /// <summary>
+        /// btnAttach 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnAttach;
+        
+        /// <summary>
+        /// btnAttachR 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnAttachR;
+        
         /// <summary>
         /// Toolbar1 控件。
         /// </summary>
@@ -111,6 +138,15 @@ namespace FineUIPro.Web.Personal {
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar1;
         
+        /// <summary>
+        /// hdId 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.HiddenField hdId;
+        
         /// <summary>
         /// btnSave 控件。
         /// </summary>
@@ -128,5 +164,14 @@ namespace FineUIPro.Web.Personal {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnClose;
+        
+        /// <summary>
+        /// WindowAtt 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window WindowAtt;
     }
 }

SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTailTermList.aspx.cs

@@ -170,7 +170,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
             //结束时间
             if (!string.IsNullOrWhiteSpace(txtEndTime.Text))
             {
-                strSql += $" and t.RectifyTime<='{DateTime.Parse(txtStartTime.Text.Trim()).ToString("yyyy-MM-dd")} 23:59:59'";
+                strSql += $" and t.RectifyTime<='{DateTime.Parse(txtEndTime.Text.Trim()).ToString("yyyy-MM-dd")} 23:59:59'";
             }
             strSql += "  order by AddTime asc";
             SqlParameter[] parameter = listStr.ToArray();

SGGL/FineUIPro.Web/TestRun/Feeding/InspectTailTermList.aspx.cs

@@ -97,7 +97,7 @@ namespace FineUIPro.Web.TestRun.Feeding
             //结束时间
             if (!string.IsNullOrWhiteSpace(txtEndTime.Text))
             {
-                strSql += $" and a.RectifyTime<='{DateTime.Parse(txtStartTime.Text.Trim()).ToString("yyyy-MM-dd")} 23:59:59'";
+                strSql += $" and a.RectifyTime<='{DateTime.Parse(txtEndTime.Text.Trim()).ToString("yyyy-MM-dd")} 23:59:59'";
             }
             strSql += "  order by a.AddTime asc";
             SqlParameter[] parameter = listStr.ToArray();

SGGL/FineUIPro.Web/TestRun/TestRunManage/InspectTailTermList.aspx.cs

@@ -152,7 +152,7 @@ namespace FineUIPro.Web.TestRun.TestRunManage
             //结束时间
             if (!string.IsNullOrWhiteSpace(txtEndTime.Text))
             {
-                strSql += $" and a.RectifyTime<='{DateTime.Parse(txtStartTime.Text.Trim()).ToString("yyyy-MM-dd")} 23:59:59'";
+                strSql += $" and a.RectifyTime<='{DateTime.Parse(txtEndTime.Text.Trim()).ToString("yyyy-MM-dd")} 23:59:59'";
             }
             strSql += "  order by a.AddTime asc";
             SqlParameter[] parameter = listStr.ToArray();

SGGL/FineUIPro.Web/Web.config

@@ -17,7 +17,7 @@
     <add key="SystemName" value="智慧施工管理信息系统V1.0"/>
     <add key="ChartImageHandler" value="storage=file;timeout=20;url=~/Images/;"/>
     <add key="aspnet:MaxHttpCollectionKeys" value="50000"/>
-    <add key="SGGLUrl" value="http://localhost:8118/"/>
+    <add key="SGGLUrl" value="http://localhost:8579/"/>
     <add key="SystemVersion" value="SGGLPackFile_V2021-02-01-001"/>
     <!--启用与集团实名制 True启用 False 不启用-->
     <add key="EnableRealName" value="False"/>

SGGL/FineUIPro.Web/ZHGL/TestRunPerformance/TestRunMonthSummaryReportEdit.aspx

@@ -5,6 +5,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
     <title></title>
+    <script src="~/res/js/jquery-3.4.1.min.js"></script>
     <style type="text/css">
         .f-grid-row.noEdit {
             pointer-events: none;
@@ -14,6 +15,29 @@
             white-space: normal;
             word-break: break-all;
         }
+
+        .imgPreview {
+            display: none;
+            top: 0;
+            left: 0;
+            width: 100%; /*容器占满整个屏幕*/
+            height: 100%;
+            position: fixed;
+            background: rgba(0, 0, 0, 0.5);
+        }
+
+            .imgPreview img {
+                z-index: 100;
+                width: 60%;
+                position: fixed;
+                top: 50%;
+                left: 50%;
+                transform: translate(-50%,-50%);
+            }
+        /*添加鼠标移入图片效果*/
+        .img {
+            cursor: url("ico/放大镜.png"), auto;
+        }
     </style>
 </head>
 <body>
@@ -39,21 +63,40 @@
                         </f:Toolbar>
                     </Toolbars>
                     <Columns>
-                        <f:BoundField Width="60px" ColumnID="Code" DataField="Code" HeaderTextAlign="Center" 
+                        <f:BoundField Width="60px" ColumnID="Code" DataField="Code" HeaderTextAlign="Center" EnableLock="true" Locked="true"
                             HeaderText="序号" />
-                        <f:BoundField Width="200px" ColumnID="ProjectName" DataField="ProjectName" HeaderText="项目名称/项目号或本部" TextAlign="Center" />
+                        <f:RenderField Width="200px" ColumnID="ProjectName" DataField="ProjectName" EnableLock="true" Locked="true"
-                        <f:BoundField Width="100px" ColumnID="ProcessName" DataField="ProcessName" HeaderText="工序名称" TextAlign="Center" />
+                            FieldType="String" HeaderText="项目名称" HeaderTextAlign="Center" TextAlign="Center">
+                        </f:RenderField>
                         <f:RenderField Width="100px" ColumnID="RaiseDate" DataField="RaiseDate"
-                            FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="提出时间"
+                            FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="填报日期"
                             HeaderTextAlign="Center" TextAlign="Center">
                         </f:RenderField>
-                        <f:RenderField Width="300px" ColumnID="ProblemDescription" DataField="ProblemDescription"
+                        <f:RenderField Width="100px" ColumnID="Major" DataField="Major"
-                            FieldType="String" HeaderText="问题描述" HeaderTextAlign="Center" TextAlign="Center">
+                            FieldType="String" HeaderText="填报专业" HeaderTextAlign="Center" TextAlign="Center">
                         </f:RenderField>
-                        <f:RenderField Width="300px" ColumnID="HandleMethod" DataField="HandleMethod" ExpandUnusedSpace="true"
+                        <f:RenderField Width="120px" ColumnID="ProcessName" DataField="ProcessName"
-                            FieldType="String" HeaderText="处理方法" HeaderTextAlign="Center" TextAlign="Center">
+                            FieldType="String" HeaderText="装置" HeaderTextAlign="Center" TextAlign="Center">
                         </f:RenderField>
-                        <f:RenderField Width="300px" ColumnID="ExperienceOrSuggestion" DataField="ExperienceOrSuggestion"
+                        <f:RenderField Width="400px" ColumnID="ProblemDescription" DataField="ProblemDescription"
+                            FieldType="String" HeaderText="案例描述" HeaderTextAlign="Center" TextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="400px" ColumnID="HandleMethod" DataField="HandleMethod"
+                            FieldType="String" HeaderText="案例分析及解决方案" HeaderTextAlign="Center" TextAlign="Center">
+                        </f:RenderField>
+                        <f:TemplateField ColumnID="tfImageUrl1" Width="180px" HeaderText="问题图片" HeaderTextAlign="Center"
+                            TextAlign="Left">
+                            <ItemTemplate>
+                                <asp:Label ID="lbImageUrl1" runat="server" Text='<%# ConvertImageUrlByImage(Eval("Id")) %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                        <f:TemplateField ColumnID="tfImageUrl2" Width="180px" HeaderText="处理后图片" HeaderTextAlign="Center"
+                            TextAlign="Left">
+                            <ItemTemplate>
+                                <asp:Label ID="lbImageUrl2" runat="server" Text='<%# ConvertImageUrlByImage2(Eval("Id")) %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                        <f:RenderField Width="400px" ColumnID="ExperienceOrSuggestion" DataField="ExperienceOrSuggestion"
                             FieldType="String" HeaderText="体会或建议" HeaderTextAlign="Center" TextAlign="Center">
                         </f:RenderField>
                     </Columns>
@@ -61,5 +104,34 @@
             </Items>
         </f:Panel>
     </form>
+    <div class="imgPreview">
+        <img src="#" alt="" id="imgPreview" />
+    </div>
+    <script type="text/jscript">
+        var imgID = '<%=Grid1.ClientID %>';
+        F.ready(function () {
+            var $wrap = $("#" + imgID)
+            $wrap.find('img').on('click', function () {
+                var src = $(this).attr('src');
+                console.log(src);
+                $('.imgPreview img').attr('src', src);
+
+                $('.imgPreview').show()
+            });
+            $('.imgPreview').on('click', function () {
+                $('.imgPreview').hide()
+            });
+            /* $wrap.find('img').hover(function (e) {
+                 console.log($(this).offset())
+                 var top = $(this).offset().top;
+                 var left = $(this).offset().left - 200;
+                 var src = $(this).attr('src')
+                 console.log('src', src, top, left)
+                 $('#imgID1').css("left", left).css("top", top).show().find('img').attr('src', src)
+             }, function () {
+                 $('#imgID1').hide()
+             })*/
+        })
+    </script>
 </body>
 </html>

SGGL/FineUIPro.Web/ZHGL/TestRunPerformance/TestRunMonthSummaryReportEdit.aspx.cs

@@ -60,7 +60,7 @@ namespace FineUIPro.Web.ZHGL.TestRunPerformance
                                            join y in db.Sys_User on x.UserId equals y.UserId
                                            where x.UserId == this.drpUser.SelectedValue && x.RaiseDate >= startDate && x.RaiseDate < endDate
                                            orderby x.ProjectId
-                                           select new { x.TestRunMonthSummaryId, x.ProjectId, x.UserId, y.UserName, x.ProcessName, x.RaiseDate, x.ProblemDescription, x.HandleMethod, x.ExperienceOrSuggestion }).ToList();
+                                           select new { x.TestRunMonthSummaryId, x.ProjectId, x.UserId, y.UserName, x.Major, x.ProcessName, x.RaiseDate, x.ProblemDescription, x.HandleMethod, x.ExperienceOrSuggestion }).ToList();
             if (getTestRunMonthSummarys.Count() > 0)
             {
                 DataTable table = new DataTable();
@@ -76,6 +76,7 @@ namespace FineUIPro.Web.ZHGL.TestRunPerformance
                 table.Columns.Add(new DataColumn("Id", typeof(String)));
                 table.Columns.Add(new DataColumn("Code", typeof(String)));
                 table.Columns.Add(new DataColumn("ProjectName", typeof(String)));
+                table.Columns.Add(new DataColumn("Major", typeof(String)));
                 table.Columns.Add(new DataColumn("ProcessName", typeof(String)));
                 table.Columns.Add(new DataColumn("RaiseDate", typeof(String)));
                 table.Columns.Add(new DataColumn("ProblemDescription", typeof(String)));
@@ -86,7 +87,7 @@ namespace FineUIPro.Web.ZHGL.TestRunPerformance
                 for (int i = 0; i < months.Count; i++)
                 {
                     row = table.NewRow();
-                    row["Id"] = i;
+                    row["Id"] = SQLHelper.GetNewID();
                     row["Code"] = GetNum(i + 1);
                     row["ProjectName"] = months[i].Year + "年" + months[i].Month + "月份开车技术总结";
                     DateTime monthEndDate = months[i].AddMonths(1);
@@ -97,7 +98,7 @@ namespace FineUIPro.Web.ZHGL.TestRunPerformance
                     foreach (var item in monthList)
                     {
                         row = table.NewRow();
-                        row["Id"] = SQLHelper.GetNewID();
+                        row["Id"] = item.TestRunMonthSummaryId;
                         var project = projects.FirstOrDefault(x => x.ProjectId == item.ProjectId);
                         if (project != null)
                         {
@@ -115,6 +116,7 @@ namespace FineUIPro.Web.ZHGL.TestRunPerformance
                                 projectName = row["ProjectName"].ToString();
                             }
                         }
+                        row["Major"] = item.Major;
                         row["ProcessName"] = item.ProcessName;
                         row["RaiseDate"] = item.RaiseDate;
                         row["ProblemDescription"] = item.ProblemDescription;
@@ -242,5 +244,45 @@ namespace FineUIPro.Web.ZHGL.TestRunPerformance
                 this.Grid1.DataBind();
             }
         }
+
+        /// <summary>
+        /// 获取整改前图片(放于Img中)
+        /// </summary>
+        /// <param name="TestRunMonthSummaryId"></param>
+        /// <returns></returns>
+        protected string ConvertImageUrlByImage(object TestRunMonthSummaryId)
+        {
+            string url = string.Empty;
+            string httpUrl = string.Empty;
+            if (TestRunMonthSummaryId != null)
+            {
+                var file = BLL.AttachFileService.GetAttachFileByToKeyId(TestRunMonthSummaryId.ToString());
+                if (file != null)
+                {
+                    url = BLL.UploadAttachmentService.ShowImage(Funs.SGGLUrl, file.AttachUrl);
+                }
+            }
+            return url;
+        }
+
+        /// <summary>
+        /// 获取整改前图片(放于Img中)
+        /// </summary>
+        /// <param name="TestRunMonthSummaryId"></param>
+        /// <returns></returns>
+        protected string ConvertImageUrlByImage2(object TestRunMonthSummaryId)
+        {
+            string url = string.Empty;
+            string httpUrl = string.Empty;
+            if (TestRunMonthSummaryId != null)
+            {
+                var file = BLL.AttachFileService.GetAttachFileByToKeyId(TestRunMonthSummaryId.ToString() + "R");
+                if (file != null)
+                {
+                    url = BLL.UploadAttachmentService.ShowImage(Funs.SGGLUrl, file.AttachUrl);
+                }
+            }
+            return url;
+        }
     }
 }

SGGL/FineUIPro.Web/ZHGL/TestRunPerformance/TestRunMonthSummaryReportEdit.aspx.designer.cs

@@ -92,5 +92,23 @@ namespace FineUIPro.Web.ZHGL.TestRunPerformance {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnSave;
+        
+        /// <summary>
+        /// lbImageUrl1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label lbImageUrl1;
+        
+        /// <summary>
+        /// lbImageUrl2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label lbImageUrl2;
     }
 }