diff --git a/SGGL/FineUIPro.Web/App_GlobalResources/Lan.en-US.resx b/SGGL/FineUIPro.Web/App_GlobalResources/Lan.en-US.resx
index 6a2e6cac..70caf403 100644
--- a/SGGL/FineUIPro.Web/App_GlobalResources/Lan.en-US.resx
+++ b/SGGL/FineUIPro.Web/App_GlobalResources/Lan.en-US.resx
@@ -260,6 +260,10 @@
Completed
已完成
+
+
+ Qualified
+ 合格数
Construction unit
diff --git a/SGGL/FineUIPro.Web/App_GlobalResources/Lan.resx b/SGGL/FineUIPro.Web/App_GlobalResources/Lan.resx
index 8236a725..4d8a209a 100644
--- a/SGGL/FineUIPro.Web/App_GlobalResources/Lan.resx
+++ b/SGGL/FineUIPro.Web/App_GlobalResources/Lan.resx
@@ -224,6 +224,9 @@
已完成
+
+
+ 合格数
施工单位
diff --git a/SGGL/FineUIPro.Web/App_GlobalResources/Lan.zh-CN.resx b/SGGL/FineUIPro.Web/App_GlobalResources/Lan.zh-CN.resx
index be94a888..bd325cb3 100644
--- a/SGGL/FineUIPro.Web/App_GlobalResources/Lan.zh-CN.resx
+++ b/SGGL/FineUIPro.Web/App_GlobalResources/Lan.zh-CN.resx
@@ -224,6 +224,9 @@
已完成
+
+
+ 合格数
施工单位
@@ -1083,7 +1086,7 @@
共检总数
-
+
一次合格数量
diff --git a/SGGL/FineUIPro.Web/App_GlobalResources/Lan1.designer.cs b/SGGL/FineUIPro.Web/App_GlobalResources/Lan1.designer.cs
index f1782eff..5a3813d3 100644
--- a/SGGL/FineUIPro.Web/App_GlobalResources/Lan1.designer.cs
+++ b/SGGL/FineUIPro.Web/App_GlobalResources/Lan1.designer.cs
@@ -2796,6 +2796,15 @@ namespace Resources {
}
}
+ ///
+ /// 查找类似 合格数 的本地化字符串。
+ ///
+ internal static string qualified {
+ get {
+ return ResourceManager.GetString("qualified", resourceCulture);
+ }
+ }
+
///
/// 查找类似 质量管理 的本地化字符串。
///
diff --git a/SGGL/FineUIPro.Web/common/mainProject2.aspx b/SGGL/FineUIPro.Web/common/mainProject2.aspx
index 45a746ac..6c122362 100644
--- a/SGGL/FineUIPro.Web/common/mainProject2.aspx
+++ b/SGGL/FineUIPro.Web/common/mainProject2.aspx
@@ -1968,7 +1968,7 @@
})--%>
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' })
+ createZL3({ name: '<%=OnePassRateOfWelding%>', value1: <%=hjallNumber%>, value2: <%=hjfinishNumber%>, el: 'zl-map3' })
function createZL(obj) {
let AOption1 = {
title: [{
@@ -2131,6 +2131,168 @@
var aPassChart = echarts.init(document.getElementById(obj.el));
aPassChart.setOption(AOption1);
}
+ function createZL3(obj) {
+ let AOption1 = {
+ title: [{
+ text: obj.name || '',
+ top: '62%',
+ left: 'center',
+ textStyle: {
+ color: '#FFFFFF',
+ fontSize: 14,
+ fontWeight: 100
+ }
+ }, {
+ // text: `总计：${obj.value1} | 合格数：${obj.value2}`,
+ text: [`{a|<%=total%>：}{b|${obj.value1}}{c||}{a|<%=qualified%>：}{d|${obj.value2}}`],
+ top: '80%',
+ left: 'center',
+ textStyle: {
+ rich: {
+ a: {
+ fontSize: 14,
+ color: '#DADADA',
+ },
+ b: {
+ color: '#FFFFFF',
+ fontSize: 14,
+ },
+ c: {
+ padding: [0, 6],
+ fontSize: 14,
+ color: '#FFFFFF',
+ },
+ d: {
+ fontSize: 14,
+ color: '#12CDA2',
+ }
+ }
+ }
+ },
+ ],
+ series: [
+ {
+ name: '',
+ type: 'gauge',
+ radius: "60%",
+ center: ["50%", "30%"],
+ startAngle: 360,
+ endAngle: 0,
+ splitNumber: 20,
+ progress: {
+ show: false
+ },
+ axisLine: {
+ roundCap: true,
+ lineStyle: {
+ width: 20,
+ color: [[1, new echarts.graphic.LinearGradient(
+ 0, 0, 0, 1, // 这四个参数分别表示渐变的起点 (x1, y1) 与终点 (x2, y2)
+ [
+ { offset: 0, color: 'RGBA(38, 223, 235, .4)' }, // 0% 处的颜色
+ { offset: 1, color: '#29F1FA' } // 100% 处的颜色
+ ]
+ )]]
+ }
+ },
+ detail: {
+ valueAnimation: true,
+ formatter: function (value) {
+ if (obj.value1 == 0) {
+ str = `{a|0}{b|%}`
+ } else {
+ str = `{a|${(obj.value2 / obj.value1 * 100).toFixed(2)}}{b|%}`
+ }
+
+
+ return str;
+ },
+ color: 'inherit',
+ offsetCenter: [0, 0],
+ rich: {
+ a: {
+ fontSize: 20,
+ color: '#FFFFFF'
+ },
+ b: {
+ fontSize: 12,
+ color: '#FFFFFF'
+ }
+ }
+ },
+ pointer: {
+ show: false
+ },
+ axisLabel: {
+ show: false
+ },
+ splitLine: {
+
+ distance: -20,
+ length: 20,
+
+ lineStyle: {
+ color: '#021837',
+ width: 4,
+ }
+ },
+
+ axisTick: {
+ show: false
+ },
+ anchor: {
+ show: false
+ },
+ data: [
+ { value: obj.value1 },
+ ],
+ },
+ {
+ name: '',
+ type: 'gauge',
+ radius: "68%",
+ center: ["50%", "30%"],
+ startAngle: 20,
+ endAngle: 200,
+ splitNumber: 20,
+ progress: {
+ show: false
+ },
+ axisLine: {
+ roundCap: true,
+ lineStyle: {
+ width: 1,
+ color: [[1, new echarts.graphic.LinearGradient(
+ 0, 0, 0, 1, // 这四个参数分别表示渐变的起点 (x1, y1) 与终点 (x2, y2)
+ [
+ { offset: 0, color: 'RGBA(38, 223, 235, .4)' }, // 0% 处的颜色
+ { offset: 1, color: '#29F1FA' } // 100% 处的颜色
+ ]
+ )]]
+ }
+ },
+ pointer: {
+ show: false
+ },
+ axisLabel: {
+ show: false
+ },
+ splitLine: {
+ show: false
+ },
+
+ axisTick: {
+ show: false
+ },
+ anchor: {
+ show: false
+ },
+ }
+ ]
+ };
+ var aPassChart = echarts.init(document.getElementById(obj.el));
+ aPassChart.setOption(AOption1);
+ }
// 风险巡检图标
createFXMap()
diff --git a/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs b/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs
index 14d95cb9..39215b69 100644
--- a/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs
+++ b/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs
@@ -29,6 +29,8 @@ namespace FineUIPro.Web.common
protected string completed = string.Empty;
+ protected string qualified = string.Empty;
+
protected string Cumulative_actual_value = string.Empty;
//实际值
@@ -1792,6 +1794,7 @@ where qc.QuantityCompletionId=(select top 1 QuantityCompletionId from[JDGL_Quant
OnePassRateOfWelding = Resources.Lan.OnePassRateOfWelding;
total = Resources.Lan.total;
completed = Resources.Lan.completed;
+ qualified = Resources.Lan.qualified;
majorRisk = Resources.Lan.MajorRisk;
LowRisk = Resources.Lan.LowRisk;
GeneralRisk = Resources.Lan.GeneralRisk;