From 0732a5021c3c48e463b29f7d0757e022e72e0ecc Mon Sep 17 00:00:00 2001
From: "754998852@qq.com" <754998852@qq.com>
Date: Thu, 12 Sep 2024 14:14:08 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9C=8B=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SGGLDB_WH_V2024-09-11-phf.sql             |  5 ++++
 SGGL/FineUIPro.Web/FineUIPro.Web.csproj       |  2 +-
 .../InspectionSummary.aspx.cs                 |  4 +--
 .../common/mainMenu_TestRun.aspx              |  4 +--
 .../common/mainMenu_TestRun.aspx.cs           |  2 ++
 .../common/mainMenu_TestRun.aspx.designer.cs  | 30 +++++++++++++++----
 SGGL/FineUIPro.Web/common/main_new.aspx       | 12 ++++----
 SGGL/FineUIPro.Web/index.aspx                 |  4 +--
 8 files changed, 45 insertions(+), 18 deletions(-)
 create mode 100644 DataBase/版本日志/SGGLDB_WH_V2024-09-11-phf.sql

diff --git a/DataBase/版本日志/SGGLDB_WH_V2024-09-11-phf.sql b/DataBase/版本日志/SGGLDB_WH_V2024-09-11-phf.sql
new file mode 100644
index 00000000..5ef0d067
--- /dev/null
+++ b/DataBase/版本日志/SGGLDB_WH_V2024-09-11-phf.sql
@@ -0,0 +1,5 @@
+
+CREATE NONCLUSTERED INDEX [t_d_facerecord_Projectid_Index]
+ON [dbo].[t_d_facerecord] ([ProjectId])
+INCLUDE ([ID],[EmployName],[DepartmentID],[DepartName],[AreaID],[AreaName],[EmployNO],[CardID],[RoleID],[DateTimeRecord],[RecordDes],[FaceIP],[InOrOut],[Des1],[Des2],[Des3],[Des4])
+;
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
index a779b583..1cd2185e 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -19248,7 +19248,7 @@
       </FlavorProperties>
     </VisualStudio>
   </ProjectExtensions>
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0\WebApplications\Microsoft.WebApplication.targets" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v16.0\WebApplications\Microsoft.WebApplication.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/SGGL/FineUIPro.Web/ZHGL/InspectionSummary/InspectionSummary.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/InspectionSummary/InspectionSummary.aspx.cs
index 1e5e7c7d..0a56884a 100644
--- a/SGGL/FineUIPro.Web/ZHGL/InspectionSummary/InspectionSummary.aspx.cs
+++ b/SGGL/FineUIPro.Web/ZHGL/InspectionSummary/InspectionSummary.aspx.cs
@@ -788,8 +788,8 @@ namespace FineUIPro.Web.ZHGL.InspectionSummary
                     model.CompileDateMonth = this.drpCompileDateMonth.Text.Trim();
                     model.InspectionSummaryId = Guid.NewGuid().ToString();
                     model.InspectionSummaryMbId = "24";
-                    var Rykq =db.T_d_facerecord.Where(x => x.ProjectId == pid).FirstOrDefault();
-                    if (Rykq !=null)
+                    var Rykq =db.T_d_facerecord.Where(x => x.ProjectId == pid).Select(x=>x.ID).FirstOrDefault();
+                    if (Rykq !=0)
                     {
                         model.SummeryResult = "已对接";
                     }
diff --git a/SGGL/FineUIPro.Web/common/mainMenu_TestRun.aspx b/SGGL/FineUIPro.Web/common/mainMenu_TestRun.aspx
index 1e265a39..2da6f6d8 100644
--- a/SGGL/FineUIPro.Web/common/mainMenu_TestRun.aspx
+++ b/SGGL/FineUIPro.Web/common/mainMenu_TestRun.aspx
@@ -116,7 +116,7 @@
                         <div class="bw-b-bottom-up">
                             <div class="tab-wrap" style="left: 20px">
                                 <div class="tab" style="border: 0; box-shadow: none;">
-                                    <div class="t-item" style="font-size: 16px; font-weight: normal; color: #fff">投料试车进度</div>
+                                    <div class="t-item" style="font-size: 16px; font-weight: normal; color: #fff" id="tlscNum" runat="server">投料试车进度</div>
                                 </div>
                             </div>
                             <div class="tab-wrap">
@@ -143,7 +143,7 @@
                         <div class="bw-b-bottom-up">
                             <div class="tab-wrap" style="left: 20px">
                                 <div class="tab" style="border: 0; box-shadow: none;">
-                                    <div class="t-item" style="font-size: 16px; font-weight: normal; color: #fff">试运行进度</div>
+                                    <div class="t-item" style="font-size: 16px; font-weight: normal; color: #fff" id="syxNum" runat="server">试运行进度</div>
                                 </div>
                             </div>
                             <div class="tab-wrap">
diff --git a/SGGL/FineUIPro.Web/common/mainMenu_TestRun.aspx.cs b/SGGL/FineUIPro.Web/common/mainMenu_TestRun.aspx.cs
index cf3c7de1..852e9f59 100644
--- a/SGGL/FineUIPro.Web/common/mainMenu_TestRun.aspx.cs
+++ b/SGGL/FineUIPro.Web/common/mainMenu_TestRun.aspx.cs
@@ -290,6 +290,7 @@ namespace FineUIPro.Web
                         InstallationName = item.InstallationName
                     });
                 }
+                tlscNum.InnerHtml = "投料试车进度(" + result.Count.ToString() + ")";
                 feedingRunStr = JsonConvert.SerializeObject(result);
             }
         }
@@ -312,6 +313,7 @@ namespace FineUIPro.Web
                         InstallationName = item.InstallationName
                     });
                 }
+                syxNum.InnerHtml = "试运行进度(" + result.Count.ToString() + ")";
                 productsStr = JsonConvert.SerializeObject(result);
             }
         }
diff --git a/SGGL/FineUIPro.Web/common/mainMenu_TestRun.aspx.designer.cs b/SGGL/FineUIPro.Web/common/mainMenu_TestRun.aspx.designer.cs
index 93b106a6..47b3add2 100644
--- a/SGGL/FineUIPro.Web/common/mainMenu_TestRun.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/common/mainMenu_TestRun.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web {
-    
-    
-    public partial class mainMenu_TestRun {
-        
+namespace FineUIPro.Web
+{
+
+
+    public partial class mainMenu_TestRun
+    {
+
         /// <summary>
         /// Head1 控件。
         /// </summary>
@@ -20,5 +22,23 @@ namespace FineUIPro.Web {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
+
+        /// <summary>
+        /// tlscNum 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl tlscNum;
+
+        /// <summary>
+        /// syxNum 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl syxNum;
     }
 }
diff --git a/SGGL/FineUIPro.Web/common/main_new.aspx b/SGGL/FineUIPro.Web/common/main_new.aspx
index 118182c2..a9505b8d 100644
--- a/SGGL/FineUIPro.Web/common/main_new.aspx
+++ b/SGGL/FineUIPro.Web/common/main_new.aspx
@@ -1919,23 +1919,23 @@
                 textStyle: {
                     rich: {
                         a: {
-                            fontSize: 14,
+                            fontSize: 12,
                             color: '#DADADA',
                         },
                         b: {
                             color: '#FFFFFF',
-                            fontSize: 14,
+                            fontSize: 12,
                         },
                         c: {
                             padding: [0, 6],
-                            fontSize: 14,
+                            fontSize: 12,
                             color: '#FFFFFF',
                         },
                         d: {
-                            fontSize: 14,
+                            fontSize: 12,
                             color: '#12CDA2',
                         }
-                    }
+                    },
                 }
             },
             ],
@@ -2325,7 +2325,7 @@
                 },
                 axisLabel: {
                     interval: 0,
-                    rotate: -16, // 如果数据较多时旋转标签以避免重叠
+                    rotate: -10, // 如果数据较多时旋转标签以避免重叠
                     margin: 8, // 设置标签与轴线之间的距离
                     // align: 'center'
                 },
diff --git a/SGGL/FineUIPro.Web/index.aspx b/SGGL/FineUIPro.Web/index.aspx
index 55c73ac5..15c84483 100644
--- a/SGGL/FineUIPro.Web/index.aspx
+++ b/SGGL/FineUIPro.Web/index.aspx
@@ -162,9 +162,9 @@
         .bgbtn_head {
             display: inline-block;
             position: absolute;
-            width: 40%;
+            width: 96%;
             height: 50%;
-            left: 30%;
+            left: 2%;
             top: 0;
             background: none !important;
             border: none !important;

From f0a453cda24e854bca83f2953eb47fce182b9c78 Mon Sep 17 00:00:00 2001
From: "754998852@qq.com" <754998852@qq.com>
Date: Thu, 12 Sep 2024 15:53:31 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=AC=E5=8F=B8?=
 =?UTF-8?q?=E7=BA=A7=E5=9C=B0=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SGGL/FineUIPro.Web/common/main_new.aspx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/SGGL/FineUIPro.Web/common/main_new.aspx b/SGGL/FineUIPro.Web/common/main_new.aspx
index a9505b8d..f178c5cb 100644
--- a/SGGL/FineUIPro.Web/common/main_new.aspx
+++ b/SGGL/FineUIPro.Web/common/main_new.aspx
@@ -2535,7 +2535,8 @@
                 map: "china",
                 roam: false, // 可以缩放和平移
                 aspectScale: 0.75, // 比例
-                top: 120,
+                top: 130,
+                left: 170,
                 zlevel: 10,
                 zoom: 1.4,
                 regions: [

From c628c83364c829260be2a44c98a386d13deab0ad Mon Sep 17 00:00:00 2001
From: "754998852@qq.com" <754998852@qq.com>
Date: Fri, 13 Sep 2024 14:13:29 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=AC=E5=8F=B8?=
 =?UTF-8?q?=E7=BA=A7=E9=99=A4=E4=BA=86=E4=BA=94=E7=8E=AF=E4=B9=9F=E8=83=BD?=
 =?UTF-8?q?=E8=BF=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SGGL/FineUIPro.Web/indexProject.aspx.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/SGGL/FineUIPro.Web/indexProject.aspx.cs b/SGGL/FineUIPro.Web/indexProject.aspx.cs
index db315f2d..9ab9b61a 100644
--- a/SGGL/FineUIPro.Web/indexProject.aspx.cs
+++ b/SGGL/FineUIPro.Web/indexProject.aspx.cs
@@ -730,8 +730,10 @@ namespace FineUIPro.Web
 
         protected void btnHome_Click(object sender, EventArgs e)
         {
+            //修改本部用户都能进
+            //this.CurrUser.UnitId == Const.UnitId_CWCEC &&
             if (string.IsNullOrEmpty(this.CurrUser.LastProjectId)
-                && ((this.CurrUser.UnitId == Const.UnitId_CWCEC && this.CurrUser.IsOffice == true) || this.CurrUser.UserId == Const.sysglyId || this.CurrUser.UserId == Const.hfnbdId))
+                && ((this.CurrUser.IsOffice == true) || this.CurrUser.UserId == Const.sysglyId || this.CurrUser.UserId == Const.hfnbdId))
             {
                 UserService.UpdateLastUserInfo(this.CurrUser.UserId, this.CurrUser.LastMenuType, false, this.CurrUser.LoginProjectId);
                 this.CurrUser.LastProjectId = this.CurrUser.LoginProjectId;

From 4063e5b7cf2ef9a25e45448247ba214a3f185f23 Mon Sep 17 00:00:00 2001
From: "754998852@qq.com" <754998852@qq.com>
Date: Fri, 13 Sep 2024 14:57:02 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E7=BA=A7=E9=A1=B9=E7=9B=AE=E8=AE=BF=E9=97=AE=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SGGL/BLL/ProjectData/ProjectService.cs  | 52 ++++++++++++++++++-------
 SGGL/FineUIPro.Web/indexProject.aspx.cs |  4 +-
 2 files changed, 39 insertions(+), 17 deletions(-)

diff --git a/SGGL/BLL/ProjectData/ProjectService.cs b/SGGL/BLL/ProjectData/ProjectService.cs
index 5d01ccf9..fcf65cef 100644
--- a/SGGL/BLL/ProjectData/ProjectService.cs
+++ b/SGGL/BLL/ProjectData/ProjectService.cs
@@ -326,7 +326,7 @@
         /// 获取userId参与项目下拉框
         /// </summary>
         /// <returns></returns>
-        public static List<Model.Base_Project> GetProjectByUserIdStateDropDownList(string userId, string state)
+        public static List<Model.Base_Project> GetProjectByUserIdStateDropDownList(string userId, string state,string urlType="")
         {
             if (userId == Const.sysglyId || userId == Const.hfnbdId || userId == Const.sedinId)
             {
@@ -340,20 +340,42 @@
             {
                 /// 获取角色类型
                 var getRoleP = Funs.DB.Sys_RolePower.FirstOrDefault(x => x.RoleId == getUser.RoleId && x.IsOffice == false);
-                if (getRoleP != null)
+                //如果是项目级别，获取到他的类型后，并且还要单位是五环的
+                if (!string.IsNullOrEmpty(urlType))
                 {
-                    return (from x in Funs.DB.Base_Project
-                            where x.ProjectState == state
-                            orderby x.ProjectCode descending
-                            select x).ToList();
+                    //五环的能看所有项目，否则只能看项目用户中有自己或者所属单位是自己单位的
+                    if (getRoleP != null && getUser.UnitId== Const.UnitId_CWCEC)
+                    {
+                        return (from x in Funs.DB.Base_Project
+                                where x.ProjectState == state
+                                orderby x.ProjectCode descending
+                                select x).ToList();
+                    }
+                    else
+                    {
+                        return (from x in Funs.DB.Base_Project
+                                join y in Funs.DB.Project_ProjectUser on x.ProjectId equals y.ProjectId
+                                where ( (y.UserId == userId && y.IsPost == true)|| x.UnitId== getUser.UnitId) && x.ProjectState == state
+                                orderby x.ProjectCode descending
+                                select x).Distinct().ToList();
+                    }
                 }
-                else
-                {
-                    return (from x in Funs.DB.Base_Project
-                            join y in Funs.DB.Project_ProjectUser on x.ProjectId equals y.ProjectId
-                            where y.UserId == userId && y.IsPost == true && x.ProjectState == state
-                            orderby x.ProjectCode descending
-                            select x).Distinct().ToList();
+                else { 
+                    if (getRoleP != null)
+                    {
+                        return (from x in Funs.DB.Base_Project
+                                where x.ProjectState == state
+                                orderby x.ProjectCode descending
+                                select x).ToList();
+                    }
+                    else
+                    {
+                        return (from x in Funs.DB.Base_Project
+                                join y in Funs.DB.Project_ProjectUser on x.ProjectId equals y.ProjectId
+                                where y.UserId == userId && y.IsPost == true && x.ProjectState == state
+                                orderby x.ProjectCode descending
+                                select x).Distinct().ToList();
+                    }
                 }
             }
             else
@@ -459,11 +481,11 @@
         /// <param name="dropName"></param>
         /// <param name="userId"></param>
         /// <param name="isShowPlease"></param>
-        public static void InitProjectShortNameByStateDropDownList(FineUIPro.DropDownList dropName, string userId, string state, bool isShowPlease)
+        public static void InitProjectShortNameByStateDropDownList(FineUIPro.DropDownList dropName, string userId, string state, bool isShowPlease,string urlType="")
         {
             dropName.DataValueField = "ProjectId";
             dropName.DataTextField = "ProjectName";
-            var projectlist = GetProjectByUserIdStateDropDownList(userId, state);
+            var projectlist = GetProjectByUserIdStateDropDownList(userId, state, urlType);
             dropName.DataSource = projectlist;
             dropName.DataBind();
             if (projectlist.Count() == 0)
diff --git a/SGGL/FineUIPro.Web/indexProject.aspx.cs b/SGGL/FineUIPro.Web/indexProject.aspx.cs
index 9ab9b61a..b02081ca 100644
--- a/SGGL/FineUIPro.Web/indexProject.aspx.cs
+++ b/SGGL/FineUIPro.Web/indexProject.aspx.cs
@@ -294,7 +294,7 @@ namespace FineUIPro.Web
                 Response.Expires = 0;               //设置过期时间
                 Response.Cache.SetNoStore();			//在服务器端不缓存该页面
                 Response.AppendHeader("Pragma", "no-cache");	//在客户端不缓存
-                ProjectService.InitProjectShortNameByStateDropDownList(this.drpProject, this.CurrUser.UserId, BLL.Const.ProjectState_1, false);
+                ProjectService.InitProjectShortNameByStateDropDownList(this.drpProject, this.CurrUser.UserId, BLL.Const.ProjectState_1, false,"1");
                 if (!string.IsNullOrEmpty(Request.Params["projectId"]))
                 {
                     this.drpProject.SelectedValue = Request.Params["projectId"];
@@ -731,7 +731,7 @@ namespace FineUIPro.Web
         protected void btnHome_Click(object sender, EventArgs e)
         {
             //修改本部用户都能进
-            //this.CurrUser.UnitId == Const.UnitId_CWCEC &&
+            //this.CurrUser.UnitId == Const.drpProject &&
             if (string.IsNullOrEmpty(this.CurrUser.LastProjectId)
                 && ((this.CurrUser.IsOffice == true) || this.CurrUser.UserId == Const.sysglyId || this.CurrUser.UserId == Const.hfnbdId))
             {