整改闭环项
@@ -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')//隐患排查-重大隐患
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;
}