lpf
/
SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

20220920

This commit is contained in:
杨红卫 2022-09-20 17:50:09 +08:00
parent 7412e411a7
commit 8474675b90
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SGGL/FineUIPro.Web/HSSE/EduTrain/TestRecord.aspx.cs
View File

@ -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 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, (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 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 FROM dbo.Training_TestRecord AS TestRecord
LEFT JOIN dbo.Training_TestPlan AS TestPlan ON TestPlan.TestPlanId=TestRecord.TestPlanId LEFT JOIN dbo.Training_TestPlan AS TestPlan ON TestPlan.TestPlanId=TestRecord.TestPlanId
LEFT JOIN dbo.Training_TestTraining AS Training ON Training.TrainingId = TestRecord.TestType LEFT JOIN dbo.Training_TestTraining AS Training ON Training.TrainingId = TestRecord.TestType

1
SGGL/FineUIPro.Web/HSSE/Manager/HSEDiary.aspx.cs
View File

@ -102,6 +102,7 @@ namespace FineUIPro.Web.HSSE.Manager
/// <param name="e"></param> /// <param name="e"></param>
protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
{ {
Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
BindGrid(); BindGrid();
} }

4
SGGL/FineUIPro.Web/HSSE/Manager/HSEDiaryView.aspx
View File

@ -129,13 +129,13 @@
</f:FormRow> </f:FormRow>
<f:FormRow> <f:FormRow>
<Items> <Items>
<f:TextArea ID="txtDailySummary" runat="server" Label="今日小结" Readonly="true" LabelWidth="90px" Height="64px"> <f:TextArea ID="txtDailySummary" runat="server" Label="今日小结" Readonly="true" LabelWidth="90px" Height="90px">
</f:TextArea> </f:TextArea>
</Items> </Items>
</f:FormRow> </f:FormRow>
<f:FormRow> <f:FormRow>
<Items> <Items>
<f:TextArea ID="txtTomorrowPlan" runat="server" Label="明日计划" Readonly="true" LabelWidth="90px" Height="64px"> <f:TextArea ID="txtTomorrowPlan" runat="server" Label="明日计划" Readonly="true" LabelWidth="90px" Height="90px">
</f:TextArea> </f:TextArea>
</Items> </Items>
</f:FormRow> </f:FormRow>