fix:1

SUBQHSE/BLL/API/APIIndexService.cs

@@ -130,6 +130,7 @@ namespace BLL.API
 					ProjectShortName = gg.Key.ShortName,
                     ProNum = gg.Count(y => y.States != "4" && y.States != "-1"),
                     RecNum = gg.Count(y => y.States == "3"),
+                    RCNum = gg.Count(y => y.States == "2"),
                     NoRecNum = gg.Count(y => y.States != "3" && y.States != "-1"),
                     RecRate = gg.Count(y => y.States != "4" && y.States != "-1") == 0 ? "0" :
                         Math.Round((decimal)gg.Count(y => y.States == "3") /

SUBQHSE/FineUIPro.Web/Customization/ZJ/HSSE/HiddenInspection/UnitHiddenRectificationList.aspx.cs

@@ -841,6 +841,10 @@ namespace FineUIPro.Web.Customization.ZJ.HSSE.HiddenInspection
                 }
                 
             }*/
+            if (this.CurrUser.UserId == BLL.Const.hfnbdId || this.CurrUser.UserId == BLL.Const.sysglyId)
+            {
+                this.btnMenuDelete.Hidden = false;
+            }
             if (Request.Params["value"] == "0")
             {
                 return;

SUBQHSE/FineUIPro.Web/HSSE/Meeting/ClassMeeting.aspx.cs

@@ -35,7 +35,7 @@ namespace FineUIPro.Web.HSSE.Meeting
             if (!IsPostBack)
             {
                 Funs.DropDownPageSize(this.ddlPageSize);
-                this.ProjectId = this.ProjectId;
+                this.ProjectId = this.CurrUser.LoginProjectId;
                 if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.ProjectId)
                 {
                     this.ProjectId = Request.Params["projectId"];

SUBQHSE/FineUIPro.Web/common/main2024.aspx

@@ -181,7 +181,7 @@
                                     <div class="mod1">
                                         <%--<div class="mod1-icon dcdb"></div>
                                         <div class="mod1-val">督查督办</div>--%>
-                                        <f:Button ID="BtnDCDB" IconUrl="~/res/image/01.png" IconAlign="Top" CssClass="SetBtn" Text="督查督办" runat="server" />
+                                        <f:Button ID="BtnDCDB" IconUrl="~/res/image/01.png" IconAlign="Top" CssClass="SetBtn" Text="督查督办" runat="server" EnableAjax="False" OnClick="BtnBBZX_OnClick"/>
                                     </div>
                                     <div class="mod1">
                                         <f:Button ID="BtnFXYJ" IconUrl="~/res/image/02.png" IconAlign="Top" CssClass="SetBtn" Text="风险预警" runat="server" EnableAjax="False" OnClick="BtnFXYJ_OnClick" />

SUBQHSE/FineUIPro.Web/common/main2024.aspx.cs

@@ -420,7 +420,8 @@ namespace FineUIPro.Web.common
         /// <param name="e"></param>
         protected void BtnSJKB_Click(object sender, EventArgs e)
         {
-            string url = Funs.SGGLUrl + "/common/main.aspx";
+            // string url = Funs.SGGLUrl + "/common/main.aspx";
+            string url = Funs.SGGLUrl + "/index.aspx";
             if (!string.IsNullOrEmpty(url))
             {
                 Response.Write("<script>window.open('" + url + "','_blank')</script>");
@@ -459,7 +460,7 @@ namespace FineUIPro.Web.common
         /// <param name="e"></param>
         protected void BtnBBZX_OnClick(object sender, EventArgs e)
         {
-            string url = Funs.SGGLUrl + "/index.aspx?menuType=Menu_GroupReport" ;
+            string url = Funs.SGGLUrl + "/index.aspx?menuType=Menu_SJTB" ;
             if (!string.IsNullOrEmpty(url))
             {
                 Response.Write("<script>window.open('" + url + "','_blank')</script>");

SUBQHSE/FineUIPro.Web/index.aspx

@@ -230,7 +230,7 @@
                     </div>
                 </div>
             </div>
-            <div class="logo-tit" style="position: relative;">建投公司智慧工地管理信息系统
+            <div class="logo-tit" style="position: relative;">建投公司项目管理数字化平台
                 <f:Button runat="server" CssClass="bgbtn3" EnablePostBack="true" OnClick="btnHome_Click"
     EnableDefaultState="true" EnableDefaultCorner="false" ID="btnHome" OnClientClick="parent.removeActiveTab();">
 </f:Button>

SUBQHSE/FineUIPro.Web/indexProject.aspx

@@ -504,7 +504,7 @@
                 </div>
             </div>
             <div class="logo-tit" style="position: relative;">
-                建投公司智慧工地管理信息系统
+                建投公司项目管理数字化平台
                 <f:Button runat="server" CssClass="bgbtn3" EnablePostBack="true" OnClick="btnHome_Click"
                     EnableDefaultState="true" EnableDefaultCorner="false" ID="btnHome" OnClientClick="parent.removeActiveTab();">
                 </f:Button>

SUBQHSE/FineUIPro.Web/res/css/2024index.css

@@ -178,6 +178,7 @@ html::-webkit-scrollbar {
         height: .5rem;
         padding: .125rem .25rem;
         position: relative;
+font-size: .25rem;
     }
 
     .navs > .nav-active {

SUBQHSE/Model/ZHGL/DataSync/HiddenRectificationOutput.cs

@@ -15,6 +15,10 @@
         /// </summary>
         public int  RecNum { get; set; }
         /// <summary>
+        /// 已整改待确认数量
+        /// </summary>
+        public int  RCNum { get; set; }
+        /// <summary>
         /// 未整改数量
         /// </summary>
         public int  NoRecNum { get; set; }

SUBQHSE/WebAPI/Controllers/Customization/ZJ/UnitHazardRegisterController.cs

@@ -22,7 +22,13 @@ namespace WebAPI
             var responeData = new Model.ResponeData();
             try
             {
-                responeData.data = BLL.APIUnitHazardRegisterService.getHazardRegisterByHazardRegisterId(hazardRegisterId);
+                var hazardRegisterItem = BLL.APIUnitHazardRegisterService.getHazardRegisterByHazardRegisterId(hazardRegisterId);
+                var project  = ProjectService.GetProjectByProjectId(hazardRegisterItem.ProjectId);
+                if (project!=null)
+                {
+                    hazardRegisterItem.ProjectName = project.ProjectName;
+                }
+                responeData.data = hazardRegisterItem;
             }
             catch (Exception ex)
             {

SUBQHSE/WebAPI/Controllers/HSSE/TestPlanController.cs

@@ -490,7 +490,7 @@ namespace WebAPI.Controllers
                 var getTestTrainingItemList = (from x in Funs.DB.Training_TestTrainingItem
                     join y in Funs.DB.Training_TestTraining on x.TrainingId equals y.TrainingId
                     where y.TrainingName.Contains("岗位人员试题") &&
-                          x.WorkPostNames.Contains(person.WorkPostName)
+                          x.WorkPostIds.Contains(person.WorkPostId)
                     orderby x.TestType, x.TrainingItemCode
                     select new
                     {

SUBQHSE/WebAPI/Controllers/HSSE/TestRecordController.cs

@@ -804,7 +804,37 @@ namespace WebAPI.Controllers
         }
 
         #endregion
+         
         
+        #region 根据personId获取用户考试分数
+        /// <summary>
+        /// 根据personId获取用户信息
+        /// </summary>
+        /// <param name="personId"></param>
+        /// <returns></returns>
+        public Model.ResponeData getTestScoreByPersonId(string personId)
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                Model.Training_TestRecord testRecord = Funs.DB.Training_TestRecord
+                    .Where(e => e.TestManId == personId && e.TestScores != null && e.TestEndTime.HasValue && e.TestStartTime.HasValue)
+                    .OrderByDescending(e => e.TestStartTime)
+                    .FirstOrDefault();
+                if (testRecord != null)
+                {
+                    responeData.data = new {testRecord.TestScores};
+                }
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+
+            return responeData;
+        }
+        #endregion
         
     }
 }

SUBQHSE/WebAPI/Filter/TestPermissionAttribute.cs

@@ -160,6 +160,7 @@ namespace WebAPI.Filter
             , "TestRecord*getTestTimesByTestRecordId"
             , "TestRecord*getTestRecordItemAnswerBySelectedItem"
             , "TestRecord*postSubmitTestRecord"
+            , "TestRecord*getTestScoreByPersonId"
         };
 
         /// <summary>