From b4fd587f422fd1c3d2dd56d150ab466b7c05e9f1 Mon Sep 17 00:00:00 2001 From: fei550 <1420031550@qq.com> Date: Tue, 18 Nov 2025 15:43:29 +0800 Subject: [PATCH 1/2] 1 --- SGGL/FineUIPro.Web/HJGL/BaseInfo/MaterialColorIn.aspx.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/SGGL/FineUIPro.Web/HJGL/BaseInfo/MaterialColorIn.aspx.cs b/SGGL/FineUIPro.Web/HJGL/BaseInfo/MaterialColorIn.aspx.cs index 4b463c73..6107216c 100644 --- a/SGGL/FineUIPro.Web/HJGL/BaseInfo/MaterialColorIn.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/BaseInfo/MaterialColorIn.aspx.cs @@ -64,7 +64,7 @@ namespace FineUIPro.Web.HJGL.BaseInfo var fileName = rootPath + initPath + hdFileName.Text; ResponeData responeData; - responeData = TwInOutplanmasterService.ImportData(fuAttachUrl.FileName, fileName, this.CurrUser.LoginProjectId, this.CurrUser.PersonId); + responeData = BaseMaterialcolorService.ImportData( fileName, this.CurrUser.LoginProjectId); if (responeData.code == 1) @@ -121,8 +121,8 @@ namespace FineUIPro.Web.HJGL.BaseInfo if (e.EventArgument == "Confirm_OK") { var rootPath = Server.MapPath("~/"); - var uploadfilepath = rootPath + Const.Tw_InPlanMasteTemplateUrl; - var filePath = Const.Tw_InPlanMasteTemplateUrl; + var uploadfilepath = rootPath + Const.HJGL_MaterialColorDataImportPath; + var filePath = Const.HJGL_MaterialColorDataImportPath; var fileName = Path.GetFileName(filePath); var info = new FileInfo(uploadfilepath); var fileSize = info.Length; From ace0e3b5e4486b36b5a7a55e751dc1f542ba3896 Mon Sep 17 00:00:00 2001 From: fei550 <1420031550@qq.com> Date: Thu, 27 Nov 2025 10:11:29 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=97=B6jQuery=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E6=BC=8F=E6=B4=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SGGL/BLL/HJGL/TestPackage/TestPackagePrintService.cs | 2 +- SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectifyEdit.aspx | 2 +- SGGL/FineUIPro.Web/FineUIPro.Web.csproj | 5 ++--- SGGL/FineUIPro.Web/HJGL/PreDesign/InstallList.aspx.cs | 4 ++-- SGGL/FineUIPro.Web/Login.aspx | 2 +- SGGL/FineUIPro.Web/OfficeCheck/Check/CheckContentEdit.aspx | 2 +- SGGL/FineUIPro.Web/OfficeCheck/Check/CheckInfo.aspx | 2 +- SGGL/FineUIPro.Web/OfficeCheck/Check/CheckNotice.aspx | 2 +- SGGL/FineUIPro.Web/OfficeCheck/Check/CheckNoticeEdit.aspx | 2 +- SGGL/FineUIPro.Web/OfficeCheck/Check/CheckReport.aspx | 2 +- SGGL/FineUIPro.Web/OfficeCheck/Check/CheckTeamEdit.aspx | 2 +- SGGL/FineUIPro.Web/TaskScheduling/InterFace/IFLogList.aspx | 2 +- .../FineUIPro.Web/TaskScheduling/InterFace/InterFaceSet.aspx | 2 +- .../TaskScheduling/InterFace/InterFaceTask.aspx | 2 +- SGGL/FineUIPro.Web/common/mainMenu_DigitalSite.aspx | 2 +- SGGL/FineUIPro.Web/common/mainMenu_JDGL.aspx | 2 +- SGGL/FineUIPro.Web/common/mainMenu_PDigData.aspx | 2 +- SGGL/FineUIPro.Web/common/mainMenu_PHTGL.aspx | 2 +- SGGL/FineUIPro.Web/common/mainMenu_PZHGL.aspx | 2 +- SGGL/FineUIPro.Web/common/mainMenu_TestRun.aspx | 2 +- SGGL/FineUIPro.Web/res/index/js/jquery-3.4.1.min.js | 2 -- SGGL/FineUIPro.Web/res/index/js/jquery-3.7.1.min.js | 2 ++ SGGL/FineUIPro.Web/res/js/jquery-3.3.1.min.js | 2 -- SGGL/FineUIPro.Web/res/js/jquery-3.4.1.min.js | 2 -- SGGL/FineUIPro.Web/res/js/jquery-3.7.1.min.js | 2 ++ 25 files changed, 26 insertions(+), 29 deletions(-) delete mode 100644 SGGL/FineUIPro.Web/res/index/js/jquery-3.4.1.min.js create mode 100644 SGGL/FineUIPro.Web/res/index/js/jquery-3.7.1.min.js delete mode 100644 SGGL/FineUIPro.Web/res/js/jquery-3.3.1.min.js delete mode 100644 SGGL/FineUIPro.Web/res/js/jquery-3.4.1.min.js create mode 100644 SGGL/FineUIPro.Web/res/js/jquery-3.7.1.min.js diff --git a/SGGL/BLL/HJGL/TestPackage/TestPackagePrintService.cs b/SGGL/BLL/HJGL/TestPackage/TestPackagePrintService.cs index 983d6f3d..1b95c8d1 100644 --- a/SGGL/BLL/HJGL/TestPackage/TestPackagePrintService.cs +++ b/SGGL/BLL/HJGL/TestPackage/TestPackagePrintService.cs @@ -601,7 +601,7 @@ namespace BLL keyValuePairs.Add("ProjectName", projectName); keyValuePairs.Add("UnitWorkName", UnitWorkName); keyValuePairs.Add("UnitWorkCode", UnitWorkCode); - keyValuePairs.Add("UnitName2", unitNames);//施工单位 + keyValuePairs.Add("UnitName2", unitNames);//施工单位 需要修改,取值来源焊工的单位去重 if (!string.IsNullOrEmpty(q.PipingClassId)) { var PipingClass = BLL.Base_PipingClassService.GetPipingClassByPipingClassId(q.PipingClassId); diff --git a/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectifyEdit.aspx b/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectifyEdit.aspx index c545431f..d87ec2cf 100644 --- a/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectifyEdit.aspx +++ b/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectifyEdit.aspx @@ -7,7 +7,7 @@