lpf
/
xinjiang
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

This commit is contained in:
夏菊 2025-12-26 17:28:45 +08:00
parent 537bdfef2b
commit a4cd51a53a
5 changed files with 40 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
DataBase/版本日志/SGGLDB_V2025-12-26-xiaj.sql Normal file
View File

@ -0,0 +1,5 @@
insert into Sys_Set(SetId,SetName,SetValue)
values('1002','最唗溼恀華硊','http://localhost:4528/')

32
SGGL/BLL/SysManage/UserService.cs
View File

@ -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)

4
SGGL/FineUIPro.Web/SysManage/UpdatePasswordEdit.aspx
View File

@ -33,7 +33,7 @@
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtNewPassword" Label="新密码" TextMode="Password"
<f:TextBox ID="txtNewPassword" Label="新密码" TextMode="Password" MinLength="12"
EmptyText="输入新密码" Required="true" ShowRedStar="true" runat="server">
</f:TextBox>
</Items>
@ -41,7 +41,7 @@
<f:FormRow>
<Items>
<f:TextBox ID="txtConfirmPassword" Label="确认密码" TextMode="Password"
<f:TextBox ID="txtConfirmPassword" Label="确认密码" TextMode="Password" MinLength="12"
EmptyText="再次输入新密码" Required="true" ShowRedStar="true" runat="server" EnableBlurEvent="true" OnBlur="txtConfirmPassword_Blur">
</f:TextBox>
</Items>

4
SGGL/FineUIPro.Web/common/mainProject.aspx
View File

@ -140,7 +140,7 @@
</div>
</div>
<div id="general" >
<img :src="generalImg" alt="">
<img :src="form.proImg" alt="">
</div>
<div id="contract" style="height: 1.3rem;margin-bottom: 0.25rem;">
@ -307,7 +307,7 @@
data() {
return {
accidentWarning: [],
generalImg: '../res/images/01.png',
proImg: '../res/images/01.png',
iframeSrc: "",
// 控制显示状态
show: false,

16
SGGL/FineUIPro.Web/common/mainProject.aspx.cs
View File

@ -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