shecs
/
Basf_TCC7
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: shecs:218c9088076862cb1c8ada605fd113d862dfd53d
Branches Tags
shecs:master
shecs:Feature_20240510
..
compare: shecs:f84a8d8d563ff9276533e8aacb7efab01668d6eb
Branches Tags
shecs:master
shecs:Feature_20240510

No commits in common. "218c9088076862cb1c8ada605fd113d862dfd53d" and "f84a8d8d563ff9276533e8aacb7efab01668d6eb" have entirely different histories.
218c908807 ... f84a8d8d56

6 changed files with 25 additions and 35 deletions
Show Stats Expand all files Collapse all files

BIN
HJGL/.vs/HJGL/v17/.suo
View File

Binary file not shown.

BIN
HJGL/FineUIPro.Web/File/Excel/20240509054820/焊工基本信息.xlsx
View File

Binary file not shown.

BIN
HJGL/FineUIPro.Web/File/Excel/20240509055412/焊工基本信息.xlsx
View File

Binary file not shown.

2
HJGL/FineUIPro.Web/Web.config
View File

@ -9,7 +9,7 @@
<section name="FineUIPro" type="FineUIPro.ConfigSection, FineUIPro" requirePermission="false"/>
</configSections>
<connectionStrings>
<add name="HJGLDBConnectionString" connectionString="Data Source=.\sql2016;Initial Catalog=HJGLDB_ZJBSF;uid=sa;pwd=1111;"/>
<add name="HJGLDBConnectionString" connectionString="Data Source=.;Initial Catalog=HJGLDB_ZJBSF;uid=sa;pwd=Sh@nghai9;"/>
<!--<add name="HJGLDBConnectionString" connectionString="Data Source=.;Initial Catalog=HJGLDB;Integrated Security=True"
providerName="System.Data.SqlClient" />-->
</connectionStrings>

39
HJGL/FineUIPro.Web/WelderManage/WelderManage.aspx.cs
View File

@ -379,7 +379,7 @@ namespace FineUIPro.Web.WelderManage
string strSql = @"SELECT Welder.WelderId, Welder.WelderCode, Welder.WelderName, Welder.UnitId,
Welder.Birthday,(CASE WHEN Welder.Sex=1 THEN '男' ELSE '女' END) AS Sex,
Welder.IdentityCard, Welder.CertificateNum, Welder.CertificateValidity,
Welder.IdentityCard,Welder.IdentityCard, Welder.CertificateNum, Welder.CertificateValidity,
Welder.WelderLevel, Welder.Remark,Unit.UnitName,Welder.IsOnDuty
FROM Welder_Welder AS Welder LEFT JOIN Base_Unit AS Unit ON Unit.UnitId = Welder.UnitId
WHERE 1=1 ";
@ -457,25 +457,22 @@ namespace FineUIPro.Web.WelderManage
num = itemWelders.Count - 1;
ws = ExcelCreateRow(ws, hssfworkbook, rowIndex, rowIndex + num, style, 0, 11);
//合并单元格
if (num > 0)
{
region = new CellRangeAddress(rowIndex, rowIndex + num, 0, 0);
ws.AddMergedRegion(region);
region = new CellRangeAddress(rowIndex, rowIndex + num, 1, 1);
ws.AddMergedRegion(region);
region = new CellRangeAddress(rowIndex, rowIndex + num, 2, 2);
ws.AddMergedRegion(region);
region = new CellRangeAddress(rowIndex, rowIndex + num, 3, 3);
ws.AddMergedRegion(region);
region = new CellRangeAddress(rowIndex, rowIndex + num, 4, 4);
ws.AddMergedRegion(region);
region = new CellRangeAddress(rowIndex, rowIndex + num, 5, 5);
ws.AddMergedRegion(region);
region = new CellRangeAddress(rowIndex, rowIndex + num, 10, 10);
ws.AddMergedRegion(region);
region = new CellRangeAddress(rowIndex, rowIndex + num, 11, 11);
ws.AddMergedRegion(region);
}
region = new CellRangeAddress(rowIndex, rowIndex + num, 0, 0);
ws.AddMergedRegion(region);
region = new CellRangeAddress(rowIndex, rowIndex + num, 1, 1);
ws.AddMergedRegion(region);
region = new CellRangeAddress(rowIndex, rowIndex + num, 2, 2);
ws.AddMergedRegion(region);
region = new CellRangeAddress(rowIndex, rowIndex + num, 3, 3);
ws.AddMergedRegion(region);
region = new CellRangeAddress(rowIndex, rowIndex + num, 4, 4);
ws.AddMergedRegion(region);
region = new CellRangeAddress(rowIndex, rowIndex + num, 5, 5);
ws.AddMergedRegion(region);
region = new CellRangeAddress(rowIndex, rowIndex + num, 10, 10);
ws.AddMergedRegion(region);
region = new CellRangeAddress(rowIndex, rowIndex + num, 11, 11);
ws.AddMergedRegion(region);
int j = 0;
foreach (var item in itemWelders)
{
@ -516,7 +513,7 @@ namespace FineUIPro.Web.WelderManage
string isOnDutyStr = string.Empty;
if (dt.Rows[i]["IsOnDuty"] != null)
{
isOnDutyStr = dt.Rows[i]["IsOnDuty"].ToString() == "True" ? "在场" : "离场";
isOnDutyStr = dt.Rows[i]["IsOnDuty"].ToString() == "1" ? "在场" : "离场";
}
ws.GetRow(rowIndex).GetCell(10).SetCellValue(isOnDutyStr);
//备注

19
HJGL/FineUIPro.Web/common/SysManage/UserList.aspx.cs
View File

@ -153,23 +153,16 @@
/// <param name="e"></param>
protected void btnMenuUnLock_Click(object sender, EventArgs e)
{
if (this.CurrUser.Account == Const.Gly)
if (!string.IsNullOrEmpty(Grid1.SelectedRowID))
{
if (!string.IsNullOrEmpty(Grid1.SelectedRowID))
{
string userId = Grid1.SelectedRowID;
Sys_UserService.UpdateErrorNum(userId, 0);
Sys_UserService.UpdateLockTime(userId, null);
ShowNotify("该用户解锁成功！", MessageBoxIcon.Success);
}
else
{
ShowNotify("请选择要解锁的用户！");
}
string userId = Grid1.SelectedRowID;
Sys_UserService.UpdateErrorNum(userId, 0);
Sys_UserService.UpdateLockTime(userId, null);
ShowNotify("该用户解锁成功！", MessageBoxIcon.Success);
}
else
{
ShowNotify("您没有这个权限，请与管理员联系！");
ShowNotify("请选择要解锁的用户！");
}
}