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

111

This commit is contained in:
李超 2024-01-25 19:19:59 +08:00
parent f590c95d94
commit 12ecb5309e
9 changed files with 334 additions and 300 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SGGL/BLL/API/APIPersonService.cs
View File

@ -525,7 +525,7 @@ namespace BLL
if (!string.IsNullOrEmpty(trainTypeId) && trainTypeId == Const.SpecialSafeTrainId)//专项安全培训 if (!string.IsNullOrEmpty(trainTypeId) && trainTypeId == Const.SpecialSafeTrainId)//专项安全培训
{ {
var ids = db.Base_WorkPost.Where(x => x.PostType == "2").Select(x => x.WorkPostId).ToList(); var ids = db.Base_WorkPost.Where(x => x.PostType == "2").Select(x => x.WorkPostId).ToList();
getPersons = getPersons.Where(x => ids.Contains(x.DepartId)); getPersons = getPersons.Where(x => ids.Contains(x.WorkPostId));
} }
List<Model.PersonItem> getTrainPersonList = new List<Model.PersonItem>(); List<Model.PersonItem> getTrainPersonList = new List<Model.PersonItem>();
@ -654,7 +654,7 @@ namespace BLL
if (!string.IsNullOrEmpty(trainTypeId) &&trainTypeId == Const.SpecialSafeTrainId)//专项安全培训 if (!string.IsNullOrEmpty(trainTypeId) &&trainTypeId == Const.SpecialSafeTrainId)//专项安全培训
{ {
var ids = db.Base_WorkPost.Where(x => x.PostType == "2").Select(x => x.WorkPostId).ToList(); var ids = db.Base_WorkPost.Where(x => x.PostType == "2").Select(x => x.WorkPostId).ToList();
getPersons = getPersons.Where(x => ids.Contains(x.DepartId)).ToList(); getPersons = getPersons.Where(x => ids.Contains(x.WorkPostId)).ToList();
} }
List<Model.PersonItem> getTrainPersonList = new List<Model.PersonItem>(); List<Model.PersonItem> getTrainPersonList = new List<Model.PersonItem>();
var getTrainType = TrainTypeService.GetTrainTypeById(trainTypeId); var getTrainType = TrainTypeService.GetTrainTypeById(trainTypeId);

2
SGGL/FineUIPro.Web/CQMS/Check/CheckList.aspx
View File

@ -87,7 +87,7 @@
<f:DropDownList ID="drpQuestionType" runat="server" Label="问题类别" Width="210px" LabelAlign="Right" EnableEdit="true" AutoPostBack="true" <f:DropDownList ID="drpQuestionType" runat="server" Label="问题类别" Width="210px" LabelAlign="Right" EnableEdit="true" AutoPostBack="true"
OnSelectedIndexChanged="btnQuery_Click"> OnSelectedIndexChanged="btnQuery_Click">
</f:DropDownList> </f:DropDownList>
<f:TextBox ID="txtCheckMan" runat="server" Label="检查人" LabelAlign="Right" > </f:TextBox>
</Items> </Items>
</f:Toolbar> </f:Toolbar>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left"> <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">

4
SGGL/FineUIPro.Web/CQMS/Check/CheckList.aspx.cs
View File

@ -151,6 +151,10 @@ namespace FineUIPro.Web.CQMS.Check
strSql += " AND chec.unitId=@unitId"; strSql += " AND chec.unitId=@unitId";
listStr.Add(new SqlParameter("@unitId", drpSponsorUnit.SelectedValue)); listStr.Add(new SqlParameter("@unitId", drpSponsorUnit.SelectedValue));
} }
if (!string.IsNullOrEmpty(txtCheckMan.Text))
{
strSql += " AND u.UserName like '%"+ txtCheckMan.Text + "%' ";
}
if (drpUnitWork.SelectedValue != Const._Null) if (drpUnitWork.SelectedValue != Const._Null)
{ {
strSql += " AND chec.unitworkId=@unitworkId"; strSql += " AND chec.unitworkId=@unitworkId";

9
SGGL/FineUIPro.Web/CQMS/Check/CheckList.aspx.designer.cs generated
View File

@ -95,6 +95,15 @@ namespace FineUIPro.Web.CQMS.Check
/// </remarks> /// </remarks>
protected global::FineUIPro.DropDownList drpQuestionType; protected global::FineUIPro.DropDownList drpQuestionType;
/// <summary>
/// txtCheckMan 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtCheckMan;
/// <summary> /// <summary>
/// Toolbar2 控件。 /// Toolbar2 控件。
/// </summary> /// </summary>

2
SGGL/FineUIPro.Web/HSSE/License/Apply.aspx.cs
View File

@ -293,7 +293,7 @@ namespace FineUIPro.Web.HSSE.License
} }
else if (state.ToString() == "1") else if (state.ToString() == "1")
{ {
return "总包安全工程师深夜"; return "总包安全工程师审核";
} }
else if (state.ToString() == "2") else if (state.ToString() == "2")
{ {

19
SGGL/FineUIPro.Web/HSSE/License/FireWorkView.aspx
View File

@ -91,7 +91,7 @@
<f:FormRow> <f:FormRow>
<Items> <Items>
<f:Form ID="txtForm1" ShowBorder="true" ShowHeader="true" AutoScroll="true" TitleAlign="Left" <f:Form ID="txtForm1" ShowBorder="true" ShowHeader="true" AutoScroll="true" TitleAlign="Left"
BodyPadding="5px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" Title="施工单位安全人员意见："> BodyPadding="5px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" Title="施工单位安全审核：">
<Rows> <Rows>
<f:FormRow > <f:FormRow >
<Items> <Items>
@ -115,7 +115,7 @@
</Rows> </Rows>
</f:Form> </f:Form>
<f:Form ID="txtForm2" ShowBorder="true" ShowHeader="true" AutoScroll="true" TitleAlign="Left" <f:Form ID="txtForm2" ShowBorder="true" ShowHeader="true" AutoScroll="true" TitleAlign="Left"
BodyPadding="5px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" Title="总包单位专业工程师意见："> BodyPadding="5px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" Title="施工单位施工经理审批：">
<Rows> <Rows>
<f:FormRow> <f:FormRow>
<Items> <Items>
@ -143,7 +143,7 @@
<f:FormRow> <f:FormRow>
<Items> <Items>
<f:Form ID="txtForm3" ShowBorder="true" ShowHeader="true" AutoScroll="true" TitleAlign="Left" <f:Form ID="txtForm3" ShowBorder="true" ShowHeader="true" AutoScroll="true" TitleAlign="Left"
BodyPadding="5px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" Title="总包单位安全人员意见："> BodyPadding="5px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" Title="总包安全审批：">
<Rows> <Rows>
<f:FormRow> <f:FormRow>
<Items> <Items>
@ -167,8 +167,8 @@
</f:FormRow> </f:FormRow>
</Rows> </Rows>
</f:Form> </f:Form>
<f:Form ID="txtForm4" ShowBorder="true" ShowHeader="true" AutoScroll="true" TitleAlign="Left" Hidden="true" HideMode="Visibility" <f:Form ID="txtForm4" ShowBorder="true" ShowHeader="true" AutoScroll="true" TitleAlign="Left"
BodyPadding="5px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" Title="总包单位安全人员："> BodyPadding="5px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" Title="总包施工经理签发：">
<Rows> <Rows>
<f:FormRow> <f:FormRow>
<Items> <Items>
@ -176,12 +176,15 @@
</f:TextArea> </f:TextArea>
</Items> </Items>
</f:FormRow> </f:FormRow>
<f:FormRow > <f:FormRow ColumnWidths="15% 30% 20% 35%">
<Items> <Items>
<f:Label ID="Label5" runat="server" > <f:HyperLink ID="HyperLink4" Text="附件" Target="_blank" NavigateUrl="#" Width="30px" OnClientClick="showAttr(3);return false;"
</f:Label> runat="server">
</f:HyperLink>
<f:Label ID="txtName4" runat="server" Label="签字" LabelWidth="60px"> <f:Label ID="txtName4" runat="server" Label="签字" LabelWidth="60px">
</f:Label> </f:Label>
<f:Image ID="Image4" ImageUrl="~/res/images/Signature0.png" runat="server" ImageHeight="20px" ImageWidth="80px" >
</f:Image>
<f:Label ID="txtTime4" runat="server" Text="年月日时分"> <f:Label ID="txtTime4" runat="server" Text="年月日时分">
</f:Label> </f:Label>
</Items> </Items>

13
SGGL/FineUIPro.Web/HSSE/License/FireWorkView.aspx.cs
View File

@ -195,13 +195,22 @@
{ {
if (getF4.IsAgree == true) if (getF4.IsAgree == true)
{ {
// this.txtOpinion4.Text = "同意。"; this.txtOpinion4.Text = "同意。";
} }
else else
{ {
this.txtOpinion4.Text = getF4.Opinion; this.txtOpinion4.Text = getF4.Opinion;
} }
this.txtName4.Text = UserService.GetUserNameByUserId(getF4.OperaterId); if (!string.IsNullOrEmpty(getF4.SignatureUrl))
{
this.Image4.ImageUrl = "~/" + getF4.SignatureUrl;
}
var signUser4 = UserService.GetUserByUserId(getF4.OperaterId);
if (signUser4 != null)
{
this.txtName4.Text = signUser4.UserName;
}
this.txtTime4.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF4.OperaterTime); this.txtTime4.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF4.OperaterTime);
} }
} }

13
SGGL/FineUIPro.Web/HSSE/License/FireWorkView.aspx.designer.cs generated
View File

@ -312,13 +312,13 @@ namespace FineUIPro.Web.HSSE.License
protected global::FineUIPro.TextArea txtOpinion4; protected global::FineUIPro.TextArea txtOpinion4;
/// <summary> /// <summary>
/// Label5 控件。 /// HyperLink4 控件。
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.Label Label5; protected global::FineUIPro.HyperLink HyperLink4;
/// <summary> /// <summary>
/// txtName4 控件。 /// txtName4 控件。
@ -329,6 +329,15 @@ namespace FineUIPro.Web.HSSE.License
/// </remarks> /// </remarks>
protected global::FineUIPro.Label txtName4; protected global::FineUIPro.Label txtName4;
/// <summary>
/// Image4 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Image Image4;
/// <summary> /// <summary>
/// txtTime4 控件。 /// txtTime4 控件。
/// </summary> /// </summary>

2
SGGL/WebAPI/Common/PersonKqSocketServices.cs
View File

@ -18,7 +18,7 @@ namespace WebAPI.Common
{ {
allSockets = new Dictionary<string, IWebSocketConnection>(); allSockets = new Dictionary<string, IWebSocketConnection>();
webSocketServer = new WebSocketServer("wss://127.0.0.1:" + port); webSocketServer = new WebSocketServer("wss://127.0.0.1:" + port);
webSocketServer.Certificate = new X509Certificate2("D:\\project\\vs\\sggl_cd\\SGGL\\WebAPI\\bin\\wzgl.hfnbd.com.pfx", "1y1fib61"); webSocketServer.Certificate = new X509Certificate2("D:\\SGGLAPI\\bin\\wzgl.hfnbd.com.pfx", "1y1fib61");
webSocketServer.Start(socket => webSocketServer.Start(socket =>
{ {