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

2023-03-09 合同归档修改，安全首页修改

Browse Source
This commit is contained in:
李鹏飞
2023-03-09 15:02:06 +08:00
parent b76821201b
commit ffa50f752f
21 changed files with 1042 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/common/Menu_HJGL.xml
-1
View File
@@ -60,6 +60,5 @@
<TreeNode id="5F0969E3-2A0A-473E-92BE-4DD390602556" Text="焊接缺陷分析" NavigateUrl="HJGL/WeldingReport/DefectStatistics.aspx"></TreeNode>
<TreeNode id="EAD61207-E396-45B0-A1D2-7A5F0498AACC" Text="管道预制率分析" NavigateUrl="HJGL/WeldingReport/PipePrefabricationRateStatistics.aspx"></TreeNode>
<TreeNode id="854C79DF-A1C0-4E3C-BCB4-7D5CD044F72B" Text="焊工功效分析" NavigateUrl="HJGL/WeldingReport/WelderEfficacy.aspx"></TreeNode>
<TreeNode id="6035E549-66FF-4B6D-989B-BE99C9EF5EB7" Text="焊接数据" NavigateUrl="ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGL.aspx"></TreeNode>
</TreeNode>
</Tree>
SGGL/FineUIPro.Web/common/Menu_ZHGL.xml
+1
View File
@@ -26,5 +26,6 @@
<TreeNode id="1E216BE3-DB22-4649-BD9A-0777B0DC03E6" Text="QHSE上报" NavigateUrl=""><TreeNode id="94F94EC1-54B3-4BEB-A019-0A755A66D8FD" Text="安全数据" NavigateUrl="ZHGL/DataSync/HSSEData_HSSE.aspx"></TreeNode>
<TreeNode id="4C9920AE-F335-48B1-BDB0-276173305952" Text="质量数据" NavigateUrl="ZHGL/DataSync/CQMSData_CQMS.aspx"></TreeNode>
<TreeNode id="2110702F-4E12-479A-8EA1-E5A8EEF77276" Text="焊接数据" NavigateUrl="ZHGL/DataSync/HJGLData_HJGL.aspx"></TreeNode>
<TreeNode id="S89E5EC2-F725-4656-9110-5AF83C18FB6C" Text="实业数据" NavigateUrl="ZHGL/DataSync/SYHSEData_Data.aspx"></TreeNode>
</TreeNode>
</Tree>
SGGL/FineUIPro.Web/common/mainMenu_HSSE2.aspx
+11 -11
View File
@@ -192,16 +192,16 @@
<div class="i-item">
<div class="ii-desc">环保数据</div>
<div class="ii-item bg5">
<div class="desc">能耗总量</div>
<div class="num num-cl3"><%=showData(hSSEData_HSSE.TotalEnergyConsumption,"--") %></div>
<div class="desc">能耗总量<br/>(万吨标准煤)</div>
<div class="num num-cl3"><%=showDecimalData(hSSEData_HSSE.TotalEnergyConsumption,"--") %></div>
</div>
<div class="ii-item bg5">
<div class="desc">万元营业收入综合能耗</div>
<div class="num num-cl3"><%=showData(hSSEData_HSSE.IncomeComprehensiveEnergyConsumption,"--") %></div>
<div class="desc">万元营业收入综合能耗<br/>(吨标准煤/万元)</div>
<div class="num num-cl3"><%=showDecimalData(hSSEData_HSSE.IncomeComprehensiveEnergyConsumption,"--") %></div>
</div>
<div class="ii-item bg5">
<div class="desc">用新水量</div>
<div class="num num-cl3"><%=showData(hSSEData_HSSE.NewWaterConsumption,"--") %></div>
<div class="desc">用新水量<br/>(万吨)</div>
<div class="num num-cl3"><%=showDecimalData(hSSEData_HSSE.NewWaterConsumption,"--") %></div>
</div>
</div>
</div>
@@ -415,7 +415,6 @@
<script src="../res/assets/js/video-7.15.0.min.js"></script>
<script src="../res/assets/js/china.js"></script>
<script>
function initMapEchart() {
// 1. 实例化对象
var myChart = echarts.init(document.querySelector(".sd-map"));
@@ -464,9 +463,9 @@
html += '<div style="font-size:18px;margin-bottom:8px;">' + params.data.name + '</div>'
//html += '<div style="width: 98px;height: 24px;margin-bottom:10px;background: #F24166;border-radius: 12px;text-align:center;">' + '在施危大工程' + '</div>'
html += '<div style="width: 240px; white-space:normal; word-break:break-all;word-break:break-all;overflow:auto; white-space:normal; margin-bottom:12px;">监理单位：' + params.data.jLUnit + '</div>'
html += '<div style="width: 240px; white-space:normal; word-break:break-all;word-break:break-all;overflow:auto; white-space:normal; margin-bottom:12px;">施工单位：' + params.data.sGUnit + '</div>'
html += '<div style="width: 240px; white-space:normal; word-break:break-all;word-break:break-all;overflow:auto; white-space:normal; margin-bottom:12px;">施工单位：' + params.data.SGUnit + '</div>'
html += '<div style="width: 240px; white-space:normal; word-break:break-all;word-break:break-all;overflow:auto; white-space:normal; margin-bottom:12px;">建设单位：' + params.data.ownUnit + '</div>'
html += '<div style="width: 240px; white-space:normal; word-break:break-all;word-break:break-all;overflow:auto; white-space:normal; margin-bottom:12px;">工程造价：' + params.data.projectMoney + '</div>'
html += '<div style="width: 240px; white-space:normal; word-break:break-all;word-break:break-all;overflow:auto; white-space:normal; margin-bottom:12px;">工程造价：' + params.data.ProjectMoney + '</div>'
html += '<div style="width: 240px; white-space:normal; word-break:break-all;word-break:break-all;overflow:auto; white-space:normal; ">工程地点：' + params.data.address + '</div>'
html += '<div><a style="font-size:12px;color:#1AB1FF;cursor:pointer;" href="../indexProject.aspx?projectId=' + params.data.id +'" target="_blank">项目详情>></a></div>'
html += '</div>'
@@ -1072,7 +1071,8 @@
var xArrYH = [<%=xArrYH%>]
intiYhpczlsj('yhpczlsj', xArrYH, dataYHQ, dataYHZ)
var dataaq = [<%=showData(hSSEData_HSSE.CompanyLeadShiftCheckNum,"0")%>, <%=showData(hSSEData_HSSE.CompanyComprehensiveCheckNum,"0")%>, <%=showData(hSSEData_HSSE.CompanySpecialCheckNum,"0")%>, <%=showData(hSSEData_HSSE.ProjectLeadShiftCheckNum,"0")%>, <%=showData(hSSEData_HSSE.ProjectSpecialCheckNum,"0")%>, <%=showData(hSSEData_HSSE.ProjectMajorCheckNum,"0")%>]
initAqjdjcsj('aqjdjcsj', dataaq, 50)
var max = Math.max(<%=showData(hSSEData_HSSE.CompanyLeadShiftCheckNum,"0")%>, <%=showData(hSSEData_HSSE.CompanyComprehensiveCheckNum,"0")%>, <%=showData(hSSEData_HSSE.CompanySpecialCheckNum,"0")%>, <%=showData(hSSEData_HSSE.ProjectLeadShiftCheckNum,"0")%>, <%=showData(hSSEData_HSSE.ProjectSpecialCheckNum,"0")%>, <%=showData(hSSEData_HSSE.ProjectMajorCheckNum,"0")%>);
initAqjdjcsj('aqjdjcsj', dataaq, max)
var datasg = [
{ value: <%=showData(hSSEData_HSSE.GeneralAccidentNum,"0")%>, name: '一般事故' },
{ value: <%=showData(hSSEData_HSSE.MajorAccidentNum,"0")%>, name: '较大事故' },
@@ -1081,7 +1081,7 @@
]
initSgsjsj('sgsjsj', datasg)
var data = [ // 数据数组，name 为数据项名称，value 为数据项值
{ value: <%=showData(hSSEData_HSSE.CompletedNum,"0")%>, name: '一般' },
{ value: <%=showData(hSSEData_HSSE.GeneralRiskNum,"0")%>, name: '一般' },
{ value: <%=showData(hSSEData_HSSE.LowRiskNum,"0")%>, name: '低风险' },
{ value: <%=showData(hSSEData_HSSE.MediumRiskNum,"0")%>, name: '中风险' },
{ value: <%=showData(hSSEData_HSSE.HighRiskNum,"0")%>, name: '高风险' },
SGGL/FineUIPro.Web/common/mainMenu_HSSE2.aspx.cs
+15 -3
View File
@@ -5,7 +5,6 @@ using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
using BLL;
namespace FineUIPro.Web.common
{
public partial class mainMenu_HSSE2 : PageBase
@@ -29,7 +28,8 @@ namespace FineUIPro.Web.common
hSSEData_HSSE = new Model.HSSEData_HSSE();
}
zgl1 = "0";
zgl2 = "0";
if (hSSEData_HSSE.GeneralClosedNum.HasValue && hSSEData_HSSE.GeneralNotClosedNum.HasValue)
{
zgl1 = String.Format("{0:N2}", 100.0 * hSSEData_HSSE.GeneralClosedNum.Value / (hSSEData_HSSE.GeneralClosedNum.Value + hSSEData_HSSE.GeneralNotClosedNum.Value));
@@ -77,7 +77,7 @@ namespace FineUIPro.Web.common
}
var projectList = Funs.DB.Base_Project.ToList();
var projectList = Funs.DB.Base_Project.Where(x => x.MapCoordinates != null).ToList();
if (projectList != null && projectList.Count > 0)
{
foreach (var p in projectList)
@@ -103,5 +103,17 @@ namespace FineUIPro.Web.common
return format;
}
}
public string showDecimalData(decimal? value, string format)
{
if (value.HasValue)
{
return value.Value.ToString();
}
else
{
return format;
}
}
}
}
SGGL/FineUIPro.Web/common/mainMenu_HSSE2.aspx.designer.cs
Generated
+6 -4
View File
@@ -7,9 +7,11 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.common {
public partial class mainMenu_HSSE2 {
namespace FineUIPro.Web.common
{
public partial class mainMenu_HSSE2
{
}
}