zhanghj
/
ChengDa_English
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

0514

This commit is contained in:
李超 2024-05-14 10:52:21 +08:00
parent 67d2f019d4
commit 331172c12b
4 changed files with 34 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
SGGL/FineUIPro.Web/BaseInfo/PerfomanceContent.aspx
View File

@ -21,11 +21,9 @@
<f:DropDownList ID="drpType" runat="server" Label="类别" LabelAlign="Right" AutoPostBack="true" OnSelectedIndexChanged ="drpType_SelectedIndexChanged" <f:DropDownList ID="drpType" runat="server" Label="类别" LabelAlign="Right" AutoPostBack="true" OnSelectedIndexChanged ="drpType_SelectedIndexChanged"
LabelWidth="80px"> LabelWidth="80px">
<f:ListItem Value="1" Text="分包方" Selected="true"/> <f:ListItem Value="1" Text="分包方" Selected="true"/>
<f:ListItem Value="2" Text="个人" /> <f:ListItem Value="2" Text="项目组管理人员" />
<f:ListItem Value="3" Text="项目管理人员" /> <f:ListItem Value="3" Text="分包方主要负责人" />
</f:DropDownList> </f:DropDownList>
</Items> </Items>
</f:Toolbar> </f:Toolbar>
</Toolbars> </Toolbars>

4
SGGL/FineUIPro.Web/BaseInfo/PerfomanceContent.aspx.cs
View File

@ -206,9 +206,9 @@ namespace FineUIPro.Web.BaseInfo
case "1": case "1":
return "分包方"; return "分包方";
case "2": case "2":
return "个人"; return "项目组管理人员";
case "3": case "3":
return "项目管理人员"; return "分包方主要负责人";
default: default:
return ""; return "";
} }

4
SGGL/FineUIPro.Web/HSSE/EduTrain/CompanyTraining.aspx
View File

@ -124,11 +124,11 @@
</f:Panel> </f:Panel>
<f:Window ID="Window1" Title="类别" Hidden="true" EnableIFrame="true" EnableMaximize="true" <f:Window ID="Window1" Title="类别" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" OnClose="Window1_Close" IsModal="true" Target="Parent" EnableResize="false" runat="server" OnClose="Window1_Close" IsModal="true"
Width="600px" Height="400px"> Width="700px" Height="600px">
</f:Window> </f:Window>
<f:Window ID="Window2" Title="详情" Hidden="true" EnableIFrame="true" EnableMaximize="true" <f:Window ID="Window2" Title="详情" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" OnClose="Window2_Close" IsModal="true" Target="Parent" EnableResize="false" runat="server" OnClose="Window2_Close" IsModal="true"
Width="600px" Height="400px"> Width="700px" Height="600px">
</f:Window> </f:Window>
<f:Window ID="WindowAtt" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true" <f:Window ID="WindowAtt" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px" Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px"

27
SGGL/WebAPI/Controllers/HSSE/TestPlanController.cs
View File

@ -5,6 +5,7 @@ using System.Net;
using System.Net.Http; using System.Net.Http;
using System.Web.Http; using System.Web.Http;
using BLL; using BLL;
using Model;
namespace WebAPI.Controllers namespace WebAPI.Controllers
{ {
@ -350,6 +351,32 @@ namespace WebAPI.Controllers
responeData.code = 2; responeData.code = 2;
responeData.data = new { testRecordId }; responeData.data = new { testRecordId };
} }
else
{
Training_TestRecord training_TestRecord = new Training_TestRecord();
training_TestRecord.TestRecordId = Guid.NewGuid().ToString();
training_TestRecord.ProjectId = projectId;
training_TestRecord.CompanyTrainingItemId = getCompanyTraining.CompanyTrainingItemId;
training_TestRecord.TestManId = person.PersonId;
db.Training_TestRecord.InsertOnSubmit(training_TestRecord);
db.SubmitChanges();
string testRecordId = APITestRecordService.CreateTestRecordItem(getCompanyTraining, training_TestRecord.TestRecordId, person, user);
responeData.code = 2;
responeData.data = new { testRecordId };
}
}
else
{
Training_TestRecord training_TestRecord = new Training_TestRecord();
training_TestRecord.TestRecordId = Guid.NewGuid().ToString();
training_TestRecord.ProjectId = projectId;
training_TestRecord.CompanyTrainingItemId= getCompanyTraining.CompanyTrainingItemId;
training_TestRecord.TestManId = user.UserId;
db.Training_TestRecord.InsertOnSubmit(training_TestRecord);
db.SubmitChanges();
string testRecordId = APITestRecordService.CreateTestRecordItem(getCompanyTraining, training_TestRecord.TestRecordId, person, user);
responeData.code = 2;
responeData.data = new { testRecordId };
} }
} }
} }