Merge branch 'master' of https://gitee.com/frane-yang/SGGL_SeDin_New
This commit is contained in:
commit
5b119bcb98
|
|
@ -0,0 +1,4 @@
|
|||
--新增操作日志页面
|
||||
INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
|
||||
VALUES('B65A2E1A-5C0B-498A-9F22-365575397A73','操作日志','Personal/RunLog.aspx',70,'C2297533-B7C0-441E-B29F-ADE87C6F8978','Menu_SysSet',1,1,1)
|
||||
GO
|
||||
|
|
@ -59,6 +59,9 @@ INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
|
|||
VALUES('E2D59A77-5E9A-4340-8B94-86D04738F907','E4BFDCFD-2B1F-49C5-B02B-1C91BFFAAC6E','±£´æ',1)
|
||||
GO
|
||||
|
||||
INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
|
||||
VALUES('B65A2E1A-5C0B-498A-9F22-365575397A73','操作日志','Personal/RunLog.aspx',70,'C2297533-B7C0-441E-B29F-ADE87C6F8978','Menu_SysSet',1,1,1)
|
||||
GO
|
||||
|
||||
/****»ù´¡ÉèÖÃ******/
|
||||
INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
|
||||
|
|
|
|||
|
|
@ -766,6 +766,14 @@ namespace BLL
|
|||
}
|
||||
db.SubmitChanges();
|
||||
|
||||
if (!setPersonItemInOut)
|
||||
{
|
||||
var getPItem = db.SitePerson_PersonItem.FirstOrDefault(x => x.ProjectId == person.ProjectId && x.IdentityCard == person.IdentityCard);
|
||||
if (getPItem == null)
|
||||
{
|
||||
setPersonItemInOut = true;
|
||||
}
|
||||
}
|
||||
if (setPersonItemInOut)
|
||||
{
|
||||
////现场人员项目出入场记录
|
||||
|
|
|
|||
|
|
@ -632,17 +632,25 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
|||
decimal? cThicknessMax = 0;
|
||||
|
||||
var mat = BLL.Base_MaterialService.GetMaterialByMaterialId(ste);
|
||||
//var floorQ = from x in welderQualifys
|
||||
// where wmeCode1.Contains(x.WeldingMethod)
|
||||
// && (mat == null || x.MaterialType.Contains(mat.MetalType ?? ""))
|
||||
// && x.WeldType.Contains(weldType)
|
||||
// select x;
|
||||
//var cellQ = from x in welderQualifys
|
||||
// where wmeCode2.Contains(x.WeldingMethod)
|
||||
// && (mat == null || x.MaterialType.Contains(mat.MetalType ?? ""))
|
||||
// && x.WeldType.Contains(weldType)
|
||||
// select x;
|
||||
var floorQ = from x in welderQualifys
|
||||
where wmeCode1.Contains(x.WeldingMethod)
|
||||
where x.WeldingMethod.Contains(wmeCode1)
|
||||
&& (mat == null || x.MaterialType.Contains(mat.MetalType ?? ""))
|
||||
&& x.WeldType.Contains(weldType)
|
||||
// && (dia == null || x.SizesMin<=dia)
|
||||
select x;
|
||||
var cellQ = from x in welderQualifys
|
||||
where wmeCode2.Contains(x.WeldingMethod)
|
||||
where x.WeldingMethod.Contains(wmeCode2)
|
||||
&& (mat == null || x.MaterialType.Contains(mat.MetalType ?? ""))
|
||||
&& x.WeldType.Contains(weldType)
|
||||
// && (dia == null || x.SizesMin <= dia)
|
||||
select x;
|
||||
if (floorQ.Count() > 0 && cellQ.Count() > 0)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -157,6 +157,10 @@ namespace FineUIPro.Web.Person
|
|||
if (person != null)
|
||||
{
|
||||
SetPersonInfo(person);
|
||||
getInitGridCertificate();
|
||||
getInitGridTestRecord();
|
||||
getInitGridInOut();
|
||||
getInitGridContract();
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -178,6 +182,21 @@ namespace FineUIPro.Web.Person
|
|||
this.txtIdentityCard.Readonly = true;
|
||||
}
|
||||
|
||||
var getProjectPersom = SitePerson_PersonService.GetSitePersonByProjectIdPersonId(this.drpProject.SelectedValue,this.PersonId);
|
||||
if (getProjectPersom != null)
|
||||
{
|
||||
this.SitePersonId = getProjectPersom.SitePersonId;
|
||||
}
|
||||
else
|
||||
{
|
||||
var getProjectPerson = SitePerson_PersonService.GetSitePersonByProjectIdIdentityCard(this.drpProject.SelectedValue, this.txtIdentityCard.Text.Trim());
|
||||
if (getProjectPerson != null)
|
||||
{
|
||||
this.SitePersonId = getProjectPerson.SitePersonId;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
#region 基本信息
|
||||
this.txtPersonName.Text = person.PersonName;
|
||||
this.drpUnit.SelectedValue = person.UnitId;
|
||||
|
|
@ -269,6 +288,7 @@ namespace FineUIPro.Web.Person
|
|||
this.txtRelativeTel.Text = person.RelativeTel;
|
||||
this.txtAddress.Text = person.Address;
|
||||
#endregion
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
<f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true" Layout="VBox"
|
||||
ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" Title="操作日志" TitleToolTip="操作日志">
|
||||
<Items>
|
||||
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" EnableCollapse="true" runat="server"
|
||||
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" EnableCollapse="true" runat="server" ForceFit="true"
|
||||
BoxFlex="1" DataKeyNames="LogId" EnableColumnLines="true" DataIDField="LogId" AllowSorting="true" SortField="OperationTime" SortDirection="DESC"
|
||||
OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange"
|
||||
EnableRowDoubleClickEvent="true" AllowFilters="true" EnableTextSelection="True">
|
||||
|
|
@ -42,7 +42,7 @@
|
|||
<f:RenderField Width="240px" ColumnID="UnitName" DataField="UnitName" SortField="UnitName"
|
||||
FieldType="String" HeaderText="单位" HeaderTextAlign="Center" TextAlign="Left">
|
||||
</f:RenderField>
|
||||
<f:RenderField Width="95px" ColumnID="UserName" DataField="UserName" SortField="UserName"
|
||||
<f:RenderField Width="95px" ColumnID="PersonName" DataField="PersonName" SortField="PersonName"
|
||||
FieldType="String" HeaderText="操作人员" HeaderTextAlign="Center" TextAlign="Left">
|
||||
</f:RenderField>
|
||||
<f:RenderField Width="250px" ColumnID="ProjectName" DataField="ProjectName" SortField="ProjectName"
|
||||
|
|
@ -52,7 +52,7 @@
|
|||
TextAlign="Left" >
|
||||
</f:RenderField>
|
||||
<f:RenderField ColumnID="OperationLog" DataField="OperationLog" SortField="OperationLog" HeaderTextAlign="Center" TextAlign="Left"
|
||||
FieldType="String" HeaderText="操作日志" Width="320px" ExpandUnusedSpace="true">
|
||||
FieldType="String" HeaderText="操作日志" Width="320px" >
|
||||
</f:RenderField>
|
||||
</Columns>
|
||||
<PageItems >
|
||||
|
|
|
|||
|
|
@ -27,14 +27,14 @@ namespace FineUIPro.Web.Personal
|
|||
/// </summary>
|
||||
private void BindGrid()
|
||||
{
|
||||
string strSql = @"SELECT sysLog.LogId,sysLog.UserId,sysLog.OperationTime,sysLog.Ip,sysLog.HostName,sysLog.OperationLog,users.UserName,units.UnitName,Project.ProjectId,Project.ProjectName"
|
||||
string strSql = @"SELECT sysLog.LogId,sysLog.UserId,sysLog.OperationTime,sysLog.Ip,sysLog.HostName,sysLog.OperationLog,users.PersonName,units.UnitName,Project.ProjectId,Project.ProjectName"
|
||||
+ @" FROM dbo.Sys_Log as sysLog"
|
||||
+ @" LEFT JOIN Person_Persons as users ON users.UserId=sysLog.UserId "
|
||||
+ @" LEFT JOIN Person_Persons as users ON users.PersonId=sysLog.UserId "
|
||||
+ @" LEFT JOIN Base_Unit as units on users.UnitId=units.UnitId"
|
||||
+ @" LEFT JOIN Base_Project as Project on sysLog.ProjectId=Project.ProjectId"
|
||||
+ @" WHERE sysLog.UserId != '" + Const.hfnbdId + "' AND sysLog.UserId !='" + Const.sedinId + "'";
|
||||
List<SqlParameter> listStr = new List<SqlParameter>();
|
||||
if (this.CurrUser.PersonId != BLL.Const.sysglyId)
|
||||
if (this.CurrUser.PersonId != BLL.Const.sysglyId && this.CurrUser.PersonId != BLL.Const.hfnbdId)
|
||||
{
|
||||
strSql += " AND sysLog.UserId = @UserId";
|
||||
listStr.Add(new SqlParameter("@UserId", this.CurrUser.PersonId));
|
||||
|
|
@ -46,7 +46,7 @@ namespace FineUIPro.Web.Personal
|
|||
}
|
||||
if (!string.IsNullOrEmpty(this.txtUser.Text.Trim()))
|
||||
{
|
||||
strSql += " AND users.UserName LIKE @UserName";
|
||||
strSql += " AND users.PersonName LIKE @UserName";
|
||||
listStr.Add(new SqlParameter("@UserName", "%" + this.txtUser.Text.Trim() + "%"));
|
||||
}
|
||||
if (!string.IsNullOrEmpty(this.txtOperationLog.Text.Trim()))
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@
|
|||
<TreeNode id="2231022B-3519-42FC-A2E6-1DB9A98039DD" Text="角色授权" NavigateUrl="SysManage/RolePower.aspx"></TreeNode>
|
||||
<TreeNode id="E6F0167E-B0FD-4A32-9C47-25FB9E0FDC4E" Text="用户信息" NavigateUrl="SysManage/UserList.aspx"></TreeNode>
|
||||
<TreeNode id="E4BFDCFD-2B1F-49C5-B02B-1C91BFFAAC6E" Text="环境设置" NavigateUrl="SysManage/SysConstSet.aspx"></TreeNode>
|
||||
<TreeNode id="B65A2E1A-5C0B-498A-9F22-365575397A73" Text="操作日志" NavigateUrl="Personal/RunLog.aspx"></TreeNode>
|
||||
</TreeNode>
|
||||
<TreeNode id="D363BD9D-4DEC-45D8-89C8-B0E49DEF61B4" Text="基础设置" NavigateUrl=""><TreeNode id="5196A6FD-4BF1-46B3-8D24-9A3CE5BB4760" Text="公共设置" NavigateUrl=""><TreeNode id="AEB427BD-AE1A-47CC-9337-368BB06B37F7" Text="项目类型定义" NavigateUrl="BaseInfo/ProjectType.aspx"></TreeNode>
|
||||
<TreeNode id="685F1E0D-987E-491C-9DC7-014098DEE0C3" Text="单位类型定义" NavigateUrl="BaseInfo/UnitType.aspx"></TreeNode>
|
||||
|
|
|
|||
Loading…
Reference in New Issue