Merge branch 'feature/颜色文本BUG修复' into develop

performance/Performance.Services/RedistributionService.cs

@@ -123,7 +123,7 @@ public SecondDetailDto Load(int secondId, ComputeMode computeMode, EmployeeSourc
             }
 
             var head = LoadHead(computeMode, allot, second);
-            var dic = GetTableHeaderDictionary(computeMode, allot, second, loads);
+            var dic = GetTableHeaderDictionary(computeMode, allot, second, loads, isAttachFactor: false);
             return new SecondDetailDto { Head = head, Body = handson, Dic = dic };
         }
 
@@ -160,7 +160,7 @@ public HandsonTableBase GetHandsonTable(ComputeMode computeMode, List<TitleValue
         /// <param name="second"></param>
         /// <param name="loads"></param>
         /// <returns></returns>
-        public List<SecondColumnDictionary> GetTableHeaderDictionary(ComputeMode computeMode, per_allot allot, ag_secondallot second, List<TitleValue<string, decimal?>> loads, List<SecondWorkLoadDto> workloadGroups = null)
+        public List<SecondColumnDictionary> GetTableHeaderDictionary(ComputeMode computeMode, per_allot allot, ag_secondallot second, List<TitleValue<string, decimal?>> loads, List<SecondWorkLoadDto> workloadGroups = null, bool isAttachFactor = true)
         {
             /*
              此处数据需要额外注意，前端显示规则：通过isTrue=true显示，显示名称为label
@@ -219,7 +219,8 @@ public List<SecondColumnDictionary> GetTableHeaderDictionary(ComputeMode compute
                     if (!isExist)
                     {
                         string factor = item.Title.StartsWith("Workload_") ? $"({item.State ?? 0:0.####})" : "";
-                        maps.Add(new SecondColumnDictionary($"{item.Value}{factor}", item.Title, false, ++workloadSort, type: "Workload", color: $"workload_color{index}"));
+                        var label = isAttachFactor == true ? $"{item.Value}{factor}" : item.Value;
+                        maps.Add(new SecondColumnDictionary(label, item.Title, false, ++workloadSort, type: "Workload", color: $"workload_color{index}"));
                     }
                 }