@@ -233,12 +253,12 @@
-
领导个人行动计划
-
0次
+
一般隐患
+
0次
-
安全行为观察与沟通
-
0次
+
较大隐患
+
0次
@@ -455,4 +475,75 @@
let clientWidth = document.body.clientWidth
return size * (clientWidth / initWidth)
}
+
+ createZHUIMap()
+ function createZHUIMap() {
+
+ let data = [
+ { val: 1, value: 1, name: '重大故障' }, // value 控制漏斗图的占比 不动
+ { val: 29, value: 2, name: '故障' },
+ { val: 300, value: 3, name: '(Trouble)' },
+ ]
+
+ var chartDom = document.getElementById('zhuimap');
+ var myChart = echarts.init(chartDom);
+ var option;
+
+ option = {
+ title: {
+ bottom: '10%',
+ left: 'center',
+ text: `(${data[2].val}:${data[1].val}:${data[0].val})`,
+ textStyle: {
+ fontSize: resetSize(14),
+ color: '#ffffff'
+ }
+ },
+ series: [
+ {
+ name: 'Funnel',
+ type: 'funnel',
+ left: '10%',
+ top: '15%',
+ width: '80%',
+ height: '60%',
+ minSize: '0%',
+ maxSize: '100%',
+ sort: 'ascending',
+ gap: 0,
+ label: {
+ show: true,
+ position: 'inside',
+ fontSize: resetSize(10),
+ color: '#ffffff',
+ formatter: (h) => {
+ let data = h.data
+ return `${data.val}次\n${data.name}`
+
+ }
+ },
+ labelLine: {
+ length: 10,
+ lineStyle: {
+ width: 1,
+ type: 'solid'
+ }
+ },
+ itemStyle: {
+ borderColor: '#fff',
+ borderWidth: 0,
+
+ },
+ emphasis: {
+ label: {
+ fontSize: resetSize(10)
+ }
+ },
+ data
+ }
+ ]
+ };
+
+ option && myChart.setOption(option);
+ }
diff --git a/SGGL/FineUIPro.Web/common/mainNew.aspx.cs b/SGGL/FineUIPro.Web/common/mainNew.aspx.cs
index 7e7d50e..fb1a2e2 100644
--- a/SGGL/FineUIPro.Web/common/mainNew.aspx.cs
+++ b/SGGL/FineUIPro.Web/common/mainNew.aspx.cs
@@ -158,7 +158,7 @@ namespace FineUIPro.Web.common
NumberBox2.InnerHtml = data.Where(x => x.ConstText == "NumberBox2").Sum(x=>Convert.ToDecimal(x.ConstValue)).ToString();
NumberBox3.InnerHtml = data.Where(x => x.ConstText == "NumberBox3").Sum(x=>Convert.ToDecimal(x.ConstValue)).ToString();
NumberBox4.InnerHtml = data.Where(x => x.ConstText == "NumberBox4").Sum(x=>Convert.ToDecimal(x.ConstValue)).ToString();
- NumberBox5.InnerHtml = data.Where(x => x.ConstText == "NumberBox5").Sum(x=>Convert.ToDecimal(x.ConstValue)).ToString();
+ //NumberBox5.InnerHtml = data.Where(x => x.ConstText == "NumberBox5").Sum(x=>Convert.ToDecimal(x.ConstValue)).ToString();
NumberBox6.InnerHtml = data.Where(x => x.ConstText == "NumberBox6").Sum(x=>Convert.ToDecimal(x.ConstValue)).ToString();
NumberBox7.InnerHtml = data.Where(x => x.ConstText == "NumberBox7").Sum(x=>Convert.ToDecimal(x.ConstValue)).ToString();
NumberBox8.InnerHtml = data.Where(x => x.ConstText == "NumberBox8").Sum(x=>Convert.ToDecimal(x.ConstValue)).ToString();
@@ -195,6 +195,10 @@ namespace FineUIPro.Web.common
NumberBox38.InnerHtml = data.Where(x => x.ConstText == "NumberBox38").Sum(x => Convert.ToDecimal(x.ConstValue)).ToString();
NumberBox39.InnerHtml = data.Where(x => x.ConstText == "NumberBox39").Sum(x => Convert.ToDecimal(x.ConstValue)).ToString();
NumberBox40.InnerHtml = data.Where(x => x.ConstText == "NumberBox40").Sum(x => Convert.ToDecimal(x.ConstValue)).ToString();
+ NumberBox41.InnerHtml = data.Where(x => x.ConstText == "NumberBox41").Sum(x => Convert.ToDecimal(x.ConstValue)).ToString();
+ NumberBox42.InnerHtml = data.Where(x => x.ConstText == "NumberBox42").Sum(x => Convert.ToDecimal(x.ConstValue)).ToString();
+ NumberBox43.InnerHtml = data.Where(x => x.ConstText == "NumberBox43").Sum(x => Convert.ToDecimal(x.ConstValue)).ToString();
+ NumberBox44.InnerHtml = data.Where(x => x.ConstText == "NumberBox44").Sum(x => Convert.ToDecimal(x.ConstValue)).ToString();
#endregion
}
diff --git a/SGGL/FineUIPro.Web/common/mainNew.aspx.designer.cs b/SGGL/FineUIPro.Web/common/mainNew.aspx.designer.cs
index 4d63e65..e21dcca 100644
--- a/SGGL/FineUIPro.Web/common/mainNew.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/common/mainNew.aspx.designer.cs
@@ -59,15 +59,6 @@ namespace FineUIPro.Web.common
///
protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox4;
- ///
- /// NumberBox5 控件。
- ///
- ///
- /// 自动生成的字段。
- /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
- ///
- protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox5;
-
///
/// NumberBox6 控件。
///
@@ -167,6 +158,24 @@ namespace FineUIPro.Web.common
///
protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox20;
+ ///
+ /// NumberBox39 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox39;
+
+ ///
+ /// NumberBox40 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox40;
+
///
/// divProjectNum 控件。
///
@@ -195,13 +204,13 @@ namespace FineUIPro.Web.common
protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox21;
///
- /// NumberBox22 控件。
+ /// NumberBox41 控件。
///
///
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
///
- protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox22;
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox41;
///
/// NumberBox23 控件。
@@ -212,6 +221,24 @@ namespace FineUIPro.Web.common
///
protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox23;
+ ///
+ /// NumberBox42 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox42;
+
+ ///
+ /// NumberBox22 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox22;
+
///
/// NumberBox24 控件。
///
@@ -348,22 +375,22 @@ namespace FineUIPro.Web.common
protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox38;
///
- /// NumberBox39 控件。
+ /// NumberBox43 控件。
///
///
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
///
- protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox39;
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox43;
///
- /// NumberBox40 控件。
+ /// NumberBox44 控件。
///
///
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
///
- protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox40;
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox44;
///
/// swiper_div 控件。
diff --git a/SGGL/FineUIPro.Web/common/mainProjectNew.aspx b/SGGL/FineUIPro.Web/common/mainProjectNew.aspx
index c1f1929..29c2d19 100644
--- a/SGGL/FineUIPro.Web/common/mainProjectNew.aspx
+++ b/SGGL/FineUIPro.Web/common/mainProjectNew.aspx
@@ -33,7 +33,7 @@