From bf9f9c44b50a07df70a40aaa9f56fd92072ccc4a Mon Sep 17 00:00:00 2001
From: geh <1923421292@qq.com>
Date: Tue, 16 Sep 2025 10:56:03 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E6=A3=80=E6=9F=A5?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DataBase/版本日志/SGGLDB_2025-09-16-geh.sql   | Bin 0 -> 1410 bytes
 SUBQHSE/BLL/Common/Const.cs                   |   1 +
 .../UnitHiddenRectificationList.aspx          |  17 ++--
 .../UnitHiddenRectificationList.aspx.cs       |   7 +-
 ...itHiddenRectificationList.aspx.designer.cs |  18 ++--
 .../HSSE/Check/OfficeCheck.aspx.cs            |  13 +++
 SUBQHSE/FineUIPro.Web/indexProject.aspx       |   5 ++
 SUBQHSE/FineUIPro.Web/indexProject.aspx.cs    |   9 +-
 .../indexProject.aspx.designer.cs             |   9 ++
 .../Controllers/FileUploadController.cs       |  85 ++++++++++--------
 10 files changed, 109 insertions(+), 55 deletions(-)
 create mode 100644 DataBase/版本日志/SGGLDB_2025-09-16-geh.sql

diff --git a/DataBase/版本日志/SGGLDB_2025-09-16-geh.sql b/DataBase/版本日志/SGGLDB_2025-09-16-geh.sql
new file mode 100644
index 0000000000000000000000000000000000000000..72d6221fc12f7a6d6085edc16253d0e175daaea1
GIT binary patch
literal 1410
zcmd6n+iDY06o&t6!FQOuF<@#YHU}wQn3~clX)2RU6^jH-4+d<Nq=mLm;bZt1zD&V8
zA3#vQwRd-Cr&aJ$hM8H%z5aFDzkc4=J(YT)=X$2G`bxB?eZA91z0nHvNEcdYqHP`M
zL}y47na>E@v9k`Eq2B5kE3<gYJ5;KNN8djGxcE|hzx?|C>ImNX?kU%l2q%$ksR2*W
zmzwKCq)oL>?1fJ8I@U~=#5(0~XFSqtZSma%lc6$dMh^Q9agN18pP;9aM~QR>A6phT
zHizh@QG@}!#a=;XXPsMS*O`pKFh^%`EaLeM>P#IqBD*t(V!l+#P^U(8VyNes${X&u
zo<TPu(=F=Xi~Mr1?dXul&{uvbC@Q>W)puCKxv8>S`VyN1vRSt9eSb;K`YL#B3KE`m
zq7Jp|q&5)`T<>?8rvlxk`+Mm&^eePAs$z2%vdOPw)sTjYZ0LzvTE(Nw$!*oiVwLmy
zQ1;Jw>u8&B4X7r3k8cydOpo#EKy}D$%^@|k_U2%<DJk6a8aD?2zf8U5bsO_?9@PeT
zc{Syp4^!>AKTS^1+?^G#2^Fhm!^`jXzLJM-SCY8DHCGku)_{AUPi;b9eIHX-#kMx6
zXbak^-ovizDBqthvMyD(iLWDXbDGsYb6se<eze?-{q0sTdAI?*&HuOW33=E)dwhPU
cJRQ1HZRLa;)pjo78!W?~nanoM_FzrF0k^5zivR!s

literal 0
HcmV?d00001

diff --git a/SUBQHSE/BLL/Common/Const.cs b/SUBQHSE/BLL/Common/Const.cs
index 26b389f..2877f97 100644
--- a/SUBQHSE/BLL/Common/Const.cs
+++ b/SUBQHSE/BLL/Common/Const.cs
@@ -1291,6 +1291,7 @@ namespace BLL
         /// 数据同步
         /// </summary>
         public const string Menu_SJTB = "Menu_SJTB";
+        public const string Menu_SJTB_P = "Menu_SJTB_P";
         ///// <summary>
         ///// 合同菜单
         ///// </summary>
diff --git a/SUBQHSE/FineUIPro.Web/Customization/ZJ/HSSE/HiddenInspection/UnitHiddenRectificationList.aspx b/SUBQHSE/FineUIPro.Web/Customization/ZJ/HSSE/HiddenInspection/UnitHiddenRectificationList.aspx
index a9571e8..e13fc15 100644
--- a/SUBQHSE/FineUIPro.Web/Customization/ZJ/HSSE/HiddenInspection/UnitHiddenRectificationList.aspx
+++ b/SUBQHSE/FineUIPro.Web/Customization/ZJ/HSSE/HiddenInspection/UnitHiddenRectificationList.aspx
@@ -78,6 +78,11 @@
                                             AutoPostBack="true" OnTextChanged="TextBox_TextChanged" LabelAlign="right" Width="250px"
                                             LabelWidth="80px">
                                         </f:TextBox>
+                                        <f:DropDownList ID="drpProblemTypes" runat="server" Label="问题类别" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged"
+                                                        LabelWidth="80px" LabelAlign="Right" Width="170px">
+                                            <f:ListItem Text="安全" Value="1" Selected="True"/>
+                                            <f:ListItem Text="质量" Value="0"/>
+                                        </f:DropDownList>
                                     </Items>
                                 </f:Toolbar>
                             </Toolbars>
@@ -160,12 +165,12 @@
                                 </f:RenderField>
 
 
-                                <f:TemplateField ColumnID="ProblemTypes" Width="120px" HeaderText="检查类型" HeaderTextAlign="Center"
-                                    TextAlign="Left">
-                                    <ItemTemplate>
-                                        <asp:Label ID="lbProblemTypes" runat="server" Text='<%# ConvertProblemTypes(Eval("ProblemTypes")) %>'></asp:Label>
-                                    </ItemTemplate>
-                                </f:TemplateField>
+                                <%-- <f:TemplateField ColumnID="ProblemTypes" Width="120px" HeaderText="检查类型" HeaderTextAlign="Center" --%>
+                                <%--     TextAlign="Left"> --%>
+                                <%--     <ItemTemplate> --%>
+                                <%--         <asp:Label ID="lbProblemTypes" runat="server" Text='<%# ConvertProblemTypes(Eval("ProblemTypes")) %>'></asp:Label> --%>
+                                <%--     </ItemTemplate> --%>
+                                <%-- </f:TemplateField> --%>
                               <%--  <f:TemplateField ColumnID="CheckCycle" Width="120px" HeaderText="检查周期" HeaderTextAlign="Center" Hidden="true"
                                     TextAlign="Left">
                                     <ItemTemplate>
diff --git a/SUBQHSE/FineUIPro.Web/Customization/ZJ/HSSE/HiddenInspection/UnitHiddenRectificationList.aspx.cs b/SUBQHSE/FineUIPro.Web/Customization/ZJ/HSSE/HiddenInspection/UnitHiddenRectificationList.aspx.cs
index 2d08628..1d0d193 100644
--- a/SUBQHSE/FineUIPro.Web/Customization/ZJ/HSSE/HiddenInspection/UnitHiddenRectificationList.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/Customization/ZJ/HSSE/HiddenInspection/UnitHiddenRectificationList.aspx.cs
@@ -114,8 +114,13 @@ namespace FineUIPro.Web.Customization.ZJ.HSSE.HiddenInspection
         {
             if (!string.IsNullOrEmpty(this.ProjectId) || !string.IsNullOrEmpty(this.UnintId))
             {
-                string strSql = "SELECT * FROM View_Hazard_HazardRegister_Unit WHERE ProblemTypes ='1' ";
+                string strSql = "SELECT * FROM View_Hazard_HazardRegister_Unit WHERE 1=1 ";
                 List<SqlParameter> listStr = new List<SqlParameter>();
+                if (this.drpProblemTypes.SelectedValue != BLL.Const._Null)
+                {
+                    strSql += " AND ProblemTypes = @ProblemTypes";
+                    listStr.Add(new SqlParameter("@ProblemTypes", this.drpProblemTypes.SelectedValue));
+                }
                 if (!string.IsNullOrEmpty(ProjectId))
                 {
                     strSql += " AND ProjectId = @ProjectId";
diff --git a/SUBQHSE/FineUIPro.Web/Customization/ZJ/HSSE/HiddenInspection/UnitHiddenRectificationList.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/Customization/ZJ/HSSE/HiddenInspection/UnitHiddenRectificationList.aspx.designer.cs
index 3c83303..732dfc2 100644
--- a/SUBQHSE/FineUIPro.Web/Customization/ZJ/HSSE/HiddenInspection/UnitHiddenRectificationList.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/Customization/ZJ/HSSE/HiddenInspection/UnitHiddenRectificationList.aspx.designer.cs
@@ -131,6 +131,15 @@ namespace FineUIPro.Web.Customization.ZJ.HSSE.HiddenInspection
         /// </remarks>
         protected global::FineUIPro.TextBox txtResponsibilityUnitName;
 
+        /// <summary>
+        /// drpProblemTypes 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpProblemTypes;
+
         /// <summary>
         /// Toolbar2 控件。
         /// </summary>
@@ -275,15 +284,6 @@ namespace FineUIPro.Web.Customization.ZJ.HSSE.HiddenInspection
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblPageIndex;
 
-        /// <summary>
-        /// lbProblemTypes 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.Label lbProblemTypes;
-
         /// <summary>
         /// lbImageUrl1 控件。
         /// </summary>
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Check/OfficeCheck.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/Check/OfficeCheck.aspx.cs
index d68435b..e9749b7 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Check/OfficeCheck.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Check/OfficeCheck.aspx.cs
@@ -34,6 +34,19 @@ namespace FineUIPro.Web.HSSE.Check
         {
             if (!IsPostBack)
             {
+                this.ProjectId = this.CurrUser.LoginProjectId;
+                if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId)
+                {
+                    this.ProjectId = Request.Params["projectId"];
+                }
+                this.ucTree.UnitId = this.CurrUser.UnitId;
+                this.ucTree.ProjectId = this.ProjectId;
+
+                if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
+                {
+                    this.panelLeftRegion.Hidden = true;
+                    //   this.Grid1.Columns[0].Hidden = true;
+                }
                 BindGrid();
             }
         }
diff --git a/SUBQHSE/FineUIPro.Web/indexProject.aspx b/SUBQHSE/FineUIPro.Web/indexProject.aspx
index f12f2f6..42dc7c2 100644
--- a/SUBQHSE/FineUIPro.Web/indexProject.aspx
+++ b/SUBQHSE/FineUIPro.Web/indexProject.aspx
@@ -526,6 +526,11 @@
                             EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="btnDigitalSite">
                         </f:Button>
                     </div>
+                    <div :class="['nav', 'nav-r', navIdx==7?'nav-r-active':'']" @click="onSwitchMenu(7)">
+                        <f:Button runat="server" CssClass="bgbtn" Text="数据管理" ID="btnServer" OnClick="btnServer_Click"
+                                  EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" OnClientClick="parent.removeActiveTab();">
+                        </f:Button>
+                    </div>
 
                 </div>
                 <div class="timer">
diff --git a/SUBQHSE/FineUIPro.Web/indexProject.aspx.cs b/SUBQHSE/FineUIPro.Web/indexProject.aspx.cs
index 5483f43..5927cb2 100644
--- a/SUBQHSE/FineUIPro.Web/indexProject.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/indexProject.aspx.cs
@@ -673,6 +673,10 @@ namespace FineUIPro.Web
                     {
                         this.Tab1.IFrameUrl = "";
                     }
+                    else if (type == Const.Menu_SJTB_P)
+                    {
+                        this.Tab1.IFrameUrl = "";
+                    }
                 }
                 else
                 {
@@ -725,7 +729,10 @@ namespace FineUIPro.Web
         {
             this.MenuSwitchMethod(Const.Menu_Device_P);
         }
-
+        protected void btnServer_Click(object sender, EventArgs e)
+        {
+            this.MenuSwitchMethod(Const.Menu_SJTB_P);
+        }
         protected void btnHSSE_Click(object sender, EventArgs e)
         {
             this.MenuSwitchMethod(Const.Menu_HSSE_P);
diff --git a/SUBQHSE/FineUIPro.Web/indexProject.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/indexProject.aspx.designer.cs
index 57fc156..67323f0 100644
--- a/SUBQHSE/FineUIPro.Web/indexProject.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/indexProject.aspx.designer.cs
@@ -122,6 +122,15 @@ namespace FineUIPro.Web
         /// </remarks>
         protected global::FineUIPro.Button btnDigitalSite;
 
+        /// <summary>
+        /// btnServer 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnServer;
+
         /// <summary>
         /// drpProject 控件。
         /// </summary>
diff --git a/SUBQHSE/WebAPI/Controllers/FileUploadController.cs b/SUBQHSE/WebAPI/Controllers/FileUploadController.cs
index 41bf601..4a3750a 100644
--- a/SUBQHSE/WebAPI/Controllers/FileUploadController.cs
+++ b/SUBQHSE/WebAPI/Controllers/FileUploadController.cs
@@ -61,48 +61,57 @@ namespace WebAPI.Controllers
 
                     if (extensionstr==".jpg" || extensionstr == ".gif" || extensionstr == ".bmp" || extensionstr == ".png")
                     {
-                        string TakePicDateTime = string.Empty;
-                        System.Drawing.Image image = System.Drawing.Image.FromStream(file.InputStream, true, false);
-                        Encoding ascii = Encoding.ASCII;
-                        //遍历图像文件元数据，检索所有属性
-                        foreach (System.Drawing.Imaging.PropertyItem p in image.PropertyItems)
+                        //人员入场忽略签字时的时间水印
+                        if (typeName != "PersonSign")
                         {
-                            //如果是PropertyTagDateTime，则返回该属性所对应的值
-                            if (p.Id == 0x0132)
+                            string TakePicDateTime = string.Empty;
+                            System.Drawing.Image image = System.Drawing.Image.FromStream(file.InputStream, true, false);
+                            Encoding ascii = Encoding.ASCII;
+                            //遍历图像文件元数据，检索所有属性
+                            foreach (System.Drawing.Imaging.PropertyItem p in image.PropertyItems)
                             {
-                                TakePicDateTime = ascii.GetString(p.Value);
-                            }
-                        }
-                        TakePicDateTime = string.IsNullOrEmpty(TakePicDateTime) ? string.Format("{0:yyyy-MM-dd HH:mm:ss}", DateTime.Now) : TakePicDateTime;
-                        if (!string.IsNullOrEmpty(TakePicDateTime))
-                        {
-                            ////获取元数据中的拍照日期时间，以字符串形式保存
-                            //TakePicDateTime = GetTakePicDateTime(pi);
-                            //分析字符串分别保存拍照日期和时间的标准格式
-                            var SpaceLocation = TakePicDateTime.IndexOf(" ");
-                            var dt = TakePicDateTime.Substring(0, SpaceLocation);
-                            dt = dt.Replace(":", "-");
-                            var tm = TakePicDateTime.Substring(SpaceLocation + 1, TakePicDateTime.Length - SpaceLocation - 2);
-                            TakePicDateTime = dt + " " + tm;
-                            //由列表中的文件创建内存位图对象
-                            var Pic = new Bitmap(rootUrl);
-                            //由位图对象创建Graphics对象的实例
-                            var g = Graphics.FromImage(Pic);
-                            Font ft = new Font("宋体", 20, FontStyle.Regular, GraphicsUnit.Point, ((byte)(134)));//定义字体
-                            //在Graphics表面绘制数码照片的日期/时间戳
-                            g.DrawString(TakePicDateTime, ft, Brushes.Gold, 0, Pic.Height - 100);
-                            //  - 50);
-                            string newRoot = localRoot + "newfile/";
-                            if (!Directory.Exists(newRoot))
-                            {
-                                Directory.CreateDirectory(newRoot);
+                                //如果是PropertyTagDateTime，则返回该属性所对应的值
+                                if (p.Id == 0x0132)
+                                {
+                                    TakePicDateTime = ascii.GetString(p.Value);
+                                }
                             }
 
-                            //将添加日期/时间戳后的图像进行保存                       
-                            Pic.Save(newRoot + fileName);
-                            fileName = "newfile/" + fileName;
-                            //释放内存位图对象
-                            Pic.Dispose();
+                            TakePicDateTime = string.IsNullOrEmpty(TakePicDateTime)
+                                ? string.Format("{0:yyyy-MM-dd HH:mm:ss}", DateTime.Now)
+                                : TakePicDateTime;
+                            if (!string.IsNullOrEmpty(TakePicDateTime))
+                            {
+                                ////获取元数据中的拍照日期时间，以字符串形式保存
+                                //TakePicDateTime = GetTakePicDateTime(pi);
+                                //分析字符串分别保存拍照日期和时间的标准格式
+                                var SpaceLocation = TakePicDateTime.IndexOf(" ");
+                                var dt = TakePicDateTime.Substring(0, SpaceLocation);
+                                dt = dt.Replace(":", "-");
+                                var tm = TakePicDateTime.Substring(SpaceLocation + 1,
+                                    TakePicDateTime.Length - SpaceLocation - 2);
+                                TakePicDateTime = dt + " " + tm;
+                                //由列表中的文件创建内存位图对象
+                                var Pic = new Bitmap(rootUrl);
+                                //由位图对象创建Graphics对象的实例
+                                var g = Graphics.FromImage(Pic);
+                                Font ft = new Font("宋体", 20, FontStyle.Regular, GraphicsUnit.Point,
+                                    ((byte)(134))); //定义字体
+                                //在Graphics表面绘制数码照片的日期/时间戳
+                                g.DrawString(TakePicDateTime, ft, Brushes.Gold, 0, Pic.Height - 100);
+                                //  - 50);
+                                string newRoot = localRoot + "newfile/";
+                                if (!Directory.Exists(newRoot))
+                                {
+                                    Directory.CreateDirectory(newRoot);
+                                }
+
+                                //将添加日期/时间戳后的图像进行保存                       
+                                Pic.Save(newRoot + fileName);
+                                fileName = "newfile/" + fileName;
+                                //释放内存位图对象
+                                Pic.Dispose();
+                            }
                         }
                     }