From 51d64d6da18c2cc6039974f81c9e0e6f4f0daff2 Mon Sep 17 00:00:00 2001
From: fly-l <1420031550@qq.com>
Date: Tue, 14 Nov 2023 11:48:52 +0800
Subject: [PATCH 1/2] 2023-11-14

---
 SGGL/FineUIPro.Web/FineUIPro.Web.csproj  |  3 +++
 SGGL/FineUIPro.Web/common/main_new0.aspx | 16 +++++++++++-----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
index 497154ee..4cf4ce27 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -15151,12 +15151,14 @@
     </Compile>
     <Compile Include="TestRun\BeforeTestRun\InspectWanderAboutAllPass.aspx.cs">
       <DependentUpon>InspectWanderAboutAllPass.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="TestRun\BeforeTestRun\InspectWanderAboutAllPass.aspx.designer.cs">
       <DependentUpon>InspectWanderAboutAllPass.aspx</DependentUpon>
     </Compile>
     <Compile Include="TestRun\BeforeTestRun\InspectWanderAboutAllPassList.aspx.cs">
       <DependentUpon>InspectWanderAboutAllPassList.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="TestRun\BeforeTestRun\InspectWanderAboutAllPassList.aspx.designer.cs">
       <DependentUpon>InspectWanderAboutAllPassList.aspx</DependentUpon>
@@ -15184,6 +15186,7 @@
     </Compile>
     <Compile Include="TestRun\BeforeTestRun\SelectTailTermList.aspx.cs">
       <DependentUpon>SelectTailTermList.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="TestRun\BeforeTestRun\SelectTailTermList.aspx.designer.cs">
       <DependentUpon>SelectTailTermList.aspx</DependentUpon>
diff --git a/SGGL/FineUIPro.Web/common/main_new0.aspx b/SGGL/FineUIPro.Web/common/main_new0.aspx
index a96861f6..f5f642b2 100644
--- a/SGGL/FineUIPro.Web/common/main_new0.aspx
+++ b/SGGL/FineUIPro.Web/common/main_new0.aspx
@@ -217,15 +217,15 @@
                         </div>
                     </div>
                 </div>
-                <div class="y_box" style="width: 6rem;height: 5.0875rem;">
+                <div class="y_box " style="width: 6rem;height: 5.0875rem;">
                     <div class="y_box_label y_image_default tab-wrap">隐患排查治理数据
                         <div class="y_tabs y_row">
-                            <span class="y_image_default y_tab-action " data-type="yb" style="cursor:pointer" onclick="yjClick(0)" id="ybyh_span">一般隐患</span>
-                            <span class="y_image_default" data-type="zd" style="cursor:pointer" onclick="yjClick(1)" id="zdyh_span">重大隐患</span>
+                            <span class="y_image_default y_tab-action active" data-type="yb"    style="cursor:pointer" onclick="yjClick(0)" id="ybyh_span">一般隐患</span>
+                            <span class="y_image_default" data-type="zd"   style="cursor:pointer" onclick="yjClick(1)" id="zdyh_span">重大隐患</span>
                         </div>
                     </div>
                     <div class="y_box_main">
-                        <div class="pc_box y_row js-hover" data-type="yhpc"style="padding-top: .25rem;">
+                        <div class="pc_box y_row js-hover" data-type="yhpc" data-tabType="yhpc" style="padding-top: .25rem;">
                             <div class="pc-item">
                                 <div class="pc-item-card y_column y_image_default">
                                     <div class="pc-item-card_label">整改闭环项</div>
@@ -364,7 +364,8 @@
         zgbarmap(0)
         initClick();
     })
-    
+
+
     function GetClickHtml(obj) {
         var $this = $(obj), type = $this.attr('data-type'), tabType = $this.attr('data-tabType') || '';
         var title = '';
@@ -375,6 +376,7 @@
             }
         }
         console.log(type)
+        console.log(tabType)
         if (type == 'HeadOfficeNum') {
             $('iframe').attr('src', '../DataShow/CompanyPerson.aspx') //企业总部
             window.open("../DataShow/CompanyPerson.aspx")
@@ -494,6 +496,10 @@
             $('iframe').attr('src', '../DataShow/HiddenRectification.aspx') //隐患排查-一般隐患
             window.open("../DataShow/HiddenRectification.aspx")
 
+        }else if (type == 'yhpc' ) {
+            $('iframe').attr('src', '../DataShow/HiddenRectification.aspx') //隐患排查-一般隐患
+            window.open("../DataShow/HiddenRectification.aspx")
+
         }
         else if (type == 'yhpc' && tabType == "zd") {
             $('iframe').attr('src', '../DataShow/HiddenRectification.aspx')//隐患排查-重大隐患

From 416366935c166873a9665112f3793751b50423bb Mon Sep 17 00:00:00 2001
From: fly-l <1420031550@qq.com>
Date: Tue, 14 Nov 2023 11:53:38 +0800
Subject: [PATCH 2/2] 2023-11-14

---
 SGGL/FineUIPro.Web/common/main_new0.aspx.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/SGGL/FineUIPro.Web/common/main_new0.aspx.cs b/SGGL/FineUIPro.Web/common/main_new0.aspx.cs
index 602f5250..e89c0e3c 100644
--- a/SGGL/FineUIPro.Web/common/main_new0.aspx.cs
+++ b/SGGL/FineUIPro.Web/common/main_new0.aspx.cs
@@ -346,6 +346,9 @@ namespace FineUIPro.Web.common
         public static string GetMajorZgl()
         {
             var num1 = Math.Round(100.0 * GetMajorClosedNum() / (GetMajorClosedNum() + GetMajorNotClosedNum()), 0).ToString();
+            if (num1 == "NaN") num1 = "0";
+
+
             return num1;
         }