diff --git a/SGGL/FineUIPro.Web/HSSE/EduTrain/TestRecord.aspx.cs b/SGGL/FineUIPro.Web/HSSE/EduTrain/TestRecord.aspx.cs index 84299e95..afd87ee4 100644 --- a/SGGL/FineUIPro.Web/HSSE/EduTrain/TestRecord.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/EduTrain/TestRecord.aspx.cs @@ -57,7 +57,7 @@ namespace FineUIPro.Web.HSSE.EduTrain (CASE WHEN TestPlan.PlanName IS NULL THEN Training.TrainingName ELSE TestPlan.PlanName END) AS PlanName,Person.IdentityCard,WorkPost.WorkPostName,Person.PersonId,SitePerson.SitePersonId, (CASE WHEN TestRecord.TestScores>=60 THEN '是' ELSE '否' END) AS IsPass, ISNULL(TestPlan.Duration,90) AS Duration,ISNULL(TestPlan.TotalScore,100) AS TotalScore,TestPlan.TestPalce,ISNULL(TestPlan.QuestionCount,95) AS QuestionCount,TestRecord.TemporaryUser,Person.PersonName AS TestManName - ,Unit.UnitName + ,Unit.UnitName,Person.Telephone FROM dbo.Training_TestRecord AS TestRecord LEFT JOIN dbo.Training_TestPlan AS TestPlan ON TestPlan.TestPlanId=TestRecord.TestPlanId LEFT JOIN dbo.Training_TestTraining AS Training ON Training.TrainingId = TestRecord.TestType diff --git a/SGGL/FineUIPro.Web/HSSE/Manager/HSEDiary.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Manager/HSEDiary.aspx.cs index fc39c96b..fabc05fe 100644 --- a/SGGL/FineUIPro.Web/HSSE/Manager/HSEDiary.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Manager/HSEDiary.aspx.cs @@ -102,6 +102,7 @@ namespace FineUIPro.Web.HSSE.Manager /// protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) { + Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue); BindGrid(); } diff --git a/SGGL/FineUIPro.Web/HSSE/Manager/HSEDiaryView.aspx b/SGGL/FineUIPro.Web/HSSE/Manager/HSEDiaryView.aspx index 3b931aff..5078c5a4 100644 --- a/SGGL/FineUIPro.Web/HSSE/Manager/HSEDiaryView.aspx +++ b/SGGL/FineUIPro.Web/HSSE/Manager/HSEDiaryView.aspx @@ -129,13 +129,13 @@ - + - +