Merge branch 'master' of https://gitee.com/frane-yang/SGGL_CWCEC
This commit is contained in:
commit
25c98683a1
|
@ -220,12 +220,12 @@
|
||||||
<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_box_label y_image_default tab-wrap">隐患排查治理数据
|
||||||
<div class="y_tabs y_row">
|
<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 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>
|
<span class="y_image_default" data-type="zd" style="cursor:pointer" onclick="yjClick(1)" id="zdyh_span">重大隐患</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="y_box_main">
|
<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">
|
||||||
<div class="pc-item-card y_column y_image_default">
|
<div class="pc-item-card y_column y_image_default">
|
||||||
<div class="pc-item-card_label">整改闭环项</div>
|
<div class="pc-item-card_label">整改闭环项</div>
|
||||||
|
@ -365,6 +365,7 @@
|
||||||
initClick();
|
initClick();
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
||||||
function GetClickHtml(obj) {
|
function GetClickHtml(obj) {
|
||||||
var $this = $(obj), type = $this.attr('data-type'), tabType = $this.attr('data-tabType') || '';
|
var $this = $(obj), type = $this.attr('data-type'), tabType = $this.attr('data-tabType') || '';
|
||||||
var title = '';
|
var title = '';
|
||||||
|
@ -375,6 +376,7 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
console.log(type)
|
console.log(type)
|
||||||
|
console.log(tabType)
|
||||||
if (type == 'HeadOfficeNum') {
|
if (type == 'HeadOfficeNum') {
|
||||||
$('iframe').attr('src', '../DataShow/CompanyPerson.aspx') //企业总部
|
$('iframe').attr('src', '../DataShow/CompanyPerson.aspx') //企业总部
|
||||||
window.open("../DataShow/CompanyPerson.aspx")
|
window.open("../DataShow/CompanyPerson.aspx")
|
||||||
|
@ -494,6 +496,10 @@
|
||||||
$('iframe').attr('src', '../DataShow/HiddenRectification.aspx') //隐患排查-一般隐患
|
$('iframe').attr('src', '../DataShow/HiddenRectification.aspx') //隐患排查-一般隐患
|
||||||
window.open("../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") {
|
else if (type == 'yhpc' && tabType == "zd") {
|
||||||
$('iframe').attr('src', '../DataShow/HiddenRectification.aspx')//隐患排查-重大隐患
|
$('iframe').attr('src', '../DataShow/HiddenRectification.aspx')//隐患排查-重大隐患
|
||||||
|
|
|
@ -346,6 +346,9 @@ namespace FineUIPro.Web.common
|
||||||
public static string GetMajorZgl()
|
public static string GetMajorZgl()
|
||||||
{
|
{
|
||||||
var num1 = Math.Round(100.0 * GetMajorClosedNum() / (GetMajorClosedNum() + GetMajorNotClosedNum()), 0).ToString();
|
var num1 = Math.Round(100.0 * GetMajorClosedNum() / (GetMajorClosedNum() + GetMajorNotClosedNum()), 0).ToString();
|
||||||
|
if (num1 == "NaN") num1 = "0";
|
||||||
|
|
||||||
|
|
||||||
return num1;
|
return num1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue