GP12触摸屏优化

ZR.Admin.WebApi/Controllers/mes/qc/GP12/QcGp12Controller.cs

@@ -60,6 +60,18 @@ namespace ZR.Admin.WebApi.Controllers
             return SUCCESS(response);
         }
 
+        /// <summary>
+        /// 获取缺陷项列表初始数据
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet("GetDefectTableOptions")]
+        [AllowAnonymous]
+        public IActionResult GetDefectTableOptions()
+        {
+            var response = _QcGp12Service.GetDefectTableOptions();
+            return SUCCESS(response);
+        }
+
         /// <summary>
         /// 解析标签
         /// </summary>

ZR.Admin.WebApi/Controllers/mes/qc/GP12/QcGp12ServiceStatisticsController.cs

@@ -87,19 +87,29 @@ namespace ZR.Admin.WebApi.Controllers
                     return itemDict;
                 })
                 .ToList();
-
-            // 计算合格率
-            double qualifiedRate =
-                totalRequireNumber > 0
-                    ? (double)totalQualifiedNumber / totalRequireNumber * 150
-                    : 0;
+            // 数据除三
+            totalRequireNumber = totalRequireNumber / 3;
+            totalQualifiedNumber = totalQualifiedNumber / 3;
+            totalPolishNumber = totalPolishNumber / 3;
+            totalDamoNumber = totalDamoNumber / 3;
+            totalBaofeiNumber = totalBaofeiNumber / 3;
             totalListCount = totalListCount / 3;
+            // 计算合格率
+            double qualifiedRate = 0.0;
+            if (totalRequireNumber > 0)
+            {
+                qualifiedRate = (double)totalQualifiedNumber / totalRequireNumber * 100;
+            }
+            else
+            {
+                qualifiedRate = 0.0;
+            }
             // 创建统计数据字典
             var statistics = new Dictionary<string, object>
             {
                 { "TotalRequireNumber", totalRequireNumber },
                 { "TotalQualifiedNumber", totalQualifiedNumber },
-                { "QualifiedRate", $"{qualifiedRate:F2}%" },
+                { "QualifiedRate", $"{qualifiedRate:F1}%" },
                 { "TotalPolishNumber", totalPolishNumber },
                 { "TotalDamoNumber", totalDamoNumber },
                 { "TotalBaofeiNumber", totalBaofeiNumber },