2023-09-21

This commit is contained in:
李鹏飞 2023-09-21 19:13:16 +08:00
parent 392934abc0
commit 687bc577cd
7 changed files with 158 additions and 23 deletions

View File

@ -20,7 +20,7 @@
<TreeNode id="874B4232-E0AD-41CD-8C66-8A7FF2D79358" Text="项目安全协议清单" NavigateUrl="HSSE/QualityAudit/ProjectRecord.aspx"></TreeNode>
</TreeNode>
</TreeNode>
<TreeNode id="5FF7BBD8-3E0A-4C90-8976-AFF5CE7E17A5" Text="施工方案" NavigateUrl=""><TreeNode id="9B42977B-FA0B-48EF-8616-D53FC14E5127" Text="施工方案" NavigateUrl="HSSE/Solution/ConstructSolution.aspx"></TreeNode>
<TreeNode id="5FF7BBD8-3E0A-4C90-8976-AFF5CE7E17A5" Text="施工方案" NavigateUrl=""><TreeNode id="9B42977B-FA0B-48EF-8616-D53FC14E5127" Text="施工方案" NavigateUrl="CQMS/Solution/ConstructSolution.aspx"></TreeNode>
<TreeNode id="5B3D3F7B-9B50-4927-B131-11D13D4D1C19" Text="危大工程施工方案清单" NavigateUrl="HSSE/Solution/LargerHazardList.aspx"></TreeNode>
<TreeNode id="27DE7248-C4FF-4288-BBAC-11CB8741AD67" Text="专家论证清单" NavigateUrl="HSSE/Solution/ExpertArgumentList.aspx"></TreeNode>
<TreeNode id="49485F7E-8E71-4EED-87B4-BF6CC180C69C" Text="HSE技术交底" NavigateUrl="HSSE/License/HSETechnical.aspx"></TreeNode>
@ -82,7 +82,16 @@
<TreeNode id="B2DA78EF-EECA-4AF4-9FAC-ECCFF1D6E459" Text="其他会议记录" NavigateUrl="HSSE/Meeting/AttendMeeting.aspx"></TreeNode>
<TreeNode id="F8ADCDBC-AAAD-4884-9935-2B63562E4779" Text="班前会" NavigateUrl="HSSE/Meeting/ClassMeeting.aspx"></TreeNode>
</TreeNode>
<TreeNode id="473A87D2-1365-4A68-BD38-06F312F81BC2" Text="作业许可" NavigateUrl=""><TreeNode id="0E9B7084-D021-4CA3-B9D2-9CBAA27A571B" Text="作业票(定稿)" NavigateUrl="HSSE/License/LicenseManager.aspx"></TreeNode>
<TreeNode id="473A87D2-1365-4A68-BD38-06F312F81BC2" Text="作业许可" NavigateUrl=""><TreeNode id="2E58D4F1-2FF1-450E-8A00-1CE3BBCF8D4B" Text="动火作业票" NavigateUrl="HSSE/License/FireWork.aspx"></TreeNode>
<TreeNode id="DA1CAE8E-B5BF-4AC0-9996-AF6CAA412CA9" Text="高处作业票" NavigateUrl="HSSE/License/HeightWork.aspx"></TreeNode>
<TreeNode id="AEC9166D-1C91-45F0-8BFE-D3D0479A28C7" Text="受限空间作业票" NavigateUrl="HSSE/License/LimitedSpace.aspx"></TreeNode>
<TreeNode id="F72FF20B-D3EB-46A5-97F7-C99B2473A140" Text="射线作业票" NavigateUrl="HSSE/License/RadialWork.aspx"></TreeNode>
<TreeNode id="48F64E0F-38B2-4BDC-9B61-6200BD02CBF5" Text="临时用电作业票" NavigateUrl="HSSE/License/Electricity.aspx"></TreeNode>
<TreeNode id="4E607E83-41FC-4F49-B26F-A21CFE38328F" Text="断路(占道)作业票" NavigateUrl="HSSE/License/OpenCircuit.aspx"></TreeNode>
<TreeNode id="755C6AC9-2E38-4D4F-AF33-33CB1744A907" Text="动土作业票" NavigateUrl="HSSE/License/BreakGround.aspx"></TreeNode>
<TreeNode id="7BBAE649-7B00-4475-A911-BFE3A37AC55B" Text="夜间施工作业票" NavigateUrl="HSSE/License/NightWork.aspx"></TreeNode>
<TreeNode id="A1BE3AB6-9D4A-41E7-8870-E73423165451" Text="吊装作业票" NavigateUrl="HSSE/License/LiftingWork.aspx"></TreeNode>
<TreeNode id="0E9B7084-D021-4CA3-B9D2-9CBAA27A571B" Text="作业票(定稿)" NavigateUrl="HSSE/License/LicenseManager.aspx"></TreeNode>
</TreeNode>
<TreeNode id="20ECB69E-28C4-4FAC-941A-15F446AEB634" Text="HSE费用" NavigateUrl=""><TreeNode id="EEE7CBBE-2EFB-4D64-96A6-A932E20FF9DB" Text="HSE费用计划" NavigateUrl="HSSE/CostGoods/Expense.aspx"></TreeNode>
<TreeNode id="0C311396-C859-40B0-9D72-6A8B20733002" Text="HSE费用支出" NavigateUrl="HSSE/CostGoods/CostSmallDetail.aspx"></TreeNode>
@ -144,7 +153,7 @@
<TreeNode id="C483220C-0FEE-4E45-9B78-BBBA857EFFB3" Text="安全数据" NavigateUrl="ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSE.aspx"></TreeNode>
</TreeNode>
<TreeNode id="0ED3E0CC-75E0-4FF3-8832-067217A6CD4D" Text="事故管理" NavigateUrl=""><TreeNode id="FB5C66FF-3BFB-490F-A14F-0DD5B5A4D110" Text="HSSE事故(对人员)记录" NavigateUrl="HSSE/Accident/AccidentPersonRecord.aspx"></TreeNode>
<TreeNode id="9A9D6805-6C98-46E4-943E-130C4A3EB9A2" Text="HSSE事故(含未遂)处理" NavigateUrl="HSSE/Accident/AccidentHandle.aspx"></TreeNode>
<TreeNode id="9A9D6805-6C98-46E4-943E-130C4A3EB9A2" Text="HSSE事故处理" NavigateUrl="HSSE/Accident/AccidentHandle.aspx"></TreeNode>
<TreeNode id="27C681E5-135A-414F-9FC2-D86D27805E6A" Text="事故报告登记" NavigateUrl="HSSE/Accident/AccidentReport.aspx"></TreeNode>
<TreeNode id="B0A341A2-954A-4E24-BFC3-53D7F50628EE" Text="事故调查处理报告" NavigateUrl="HSSE/Accident/AccidentReportOther.aspx"></TreeNode>
</TreeNode>

View File

@ -81,4 +81,5 @@
<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>
<TreeNode id="EA413D2A-8D29-4DE2-932D-8511BB7F6CB2" Text="各项目巡查汇总" NavigateUrl="ZHGL/InspectionSummary/InspectionSummary.aspx"></TreeNode>
</Tree>

View File

@ -487,9 +487,9 @@
else if (type == 'wdgcsj' && tabType == "super") {
$('iframe').attr('src', '../DataShow/LargeEngineering.aspx') // 危大工程 - 超危大工程
window.open("../DataShow/LargeEngineering.aspx")
--%>
}
}--%>
else if (type == 'yhpc' && tabType == "yb") {
$('iframe').attr('src', '../DataShow/HiddenRectification.aspx') //隐患排查-一般隐患
window.open("../DataShow/HiddenRectification.aspx")

View File

@ -10,12 +10,13 @@
<link rel="stylesheet" href="css/base.css"/>
<link rel="stylesheet" href="css/quality.css"/>
<link rel="stylesheet" href="css/swiper-bundle.min.css" />
<link rel="stylesheet" href="../res/assets/css/xfk.css"/>
</head>
<body>
<form id="form1" runat="server">
<div class="y_body y_row">
<div class="site y_column">
<div class="y_box">
<div class="y_box js-hover" data-type="ManagerData">
<div class="y_box_label y_image_default">质量管理人员数据</div>
<div class="y_box_main zlgl-box y_row">
<div class="y_column">
@ -38,7 +39,7 @@
</div>
</div>
</div>
<div class="y_box">
<div class="y_box js-hover" data-type="MeasuringInstrumentsData">
<div class="y_box_label y_image_default">计量器具数据</div>
<div class="y_box_main " style="padding: .375rem .75rem;">
<div class="jlq-box y_image_default">
@ -69,7 +70,7 @@
</div>
</div>
</div>
<div class="y_box">
<div class="y_box js-hover" data-type="QualityTrainingData">
<div class="y_box_label y_image_default">质量培训数据</div>
<div class="y_box_main zlpx-box y_image_default y_row">
<div class="zlpx-item y_column" style="padding-right: 1.5rem;margin-top: 1.25rem;">
@ -104,7 +105,7 @@
</div>
<div class="y_box" style="width: 100%;">
<div class="y_box js-hover" data-type="QualityProblem" style="width: 100%;">
<div class="y_box_label y_image_default">质量验收数据</div>
<div class="y_box_main">
<div class="zl-card y_row">
@ -126,7 +127,7 @@
</div>
</div>
<div class="site y_column">
<div class="y_box">
<div class="y_box js-hover" data-type="HjData">
<div class="y_box_label y_image_default">焊接数据</div>
<div class="y_box_main hj-box" style="padding: .125rem;">
<div class="y_column">
@ -156,7 +157,7 @@
</div>
</div>
<div class="y_box">
<div class="y_box js-hover" data-type="QualityProblem">
<div class="y_box_label y_image_default">质量问题治理数据</div>
<div class="y_box_main">
<div class="zl-card y_row">
@ -198,6 +199,13 @@
</div>
</div>
</div>
<div class="click-wrap" style="height: 75%; top: 10%;">
<div class="click-close"></div>
<div class="click-item">
<%-- <iframe src="../SysManage/Unit.aspx" width="100%" height="450"></iframe>--%>
<iframe src="" id="iframe" width="100%" height="450"></iframe>
</div>
</div>
</form>
</body>
</html>
@ -501,5 +509,85 @@
};
var aPassChart = echarts.init(document.getElementById('zlysmap'));
aPassChart.setOption(opt);
}
function GetClickHtml(obj) {
var $this = $(obj), type = $this.attr('data-type'), tabType = $this.attr('data-tabType') || '';
var title = '';
if (tabType != '') {
tabType = $this.closest('.bb-item').find('.tab-wrap .tab .active').attr('data-type')
if (tabType == null) {
tabType = $this.closest('.str-bottom').find('.tab-wrap .tab .active').attr('data-type')
}
}
console.log(type)
if (type == 'QualityTrainingData') {
// $('iframe').attr('src', '../InterfacePopup/CQMS/QualityTrainingData.aspx') //质量培训数据
window.open("../DataShow/QualityTraining.aspx")
}
else if (type == 'MeasuringInstrumentsData') {
// $('iframe').attr('src', '../InterfacePopup/CQMS/MeasuringInstrumentsData.aspx') //计量器具数据
window.open("../DataShow/QualityInstruments.aspx")
title = '计量器具数据'
}
else if (type == 'ManagerData') {
// $('iframe').attr('src', '../InterfacePopup/CQMS/ManagerData.aspx') //管理人员数据
window.open("../DataShow/QualityPerson.aspx")
title = '管理人员数据'
}
else if (type == 'QualityProblem') {
// $('iframe').attr('src', '../InterfacePopup/CQMS/QualityProblem.aspx') //质量问题数据
window.open("../DataShow/QualityProblem.aspx")
}
else if (type == 'QualityControlPoint') {
// $('iframe').attr('src', '../InterfacePopup/CQMS/QualityControlPoint.aspx') //质量控制点数据
window.open("../DataShow/QualityControlPoint.aspx")
}
else if (type == 'QualityAcceptance') {
// $('iframe').attr('src', '../InterfacePopup/CQMS/QualityAcceptance.aspx') //质量验收数据
window.open("../DataShow/QualityAcceptance.aspx")
}
else if (type == 'ProjectDivision') {
// $('iframe').attr('src', '../InterfacePopup/CQMS/ProjectDivision.aspx') //工程划分数据
window.open("../DataShow/ProjectDivision.aspx")
}
else if (type == 'HjData') {
// $('iframe').attr('src', '../InterfacePopup/CQMS/HjData.aspx') //焊接数据
window.open("../DataShow/HJGLWelding.aspx")
}
else if (type == 'DefectAnalysis') {
// $('iframe').attr('src', '../InterfacePopup/CQMS/DefectAnalysis.aspx') //缺陷分析
window.open("../DataShow/HJGLDefect.aspx")
}
else {
// $('iframe').attr('src', '../SysManage/Unit.aspx')
//window.open("../DataShow/HJGLDefect.aspx")
console.log("通用")
}
}
initClick();
function initClick() {
// 设置iframe高度
$('.click-wrap .click-item iframe').height($('.click-wrap').height())
$(".js-hover").click(function () {
var htmlContent = GetClickHtml(this)
//$('.click-wrap').show()
//$(".hover-wrap").hide()
})
$('.click-close').click(function () {
$('.click-wrap').hide()
})
}
</script>

View File

@ -244,6 +244,12 @@
</f:Button>
</div>
<div class="y_setting y_row">
<div class="y_set mine y_image_default" onclick="HelpFunction()" style="cursor:pointer">
帮助
<f:Button runat="server" CssClass="bgbtntop" IconFont="Eye" OnClick="btnHelp_Click" ToolTip="帮助" Hidden="true"
EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="btnHelp" OnClientClick="parent.removeActiveTab();">
</f:Button>
</div>
<div class="y_set mine y_image_default" onclick="PersonalFunction()" style="cursor:pointer">
个人
<f:Button runat="server" CssClass="bgbtntop" IconFont="User" OnClick="btnPersonal_Click" ToolTip="我的" Hidden="true"
@ -382,11 +388,11 @@
<f:Listener Event="click" Handler="onToolMaximizeClick" />
</Listeners>
</f:Tool>
<f:Tool runat="server" EnablePostBack="false" IconFont="Eye" CssClass="tabtool" ToolTip="帮助" ID="toolSourceCode">
<%--<f:Tool runat="server" EnablePostBack="false" IconFont="Eye" CssClass="tabtool" ToolTip="帮助" ID="toolSourceCode">
<Listeners>
<f:Listener Event="click" Handler="onToolSourceCodeClick" />
</Listeners>
</f:Tool>
</f:Tool>--%>
<f:Tool runat="server" EnablePostBack="false" IconFont="SignOut" Hidden="true"
CssClass="tabtool" ToolTip="注销" ID="toolSignOut">
<Listeners>
@ -401,6 +407,10 @@
runat="server" IsModal="true" Width="1200px" Height="620px" EnableClose="true"
EnableMaximize="true" EnableResize="false">
</f:Window>
<f:Window ID="WindowAtt" Title="帮助" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px"
Height="500px">
</f:Window>
<asp:XmlDataSource ID="XmlDataSource1" runat="server" EnableCaching="false"></asp:XmlDataSource>
<f:Button runat="server" ID="ProjectZJ" OnClick="ProjectZJ_Click" Hidden="true"></f:Button>
<f:Button runat="server" ID="ProjectTG" OnClick="ProjectTG_Click" Hidden="true"></f:Button>
@ -902,7 +912,10 @@
function PersonalFunction() {
$('[id$="_btnPersonal"]').click();
}
//帮助
function HelpFunction() {
$('[id$="_btnHelp"]').click();
}
//设置
function btnSysSetFunction() {
$('[id$="_btnProjectSet"]').click();

View File

@ -833,5 +833,20 @@ namespace FineUIPro.Web
this.CurrUser.LoginProjectId = this.drpProject.SelectedValue;
}
}
protected void btnHelp_Click(object sender, EventArgs e)
{
if (this.CurrUser.UserId==Const.hfnbdId)
{
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/Help&menuId={1}",Const.UnitId_CWCEC, BLL.Const.SysConstSetMenuId)));
}
else
{
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/Help&menuId={1}&type=-1", Const.UnitId_CWCEC, BLL.Const.SysConstSetMenuId)));
}
}
}
}

View File

@ -77,6 +77,15 @@ namespace FineUIPro.Web
/// </remarks>
protected global::FineUIPro.Button Button21;
/// <summary>
/// btnHelp 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnHelp;
/// <summary>
/// btnPersonal 控件。
/// </summary>
@ -284,15 +293,6 @@ namespace FineUIPro.Web
/// </remarks>
protected global::FineUIPro.Tool toolMaximize;
/// <summary>
/// toolSourceCode 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Tool toolSourceCode;
/// <summary>
/// toolSignOut 控件。
/// </summary>
@ -311,6 +311,15 @@ namespace FineUIPro.Web
/// </remarks>
protected global::FineUIPro.Window windowCustomQuery;
/// <summary>
/// WindowAtt 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window WindowAtt;
/// <summary>
/// XmlDataSource1 控件。
/// </summary>