diff --git a/DataBase/版本日志/SGGLDB_V2025-12-26-xiaj.sql b/DataBase/版本日志/SGGLDB_V2025-12-26-xiaj.sql new file mode 100644 index 0000000..b863720 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2025-12-26-xiaj.sql @@ -0,0 +1,5 @@ + + + +insert into Sys_Set(SetId,SetName,SetValue) +values('1002','ʵַ','http://localhost:4528/') diff --git a/SGGL/BLL/SysManage/UserService.cs b/SGGL/BLL/SysManage/UserService.cs index fdf2488..3e851cc 100644 --- a/SGGL/BLL/SysManage/UserService.cs +++ b/SGGL/BLL/SysManage/UserService.cs @@ -1599,23 +1599,23 @@ namespace BLL public static string getInitialPassword(string unitId, string idCard) { - string prefixValue = "XJYJ"; + string prefixValue = "XJYJ!@#qwe"; string suffixValue = "1234"; - var getUnit = UnitService.GetUnitByUnitId(unitId); - if (getUnit != null) - { - if (!string.IsNullOrEmpty(getUnit.UnitCode)) - { - if (getUnit.UnitCode.Length > 4) - { - prefixValue = getUnit.UnitCode.Substring(getUnit.UnitCode.Length-4, 4); - } - else - { - prefixValue = getUnit.UnitCode; - } - } - } + //var getUnit = UnitService.GetUnitByUnitId(unitId); + //if (getUnit != null) + //{ + // if (!string.IsNullOrEmpty(getUnit.UnitCode)) + // { + // if (getUnit.UnitCode.Length > 4) + // { + // prefixValue = getUnit.UnitCode.Substring(getUnit.UnitCode.Length-4, 4); + // } + // else + // { + // prefixValue = getUnit.UnitCode; + // } + // } + //} if (!string.IsNullOrEmpty(idCard)) { if (idCard.Length > 4) diff --git a/SGGL/FineUIPro.Web/SysManage/UpdatePasswordEdit.aspx b/SGGL/FineUIPro.Web/SysManage/UpdatePasswordEdit.aspx index b292040..97e3590 100644 --- a/SGGL/FineUIPro.Web/SysManage/UpdatePasswordEdit.aspx +++ b/SGGL/FineUIPro.Web/SysManage/UpdatePasswordEdit.aspx @@ -33,7 +33,7 @@ - @@ -41,7 +41,7 @@ - diff --git a/SGGL/FineUIPro.Web/common/mainProject.aspx b/SGGL/FineUIPro.Web/common/mainProject.aspx index d47f85f..5d20ec4 100644 --- a/SGGL/FineUIPro.Web/common/mainProject.aspx +++ b/SGGL/FineUIPro.Web/common/mainProject.aspx @@ -140,7 +140,7 @@
- +
@@ -307,7 +307,7 @@ data() { return { accidentWarning: [], - generalImg: '../res/images/01.png', + proImg: '../res/images/01.png', iframeSrc: "", // 控制显示状态 show: false, diff --git a/SGGL/FineUIPro.Web/common/mainProject.aspx.cs b/SGGL/FineUIPro.Web/common/mainProject.aspx.cs index 7c180a7..b76b047 100644 --- a/SGGL/FineUIPro.Web/common/mainProject.aspx.cs +++ b/SGGL/FineUIPro.Web/common/mainProject.aspx.cs @@ -53,6 +53,19 @@ namespace FineUIPro.Web.common endDays = (project.EndDate.Value - DateTime.Now).Days; } + string proImg = "../res/images/01.png"; + var proFile = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == projectId); + if (proFile != null && !string.IsNullOrWhiteSpace(proFile.AttachUrl)) + { + string httpUrl = string.Empty; + var sysSet6 = (from x in Funs.DB.Sys_Set where x.SetName == "程序访问地址" select x).ToList().FirstOrDefault(); + if (sysSet6 != null) + { + httpUrl = sysSet6.SetValue; + } + proImg = $"{httpUrl}{proFile.AttachUrl.Split(',')[0]}"; + } + //事故事件 var list = AccidentWarningService.GetYearsTodayList(); // 构造返回数据 @@ -61,13 +74,14 @@ namespace FineUIPro.Web.common success = true, data = new { + proImg = proImg, accidentWarning = (from x in list select new { Title = x.Title, AccidentDate = x.AccidentDate.ToString("yyyy-MM-dd") }).ToList(), projectInfo = new { participateInNum = hsseData.JoinConstructionPersonNum ?? 0, dangerousProject = hsseData.MajorProjectsUnderConstructionNum ?? 0, projectDays = projectDays,//项目总工期 - projectEndDate = string.Format("{0:yyyy-MM-dd}", project.EndDate),//项目到期时间 + projectEndDate = project.EndDate != null ? string.Format("{0:yyyy-MM-dd}", project.EndDate) : string.Empty,//项目到期时间 projectEndDays = endDays > 0 ? endDays : 0,//合同倒计时 }, //meetAnEmergency = new