20221214项目劳务人员优化出入记录，新增操作日志页面呈现

2022-12-14 14:55:56 +08:00 · 2022-12-14 14:55:56 +08:00 · 944ee63433
parent dbd41568b5
commit 944ee63433
11 changed files with 72 additions and 44 deletions
--- a/DataBase/版本日志/SGGLDB_V2022-12-14.sql
+++ b/DataBase/版本日志/SGGLDB_V2022-12-14.sql
@ -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
--- a/DataBase/菜单初始化脚本/0-0系统设置（Menu_SysSet）.sql
+++ b/DataBase/菜单初始化脚本/0-0系统设置（Menu_SysSet）.sql
@ -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)
--- a/SGGL/BLL/HSSE/SitePerson/SitePerson_PersonService.cs
+++ b/SGGL/BLL/HSSE/SitePerson/SitePerson_PersonService.cs
@ -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)
                    {
                        ////现场人员项目出入场记录
--- a/SGGL/FineUIPro.Web/Person/ProjectPersonEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/Person/ProjectPersonEdit.aspx.cs
@ -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

--- a/SGGL/FineUIPro.Web/Personal/RunLog.aspx
+++ b/SGGL/FineUIPro.Web/Personal/RunLog.aspx
@ -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 >
--- a/SGGL/FineUIPro.Web/Personal/RunLog.aspx.cs
+++ b/SGGL/FineUIPro.Web/Personal/RunLog.aspx.cs
@ -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()))
--- a/SGGL/FineUIPro.Web/common/Menu_CQMS.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_CQMS.xml
@ -1,15 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Tree>
-  <TreeNode id="34A3DBD0-1472-4D99-B2A4-21F0AF3227BD" Text="质量计划" NavigateUrl="">
-    <TreeNode id="02970CE5-1A63-4DED-83B2-B283E7E68A1F" Text="总包施工质量计划" NavigateUrl="CQMS/Plan/MainPlan.aspx">
+  <TreeNode id="71193A92-2FF6-4D16-AD82-47CD2DE4CB1A" Text="WBS定制" NavigateUrl="">
+    <TreeNode id="F0E4A87F-0D1E-499D-A9EF-9D42ABF4422F" Text="项目WBS基础数据库" NavigateUrl="CQMS/WBS/ProjectControlItemInitSet.aspx">
    </TreeNode>
-<TreeNode id="68DA6E87-1016-4225-AA80-117E788EEE9B" Text="分包施工质量计划" NavigateUrl="CQMS/Plan/SubPlan.aspx"></TreeNode>
-</TreeNode>
-<TreeNode id="71193A92-2FF6-4D16-AD82-47CD2DE4CB1A" Text="WBS定制" NavigateUrl=""><TreeNode id="F0E4A87F-0D1E-499D-A9EF-9D42ABF4422F" Text="项目WBS基础数据库" NavigateUrl="CQMS/WBS/ProjectControlItemInitSet.aspx"></TreeNode>
 <TreeNode id="7BA846E7-D9B2-4F08-9098-DF4DBD654789" Text="项目施工WBS定制" NavigateUrl="CQMS/WBS/ControlItemAndCycle.aspx"></TreeNode>
 <TreeNode id="94217974-201A-4D4F-A832-D9477ACD63A5" Text="项目施工WBS展示" NavigateUrl="CQMS/WBS/ControlItemAndCycleShow.aspx"></TreeNode>
 <TreeNode id="A8E0BC5C-3242-48B1-90AD-7A25E84DDC41" Text="项目施工WBS查询" NavigateUrl="CQMS/WBS/ControlItemAndCycleSearch.aspx"></TreeNode>
 </TreeNode>
+<TreeNode id="34A3DBD0-1472-4D99-B2A4-21F0AF3227BD" Text="质量计划" NavigateUrl=""><TreeNode id="02970CE5-1A63-4DED-83B2-B283E7E68A1F" Text="总包施工质量计划" NavigateUrl="CQMS/Plan/MainPlan.aspx"></TreeNode>
+<TreeNode id="68DA6E87-1016-4225-AA80-117E788EEE9B" Text="分包施工质量计划" NavigateUrl="CQMS/Plan/SubPlan.aspx"></TreeNode>
+</TreeNode>
+<TreeNode id="7E19D4B2-190A-4707-A72B-1161F2BB3261" Text="人员管理" NavigateUrl=""><TreeNode id="B7BCBD17-14CC-49D9-BF92-BEB0239C6429" Text="焊工管理" NavigateUrl=""><TreeNode id="073390B9-3B8E-48B1-BBAB-1127FABEB82C" Text="焊工信息" NavigateUrl="CQMS/PersonManage/WelderManage.aspx"></TreeNode>
+<TreeNode id="BBB314BA-1671-4086-8819-92444E4F12D8" Text="焊工入场考试" NavigateUrl=""><TreeNode id="D2C94CEC-BB3C-4C61-844D-91384285BACD" Text="考试计划" NavigateUrl="CQMS/PersonManage/TestPlan.aspx"></TreeNode>
+<TreeNode id="6D280D83-B39F-4F0B-99B7-9C1A576B8287" Text="考试记录" NavigateUrl="CQMS/PersonManage/TestRecord.aspx"></TreeNode>
+</TreeNode>
+</TreeNode>
+<TreeNode id="0A8195B1-4136-4CF1-A0A2-C29A1620B018" Text="无损检测工管理" NavigateUrl="CQMS/PersonManage/CheckerManage.aspx"></TreeNode>
+</TreeNode>
 <TreeNode id="751BFAB7-1589-4CCF-AF6C-85B214D94E6D" Text="材料设备验收管理" NavigateUrl=""><TreeNode id="3C592866-2355-4371-9056-9BCEC405D419" Text="材料信息" NavigateUrl="CQMS/Material/Material.aspx"></TreeNode>
 <TreeNode id="C9E75EEC-6A93-4313-89EB-E24E05CAC4F1" Text="设备信息" NavigateUrl="CQMS/Material/Equipment.aspx"></TreeNode>
 <TreeNode id="BF90BB3C-13FC-4FB4-B2E2-14B81E7867F6" Text="报验管理" NavigateUrl="CQMS/Material/Inspection.aspx"></TreeNode>
@ -18,43 +25,30 @@
 </TreeNode>
 <TreeNode id="88822AAB-A13F-4ECA-B2ED-592321CDB173" Text="告知和监检管理" NavigateUrl="CQMS/Material/NoticeAndSupervision.aspx"></TreeNode>
 </TreeNode>
-<TreeNode id="53A5EF93-F0F0-4416-A5F8-1AEC37C0C622" Text="质量会议" NavigateUrl=""><TreeNode id="CB0754F9-55D3-4AA3-8E8D-82F11884DAB7" Text="质量月例会" NavigateUrl="CQMS/Meeting/MonthMeeting.aspx"></TreeNode>
-<TreeNode id="31A86992-5FB9-4525-AE97-E2E9E28FACE8" Text="质量专题会" NavigateUrl="CQMS/Meeting/SpecialMeeting.aspx"></TreeNode>
+<TreeNode id="31B86B12-632D-4DDD-B937-E21CA6A88537" Text="检试验设备管理" NavigateUrl=""><TreeNode id="BB8EB284-A014-442E-A1D7-956AA11272AE" Text="检试验设备" NavigateUrl="CQMS/Check/CheckEquipment.aspx"></TreeNode>
+</TreeNode>
+<TreeNode id="09887155-4DEF-4B9A-A15A-0CE8DE81B75A" Text="质量培训" NavigateUrl=""><TreeNode id="E73622CA-1520-4A79-A355-81C08C60A08D" Text="培训计划" NavigateUrl="CQMS/Train/TrainPlan.aspx"></TreeNode>
+<TreeNode id="C062AD89-3C3A-4DA1-AB8A-53E2BD5E5D2D" Text="培训记录" NavigateUrl="CQMS/Train/TrainRecord.aspx"></TreeNode>
+</TreeNode>
+<TreeNode id="BBBF69F1-9520-4E0A-B0C0-9F4D3FBF4C10" Text="施工方案管理" NavigateUrl=""><TreeNode id="91C4BFDB-0A51-4992-99CC-EB4EC185593D" Text="施工方案" NavigateUrl="CQMS/Solution/ConstructSolution.aspx"></TreeNode>
+</TreeNode>
+<TreeNode id="1011063B-FEAC-4B89-A9D9-0F9F6BB3328E" Text="施工技术交底管理" NavigateUrl=""><TreeNode id="F0D0B2C6-51ED-4C47-95EB-C3DCB639BA5F" Text="施工技术交底" NavigateUrl="CQMS/Technical/TechnicalDisclose.aspx"></TreeNode>
 </TreeNode>
 <TreeNode id="B8500D87-407E-458C-9915-FD54F0E81F36" Text="质量验收" NavigateUrl=""><TreeNode id="CC43E208-335D-4AE3-A1CE-B2D8510AE854" Text="实体验收" NavigateUrl="CQMS/Check/SpotCheck.aspx"></TreeNode>
 <TreeNode id="8317C0F7-3A69-48AB-87E5-03E96C543B1C" Text="资料验收" NavigateUrl="CQMS/Check/SpotDataCheck.aspx"></TreeNode>
 <TreeNode id="1433BE70-13C0-4AC7-BC3D-34C9471CE2A8" Text="质量验收统计" NavigateUrl="CQMS/Check/SpotCheckStatistics.aspx"></TreeNode>
 </TreeNode>
-<TreeNode id="09887155-4DEF-4B9A-A15A-0CE8DE81B75A" Text="质量培训" NavigateUrl=""><TreeNode id="E73622CA-1520-4A79-A355-81C08C60A08D" Text="培训计划" NavigateUrl="CQMS/Train/TrainPlan.aspx"></TreeNode>
-<TreeNode id="C062AD89-3C3A-4DA1-AB8A-53E2BD5E5D2D" Text="培训记录" NavigateUrl="CQMS/Train/TrainRecord.aspx"></TreeNode>
-</TreeNode>
-<TreeNode id="7E19D4B2-190A-4707-A72B-1161F2BB3261" Text="人员管理" NavigateUrl=""><TreeNode id="B7BCBD17-14CC-49D9-BF92-BEB0239C6429" Text="焊工管理" NavigateUrl=""><TreeNode id="073390B9-3B8E-48B1-BBAB-1127FABEB82C" Text="焊工信息" NavigateUrl="CQMS/PersonManage/WelderManage.aspx"></TreeNode>
-<TreeNode id="BBB314BA-1671-4086-8819-92444E4F12D8" Text="焊工入场考试" NavigateUrl=""><TreeNode id="D2C94CEC-BB3C-4C61-844D-91384285BACD" Text="考试计划" NavigateUrl="CQMS/PersonManage/TestPlan.aspx"></TreeNode>
-<TreeNode id="6D280D83-B39F-4F0B-99B7-9C1A576B8287" Text="考试记录" NavigateUrl="CQMS/PersonManage/TestRecord.aspx"></TreeNode>
-</TreeNode>
-</TreeNode>
-<TreeNode id="0A8195B1-4136-4CF1-A0A2-C29A1620B018" Text="无损检测工管理" NavigateUrl="CQMS/PersonManage/CheckerManage.aspx"></TreeNode>
-</TreeNode>
 <TreeNode id="A54EC449-5F77-4068-83B9-AA305B721A0B" Text="质量检查" NavigateUrl=""><TreeNode id="B3E99BD9-FDC7-4F15-8C3C-A7821AC9E306" Text="质量巡检" NavigateUrl="CQMS/Check/CheckList.aspx"></TreeNode>
 <TreeNode id="E6703F32-4E42-4D03-84B3-5EC0E8E48E0F" Text="质量共检" NavigateUrl="CQMS/Check/JointCheck.aspx"></TreeNode>
 <TreeNode id="D3B1433E-00DE-432B-A30A-0EFB513480A8" Text="问题统计" NavigateUrl="CQMS/Check/JointCheckStatistics.aspx"></TreeNode>
 </TreeNode>
-<TreeNode id="1011063B-FEAC-4B89-A9D9-0F9F6BB3328E" Text="施工技术交底管理" NavigateUrl=""><TreeNode id="F0D0B2C6-51ED-4C47-95EB-C3DCB639BA5F" Text="施工技术交底" NavigateUrl="CQMS/Technical/TechnicalDisclose.aspx"></TreeNode>
+<TreeNode id="53A5EF93-F0F0-4416-A5F8-1AEC37C0C622" Text="质量会议" NavigateUrl=""><TreeNode id="CB0754F9-55D3-4AA3-8E8D-82F11884DAB7" Text="质量月例会" NavigateUrl="CQMS/Meeting/MonthMeeting.aspx"></TreeNode>
+<TreeNode id="31A86992-5FB9-4525-AE97-E2E9E28FACE8" Text="质量专题会" NavigateUrl="CQMS/Meeting/SpecialMeeting.aspx"></TreeNode>
 </TreeNode>
 <TreeNode id="BA383490-BAE3-4E65-B221-8F89D2431135" Text="质量奖惩" NavigateUrl=""><TreeNode id="81053EAB-09C6-4A6B-A952-B756071EE0DA" Text="质量奖励处罚" NavigateUrl="CQMS/RewardAndPunish/RewardAndPunish.aspx"></TreeNode>
 </TreeNode>
-<TreeNode id="0416D750-6AB4-4E7E-AAE1-19919F7EB538" Text="工程联络单管理" NavigateUrl=""><TreeNode id="87867EA8-576A-4166-AE7A-7416115DF30B" Text="工程联络单" NavigateUrl="CQMS/Check/TechnicalContactList.aspx"></TreeNode>
-</TreeNode>
 <TreeNode id="F54EABD2-4242-4A5D-9154-680E02E9F466" Text="质量样板管理" NavigateUrl=""><TreeNode id="B44EC915-7854-4F06-8C87-CD5FF41E3AC0" Text="质量样板" NavigateUrl="CQMS/Models/QualityModel.aspx"></TreeNode>
 </TreeNode>
-<TreeNode id="8CD32BC0-1023-49CE-AF1A-F8895B04A651" Text="设计变更管理" NavigateUrl=""><TreeNode id="38F11FC6-E9F0-4ABD-BD78-BB1807EA3CE3" Text="设计变更" NavigateUrl="CQMS/Check/Design.aspx"></TreeNode>
-</TreeNode>
-<TreeNode id="BBBF69F1-9520-4E0A-B0C0-9F4D3FBF4C10" Text="施工方案管理" NavigateUrl=""><TreeNode id="91C4BFDB-0A51-4992-99CC-EB4EC185593D" Text="施工方案" NavigateUrl="CQMS/Solution/ConstructSolution.aspx"></TreeNode>
-</TreeNode>
-<TreeNode id="FD383DBE-4467-44EE-B50C-5F2DA70CD1D3" Text="施工图纸管理" NavigateUrl=""><TreeNode id="3A9039B2-20DC-47FA-A943-E3604FBBF699" Text="施工图纸" NavigateUrl="CQMS/Check/Draw.aspx"></TreeNode>
-</TreeNode>
-<TreeNode id="31B86B12-632D-4DDD-B937-E21CA6A88537" Text="检试验设备管理" NavigateUrl=""><TreeNode id="BB8EB284-A014-442E-A1D7-956AA11272AE" Text="检试验设备" NavigateUrl="CQMS/Check/CheckEquipment.aspx"></TreeNode>
-</TreeNode>
 <TreeNode id="C91C8319-0BFC-4585-BE14-ED41D45A160D" Text="质量月报" NavigateUrl=""><TreeNode id="786864C0-2875-49CD-B55E-0B5C8253295D" Text="质量月报" NavigateUrl="CQMS/Check/CheckMonth.aspx"></TreeNode>
 </TreeNode>
 <TreeNode id="390A78F0-43B2-4AF1-81B9-7C216FA7E0A4" Text="文件柜" NavigateUrl=""><TreeNode id="CF33572A-E875-4492-92BF-6EA265909A6C" Text="质量共检通知单" NavigateUrl="CQMS/Check/SpotCheckFile.aspx"></TreeNode>
--- a/SGGL/FineUIPro.Web/common/Menu_HJGL.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_HJGL.xml
@ -4,7 +4,6 @@
    <TreeNode id="8IDKGJE2-09B1-1234-VC6D-865CE48F0005" Text="管道等级" NavigateUrl="HJGL/BaseInfo/PipingClass.aspx">
    </TreeNode>
 <TreeNode id="8IDKGJE2-09B1-4607-BC6D-865CE48F0014" Text="管道介质" NavigateUrl="HJGL/BaseInfo/Medium.aspx"></TreeNode>
-<TreeNode id="8IDKGJE2-09B1-4607-BC6D-865CE48F0009" Text="安装组件" NavigateUrl="HJGL/BaseInfo/Components.aspx"></TreeNode>
 </TreeNode>
 <TreeNode id="8IDKGJE2-09B1-4607-DCS2-DCC3O48F080F" Text="数据导入" NavigateUrl=""><TreeNode id="B13BFFA5-3112-4209-8562-5329B78B405C" Text="三维模型导入" NavigateUrl="HJGL/DataImport/TDMImport.aspx"></TreeNode>
 <TreeNode id="5CBE9258-6FE9-47A8-BFDD-3BDD90F7DECC" Text="图纸导入" NavigateUrl="HJGL/DataImport/DrawingImport.aspx"></TreeNode>
@ -32,7 +31,6 @@
 <TreeNode id="164E056C-30C9-4C29-A6B6-AF0F0C943A59" Text="材料匹配(现场安装)" NavigateUrl="HJGL/WeldingManage/WeldMatMatch.aspx?PipeArea=2"></TreeNode>
 <TreeNode id="C1EACB23-A029-4DE7-886D-7772D9DDE735" Text="焊口二次设计" NavigateUrl="HJGL/WeldingManage/JotTwoDesign.aspx"></TreeNode>
 <TreeNode id="6ce0b6bc-aa4d-4f0d-9f1f-75a553810793" Text="焊接任务单" NavigateUrl="HJGL/WeldingManage/WeldTask.aspx"></TreeNode>
-<TreeNode id="294A4F70-B19E-4D84-A09D-484128D9CC19" Text="预提交日报审核" NavigateUrl="HJGL/WeldingManage/PreWeldReportAudit.aspx"></TreeNode>
 <TreeNode id="5TYHMD2F-2582-4DEB-905E-6E9DCFEFBGHO" Text="焊接日报" NavigateUrl="HJGL/WeldingManage/WeldReport.aspx"></TreeNode>
 </TreeNode>
 <TreeNode id="7FE911EF-616A-4F04-AACD-E53E633A9E86" Text="热处理/硬度管理" NavigateUrl=""><TreeNode id="90579BE7-E38C-4CD2-A3BC-755169FF3BB2" Text="热处理委托" NavigateUrl="HJGL/HotProcessHard/HotProessTrust.aspx"></TreeNode>
--- a/SGGL/FineUIPro.Web/common/Menu_HTGL.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_HTGL.xml
@ -7,6 +7,4 @@
 <TreeNode id="98573D16-3310-4292-96A5-A59B9A5E6B6B" Text="通用条款" NavigateUrl="PHTGL/ContractCompile/GeneralTermsConditions.aspx"></TreeNode>
 <TreeNode id="98367C43-9C85-467E-9144-288D80101E41" Text="专用条款" NavigateUrl="PHTGL/ContractCompile/SpecialTermsConditions.aspx"></TreeNode>
 </TreeNode>
-<TreeNode id="E3978B9E-89D7-4B23-B44B-A680FAFA0443" Text="施工长名单管理" NavigateUrl=""><TreeNode id="9C4E7381-4080-4082-8C4D-B041149D48C7" Text="施工长名单入网申请" NavigateUrl="PHTGL/LongListManager/LongListNetApplication.aspx"></TreeNode>
-</TreeNode>
 </Tree>
--- a/SGGL/FineUIPro.Web/common/Menu_PZHGL.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_PZHGL.xml
@ -1,15 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Tree>
-  <TreeNode id="1DFB41AB-526C-4246-B2A7-A201AB334C17" Text="总承包商施工计划" NavigateUrl="PZHGL/InformationProject/ConstructionPlan.aspx">
+  <TreeNode id="1DFB41AB-526C-4246-B2A7-A201AB334C17" Text="总承包商施工计划" NavigateUrl="">
  </TreeNode>
-<TreeNode id="0DAFF358-EA16-44B2-8E4B-E15E40EFAAD0" Text="总承包商施工报告" NavigateUrl="PZHGL/InformationProject/ConstructionReport.aspx"></TreeNode>
-<TreeNode id="4CB03F8B-C967-4082-ADF1-08776FE40E21" Text="项目级施工日志" NavigateUrl="PZHGL/InformationProject/ConstructionLog.aspx"></TreeNode>
-<TreeNode id="CD88CE2A-A8E2-4F07-9A90-9161BD1C345C" Text="工作交接" NavigateUrl="PZHGL/InformationProject/WorkHandover.aspx"></TreeNode>
+<TreeNode id="0DAFF358-EA16-44B2-8E4B-E15E40EFAAD0" Text="总承包商施工报告" NavigateUrl=""></TreeNode>
+<TreeNode id="4CB03F8B-C967-4082-ADF1-08776FE40E21" Text="项目级施工日志" NavigateUrl=""></TreeNode>
+<TreeNode id="CD88CE2A-A8E2-4F07-9A90-9161BD1C345C" Text="工作交接" NavigateUrl=""></TreeNode>
 <TreeNode id="4F5C00F3-DA7D-4B2D-B1EF-310DFFCA77DD" Text="来往文件管理" NavigateUrl="PZHGL/InformationProject/ReceiveFileManager.aspx"></TreeNode>
 <TreeNode id="44140854-701D-4D67-AD8E-AA8DD48B6D6A" Text="移动端首页数据" NavigateUrl="PZHGL/ProjectData/ProjectPageData.aspx"></TreeNode>
 <TreeNode id="F266456A-991F-45A3-BCD6-CF2515D71E39" Text="项目施工平面布置图" NavigateUrl="PZHGL/ProjectData/ProjectMap.aspx"></TreeNode>
 <TreeNode id="B58179BE-FE6E-4E91-84FC-D211E4692354" Text="项目亮点" NavigateUrl="PZHGL/InformationProject/Picture.aspx"></TreeNode>
 <TreeNode id="43E96F2A-9497-4C37-998F-0EB324000609" Text="工作联系单" NavigateUrl="CQMS/Unqualified/ContactList.aspx"></TreeNode>
+<TreeNode id="87867EA8-576A-4166-AE7A-7416115DF30B" Text="工程联络单" NavigateUrl="CQMS/Check/TechnicalContactList.aspx"></TreeNode>
+<TreeNode id="38F11FC6-E9F0-4ABD-BD78-BB1807EA3CE3" Text="设计变更" NavigateUrl="CQMS/Check/Design.aspx"></TreeNode>
+<TreeNode id="3A9039B2-20DC-47FA-A943-E3604FBBF699" Text="施工图纸" NavigateUrl="CQMS/Check/Draw.aspx"></TreeNode>
 <TreeNode id="25AC041E-0B27-4D7C-860B-1A06518B6673" Text="文件柜" NavigateUrl=""><TreeNode id="F274F84A-B648-4ABA-99D4-993AA6D1143A" Text="工作联系单" NavigateUrl="CQMS/Check/WorkContactFile.aspx"></TreeNode>
 </TreeNode>
 </Tree>
--- a/SGGL/FineUIPro.Web/common/Menu_SysSet.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_SysSet.xml
@ -7,11 +7,11 @@
 <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>
 <TreeNode id="D9F1F0BD-D48F-4C5B-AF26-7F4C561D1352" Text="公司部门定义" NavigateUrl="SysManage/Depart.aspx"></TreeNode>
-<TreeNode id="565E9B43-47CF-4C49-906F-539E7DB42A00" Text="职务定义" NavigateUrl="BaseInfo/Position.aspx"></TreeNode>
 <TreeNode id="2E424093-81B8-421A-963F-D85D17B1E82A" Text="职称定义" NavigateUrl="BaseInfo/PostTitle.aspx"></TreeNode>
 <TreeNode id="3A40AF0B-C9B8-4AF9-A683-FEADD8CC3A1C" Text="执业资格证书定义" NavigateUrl="BaseInfo/Certificate.aspx"></TreeNode>
 <TreeNode id="871A4DA2-2CE0-4049-8255-3759A269110E" Text="法律法规类型定义" NavigateUrl="BaseInfo/LawsRegulationsType.aspx"></TreeNode>