和美安装包_v6.22.1 -20210414

1. 修复 收卷 设备连接变量表_v3_全部合体-20210302 内外收卷设定m,收卷预警m 为放大0.1倍
2. 修复 限制纵向趋势图配置参数大小

Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI/UiModule/ScanGraph/ScanGraphItemParam.cs

@@ -13,12 +13,27 @@ namespace FLY.Thick.Blowing.UI.Fix.Client.UiModule
     public class ScanGraphItemParam : UIModuleParam
     {
         public string UiModule { get; set; } = "scangraph";
+        private double yRangePercent = 3;
         /// <summary>
         /// Y轴比例
         /// </summary>
-        public double YRangePercent { get; set; } = 3;
+        public double YRangePercent
+        {
+            get { return yRangePercent; }
+            set
+            {
+                if (value < 1)
+                {
+                    value = 1;
+                }
+                if (yRangePercent != value)
+                {
+                    yRangePercent = value;
+                }
+            }
+        }
 
-        private int mix = 2;
+        private int mix = 1;
         /// <summary>
         /// 混合数
         /// </summary>

Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI/UiModule/ScanGraphCircular/ScanGraphCircularParam.cs

@@ -9,10 +9,25 @@ namespace FLY.Thick.Blowing.UI.Fix.Client.UiModule
 {
     public class ScanGraphCircularParam : UIModuleParam
     {
+        private int mix = 1;
         /// <summary>
-        /// 混合数
+        /// 混合图
         /// </summary>
-        public int Mix { get; set; } = 1;
+        public int Mix
+        {
+            get { return mix; }
+            set
+            {
+                if (value < 1)
+                {
+                    value = 1;
+                }
+                if (mix != value)
+                {
+                    mix = value;
+                }
+            }
+        }
 
 
         /// <summary>
@@ -20,9 +35,24 @@ namespace FLY.Thick.Blowing.UI.Fix.Client.UiModule
         /// </summary>
         public int Number { get; set; } = 0;
 
+        private double yRangePercent = 3;
         /// <summary>
-        /// Y轴显示范围是公差的N倍
+        /// Y轴比例
         /// </summary>
-        public double YRangePercent { get; set; } = 3;
+        public double YRangePercent
+        {
+            get { return yRangePercent; }
+            set
+            {
+                if (value < 1)
+                {
+                    value = 1;
+                }
+                if (yRangePercent != value)
+                {
+                    yRangePercent = value;
+                }
+            }
+        }
     }
 }

Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI/UiModule/TrendGraph2/TrendGraphItemParam2.cs

@@ -12,19 +12,61 @@ namespace FLY.Thick.Blowing.UI.Fix.Client.UiModule
     /// </summary>
     public class TrendGraphItemParam2 : UIModuleParam
     {
+        private int interval = 1;
         /// <summary>
         /// 间隔, 只显示 ID % Interval == 0 的数
         /// </summary>
-        public int Interval { get; set; } = 1;
+        public int Interval 
+        {
+            get { return interval; }
+            set {
+                if (value < 1) {
+                    value = 1;
+                }
+                if (interval != value) {
+                    interval = value;
+                }
+            }
+        }
 
+        private double yRangePercent = 3;
         /// <summary>
         /// Y轴比例
         /// </summary>
-        public double YRangePercent { get; set; } = 3;
+        public double YRangePercent
+        {
+            get { return yRangePercent; }
+            set
+            {
+                if (value < 1)
+                {
+                    value = 1;
+                }
+                if (yRangePercent != value)
+                {
+                    yRangePercent = value;
+                }
+            }
+        }
 
+        private int mix = 1;
         /// <summary>
         /// 混合图
         /// </summary>
-        public int Mix { get; set; } = 1;
+        public int Mix
+        {
+            get { return mix; }
+            set
+            {
+                if (value < 1)
+                {
+                    value = 1;
+                }
+                if (mix != value)
+                {
+                    mix = value;
+                }
+            }
+        }
     }
 }

Resource/收卷/设备连接变量表_v3_全部合体-20210302/Generated/plcgroup.json

@@ -28,7 +28,7 @@
       "Mode": "4",
       "Addr": 936,
       "Type": "uint32",
-      "Scale": 1.0,
+      "Scale": 0.1,
       "OwnerName": "Items[0]",
       "PropertyName": "MeasureLenSet"
     },
@@ -37,7 +37,7 @@
       "Mode": "4",
       "Addr": 930,
       "Type": "uint32",
-      "Scale": 1.0,
+      "Scale": 0.1,
       "OwnerName": "Items[1]",
       "PropertyName": "MeasureLenSet"
     },
@@ -46,7 +46,7 @@
       "Mode": "4",
       "Addr": 942,
       "Type": "uint32",
-      "Scale": 1.0,
+      "Scale": 0.1,
       "OwnerName": "Items[0]",
       "PropertyName": "MeasurePreWarning"
     },
@@ -55,7 +55,7 @@
       "Mode": "4",
       "Addr": 940,
       "Type": "uint32",
-      "Scale": 1.0,
+      "Scale": 0.1,
       "OwnerName": "Items[1]",
       "PropertyName": "MeasurePreWarning"
     },

脚本/release_conf/FLY.Winder.UI.Server/Gage1/plcgroups/设备连接变量表_v3_全部合体-20210302/Generated/plcgroup.json

@@ -28,7 +28,7 @@
       "Mode": "4",
       "Addr": 936,
       "Type": "uint32",
-      "Scale": 1.0,
+      "Scale": 0.1,
       "OwnerName": "Items[0]",
       "PropertyName": "MeasureLenSet"
     },
@@ -37,7 +37,7 @@
       "Mode": "4",
       "Addr": 930,
       "Type": "uint32",
-      "Scale": 1.0,
+      "Scale": 0.1,
       "OwnerName": "Items[1]",
       "PropertyName": "MeasureLenSet"
     },
@@ -46,7 +46,7 @@
       "Mode": "4",
       "Addr": 942,
       "Type": "uint32",
-      "Scale": 1.0,
+      "Scale": 0.1,
       "OwnerName": "Items[0]",
       "PropertyName": "MeasurePreWarning"
     },
@@ -55,7 +55,7 @@
       "Mode": "4",
       "Addr": 940,
       "Type": "uint32",
-      "Scale": 1.0,
+      "Scale": 0.1,
       "OwnerName": "Items[1]",
       "PropertyName": "MeasurePreWarning"
     },

脚本/版本描述.txt

+和美安装包_v6.22.1 -20210414
+1. 修复 收卷 设备连接变量表_v3_全部合体-20210302 内外收卷设定m,收卷预警m 为放大0.1倍
+
 和美安装包_v6.22.0 -20210403
 1. 添加 吹膜数据库浏览器