试验-保存

1、速凝剂-凝结时间差图表  特殊点位缩小
2、时间 小时:分钟 处理

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/FormulaServiceImpl.java

@@ -5090,8 +5090,14 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
                     if (!target1.isEmpty()) {
                         FormData a = target1.get(0);
                         for (ElementData value : a.getValues()) {
-                            if(ConvertUtils.canConvertToDouble(value.getValue())){
-                                x.add(Double.valueOf(value.getValue().toString()));
+                            Object obj = value.getValue();
+                            //处理 小时:分钟
+                            if(obj !=null && obj.toString().contains(":")){
+                                String[] split = obj.toString().split(":");
+                                obj = Integer.parseInt(split[0]) * 60 + Integer.parseInt(split[1]);
+                            }
+                            if(ConvertUtils.canConvertToDouble(obj)){
+                                x.add(Double.valueOf(obj.toString()));
                             }
                         }
                     }

blade-service/blade-manager/src/main/java/org/springblade/manager/utils/PenetrationResistanceChart.java

@@ -154,7 +154,7 @@ public class PenetrationResistanceChart {
                 renderer.setSeriesPaint(index, Color.RED);
                 renderer.setSeriesStroke(index, new BasicStroke(1.0f));
                 // 圆形标记
-                renderer.setSeriesShape(index, new java.awt.geom.Ellipse2D.Double(-5, -5, 10, 10));
+                renderer.setSeriesShape(index, new java.awt.geom.Ellipse2D.Double(-3, -3, 5, 5));
                 renderer.setSeriesShapesVisible(index, true);
                 // 不连接线
                 renderer.setSeriesLinesVisible(index, false);
@@ -169,7 +169,7 @@ public class PenetrationResistanceChart {
                 renderer.setSeriesPaint(index, Color.GREEN);
                 renderer.setSeriesStroke(index, new BasicStroke(1.0f));
                 // 圆形标记
-                renderer.setSeriesShape(index, new java.awt.geom.Ellipse2D.Double(-5, -5, 10, 10));
+                renderer.setSeriesShape(index, new java.awt.geom.Ellipse2D.Double(-3, -3, 5, 5));
                 renderer.setSeriesShapesVisible(index, true);
                 // 不连接线
                 renderer.setSeriesLinesVisible(index, false);