-
危大工程
+
-
审批完成
+ <%=GetCompletedNum() %>
-
培训人次数
+ <%=GetTrainPersonNum() %>
-
施工个数
+ <%=GetConstructionNum() %>
-
完工个数
+ <%=GetFinishedNum() %>
-
超危大工程
+
-
审批完成
+ <%=GetSuperCompletedNum() %>
-
培训人次数
+ <%=GetSuperTrainPersonNum() %>
-
施工个数
+ <%=GetSuperConstructionNum() %>
-
完工个数
+ <%=GetSuperFinishedNum() %>
- 质量概况
+
-
质量培训累计人员
+ 1307
-
施工方案审批量
+ 5217
- 作业许可
+
-
动火
+ <%=getWrokCount0() %>/<%=getALLWrokCount0() %>
-
高处
+ <%=getWrokCount1() %>/<%=getALLWrokCount1() %>
-
吊装
+ <%=getWrokCount2() %>/<%=getALLWrokCount2() %>
-
其他
+ <%=getWrokCount3() %>/<%=getALLWrokCount3() %>
1656059
- 累计安全人工时
+ 0
- 本月安全人工时
+ 1161
- 安全培训累计人员
+ 3
- 安全管理人员
+ 4564
- 未遂事件
+
-
@@ -290,24 +290,24 @@
整改数据
+ 总数
+265
已完成
+265
未完成
+12
整改率
+100%
-
合同工期
+ 0天
-
合同到期时间
+
-
合同剩余
+ 0天
-
关键事项准点率 <%=gjsxRate %>
+
- 进度统计
+
<%-- --%>
@@ -318,24 +318,24 @@
@@ -358,19 +358,19 @@
@@ -378,28 +378,28 @@
- 工作台面
+
-
关键事项
+ 0
-
待办事项
+ 0
-
个人流程
+ 0
-
已办任务
+ 0
- 人员信息
+
-
当前现场人数
+ 0
-
作业人员总数
+ 0
-
管理人员总数
+ 0
- 材料统计
+
-
管道材料
- 设备材料
+
-
材料类别
- 设计量
+
-
采购量
-采购量百分比
+
-
到货量
-已到货百分比
+
-
领料量
-已领料百分比
+
@@ -1787,9 +1787,9 @@
weekData.forEach(e => {
createZL(e)
})--%>
- createZL({ name: '质量问题整改率', value1: <%=zlallNumber%>, value2: <%=zlfinishNumber%>, el: 'zl-map1' })
- createZL({ name: '一次共检合格率', value1: <%=zlgjallNumber%>, value2: <%=zlgjfinishNumber%>, el: 'zl-map2' })
- createZL({ name: '焊接一次合格率', value1: <%=hjallNumber%>, value2: <%=hjfinishNumber%>, el: 'zl-map3' })
+ createZL({ name: '<%=QualityRate%>', value1: <%=zlallNumber%>, value2: <%=zlfinishNumber%>, el: 'zl-map1' })
+ createZL({ name: '<%=OnePassRate%>', value1: <%=zlgjallNumber%>, value2: <%=zlgjfinishNumber%>, el: 'zl-map2' })
+ createZL({ name: '<%=OnePassRateOfWelding%>', value1: <%=hjallNumber%>, value2: <%=hjfinishNumber%>, el: 'zl-map3' })
function createZL(obj) {
let AOption1 = {
title: [{
@@ -1803,7 +1803,7 @@
}
}, {
// text: `总计：${obj.value1} | 完成：${obj.value2}`,
- text: [`{a|总计：}{b|${obj.value1}}{c||}{a|完成：}{d|${obj.value2}}`],
+ text: [`{a|<%=total%>：}{b|${obj.value1}}{c||}{a|<%=completed%>：}{d|${obj.value2}}`],
top: '80%',
left: 'center',
textStyle: {
@@ -1958,10 +1958,10 @@
function createFXMap() {
const list = [
- { TypeName: "重大风险", ValueAmount: <%=riskData4%> },
- { TypeName: "低风险", ValueAmount: <%=riskData1%> },
- { TypeName: "一般风险", ValueAmount: <%=riskData3%> },
- { TypeName: "较大风险", ValueAmount: <%=riskData2%> },
+ { TypeName: "<%=majorRisk%>", ValueAmount: <%=riskData4%> },
+ { TypeName: "<%=LowRisk%>", ValueAmount: <%=riskData1%> },
+ { TypeName: "<%=GeneralRisk%>", ValueAmount: <%=riskData3%> },
+ { TypeName: "<%=GreaterRisk%>", ValueAmount: <%=riskData2%> },
]
@@ -1999,7 +1999,7 @@
}
}
}, {
- text: '重大风险',
+ text: '<%=majorRisk%>',
top: 110,
left: 'center',
textStyle: {
@@ -2282,7 +2282,7 @@
var two =<%=Tree %>
var xArr1 = two.categories
var data1 = [{
- name: '计划值',
+ name: '<%=PlannedValue%>',
type: 'bar',
//smooth: true,
data: two.series[0].data,
@@ -2299,7 +2299,7 @@
//color: 'rgba(200,201,10, 1)'
}
}, {
- name: '实际值',
+ name: '<%=ActualValue%>',
type: 'bar',
//smooth: true,
data: two.series[2].data,
@@ -2313,7 +2313,7 @@
formatter: '{c}',
},
}, {
- name: '累计计划值',
+ name: '<%=Cumulative_planned_value%>',
type: 'line',
//smooth: true,
data: two.series[1].data,
@@ -2330,7 +2330,7 @@
//color: 'rgba(200,201,10, 1)'
}
}, {
- name: '累计实际值',
+ name: '<%=Cumulative_actual_value%>',
type: 'line',
//smooth: true,
data: two.series[3].data,
diff --git a/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs b/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs
index 3556ac9e..62214521 100644
--- a/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs
+++ b/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs
@@ -132,6 +132,8 @@ namespace FineUIPro.Web.common
//材料到货
getCldh();
+
+ getCNEN();//中英文翻译
}
}
@@ -1236,5 +1238,40 @@ namespace FineUIPro.Web.common
}
}
#endregion
+
+
+ ///
+ /// 中英文
+ ///
+ protected string QualityRate = string.Empty;//质量问题整改率
+ protected string OnePassRate = string.Empty;//一次共检合格率
+ protected string OnePassRateOfWelding = string.Empty;//焊接一次合格率
+ protected string total = string.Empty;//总计
+ protected string completed = string.Empty;//已完成
+ protected string majorRisk = string.Empty;//重大风险
+ protected string LowRisk = string.Empty;//低风险
+ protected string GeneralRisk = string.Empty;//一般风险
+ protected string GreaterRisk = string.Empty;//较大风险
+ protected string PlannedValue = string.Empty;//计划值
+ protected string ActualValue = string.Empty;//实际值
+ protected string Cumulative_planned_value = string.Empty;//累计计划值
+ protected string Cumulative_actual_value = string.Empty;//累计实际值
+
+ private void getCNEN()
+ {
+ QualityRate = Resources.Lan.QualityRate;
+ OnePassRate = Resources.Lan.OnePassRate;
+ OnePassRateOfWelding = Resources.Lan.OnePassRateOfWelding;
+ total = Resources.Lan.total;
+ completed = Resources.Lan.completed;
+ majorRisk = Resources.Lan.MajorRisk;
+ LowRisk = Resources.Lan.LowRisk;
+ GeneralRisk = Resources.Lan.GeneralRisk;
+ GreaterRisk = Resources.Lan.GreaterRisk;
+ PlannedValue = Resources.Lan.PlannedValue;
+ ActualValue = Resources.Lan.ActualValue;
+ Cumulative_planned_value = Resources.Lan.Cumulative_planned_value;
+ Cumulative_actual_value = Resources.Lan.Cumulative_actual_value;
+ }
}
}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/common/main_new.aspx.cs b/SGGL/FineUIPro.Web/common/main_new.aspx.cs
index 2d1557e8..d9138911 100644
--- a/SGGL/FineUIPro.Web/common/main_new.aspx.cs
+++ b/SGGL/FineUIPro.Web/common/main_new.aspx.cs
@@ -317,15 +317,15 @@ namespace FineUIPro.Web.common
if (getAllPersonInOutList.Count() > 0)
{
//cout1 = getAllPersonInOutList.Sum(x => (long)x.WorkHours);
- foreach (var pid in pids)
- {
- var q1 = getAllPersonInOutList.Where(x => x.ProjectId == pid).OrderByDescending(x => x.InOutDate);
- var q2 = getAllPersonInOutList.Where(x => x.ProjectId == pid).OrderBy(x => x.InOutDate);
- if (q1.Count() > 0)
- {
- cout1 += (q1.First().WorkHours ?? 0) - (q2.First().WorkHours ?? 0);
- }
- }
+ //foreach (var pid in pids)
+ //{
+ // var q1 = getAllPersonInOutList.Where(x => x.ProjectId == pid).OrderByDescending(x => x.InOutDate);
+ // var q2 = getAllPersonInOutList.Where(x => x.ProjectId == pid).OrderBy(x => x.InOutDate);
+ // if (q1.Count() > 0)
+ // {
+ // cout1 += (q1.First().WorkHours ?? 0) - (q2.First().WorkHours ?? 0);
+ // }
+ //}
}
}
diff --git a/SGGL/FineUIPro.Web/indexProject.aspx b/SGGL/FineUIPro.Web/indexProject.aspx
index 69fbd111..28c9bcbe 100644
--- a/SGGL/FineUIPro.Web/indexProject.aspx
+++ b/SGGL/FineUIPro.Web/indexProject.aspx
@@ -236,6 +236,13 @@
";
#endregion
}
-
-
-
-
-
-
}
#endregion
@@ -1414,7 +1145,6 @@ namespace FineUIPro.Web.common
select x).Count();
return result;
}
-
}
}
}
\ No newline at end of file