危险源管理模块接入真实数据库:新增危大/超危工程、风险控制清单、安全验收、安全巡检、临时用电管理(含前端页面、BLL/API服务、WebAPI控制器、Model项、SQL脚本与接口文档)
排除 CreateModel.bat(含明文sa密码与本地服务器名,未入库)
This commit is contained in:
@@ -115,7 +115,7 @@ namespace BLL
|
||||
return res.Replace('\\', '/');
|
||||
}
|
||||
}
|
||||
catch (Exception e)
|
||||
catch (Exception)
|
||||
{
|
||||
return "";
|
||||
}
|
||||
@@ -140,7 +140,7 @@ namespace BLL
|
||||
return res.Replace('\\', '/');
|
||||
}
|
||||
}
|
||||
catch (Exception e)
|
||||
catch (Exception)
|
||||
{
|
||||
return "";
|
||||
}
|
||||
@@ -277,7 +277,6 @@ namespace BLL
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -292,7 +291,6 @@ namespace BLL
|
||||
string res = "";
|
||||
foreach (var item in urls)
|
||||
{
|
||||
string size = "0";
|
||||
int strInt = item.LastIndexOf("~");
|
||||
if (strInt < 0)
|
||||
{
|
||||
@@ -317,7 +315,6 @@ namespace BLL
|
||||
/// <returns></returns>
|
||||
public static string getAttachSource(string url, string fileDir)
|
||||
{
|
||||
string res = "";
|
||||
string attachSource = string.Empty;
|
||||
if (!string.IsNullOrEmpty(url))
|
||||
{
|
||||
@@ -392,7 +389,7 @@ namespace BLL
|
||||
}
|
||||
return file;
|
||||
}
|
||||
catch (Exception e)
|
||||
catch (Exception)
|
||||
{
|
||||
return "";
|
||||
|
||||
|
||||
@@ -249,7 +249,7 @@ namespace BLL
|
||||
}
|
||||
|
||||
}
|
||||
catch (Exception e) { }
|
||||
catch (Exception) { }
|
||||
return buttonList;
|
||||
}
|
||||
#endregion
|
||||
|
||||
@@ -2597,7 +2597,15 @@ namespace BLL
|
||||
/// <summary>
|
||||
/// 安全技术交底
|
||||
/// </summary>
|
||||
public const string ProjectHSETechnicalMenuId = "49485F7E-8E71-4EED-87B4-BF6CC180C69C";
|
||||
public const string ProjectHSETechnicalMenuId = "49485F7E-8E71-4EED-87B4-BF6CC180C69C";
|
||||
/// <summary>
|
||||
/// 安全防护验收
|
||||
/// </summary>
|
||||
public const string SafetyAcceptanceMenuId = "7962CE8E-C17C-4C50-962D-85687E2A2FC9";
|
||||
/// <summary>
|
||||
/// 安全巡检
|
||||
/// </summary>
|
||||
public const string SafetyPatrolMenuId = "3EE924B8-DFB2-47DA-ADC1-FF8190E214F1";
|
||||
/// <summary>
|
||||
/// 作业票申请
|
||||
/// </summary>
|
||||
|
||||
@@ -378,7 +378,6 @@ namespace BLL.Common
|
||||
// 第三步:创建画部
|
||||
IDrawing patriarch = ActiveSheet.CreateDrawingPatriarch();
|
||||
// 第四步:设置锚点
|
||||
int rowline = 1; // y方向
|
||||
// 参数说明:(在起始单元格的X坐标0-1023,Y的坐标0-255,在终止单元格的X坐标0-1023,Y的坐标0-255,起始单元格列数,行数,终止单元格列数,行数)
|
||||
IClientAnchor anchor = patriarch.CreateAnchor(0, 0, 0, 0, columnIndex, rowIndex, columnIndex+1, rowIndex + 1);
|
||||
// 第五步:把图片插到相应的位置+1
|
||||
|
||||
@@ -159,7 +159,7 @@ namespace BLL.Common
|
||||
break;
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
catch (Exception)
|
||||
{
|
||||
}
|
||||
}
|
||||
|
||||
@@ -118,7 +118,7 @@ namespace BLL
|
||||
}
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
catch (Exception)
|
||||
{
|
||||
//出错则删除
|
||||
File.Delete(localRoot + sFilename);
|
||||
|
||||
@@ -190,7 +190,7 @@ namespace BLL
|
||||
string fileName = subUrl[subUrl.Count() - 1];
|
||||
string newFileName = fileName.Substring(fileName.IndexOf("~") + 1);
|
||||
|
||||
htmlStr += "<img width='60' height='60' style=\"margin-right:6px;margin-bottom:6px;\" src='" + url + "'></img>";
|
||||
htmlStr += "<a href='" + url + "' target='_blank'><img width='60' height='60' style=\"margin-right:6px;margin-bottom:6px;\" src='" + url + "'></img></a>";
|
||||
}
|
||||
}
|
||||
|
||||
@@ -458,7 +458,7 @@ namespace BLL
|
||||
string fileName = subUrl[subUrl.Count() - 1];
|
||||
string newFileName = fileName.Substring(fileName.IndexOf("~") + 1);
|
||||
|
||||
htmlStr += "<tr><td style=\"width: 100%\" align=\"left\"><img width='" + width + "' height='" + height + "' src='" + url + "'></img></td>";
|
||||
htmlStr += "<tr><td style=\"width: 100%\" align=\"left\"><a href='" + url + "' target='_blank'><img width='" + width + "' height='" + height + "' src='" + url + "'></img></a></td>";
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -440,7 +440,7 @@ namespace BLL
|
||||
sw.Write(html);
|
||||
sw.Close();
|
||||
}
|
||||
catch (Exception ex)
|
||||
catch (Exception)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user