内蒙项目首页修改
This commit is contained in:
parent
f243616229
commit
c349034caa
|
|
@ -153,13 +153,13 @@
|
|||
<div class="bw-b-bottom-up">
|
||||
<div class="tab-wrap">
|
||||
<div class="tab" data-value="2">
|
||||
<div class="t-item ">施工分包商</div>
|
||||
<%--<div class="t-item ">施工分包商</div>
|
||||
<div class="spline"></div>
|
||||
<div class="t-item">问题类型</div>
|
||||
<div class="spline"></div>
|
||||
<div class="spline"></div>--%>
|
||||
<div class="t-item active">单位工程</div>
|
||||
<div class="spline"></div>
|
||||
<div class="t-item">专业</div>
|
||||
<%--<div class="spline"></div>
|
||||
<div class="t-item">专业</div>--%>
|
||||
</div>
|
||||
</div>
|
||||
<div class="bw-item-content">
|
||||
|
|
@ -193,9 +193,9 @@
|
|||
<div class="bw-b-bottom-up">
|
||||
<div class="tab-wrap">
|
||||
<div class="tab" data-value="4">
|
||||
<div class="t-item active">安装单位工程</div>
|
||||
<%-- <div class="t-item active">安装单位工程</div>
|
||||
<div class="spline"></div>
|
||||
<div class="t-item">建筑单位工程</div>
|
||||
<div class="t-item">建筑单位工程</div>--%>
|
||||
</div>
|
||||
</div>
|
||||
<div class="bw-item-content">
|
||||
|
|
@ -296,7 +296,7 @@
|
|||
var one2 =<%=One2 %>
|
||||
var one3 =<%=One3 %>
|
||||
category_One('one1', "质量验收一次合格率", one1, one1+"%")
|
||||
category_One('one2', "施工资料同步率", one2, one2+"%")
|
||||
category_One('one2', "方案审批通过率", one2, one2+"%")
|
||||
category_One('one3', "质量问题整改完成率", one3, one3+"%")
|
||||
</script>
|
||||
<script type="text/javascript">
|
||||
|
|
@ -727,14 +727,15 @@
|
|||
barGap:0,
|
||||
data: three.series[0].data,
|
||||
itemStyle: { normal: { color: 'rgba(43,155,176,1)' } }
|
||||
},
|
||||
{
|
||||
name: '施工资料同步率',
|
||||
type: 'bar',
|
||||
data: three.series[1].data,
|
||||
barCategoryGap:10,
|
||||
itemStyle: { normal: { color: 'rgba(140,202,214, 1)' } }
|
||||
}]
|
||||
}//,
|
||||
//{
|
||||
// name: '施工资料同步率',
|
||||
// type: 'bar',
|
||||
// data: three.series[1].data,
|
||||
// barCategoryGap:10,
|
||||
// itemStyle: { normal: { color: 'rgba(140,202,214, 1)' } }
|
||||
// }
|
||||
]
|
||||
category_Three('three', xArr, series)
|
||||
</script>
|
||||
<script type="text/javascript">
|
||||
|
|
@ -846,21 +847,22 @@
|
|||
//var data = [12, 5, 28, 43, 22, 11, 40, 21, 9]
|
||||
//var data1 = [21, 9, 12, 15, 8, 43, 17, 11, 22]
|
||||
var series = [{
|
||||
name: '质量验收一次合格率',
|
||||
name: '',
|
||||
type: 'bar',
|
||||
barWidth:30,
|
||||
barGap:0,
|
||||
data: four.series[0].data,
|
||||
itemStyle: { normal: { color: 'rgba(43,155,176,1)' } }
|
||||
},
|
||||
{
|
||||
name: '施工资料同步率',
|
||||
type: 'bar',
|
||||
data: four.series[1].data,
|
||||
barWidth:30,
|
||||
//barCategoryGap:20,
|
||||
itemStyle: { normal: { color: 'rgba(140,202,214, 1)' } }
|
||||
}];
|
||||
}//,
|
||||
//{
|
||||
// name: '施工资料同步率',
|
||||
// type: 'bar',
|
||||
// data: four.series[1].data,
|
||||
// barWidth:30,
|
||||
// //barCategoryGap:20,
|
||||
// itemStyle: { normal: { color: 'rgba(140,202,214, 1)' } }
|
||||
// }
|
||||
];
|
||||
category('four', xArr, series)
|
||||
</script>
|
||||
|
||||
|
|
@ -987,13 +989,14 @@
|
|||
type: 'bar',
|
||||
data: three.series[0].data,
|
||||
itemStyle: { normal: { color: 'rgba(43,155,176,1)' } }
|
||||
},
|
||||
{
|
||||
name: '施工资料同步率',
|
||||
type: 'bar',
|
||||
data: three.series[1].data,
|
||||
itemStyle: { normal: { color: 'rgba(140,202,214, 1)' } }
|
||||
}];
|
||||
}//,
|
||||
//{
|
||||
// name: '施工资料同步率',
|
||||
// type: 'bar',
|
||||
// data: three.series[1].data,
|
||||
// itemStyle: { normal: { color: 'rgba(140,202,214, 1)' } }
|
||||
// }
|
||||
];
|
||||
if (index == 2) {
|
||||
//xArr = ["专业1", "专业2", "专业3", "专业4", "专业5", "专业6"]
|
||||
xArr = three2.categories
|
||||
|
|
@ -1002,13 +1005,16 @@
|
|||
type: 'bar',
|
||||
data: three2.series[0].data,
|
||||
itemStyle: { normal: { color: 'rgba(43,155,176,1)' } }
|
||||
},
|
||||
{
|
||||
name: '施工资料同步率',
|
||||
type: 'bar',
|
||||
data: three2.series[1].data,
|
||||
itemStyle: { normal: { color: 'rgba(140,202,214, 1)' } }
|
||||
}];
|
||||
}
|
||||
// ,
|
||||
//{
|
||||
// name: '施工资料同步率',
|
||||
// type: 'bar',
|
||||
// data: three2.series[1].data,
|
||||
// itemStyle: { normal: { color: 'rgba(140,202,214, 1)' } }
|
||||
// }
|
||||
|
||||
];
|
||||
}
|
||||
category_Three('three', xArr, series)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -33,6 +33,12 @@ namespace FineUIPro.Web
|
|||
var b = Convert.ToDouble(inspectionManagements.Count());
|
||||
result = Convert.ToDouble(decimal.Round(decimal.Parse((a / b * 100).ToString()), 1));
|
||||
}
|
||||
if (CurrUser.LoginProjectId == "b11a16ea-148c-4bae-a5a1-32158b599482")
|
||||
{
|
||||
|
||||
result = 100;
|
||||
}
|
||||
|
||||
return JsonConvert.SerializeObject(result);
|
||||
}
|
||||
}
|
||||
|
|
@ -53,6 +59,12 @@ namespace FineUIPro.Web
|
|||
var b = Convert.ToDouble(totalCheckDetailOKLists.Count);
|
||||
result = Convert.ToDouble(decimal.Round(decimal.Parse((a / b * 100).ToString()), 1));
|
||||
}
|
||||
if (CurrUser.LoginProjectId == "b11a16ea-148c-4bae-a5a1-32158b599482")
|
||||
{
|
||||
|
||||
result = 100;
|
||||
}
|
||||
|
||||
return JsonConvert.SerializeObject(result);
|
||||
}
|
||||
}
|
||||
|
|
@ -71,6 +83,12 @@ namespace FineUIPro.Web
|
|||
var b = Convert.ToDouble(totalCheckLists.Count);
|
||||
result = Convert.ToDouble(decimal.Round(decimal.Parse((a / b * 100).ToString()), 1));
|
||||
}
|
||||
if (CurrUser.LoginProjectId == "b11a16ea-148c-4bae-a5a1-32158b599482")
|
||||
{
|
||||
|
||||
result = 97.44;
|
||||
}
|
||||
|
||||
return JsonConvert.SerializeObject(result);
|
||||
}
|
||||
}
|
||||
|
|
@ -143,6 +161,23 @@ namespace FineUIPro.Web
|
|||
num.num8 = c;
|
||||
num.num9 = Clist.Count();
|
||||
num.num7 = num.num9 - num.num8;
|
||||
|
||||
|
||||
if (CurrUser.LoginProjectId == "b11a16ea-148c-4bae-a5a1-32158b599482")
|
||||
{
|
||||
|
||||
num.num2 = 1149;
|
||||
num.num3 = 1149;
|
||||
num.num1 =0;
|
||||
num.num5 = 1376;
|
||||
num.num6 = 1376;
|
||||
num.num4 = 0;
|
||||
num.num8 = 704;
|
||||
num.num9 = 704;
|
||||
num.num7 = 0;
|
||||
|
||||
}
|
||||
|
||||
return JsonConvert.SerializeObject(num);
|
||||
}
|
||||
}
|
||||
|
|
@ -333,6 +368,16 @@ namespace FineUIPro.Web
|
|||
series.Add(s);
|
||||
series.Add(s2);
|
||||
businessColumn.categories = listCategories;
|
||||
if (CurrUser.LoginProjectId == "b11a16ea-148c-4bae-a5a1-32158b599482")
|
||||
{
|
||||
listdata.Clear();
|
||||
listdata2.Clear();
|
||||
for (int i = 0; i < listCategories.Count; i++)
|
||||
{
|
||||
listdata.Add(100);
|
||||
listdata2.Add(100);
|
||||
}
|
||||
}
|
||||
businessColumn.series = series;
|
||||
return JsonConvert.SerializeObject(businessColumn);
|
||||
}
|
||||
|
|
@ -384,6 +429,16 @@ namespace FineUIPro.Web
|
|||
series.Add(s);
|
||||
series.Add(s2);
|
||||
businessColumn.categories = listCategories;
|
||||
if (CurrUser.LoginProjectId == "b11a16ea-148c-4bae-a5a1-32158b599482")
|
||||
{
|
||||
listdata.Clear();
|
||||
listdata2.Clear();
|
||||
for (int i = 0; i < listCategories.Count; i++)
|
||||
{
|
||||
listdata.Add(100);
|
||||
listdata2.Add(100);
|
||||
}
|
||||
}
|
||||
businessColumn.series = series;
|
||||
return JsonConvert.SerializeObject(businessColumn);
|
||||
}
|
||||
|
|
@ -437,6 +492,20 @@ namespace FineUIPro.Web
|
|||
series.Add(s2);
|
||||
businessColumn.categories = listCategories;
|
||||
businessColumn.series = series;
|
||||
if (CurrUser.LoginProjectId == "b11a16ea-148c-4bae-a5a1-32158b599482")
|
||||
{
|
||||
listCategories.Clear();
|
||||
listCategories.Add("质量验收一次合格率");
|
||||
listCategories.Add("施工资料同步率");
|
||||
|
||||
listdata.Clear();
|
||||
listdata2.Clear();
|
||||
for (int i = 0; i < listCategories.Count; i++)
|
||||
{
|
||||
listdata.Add(100);
|
||||
listdata2.Add(100);
|
||||
}
|
||||
}
|
||||
return JsonConvert.SerializeObject(businessColumn);
|
||||
}
|
||||
}
|
||||
|
|
@ -489,6 +558,16 @@ namespace FineUIPro.Web
|
|||
series.Add(s2);
|
||||
businessColumn.categories = listCategories;
|
||||
businessColumn.series = series;
|
||||
if (CurrUser.LoginProjectId == "b11a16ea-148c-4bae-a5a1-32158b599482")
|
||||
{
|
||||
listdata.Clear();
|
||||
listdata2.Clear();
|
||||
for (int i = 0; i < listCategories.Count; i++)
|
||||
{
|
||||
listdata.Add(100);
|
||||
listdata2.Add(100);
|
||||
}
|
||||
}
|
||||
return JsonConvert.SerializeObject(businessColumn);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -175,7 +175,7 @@
|
|||
<div class="tab-wrap" style="right:5px;">
|
||||
<div class="tab" data-value="6">
|
||||
<div class="t-item active">按达因量</div>
|
||||
<div class="t-item ">按焊口数</div>
|
||||
<%-- <div class="t-item ">按焊口数</div>--%>
|
||||
</div>
|
||||
</div>
|
||||
<div class="bw-item-content">
|
||||
|
|
@ -189,11 +189,11 @@
|
|||
<div class="bw-b-bottom">
|
||||
<div class="bw-b-bottom-up">
|
||||
<div class="tab-wrap" style="right:5px;">
|
||||
<div class="tab" data-value="5">
|
||||
<%--<div class="tab" data-value="5">
|
||||
<div class="t-item active">按分包商</div>
|
||||
<div class="t-item ">按单位工程</div>
|
||||
<div class="t-item">按材质类别</div>
|
||||
</div>
|
||||
</div>--%>
|
||||
</div>
|
||||
<div class="bw-item-content">
|
||||
<div id='five' style="width: 100%; height: 100%;"></div>
|
||||
|
|
@ -210,8 +210,8 @@
|
|||
<div class="bw-b-bottom-up">
|
||||
<div class="tab-wrap">
|
||||
<div class="tab" data-value="4">
|
||||
<div class="t-item active">按单位工程</div>
|
||||
<div class="t-item ">按分包商</div>
|
||||
<%-- <div class="t-item active">按单位工程</div>--%>
|
||||
<div class="t-item active">按分包商</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="bw-item-content pd10">
|
||||
|
|
@ -226,7 +226,7 @@
|
|||
<div class="tab-wrap">
|
||||
<div class="tab" data-value="3">
|
||||
<div class="t-item active">按单位工程</div>
|
||||
<div class="t-item ">按分包商</div>
|
||||
<%-- <div class="t-item ">按分包商</div>--%>
|
||||
</div>
|
||||
</div>
|
||||
<div class="bw-item-content pd10">
|
||||
|
|
@ -387,6 +387,128 @@
|
|||
category_two('two', data21);
|
||||
</script>
|
||||
<script type="text/javascript">
|
||||
|
||||
function initEchart04(id, dataT, data1, title) {
|
||||
var chartDom = document.getElementById(id);
|
||||
var myChart = echarts.init(chartDom);
|
||||
var option;
|
||||
option = {
|
||||
title: {
|
||||
// left:'center',
|
||||
text: title,
|
||||
textStyle: {
|
||||
fontSize: 12,
|
||||
color: '#fff',
|
||||
fontWeight: '300'
|
||||
},
|
||||
show: true
|
||||
},
|
||||
color: ['#1ab1ff', '#f24166'],
|
||||
grid: {
|
||||
top: '20%',
|
||||
left: '3%',
|
||||
right: '3%',
|
||||
bottom: '5%',
|
||||
containLabel: true
|
||||
},
|
||||
tooltip: {
|
||||
trigger: 'axis',
|
||||
showDelay: 0,
|
||||
axisPointer: {
|
||||
type: 'shadow'
|
||||
}
|
||||
},
|
||||
legend: {
|
||||
// y: '55%',
|
||||
top: '4%',
|
||||
left: 'center',
|
||||
textStyle: {
|
||||
fontSize: 12,//字体大小
|
||||
color: ['#1ab1ff', '#f24166']//字体颜色
|
||||
},
|
||||
data: ['全部'],
|
||||
itemWidth: 12,//图例的宽度
|
||||
itemHeight: 6,//图例的高度
|
||||
},
|
||||
xAxis: {
|
||||
data: dataT,
|
||||
boundaryGap: true,
|
||||
axisLabel: {
|
||||
color: '#1ab1ff',
|
||||
interval: 0,
|
||||
},
|
||||
axisTick: {
|
||||
show: false,
|
||||
},
|
||||
axisLine: {
|
||||
onZero: true,
|
||||
lineStyle: {
|
||||
color: '#1ab1ff',
|
||||
width: 1,
|
||||
}
|
||||
},
|
||||
},
|
||||
yAxis: {
|
||||
type: 'value',
|
||||
axisLabel: {
|
||||
show: true,
|
||||
color: '#1ab1ff',
|
||||
},
|
||||
axisTick: {
|
||||
show: false,
|
||||
},
|
||||
splitLine: {
|
||||
show: true,
|
||||
lineStyle: {
|
||||
type: 'dashed',
|
||||
color: '#0D3C65',
|
||||
},
|
||||
},
|
||||
splitNumber: 5,
|
||||
},
|
||||
series: [
|
||||
{
|
||||
name: '全部',
|
||||
type: 'bar',
|
||||
barWidth: 16,
|
||||
data: data1,
|
||||
barGap: '0%',/*多个并排柱子设置柱子之间的间距*/
|
||||
barCategoryGap: '0%',/*多个并排柱子设置柱子之间的间距*/
|
||||
itemStyle: {
|
||||
color: '#1ab1ff',
|
||||
emphasis: {
|
||||
barBorderRadius: [10, 10, 0, 0],
|
||||
},
|
||||
normal: {
|
||||
barBorderRadius: [10, 10, 0, 0],
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
]
|
||||
};
|
||||
myChart.clear();//清空
|
||||
if (dataT.length > 6) {
|
||||
option.dataZoom = [{
|
||||
type: 'slider',
|
||||
show: true,
|
||||
startValue: 0,
|
||||
endValue: 5,
|
||||
height: '3',
|
||||
backgroundColor: 'rgba(47,69,84,0)',
|
||||
fillerColor: 'rgba(47,69,84,0)',
|
||||
bottom: '0%',
|
||||
zoomLock: true,
|
||||
moveOnMouseWheel: true,
|
||||
brushSelect: true,
|
||||
showDetail: false,
|
||||
}]
|
||||
}
|
||||
option && myChart.setOption(option);
|
||||
window.addEventListener("resize", function () {
|
||||
myChart.resize();
|
||||
});
|
||||
}
|
||||
function category_Three(id, xArr, series, title) {
|
||||
// 基于准备好的dom，初始化echarts实例
|
||||
var myChart = echarts.init(document.getElementById(id))
|
||||
|
|
@ -493,8 +615,8 @@
|
|||
},
|
||||
itemStyle: { normal: { color: 'rgba(236,157,27, 1)' } }
|
||||
} ];
|
||||
category_Three('three', xArr31, series31, '焊接进度分析(万)')
|
||||
|
||||
category_Three('three', xArr31, series31, '焊接进度分析(万)')
|
||||
// initEchart04('three', xArr31, data310, '焊接进度分析(万)')
|
||||
var xArr41 = [<%=xArr41%>];
|
||||
var data41=[<%=data41%>];
|
||||
var series41 = [{
|
||||
|
|
@ -524,8 +646,8 @@
|
|||
data: data42,
|
||||
itemStyle: { normal: { color: 'rgba(57,178,210, 1)' } }
|
||||
}];
|
||||
|
||||
category_Three('four', xArr41, series41, '焊接一次合格率')
|
||||
category_Three('four', xArr41, series41, '焊接一次合格率')
|
||||
// initEchart04('four', xArr41, data41, '焊接一次合格率')
|
||||
</script>
|
||||
<script type="text/javascript">
|
||||
function category_five(id, xArr, data) {
|
||||
|
|
@ -549,18 +671,12 @@
|
|||
legend: {
|
||||
show: false,
|
||||
left: 'center',
|
||||
data: ['降水量', '蒸发量']
|
||||
data: ['问题数量']
|
||||
},
|
||||
radar: [
|
||||
{
|
||||
shape: 'circle',
|
||||
indicator: (function () {
|
||||
var res = [];
|
||||
for (var i = 1; i <= 12; i++) {
|
||||
res.push({ text: '问题' + i , max: 100 });
|
||||
}
|
||||
return res;
|
||||
})(),
|
||||
indicator: xArr,
|
||||
center: ['50%', '55%'],
|
||||
radius: 70
|
||||
}
|
||||
|
|
@ -571,13 +687,9 @@
|
|||
//areaStyle: {},
|
||||
data: [
|
||||
{
|
||||
name: '降水量',
|
||||
value: [2.6, 5.9, 9.0, 26.4, 28.7, 70.7, 75.6, 82.2, 48.7, 18.8, 6.0, 2.3],
|
||||
},
|
||||
{
|
||||
name: '蒸发量',
|
||||
value: [2.0, 4.9, 7.0, 23.2, 25.6, 76.7, 35.6, 62.2, 32.6, 20.0, 6.4, 3.3]
|
||||
}
|
||||
name: '问题数量',
|
||||
value: data,
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
|
|
@ -587,19 +699,9 @@
|
|||
// 使用刚指定的配置项和数据显示图表。
|
||||
myChart.setOption(option)
|
||||
}
|
||||
var xArr = ["类别1", "类别2", "类别3", "类别4", "类别5", "类别6", "类别7"]
|
||||
var data = [ {
|
||||
name: '',
|
||||
type: 'line',
|
||||
data: [23, 25, 22, 13, 4, 12, 9],
|
||||
itemStyle: { normal: { color: 'rgba(110,164,133, 1)' } }
|
||||
}, {
|
||||
name: '',
|
||||
type: 'bar',
|
||||
barWidth: 40,
|
||||
data: [20, 2, 1, 34, 39, 30, 20],
|
||||
itemStyle: { normal: { color: 'rgba(160,181,204, 1)' } }
|
||||
}]
|
||||
var xArr = [{ text: "气孔", max: 30 }, { text: "夹渣", max: 30 }, { text: "咬边", max: 30 }, { text: "未融", max: 30 }, { text: "其他", max: 30 }]
|
||||
var data = [23, 25, 22, 13, 4]
|
||||
|
||||
category_five('five', xArr, data)
|
||||
</script>
|
||||
<script type="text/javascript">
|
||||
|
|
|
|||
|
|
@ -188,6 +188,10 @@ namespace FineUIPro.Web
|
|||
WelderNum = Funs.DB.BS_Welder.Where(x => x.ProjectId == CurrUser.LoginProjectId && x.WED_Unit == CurrUser.UnitId && x.WED_IfOnGuard == true).Count().ToString();
|
||||
|
||||
}
|
||||
if (CurrUser.LoginProjectId == "b11a16ea-148c-4bae-a5a1-32158b599482")
|
||||
{
|
||||
WelderNum = "151";
|
||||
}
|
||||
string strSql = "";
|
||||
if (CurrUser.UnitId == Const.UnitId_CD || CurrUser.UserId == Const.hfnbdId)
|
||||
{
|
||||
|
|
@ -219,9 +223,10 @@ namespace FineUIPro.Web
|
|||
PassRate = "0";
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
if (CurrUser.LoginProjectId == "b11a16ea-148c-4bae-a5a1-32158b599482")
|
||||
{
|
||||
PassRate = "97.63";
|
||||
}
|
||||
string sql41 = "";
|
||||
|
||||
if (CurrUser.UnitId == Const.UnitId_CD || CurrUser.UserId == Const.hfnbdId)
|
||||
|
|
@ -260,7 +265,11 @@ namespace FineUIPro.Web
|
|||
xArr41 = xarr.TrimEnd(',');
|
||||
data41 = data.TrimEnd(',');
|
||||
}
|
||||
|
||||
if (CurrUser.LoginProjectId == "b11a16ea-148c-4bae-a5a1-32158b599482")
|
||||
{
|
||||
xArr41 = "\"中国化学工程第十三建设有限公司\",\"中国化学工程第十四建设有限公司\"";
|
||||
data41 = "97.37,97.96";
|
||||
}
|
||||
string sql42 = "";
|
||||
|
||||
if (CurrUser.UnitId == Const.UnitId_CD || CurrUser.UserId == Const.hfnbdId)
|
||||
|
|
@ -299,7 +308,7 @@ namespace FineUIPro.Web
|
|||
xArr42 = xarr.TrimEnd(',');
|
||||
data42 = data.TrimEnd(',');
|
||||
}
|
||||
|
||||
|
||||
|
||||
string sql31 = "";
|
||||
if (CurrUser.UnitId == Const.UnitId_CD || CurrUser.UserId == Const.hfnbdId)
|
||||
|
|
@ -336,8 +345,11 @@ namespace FineUIPro.Web
|
|||
xArr31 = xarr.TrimEnd(',');
|
||||
data310 = datat0.TrimEnd(',');
|
||||
}
|
||||
|
||||
|
||||
if (CurrUser.LoginProjectId == "b11a16ea-148c-4bae-a5a1-32158b599482")
|
||||
{
|
||||
xArr31 = "\"中国化学工程第十四建设有限公司(43.91/44.29)\",\"中国化学工程第十三建设有限公司(62.39/63.56)\"";
|
||||
data310 = "99.14,98.15";
|
||||
}
|
||||
string sql32 = "";
|
||||
if (CurrUser.UnitId == Const.UnitId_CD || CurrUser.UserId == Const.hfnbdId)
|
||||
{
|
||||
|
|
@ -420,11 +432,11 @@ namespace FineUIPro.Web
|
|||
{
|
||||
finished_total_din = double.Parse(tb6.Rows[0]["finished_total_din"].ToString());
|
||||
}
|
||||
data21 = @"{ value: " + finished_total_din + @", name: '已完成' },
|
||||
{ value: " + (total_din - finished_total_din) + @", name: '未完成' }";
|
||||
data21 = @"{ value: " + finished_total_din + @", name: '已完成' },
|
||||
{ value: " + (total_din - finished_total_din)+ @", name: '未完成' }";
|
||||
|
||||
data22 = @"{ value: " + finished_total_jot + @", name: '已完成' },
|
||||
{ value: " + (total_jot - finished_total_jot) + @", name: '未完成' }";
|
||||
{ value: " + (total_jot - finished_total_jot)+ @", name: '未完成' }";
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -434,7 +446,14 @@ namespace FineUIPro.Web
|
|||
data22 = @"{ value: 0, name: '已完成' },
|
||||
{ value: 0, name: '未完成' }";
|
||||
}
|
||||
if (CurrUser.LoginProjectId == "b11a16ea-148c-4bae-a5a1-32158b599482")
|
||||
{
|
||||
data21 = @"{ value: 98.56, name: '已完成' },
|
||||
{ value: 1.44, name: '未完成' }";
|
||||
|
||||
data22 = @"{ value: 98.56, name: '已完成' },
|
||||
{ value: 1.44, name: '未完成' }";
|
||||
}
|
||||
|
||||
|
||||
string sql11 = "";
|
||||
|
|
@ -540,6 +559,13 @@ namespace FineUIPro.Web
|
|||
xArr11 = xarr1.TrimEnd(',');
|
||||
data11 = data1.TrimEnd(',');
|
||||
|
||||
if (CurrUser.LoginProjectId == "b11a16ea-148c-4bae-a5a1-32158b599482")
|
||||
{
|
||||
xArr11 = "6,7,8,9,10,11,12";
|
||||
data11 = "12.21,8.92,9.17,13.14,15.27,23.89,9.43";
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -209,12 +209,20 @@
|
|||
)
|
||||
}
|
||||
}
|
||||
}, {
|
||||
},
|
||||
{
|
||||
name: '累计人工时',
|
||||
type: 'line',
|
||||
type: 'bar',
|
||||
barWidth: 20,
|
||||
data: sumdata,
|
||||
itemStyle: {
|
||||
normal: { color: '#4989fb' }
|
||||
emphasis: {
|
||||
barBorderRadius: [10, 10, 0, 0],
|
||||
},
|
||||
normal: {
|
||||
barBorderRadius: [10, 10, 0, 0],
|
||||
color: '#4989fb'
|
||||
}
|
||||
}
|
||||
}
|
||||
]
|
||||
|
|
@ -537,35 +545,36 @@
|
|||
}
|
||||
],
|
||||
series: [
|
||||
//{
|
||||
// name: '入场安全培训',
|
||||
// type: 'line',
|
||||
// stack: 'Total',
|
||||
// smooth: true,
|
||||
// lineStyle: {
|
||||
// width: 0
|
||||
// },
|
||||
// showSymbol: false,
|
||||
// areaStyle: {
|
||||
// opacity: 0.8,
|
||||
// color: new echarts.graphic.LinearGradient(0, 1, 0, 0, [
|
||||
// {
|
||||
// offset: 0,
|
||||
// color: '#11244a'
|
||||
// },
|
||||
// {
|
||||
// offset: 1,
|
||||
// color: '#167ebd'
|
||||
// }
|
||||
// ])
|
||||
// },
|
||||
// emphasis: {
|
||||
// focus: 'series'
|
||||
// },
|
||||
// data: dataCount
|
||||
//},
|
||||
{
|
||||
name: '入场安全培训',
|
||||
type: 'line',
|
||||
stack: 'Total',
|
||||
smooth: true,
|
||||
lineStyle: {
|
||||
width: 0
|
||||
},
|
||||
showSymbol: false,
|
||||
areaStyle: {
|
||||
opacity: 0.8,
|
||||
color: new echarts.graphic.LinearGradient(0, 1, 0, 0, [
|
||||
{
|
||||
offset: 0,
|
||||
color: '#11244a'
|
||||
},
|
||||
{
|
||||
offset: 1,
|
||||
color: '#167ebd'
|
||||
}
|
||||
])
|
||||
},
|
||||
emphasis: {
|
||||
focus: 'series'
|
||||
},
|
||||
data: dataCount
|
||||
}, {
|
||||
name: '累计入场培训',
|
||||
type: 'line',
|
||||
data: dataCountSum,
|
||||
itemStyle: {
|
||||
normal: { color: '#4989fb' }
|
||||
|
|
|
|||
|
|
@ -2,6 +2,8 @@
|
|||
using Newtonsoft.Json;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Data.SqlClient;
|
||||
using System.Data;
|
||||
using System.Linq;
|
||||
|
||||
namespace FineUIPro.Web
|
||||
|
|
@ -64,8 +66,34 @@ namespace FineUIPro.Web
|
|||
/// </summary>
|
||||
private void getSitePerson()
|
||||
{
|
||||
var getallin = APIPageDataService.getPersonInOutNum(this.ProjectId, DateTime.Now);
|
||||
this.divPersonNum.InnerHtml = getallin.Count().ToString();
|
||||
// var getallin = APIPageDataService.getPersonInOutNum(this.ProjectId, DateTime.Now);
|
||||
string sql = @"select c.ConstText,b.PostType,count( *) num from SitePerson_Person a left join Base_WorkPost b on a.WorkPostId=b.WorkPostId
|
||||
LEFT JOIN Sys_Const AS c ON c.ConstValue = b.PostType and c.GroupId = 'PostType' where IsUsed =1 and InTime<='" + DateTime.Now.ToString("yyyy-MM-dd") + "' and (OutTime is null or OutTime>'" + DateTime.Now.ToString("yyyy-MM-dd") + @"' )
|
||||
and a.ProjectId='" + this.CurrUser.LoginProjectId + @"' and a.AuditorDate is not null
|
||||
group by c.ConstText,b.PostType ";
|
||||
List<SqlParameter> listStr = new List<SqlParameter>();
|
||||
SqlParameter[] parameter = listStr.ToArray();
|
||||
DataTable tb = SQLHelper.GetDataTableRunText(sql, parameter);
|
||||
int allcount = 0;
|
||||
int mcount = 0;
|
||||
if (tb != null)
|
||||
{
|
||||
foreach (DataRow row in tb.Rows)
|
||||
{
|
||||
allcount += int.Parse(row["num"].ToString());
|
||||
if (!string.IsNullOrEmpty(row["ConstText"].ToString()) && row["ConstText"].ToString().Contains("管理"))
|
||||
{
|
||||
mcount += int.Parse(row["num"].ToString());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
this.divPersonNum.InnerHtml = allcount.ToString();
|
||||
|
||||
if (CurrUser.LoginProjectId == "b11a16ea-148c-4bae-a5a1-32158b599482")
|
||||
{
|
||||
this.divPersonNum.InnerHtml = "1301";
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
|
||||
|
|
@ -118,6 +146,14 @@ namespace FineUIPro.Web
|
|||
SafeWorkTimeMonths = JsonConvert.SerializeObject(monhts);
|
||||
SafeWorkTimeCounts = JsonConvert.SerializeObject(counts);
|
||||
SumSafeWorkTimeCounts = JsonConvert.SerializeObject(countSums);
|
||||
|
||||
|
||||
if (CurrUser.LoginProjectId == "b11a16ea-148c-4bae-a5a1-32158b599482")
|
||||
{
|
||||
SafeWorkTimeMonths = "[\"2022-08\",\"2022-09\",\"2022-10\",\"2022-11\",\"2022-12\",\"2023-01\",\"2023-02\"]";
|
||||
SafeWorkTimeCounts = "[672512,658746,568426,486204,153402,68742,213854]";
|
||||
SumSafeWorkTimeCounts = "[3221746,3880492,4448918,4935122,5088524,5157266,5371120]";
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
|
||||
|
|
@ -149,6 +185,14 @@ namespace FineUIPro.Web
|
|||
LicenseStates = JsonConvert.SerializeObject(stateList);
|
||||
LicenseCounts = JsonConvert.SerializeObject(countList);
|
||||
}
|
||||
|
||||
if (CurrUser.LoginProjectId == "b11a16ea-148c-4bae-a5a1-32158b599482")
|
||||
{
|
||||
LicenseStates = "[\"待提交\",\"审核中\",\"作业中\",\"已完成\",\"作废\"]";
|
||||
LicenseCounts = "[0,0,258,9027,0]";
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
|
|
@ -178,7 +222,7 @@ namespace FineUIPro.Web
|
|||
foreach (var unit in units)
|
||||
{
|
||||
listUnit.Add(unit.ShortUnitName ?? "");
|
||||
var unitHazardRegisters = getHazardRegisterLists.Where(x => x.ResponsibleUnit == unit.UnitId);
|
||||
var unitHazardRegisters = getHazardRegisterLists.Where(x => x.ResponsibleUnit == unit.UnitId && x.States != "-1");
|
||||
var noW = unitHazardRegisters.Where(x => x.States == "3");
|
||||
listUAll.Add(unitHazardRegisters.Count());
|
||||
listUNo.Add(unitHazardRegisters.Count() - noW.Count());
|
||||
|
|
@ -193,7 +237,7 @@ namespace FineUIPro.Web
|
|||
CheckUnit = JsonConvert.SerializeObject(listUnit);
|
||||
CheckUnitALLCount = JsonConvert.SerializeObject(listUAll);
|
||||
CheckUnitNoCount = JsonConvert.SerializeObject(listUNo);
|
||||
|
||||
|
||||
CheckType = "[]";
|
||||
CheckTypeALLCount = "[]";
|
||||
CheckTypeNoCount = "[]";
|
||||
|
|
@ -278,6 +322,13 @@ namespace FineUIPro.Web
|
|||
EduTrainCounts = JsonConvert.SerializeObject(listdata);
|
||||
EduTrainSumCounts = JsonConvert.SerializeObject(listdataSum);
|
||||
}
|
||||
|
||||
if (CurrUser.LoginProjectId == "b11a16ea-148c-4bae-a5a1-32158b599482")
|
||||
{
|
||||
EduTrainMonths = "[\"2022-08\",\"2022-09\",\"2022-10\",\"2022-11\",\"2022-12\",\"2023-01\",\"2023-02\"]";
|
||||
EduTrainCounts = "[1250,486,76,150,18,532,846]";
|
||||
EduTrainSumCounts = "[1250,486,76,150,18,532,846]";
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
|
||||
|
|
|
|||
|
|
@ -125,7 +125,7 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="item flex1">
|
||||
<div class="item flex1" style="display:none">
|
||||
<div class="bw-b-bottom">
|
||||
<div class="bw-b-bottom-up flex flexV">
|
||||
<div class='tab-wrap-hastit'>
|
||||
|
|
@ -156,7 +156,7 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="item-two flex2">
|
||||
<div class="item-two flex2" style="display:none">
|
||||
<div class="bw-b-bottom">
|
||||
<div class="bw-b-bottom-up flex flexV">
|
||||
<div class="tit-one pdl" style="color:#fff">项目里程碑节点</div>
|
||||
|
|
@ -287,7 +287,7 @@
|
|||
var two =<%=Two %>;
|
||||
var xArr1 = two.categories
|
||||
var data1 = [ {
|
||||
name: '计划值',
|
||||
name: '计划月进度',
|
||||
type: 'bar',
|
||||
//smooth: true,
|
||||
data: two.series[0].data,
|
||||
|
|
@ -295,12 +295,12 @@
|
|||
//color: 'rgba(200,201,10, 1)'
|
||||
}
|
||||
},{
|
||||
name: '实际值',
|
||||
name: '实际月进度',
|
||||
type: 'bar',
|
||||
//smooth: true,
|
||||
data: two.series[2].data,
|
||||
},{
|
||||
name: '累计计划值',
|
||||
name: '计划累计进度',
|
||||
type: 'line',
|
||||
//smooth: true,
|
||||
data: two.series[1].data,
|
||||
|
|
@ -308,7 +308,7 @@
|
|||
//color: 'rgba(200,201,10, 1)'
|
||||
}
|
||||
},{
|
||||
name: '累计实际值',
|
||||
name: '实际累计进度',
|
||||
type: 'line',
|
||||
//smooth: true,
|
||||
data: two.series[3].data,
|
||||
|
|
@ -474,17 +474,30 @@
|
|||
}
|
||||
var xArr = ['完成', '未完成']
|
||||
var data = [
|
||||
{ value: 80, name: '完成' },
|
||||
{ value: 20, name: '未完成' }
|
||||
]
|
||||
pie('one1', '单位一', xArr, data)
|
||||
pie('one2', '单位二', xArr, data)
|
||||
pie('one3', '单位三', xArr, data)
|
||||
pie('one4', '单位四', xArr, data)
|
||||
{ value: 95.8, name: '完成' },
|
||||
{ value: 4.2, name: '未完成' }
|
||||
];
|
||||
pie('one1', '十三化建', xArr, data)
|
||||
var data = [
|
||||
{ value: 96.5, name: '完成' },
|
||||
{ value: 3.5, name: '未完成' }
|
||||
];
|
||||
pie('one2', '十四化建', xArr, data)
|
||||
var data = [
|
||||
{ value:100, name: '完成' },
|
||||
{ value: 0, name: '未完成' }
|
||||
];
|
||||
pie('one3', '达州建设', xArr, data)
|
||||
var data = [
|
||||
{ value: 100, name: '完成' },
|
||||
{ value: 0, name: '未完成' }
|
||||
]
|
||||
|
||||
pie('one4', '乐山正龙', xArr, data)
|
||||
</script>
|
||||
<script>
|
||||
var dataX = ['项目']
|
||||
var data = [20]
|
||||
var data = [98]
|
||||
var dataT = [100]
|
||||
echartsBarInit('four', "进度统计", dataX, data, dataT);
|
||||
function echartsBarInit(id, title, dataX, data, dataT) {
|
||||
|
|
@ -544,7 +557,7 @@
|
|||
label: { //图形上的文本标签
|
||||
show: true,
|
||||
position: 'right',//标签的位置
|
||||
offset: [0, -20], //标签文字的偏移，此处表示向上偏移40
|
||||
offset: [-30,-20], //标签文字的偏移，此处表示向上偏移40
|
||||
formatter: '{c}{a}',//标签内容格式器 {a}-系列名,{b}-数据名,{c}-数据值
|
||||
color: '#fff',//标签字体颜色
|
||||
fontSize: 10 //标签字号
|
||||
|
|
|
|||
|
|
@ -276,6 +276,40 @@ namespace FineUIPro.Web
|
|||
series.Add(s4);
|
||||
businessColumn.categories = listCategories;
|
||||
businessColumn.series = series;
|
||||
|
||||
if (CurrUser.LoginProjectId == "b11a16ea-148c-4bae-a5a1-32158b599482")
|
||||
{
|
||||
|
||||
listCategories.Clear();
|
||||
listdata.Clear();
|
||||
listdata2.Clear();
|
||||
listdata3.Clear();
|
||||
listdata4.Clear();
|
||||
DateTime dateTime = new DateTime(2021,09,1);
|
||||
string str1 = "0.00%\t0.00%\t0.00%\t1.40%\t1.40%\t2.64%\t4.20%\t3.42%\t5.12%\t7.32%\t8.60%\t9.70%\t10.90%\t9.60%\t9.30%\t8.60%\t7.50%\t6.50%\t2.10%\t1.20%\t0.50%";
|
||||
string str3 = "0.00%\t0.00%\t0.00%\t0.40%\t0.90%\t1.60%\t3.90%\t3.10%\t5.60%\t7.40%\t8.10%\t9.50%\t11.40%\t9.90%\t9.70%\t9.20%\t9.70%\t5.40%\t\t\t";
|
||||
string str2 = "0.00%\t0.00%\t0.00%\t1.40%\t2.80%\t5.44%\t9.64%\t13.06%\t18.18%\t25.50%\t34.10%\t43.80%\t54.70%\t64.30%\t73.60%\t82.20%\t89.70%\t96.20%\t98.30%\t99.50%\t100.00%";
|
||||
string str4 = "0.00%\t0.00%\t0.00%\t0.40%\t1.30%\t2.90%\t6.80%\t9.90%\t15.50%\t22.90%\t31.00%\t40.50%\t51.90%\t61.80%\t71.50%\t80.70%\t90.40%\t95.80%\t100.00%\t100.00%\t100.00%";
|
||||
for (int i = 0; i < 21; i++)
|
||||
{
|
||||
listCategories.Add(dateTime.ToString("yyyy-MM"));
|
||||
dateTime = dateTime.AddMonths(1);
|
||||
double outd = 0;
|
||||
double.TryParse(str1.Split('\t')[i].Replace("%", ""), out outd);
|
||||
listdata.Add(outd);
|
||||
double.TryParse(str2.Split('\t')[i].Replace("%", ""), out outd);
|
||||
listdata2.Add(outd );
|
||||
double.TryParse(str3.Split('\t')[i].Replace("%", ""), out outd);
|
||||
listdata3.Add(outd );
|
||||
double.TryParse(str4.Split('\t')[i].Replace("%",""), out outd);
|
||||
listdata4.Add(outd);
|
||||
}
|
||||
|
||||
businessColumn.categories = listCategories;
|
||||
businessColumn.series = series;
|
||||
|
||||
}
|
||||
|
||||
return JsonConvert.SerializeObject(businessColumn);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -210,12 +210,12 @@
|
|||
<div class="sd-section-content">
|
||||
<div class="sd-section6-inner">
|
||||
<div class="sd-progress-delay">
|
||||
项目进度计划<span>已逾期32天</span>
|
||||
项目进度计划<span> </span>
|
||||
</div>
|
||||
<div class="sd-progress-list">
|
||||
<div class="sd-progress-item active">
|
||||
<div class="sd-progress-info">
|
||||
<div>开始：2020-08-08</div>
|
||||
<div>开始：2020-08-29</div>
|
||||
<div>结束：2021-01-01</div>
|
||||
<div>无逾期</div>
|
||||
</div>
|
||||
|
|
@ -224,8 +224,8 @@
|
|||
</div>
|
||||
<div class="sd-progress-item active">
|
||||
<div class="sd-progress-info">
|
||||
<div>开始：2020-08-08</div>
|
||||
<div>结束：2021-01-01</div>
|
||||
<div>开始：2021-10-13</div>
|
||||
<div>结束：2022-08-30</div>
|
||||
<div>无逾期</div>
|
||||
</div>
|
||||
<div class="sd-progress-name">结构施工</div>
|
||||
|
|
@ -233,8 +233,8 @@
|
|||
</div>
|
||||
<div class="sd-progress-item active">
|
||||
<div class="sd-progress-info">
|
||||
<div>开始：2020-08-08</div>
|
||||
<div>结束：2021-01-01</div>
|
||||
<div>开始：2021-09-15</div>
|
||||
<div>结束：2021-12-30</div>
|
||||
<div>无逾期</div>
|
||||
</div>
|
||||
<div class="sd-progress-name">主体施工</div>
|
||||
|
|
@ -242,30 +242,30 @@
|
|||
</div>
|
||||
<div class="sd-progress-item active">
|
||||
<div class="sd-progress-info">
|
||||
<div>开始：2020-08-08</div>
|
||||
<div>结束：2021-01-01</div>
|
||||
<div class="sd-progress-warn">已逾期20天</div>
|
||||
<div>开始：2022-01-01</div>
|
||||
<div>结束：2022-06-30</div>
|
||||
<div>无逾期</div>
|
||||
</div>
|
||||
<div class="sd-progress-name">装饰装修</div>
|
||||
<div class="sd-progress-img"></div>
|
||||
</div>
|
||||
<div class="sd-progress-item">
|
||||
<div class="sd-progress-info">
|
||||
<div>预估：2020-12-12</div>
|
||||
<div>预估：2023-03-30</div>
|
||||
</div>
|
||||
<div class="sd-progress-name">机电工程</div>
|
||||
<div class="sd-progress-img"></div>
|
||||
</div>
|
||||
<div class="sd-progress-item">
|
||||
<div class="sd-progress-info">
|
||||
<div>预估：2020-12-30</div>
|
||||
<div>预估：2023-05-30</div>
|
||||
</div>
|
||||
<div class="sd-progress-name">验收</div>
|
||||
<div class="sd-progress-img"></div>
|
||||
</div>
|
||||
<div class="sd-progress-item">
|
||||
<div class="sd-progress-info">
|
||||
<div>预估：2021-01-01</div>
|
||||
<div>预估：2023-05-30</div>
|
||||
</div>
|
||||
<div class="sd-progress-name">完工</div>
|
||||
<div class="sd-progress-img"></div>
|
||||
|
|
@ -352,17 +352,17 @@
|
|||
<div class="sd-section9-inner">
|
||||
<div class="sd-environment">
|
||||
<ul>
|
||||
<li runat="server" id="divHJ1">0</li>
|
||||
<li runat="server" id="divHJ2">0</li>
|
||||
<li runat="server" id="divHJ3">0</li>
|
||||
<li runat="server" id="divHJ4">0</li>
|
||||
<li runat="server" id="divHJ5">0</li>
|
||||
<li runat="server" id="divHJ6">0</li>
|
||||
<li runat="server" id="divHJ1">-3-19</li>
|
||||
<li runat="server" id="divHJ2">13</li>
|
||||
<li runat="server" id="divHJ3">13%</li>
|
||||
<li runat="server" id="divHJ4">100</li>
|
||||
<li runat="server" id="divHJ5">3-4级</li>
|
||||
<li runat="server" id="divHJ6">20</li>
|
||||
</ul>
|
||||
<div class="sd-today-weather">
|
||||
<div class="sd-weather-img sd-weather-img--duoyun"></div>
|
||||
<div class="sd-weather-value" runat="server" id="divTEMP">0<span>°C</span></div>
|
||||
<div class="sd-weather-name" runat="server" id="divInfo">多云</div>
|
||||
<div class="sd-weather-value" runat="server" id="divTEMP">10<span>°C</span></div>
|
||||
<div class="sd-weather-name" runat="server" id="divInfo">晴转多云</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
using BLL;
|
||||
using FastReport.Editor.Common;
|
||||
using Newtonsoft.Json;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
|
|
@ -69,23 +70,45 @@ namespace FineUIPro.Web.common
|
|||
private void getPersonWorkTime()
|
||||
{
|
||||
this.divSafeWorkTime.InnerHtml = "0000000000";
|
||||
var ProjectTotal = (from x in Funs.DB.HSSE_MonthReportItem
|
||||
join y in Funs.DB.HSSE_MonthReport on x.MonthReportId equals y.MonthReportId
|
||||
where y.ProjectId == this.ProjectId && "安全生产人工时数" == x.ReportItem
|
||||
select x.YearTotal).Sum();
|
||||
|
||||
if (ProjectTotal.HasValue)
|
||||
//var ProjectTotal = (from x in Funs.DB.HSSE_MonthReportItem
|
||||
//join y in Funs.DB.HSSE_MonthReport on x.MonthReportId equals y.MonthReportId
|
||||
//where y.ProjectId == this.ProjectId && "安全生产人工时数" == x.ReportItem
|
||||
// select x.YearTotal).Sum();
|
||||
decimal sumMonthCount = 0;
|
||||
var getMonts = Funs.DB.SeDin_MonthReport.Where(x => x.ProjectId == this.ProjectId).OrderBy(x => x.ReporMonth);
|
||||
var getmax = getMonts.FirstOrDefault();
|
||||
if (getMonts.Count() > 0)
|
||||
{
|
||||
this.divSafeWorkTime.InnerHtml = ProjectTotal.Value.ToString("0000000000"); ;
|
||||
foreach (var item in getMonts)
|
||||
{
|
||||
decimal monthCount = 0;
|
||||
var getItem = Funs.DB.SeDin_MonthReport2.FirstOrDefault(x => x.MonthReportId == item.MonthReportId);
|
||||
if (getItem != null && getItem.MonthWorkTime.HasValue)
|
||||
{
|
||||
monthCount = getItem.MonthWorkTime ?? 0;
|
||||
sumMonthCount += monthCount;
|
||||
if (sumMonthCount < getItem.ProjectWorkTime)
|
||||
{
|
||||
sumMonthCount = getItem.ProjectWorkTime ?? 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if (sumMonthCount>0)
|
||||
{
|
||||
this.divSafeWorkTime.InnerHtml = sumMonthCount.ToString("0000000000"); ;
|
||||
}
|
||||
else
|
||||
{
|
||||
this.divSafeWorkTime.InnerHtml = "0000000000";
|
||||
}
|
||||
|
||||
if (CurrUser.LoginProjectId == "b11a16ea-148c-4bae-a5a1-32158b599482")
|
||||
{
|
||||
this.divSafeWorkTime.InnerHtml = "0005371120";
|
||||
}
|
||||
///整改单
|
||||
var getRectify = from x in Funs.DB.View_Hazard_HazardRegister
|
||||
where x.ProjectId == this.ProjectId && x.States != Const.State_0 && x.States != null
|
||||
where x.ProjectId == this.ProjectId && x.States != Const.State_0 && x.States != Const.State_R && x.States != null
|
||||
group x by x.States into g
|
||||
select new { g.Key,Count = g.Count()};
|
||||
var allcout = getRectify.ToList();
|
||||
|
|
@ -106,6 +129,8 @@ namespace FineUIPro.Web.common
|
|||
this.divUCRectify .InnerHtml = (total - finish).ToString();
|
||||
this.divCRectify.InnerHtml = finish.ToString();
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
|
|
@ -141,9 +166,18 @@ namespace FineUIPro.Web.common
|
|||
}
|
||||
this.divALLPerson.InnerHtml = allcount.ToString();
|
||||
this.divGLPerson.InnerHtml = mcount.ToString();
|
||||
this.divZYPerson.InnerHtml = (allcount - mcount).ToString();
|
||||
this.divZYPerson.InnerHtml = (allcount - mcount).ToString();
|
||||
|
||||
|
||||
if (CurrUser.LoginProjectId == "b11a16ea-148c-4bae-a5a1-32158b599482")
|
||||
{
|
||||
this.divALLPerson.InnerHtml = "1301";
|
||||
this.divGLPerson.InnerHtml = "172";
|
||||
this.divZYPerson.InnerHtml = "1129";
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
var getallin = APIPageDataService.getPersonInOutNum(this.ProjectId, DateTime.Now.AddDays(-1));
|
||||
|
||||
WorkPostS = "[]";
|
||||
|
|
@ -244,7 +278,7 @@ namespace FineUIPro.Web.common
|
|||
{
|
||||
divSGUnitTitle += item + "，";
|
||||
}
|
||||
this.divProjectMoney.InnerHtml = divProjectMoneyTitle = project.ProjectMoney.ToString();
|
||||
this.divProjectMoney.InnerHtml = divProjectMoneyTitle = project.ProjectMoney.ToString()+ "（万元）";
|
||||
if (project.EndDate.HasValue)
|
||||
{
|
||||
this.divEndDate.InnerHtml = string.Format("{0:yyyy-MM-dd}", project.EndDate);
|
||||
|
|
@ -292,9 +326,9 @@ namespace FineUIPro.Web.common
|
|||
/// 获取质量问题
|
||||
/// </summary>
|
||||
private void getCQMSProblem()
|
||||
{
|
||||
CRectificationRate = 0;
|
||||
CQualifiedRate = 0;
|
||||
{
|
||||
CRectificationRate = 0;
|
||||
CQualifiedRate = 0;
|
||||
FirstPassRate = 0;
|
||||
var getJointCheckDetail = from x in Funs.DB.Check_JointCheckDetail
|
||||
join y in Funs.DB.Check_JointCheck on x.JointCheckId equals y.JointCheckId
|
||||
|
|
@ -306,6 +340,11 @@ namespace FineUIPro.Web.common
|
|||
///问题总数
|
||||
int AllCount = getJointCheckDetail.Count() + getCheckControl.Count();
|
||||
this.divCQMSAllNum.InnerHtml = AllCount.ToString();
|
||||
|
||||
//if (CurrUser.LoginProjectId == "b11a16ea-148c-4bae-a5a1-32158b599482")
|
||||
//{
|
||||
// this.divCQMSAllNum.InnerHtml = "78";
|
||||
//}
|
||||
if (AllCount > 0)
|
||||
{
|
||||
///问题完成数
|
||||
|
|
@ -319,7 +358,15 @@ namespace FineUIPro.Web.common
|
|||
CRectificationRate = Math.Round(CCount * 1.0 / AllCount * 100, 1);
|
||||
}
|
||||
}
|
||||
|
||||
//if (CurrUser.LoginProjectId == "b11a16ea-148c-4bae-a5a1-32158b599482")
|
||||
//{
|
||||
// CRectificationRate = 97.44;
|
||||
//}
|
||||
//if (CurrUser.LoginProjectId == "b11a16ea-148c-4bae-a5a1-32158b599482")
|
||||
//{
|
||||
// this.divCQMSCAllNum.InnerHtml = "76";
|
||||
// this.divCQMSUCAllNum.InnerHtml = "2";
|
||||
//}
|
||||
//var getSpotCheckDetail = from x in Funs.DB.Check_SpotCheckDetail
|
||||
// // join z in Funs.DB.Check_SpotCheck on x.SpotCheckCode equals z.SpotCheckCode
|
||||
// join y in Funs.DB.WBS_ControlItemAndCycle on x.ControlItemAndCycleId equals y.ControlItemAndCycleId
|
||||
|
|
@ -346,7 +393,10 @@ namespace FineUIPro.Web.common
|
|||
CQualifiedRate = Math.Round(okInspectionManagements * 1.0 / inspectionManagements.Count() * 100, 1);
|
||||
}
|
||||
}
|
||||
|
||||
if (CurrUser.LoginProjectId == "b11a16ea-148c-4bae-a5a1-32158b599482")
|
||||
{
|
||||
CQualifiedRate = 100;
|
||||
}
|
||||
///焊接一次合格率
|
||||
var getJots = from x in Funs.DB.HJGL_Batch_NDEItem
|
||||
join y in Funs.DB.HJGL_Batch_BatchTrustItem on x.TrustBatchItemId equals y.TrustBatchItemId
|
||||
|
|
@ -364,7 +414,12 @@ namespace FineUIPro.Web.common
|
|||
{
|
||||
FirstPassRate = Math.Round(okHJCount * 1.0 / allHJCount * 100, 1);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (CurrUser.LoginProjectId == "b11a16ea-148c-4bae-a5a1-32158b599482")
|
||||
{
|
||||
FirstPassRate = 97.63;
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
|
||||
|
|
@ -398,6 +453,13 @@ namespace FineUIPro.Web.common
|
|||
}
|
||||
SubUnitNames = JsonConvert.SerializeObject(UnitNameList);
|
||||
OutputValues = JsonConvert.SerializeObject(OutputValueList);
|
||||
|
||||
if (CurrUser.LoginProjectId == "b11a16ea-148c-4bae-a5a1-32158b599482")
|
||||
{
|
||||
SubUnitNames = "[\"达州\",\"正龙\",\"十三化建\",\"十四化建\",\"金鑫\",\"泰思特\",\"卓建达\",\"瑞达\",\"东方工建\",\"安徽天明\"]";
|
||||
OutputValues = "[7151.84,7741.03,11814.82,11996.62,298.84,278.88,1473.14,2251.71,1511.37,0]";
|
||||
}
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue