From 687bc577cd537653170527cfc131065d3a3d7c3a Mon Sep 17 00:00:00 2001 From: fly-l <1420031550@qq.com> Date: Thu, 21 Sep 2023 19:13:16 +0800 Subject: [PATCH] 2023-09-21 --- SGGL/FineUIPro.Web/common/Menu_HSSE.xml | 15 ++- SGGL/FineUIPro.Web/common/Menu_ZHGL.xml | 1 + SGGL/FineUIPro.Web/common/main_new0.aspx | 4 +- SGGL/FineUIPro.Web/common/main_new1.aspx | 100 ++++++++++++++++-- SGGL/FineUIPro.Web/indexProject.aspx | 19 +++- SGGL/FineUIPro.Web/indexProject.aspx.cs | 15 +++ .../indexProject.aspx.designer.cs | 27 +++-- 7 files changed, 158 insertions(+), 23 deletions(-) diff --git a/SGGL/FineUIPro.Web/common/Menu_HSSE.xml b/SGGL/FineUIPro.Web/common/Menu_HSSE.xml index fb57c3a1..1544f676 100644 --- a/SGGL/FineUIPro.Web/common/Menu_HSSE.xml +++ b/SGGL/FineUIPro.Web/common/Menu_HSSE.xml @@ -20,7 +20,7 @@ - + @@ -82,7 +82,16 @@ - + + + + + + + + + + @@ -144,7 +153,7 @@ - + diff --git a/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml b/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml index 17668997..3bfa5a07 100644 --- a/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml +++ b/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml @@ -81,4 +81,5 @@ + \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/common/main_new0.aspx b/SGGL/FineUIPro.Web/common/main_new0.aspx index 0391227c..018a8172 100644 --- a/SGGL/FineUIPro.Web/common/main_new0.aspx +++ b/SGGL/FineUIPro.Web/common/main_new0.aspx @@ -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") diff --git a/SGGL/FineUIPro.Web/common/main_new1.aspx b/SGGL/FineUIPro.Web/common/main_new1.aspx index a305fea5..e0a92d12 100644 --- a/SGGL/FineUIPro.Web/common/main_new1.aspx +++ b/SGGL/FineUIPro.Web/common/main_new1.aspx @@ -10,12 +10,13 @@ +
-
+
质量管理人员数据
@@ -38,7 +39,7 @@
-
+
计量器具数据
@@ -69,7 +70,7 @@
-
+
质量培训数据
@@ -104,7 +105,7 @@
-
+
质量验收数据
@@ -126,7 +127,7 @@
-
+
焊接数据
@@ -156,7 +157,7 @@
-
+
质量问题治理数据
@@ -198,6 +199,13 @@
+
+
+
+ <%-- --%> + +
+
@@ -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() + }) } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/indexProject.aspx b/SGGL/FineUIPro.Web/indexProject.aspx index 8f99a95e..2b62a95f 100644 --- a/SGGL/FineUIPro.Web/indexProject.aspx +++ b/SGGL/FineUIPro.Web/indexProject.aspx @@ -244,6 +244,12 @@
+
+ 帮助 + +
个人