lpf/xinjiang
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改看板

Browse Source
This commit is contained in:
潘鸿锋
2024-12-09 10:44:06 +08:00
parent c9877bc6bc
commit 5bb35a53d5
11 changed files with 358 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/common/css/index.css
+13
View File
@@ -36,6 +36,7 @@ body,
.z-main {
width: 100%;
height: 100%;
display: flex;
flex-direction: row;
justify-content: flex-start;
@@ -301,4 +302,16 @@ body,
#cMap{
height: 100%;
width: 100%;
}
#zhuimap{
height: 2.5rem;
width: 2.5rem;
background: linear-gradient(180deg, rgba(46, 66, 88, 0) 0%, #1F4F7C 100%);
border-radius: 0px 0px 0px 0px;
border: 1px solid;
border-image: linear-gradient(360deg, rgba(55, 169, 229, 1), rgba(53, 148, 215, 0)) 1 1;
position: absolute;
right: .25rem;
top: 0;
}
SGGL/FineUIPro.Web/common/mainNew.aspx
+106 -15
View File
@@ -39,13 +39,13 @@
<div class="z-val"><span id="NumberBox4" runat="server">0</span><span class="z-unit">小时</span></div>
</div>
</div>
<div class="z-s">
<%-- <div class="z-s">
<div class="z-w">
<div class="z-lab">特种作业（工作票）</div>
<div class="z-val"><span id="NumberBox5" runat="server">0</span><span class="z-unit">项</span></div>
</div>
</div>
<div class="z-s">
</div>--%>
<div class="z-s">
<div class="z-w">
<div class="z-lab">高危作业</div>
<div class="z-val"><span id="NumberBox6" runat="server">0</span><span class="z-unit">项</span></div>
@@ -121,6 +121,17 @@
<div class="z-val"><span id="NumberBox20" runat="server">0</span><span class="z-unit">项</span></div>
</div>
</div>
<div class="z-s4" style="margin-top:20px">
<div class="z-w1">
<div class="z-lab">领导个人行动计划</div>
<div class="z-val"><span id="NumberBox39" runat="server">0</span><span class="z-unit">次</span></div>
</div>
<div class="z-w1">
<div class="z-lab">安全行为观察与沟通</div>
<div class="z-val"><span id="NumberBox40" runat="server">0</span><span class="z-unit">次</span></div>
</div>
</div>
</div>
<div class="z-center">
<div class="z-p">
@@ -136,6 +147,7 @@
<div class="z-map">
<div id="cMap"></div>
</div>
<div id="zhuimap"></div>
</div>
<div class="z-side">
<div class="z-s1">
@@ -144,14 +156,22 @@
<div class="z-val"><span id="NumberBox21" runat="server">0</span><span class="z-unit">项</span></div>
</div>
<div class="z-s-box">
<div class="z_box">
<div class="z-b-lab">重大风险</div>
<div class="z-b-val"><span id="NumberBox22" runat="server">0</span> <span class="z-unit">项</span> </div>
</div>
<div class="z_box">
<div class="z-b-lab">一般风险</div>
<div class="z-b-val"><span id="NumberBox23" runat="server">0</span> <span class="z-unit">项</span> </div>
</div>
<div class="z_box">
<div class="z-b-lab">低风险</div>
<div class="z-b-val"><span id="NumberBox41" runat="server">0</span> <span class="z-unit">项</span> </div>
</div>
<div class="z_box">
<div class="z-b-lab">一般风险</div>
<div class="z-b-val"><span id="NumberBox23" runat="server">0</span> <span class="z-unit">项</span> </div>
</div>
<div class="z_box">
<div class="z-b-lab">较大风险</div>
<div class="z-b-val"><span id="NumberBox42" runat="server">0</span> <span class="z-unit">项</span> </div>
</div>
<div class="z_box">
<div class="z-b-lab">重大风险</div>
<div class="z-b-val"><span id="NumberBox22" runat="server">0</span> <span class="z-unit">项</span> </div>
</div>
</div>
</div>
<div class="z-s3">
@@ -233,12 +253,12 @@
<div class="z-s4">
<div class="z-w1">
<div class="z-lab">领导个人行动计划</div>
<div class="z-val"><span id="NumberBox39" runat="server">0</span><span class="z-unit">次</span></div>
<div class="z-lab">一般隐患</div>
<div class="z-val"><span id="NumberBox43" runat="server">0</span><span class="z-unit">次</span></div>
</div>
<div class="z-w1">
<div class="z-lab">安全行为观察与沟通</div>
<div class="z-val"><span id="NumberBox40" runat="server">0</span><span class="z-unit">次</span></div>
<div class="z-lab">较大隐患</div>
<div class="z-val"><span id="NumberBox44" runat="server">0</span><span class="z-unit">次</span></div>
</div>
</div>
@@ -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);
}
</script>
SGGL/FineUIPro.Web/common/mainNew.aspx.cs
+5 -1
View File
@@ -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
}
SGGL/FineUIPro.Web/common/mainNew.aspx.designer.cs
Generated
+42 -15
View File
@@ -59,15 +59,6 @@ namespace FineUIPro.Web.common
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox4;
/// <summary>
/// NumberBox5 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox5;
/// <summary>
/// NumberBox6 控件。
/// </summary>
@@ -167,6 +158,24 @@ namespace FineUIPro.Web.common
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox20;
/// <summary>
/// NumberBox39 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox39;
/// <summary>
/// NumberBox40 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox40;
/// <summary>
/// divProjectNum 控件。
/// </summary>
@@ -195,13 +204,13 @@ namespace FineUIPro.Web.common
protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox21;
/// <summary>
/// NumberBox22 控件。
/// NumberBox41 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox22;
protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox41;
/// <summary>
/// NumberBox23 控件。
@@ -212,6 +221,24 @@ namespace FineUIPro.Web.common
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox23;
/// <summary>
/// NumberBox42 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox42;
/// <summary>
/// NumberBox22 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox22;
/// <summary>
/// NumberBox24 控件。
/// </summary>
@@ -348,22 +375,22 @@ namespace FineUIPro.Web.common
protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox38;
/// <summary>
/// NumberBox39 控件。
/// NumberBox43 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox39;
protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox43;
/// <summary>
/// NumberBox40 控件。
/// NumberBox44 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox40;
protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox44;
/// <summary>
/// swiper_div 控件。
SGGL/FineUIPro.Web/common/mainProjectNew.aspx
+29 -9
View File
@@ -33,7 +33,7 @@
<div class="z-s">
<div class="z-w">
<div class="z-lab">百万工时</div>
<div class="z-val" id="NumberBox1" runat="server">657.32</div>
<div class="z-val" id="NumberBox1" runat="server">0</div>
</div>
</div>
<div class="z-s">
@@ -54,12 +54,12 @@
<div class="z-val"><span id="NumberBox4" runat="server">0</span><span class="z-unit">小时</span></div>
</div>
</div>
<div class="z-s">
<%--<div class="z-s">
<div class="z-w">
<div class="z-lab">特种作业（工作票）</div>
<div class="z-val"><span id="NumberBox5" runat="server">0</span><span class="z-unit">项</span></div>
</div>
</div>
</div>--%>
<div class="z-s">
<div class="z-w">
<div class="z-lab">高危作业</div>
@@ -136,6 +136,17 @@
<div class="z-val"><span id="NumberBox20" runat="server">0</span><span class="z-unit">项</span></div>
</div>
</div>
<div class="z-s4" style="margin-top:20px">
<div class="z-w1">
<div class="z-lab">领导个人行动计划</div>
<div class="z-val"><span id="NumberBox39" runat="server">0</span><span class="z-unit">次</span></div>
</div>
<div class="z-w1">
<div class="z-lab">安全行为观察与沟通</div>
<div class="z-val"><span id="NumberBox40" runat="server">0</span><span class="z-unit">次</span></div>
</div>
</div>
</div>
<div class="z-center">
<div class="pro-d">
@@ -262,14 +273,23 @@
<div class="z-val"><span id="NumberBox21" runat="server">0</span><span class="z-unit">项</span></div>
</div>
<div class="z-s-box">
<div class="z_box">
<div class="z-b-lab">重大风险</div>
<div class="z-b-val"><span id="NumberBox22" runat="server">0</span> <span class="z-unit">项</span> </div>
<div class="z-b-lab">低风险</div>
<div class="z-b-val"><span id="NumberBox41" runat="server">0</span> <span class="z-unit">项</span> </div>
</div>
<div class="z_box">
<div class="z-b-lab">一般风险</div>
<div class="z-b-val"><span id="NumberBox23" runat="server">0</span> <span class="z-unit">项</span> </div>
</div>
<div class="z_box">
<div class="z-b-lab">较大风险</div>
<div class="z-b-val"><span id="NumberBox42" runat="server">0</span> <span class="z-unit">项</span> </div>
</div>
<div class="z_box">
<div class="z-b-lab">重大风险</div>
<div class="z-b-val"><span id="NumberBox22" runat="server">0</span> <span class="z-unit">项</span> </div>
</div>
</div>
</div>
<div class="z-s3">
@@ -351,12 +371,12 @@
<div class="z-s4">
<div class="z-w1">
<div class="z-lab">领导个人行动计划</div>
<div class="z-val"><span id="NumberBox39" runat="server">0</span><span class="z-unit">次</span></div>
<div class="z-lab">一般隐患</div>
<div class="z-val"><span id="NumberBox43" runat="server">0</span><span class="z-unit">次</span></div>
</div>
<div class="z-w1">
<div class="z-lab">安全行为观察与沟通</div>
<div class="z-val"><span id="NumberBox40" runat="server">0</span><span class="z-unit">次</span></div>
<div class="z-lab">较大隐患</div>
<div class="z-val"><span id="NumberBox44" runat="server">0</span><span class="z-unit">次</span></div>
</div>
</div>
SGGL/FineUIPro.Web/common/mainProjectNew.aspx.cs
+5 -1
View File
@@ -54,7 +54,7 @@ namespace FineUIPro.Web.common
NumberBox2.InnerHtml = data.FirstOrDefault(x => x.ConstText == "NumberBox2").ConstValue;
NumberBox3.InnerHtml = data.FirstOrDefault(x => x.ConstText == "NumberBox3").ConstValue;
NumberBox4.InnerHtml = data.FirstOrDefault(x => x.ConstText == "NumberBox4").ConstValue;
NumberBox5.InnerHtml = data.FirstOrDefault(x => x.ConstText == "NumberBox5").ConstValue;
//NumberBox5.InnerHtml = data.FirstOrDefault(x => x.ConstText == "NumberBox5").ConstValue;
NumberBox6.InnerHtml = data.FirstOrDefault(x => x.ConstText == "NumberBox6").ConstValue;
NumberBox7.InnerHtml = data.FirstOrDefault(x => x.ConstText == "NumberBox7").ConstValue;
NumberBox8.InnerHtml = data.FirstOrDefault(x => x.ConstText == "NumberBox8").ConstValue;
@@ -91,6 +91,10 @@ namespace FineUIPro.Web.common
NumberBox38.InnerHtml = data.FirstOrDefault(x => x.ConstText == "NumberBox38").ConstValue;
NumberBox39.InnerHtml = data.FirstOrDefault(x => x.ConstText == "NumberBox39").ConstValue;
NumberBox40.InnerHtml = data.FirstOrDefault(x => x.ConstText == "NumberBox40").ConstValue;
NumberBox41.InnerHtml = data.FirstOrDefault(x => x.ConstText == "NumberBox41").ConstValue;
NumberBox42.InnerHtml = data.FirstOrDefault(x => x.ConstText == "NumberBox42").ConstValue;
NumberBox43.InnerHtml = data.FirstOrDefault(x => x.ConstText == "NumberBox43").ConstValue;
NumberBox44.InnerHtml = data.FirstOrDefault(x => x.ConstText == "NumberBox44").ConstValue;
#endregion
}
SGGL/FineUIPro.Web/common/mainProjectNew.aspx.designer.cs
Generated
+42 -15
View File
@@ -59,15 +59,6 @@ namespace FineUIPro.Web.common
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox4;
/// <summary>
/// NumberBox5 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox5;
/// <summary>
/// NumberBox6 控件。
/// </summary>
@@ -167,6 +158,24 @@ namespace FineUIPro.Web.common
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox20;
/// <summary>
/// NumberBox39 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox39;
/// <summary>
/// NumberBox40 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox40;
/// <summary>
/// lbRemark 控件。
/// </summary>
@@ -483,13 +492,13 @@ namespace FineUIPro.Web.common
protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox21;
/// <summary>
/// NumberBox22 控件。
/// NumberBox41 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox22;
protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox41;
/// <summary>
/// NumberBox23 控件。
@@ -500,6 +509,24 @@ namespace FineUIPro.Web.common
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox23;
/// <summary>
/// NumberBox42 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox42;
/// <summary>
/// NumberBox22 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox22;
/// <summary>
/// NumberBox24 控件。
/// </summary>
@@ -636,22 +663,22 @@ namespace FineUIPro.Web.common
protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox38;
/// <summary>
/// NumberBox39 控件。
/// NumberBox43 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox39;
protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox43;
/// <summary>
/// NumberBox40 控件。
/// NumberBox44 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox40;
protected global::System.Web.UI.HtmlControls.HtmlGenericControl NumberBox44;
/// <summary>
/// swiper_div 控件。