整理追边客户端界面布局文件关于扫描图记录点与混合数设置

56142ece · 潘栩锋 · 8b11f2e6 · 56142ece · 56142ece · 56142ece
Commit 56142ece authored Jun 22, 2022 by 潘栩锋 🚴
17 changed files
--- a/脚本/hemeiInstallZipVersionInfo.json
+++ b/脚本/hemeiInstallZipVersionInfo.json
 {
  "InstallZipVersion":"7.1.1",
-  "InstallZipUrl":"http://server.flyautomation.net:8889/download/和美安装包_v7.1.1_20220614.7z"
+  "InstallZipUrl":"http://server.flyautomation.net:8889/download/和美安装包_v7.1.1_20220622.7z"
 }
\ No newline at end of file
--- a/脚本/release_conf/FLY.Thick.Blowing.UI.Fix.Client/default/layout.default/风环-称重-中心收卷-IBC-温区/scangraph.json
+++ b/脚本/release_conf/FLY.Thick.Blowing.UI.Fix.Client/default/layout.default/风环-称重-中心收卷-IBC-温区/scangraph.json
-{"Items":[{"UiModule":"scangraph2","YRangePercent":3.0,"Mix":2,"Number":0,"IsPercent":true,"IsAutoTarget":true,"ID":38906193},{"UiModule":"scangraph2","YRangePercent":3.0,"Mix":2,"Number":0,"IsPercent":true,"IsAutoTarget":true,"ID":28924227},{"UiModule":"scangraph","YRangePercent":3.0,"Mix":2,"Number":0,"IsPercent":true,"IsAutoTarget":true,"ID":19758347},{"UiModule":"scangraph","YRangePercent":3.0,"Mix":2,"Number":0,"IsPercent":true,"IsAutoTarget":true,"ID":42299744},{"UiModule":"scangraph","YRangePercent":3.0,"Mix":2,"Number":0,"IsPercent":true,"IsAutoTarget":true,"ID":55117723},{"UiModule":"scangraph2","YRangePercent":3.0,"Mix":2,"Number":0,"IsPercent":true,"IsAutoTarget":true,"ID":28715689}]}
\ No newline at end of file
+{
+  "Items": [
+    {
+      "UiModule": "scangraph2",
+      "YRangePercent": 3.0,
+      "Mix": 1,
+      "Number": -1,
+      "IsPercent": true,
+      "IsAutoTarget": true,
+      "ID": 38906193
+    },
+    {
+      "UiModule": "scangraph2",
+      "YRangePercent": 3.0,
+      "Mix": 1,
+      "Number": 0,
+      "IsPercent": true,
+      "IsAutoTarget": true,
+      "ID": 28924227
+    },
+    {
+      "UiModule": "scangraph",
+      "YRangePercent": 3.0,
+      "Mix": 1,
+      "Number": -3,
+      "IsPercent": true,
+      "IsAutoTarget": true,
+      "ID": 19758347
+    },
+    {
+      "UiModule": "scangraph",
+      "YRangePercent": 3.0,
+      "Mix": 1,
+      "Number": -2,
+      "IsPercent": true,
+      "IsAutoTarget": true,
+      "ID": 42299744
+    },
+    {
+      "UiModule": "scangraph",
+      "YRangePercent": 3.0,
+      "Mix": 1,
+      "Number": -1,
+      "IsPercent": true,
+      "IsAutoTarget": true,
+      "ID": 55117723
+    },
+    {
+      "UiModule": "scangraph2",
+      "YRangePercent": 3.0,
+      "Mix": 1,
+      "Number": 0,
+      "IsPercent": true,
+      "IsAutoTarget": true,
+      "ID": 28715689
+    }
+  ]
+}
\ No newline at end of file
--- a/脚本/release_conf/FLY.Thick.Blowing.UI.Fix.Client/default/layout.default/风环-称重-中心收卷-IBC-温区/trendgraph.json
+++ b/脚本/release_conf/FLY.Thick.Blowing.UI.Fix.Client/default/layout.default/风环-称重-中心收卷-IBC-温区/trendgraph.json
-{"Items":[{"Len":120,"BeginNo":0,"EndNo":20,"IsAll":true,"Type":1,"XType":0,"BM":0,"YRangePercent":3.0,"Title":"趋势图","Mix":1,"IsAutoTarget":false,"IsPercent":false,"ID":48220637}]}
\ No newline at end of file
+{
+  "Items": [
+    {
+      "Interval": 1,
+      "YRangePercent": 3.0,
+      "Mix": 1,
+      "ID": 48220637
+    },
+    {
+      "Interval": 1,
+      "YRangePercent": 3.0,
+      "Mix": 1,
+      "ID": 38205102
+    }
+  ]
+}
\ No newline at end of file
--- a/脚本/release_conf/FLY.Thick.Blowing.UI.Fix.Client/default/layout.default/风环-称重-中心收卷-IBC/scangraph.json
+++ b/脚本/release_conf/FLY.Thick.Blowing.UI.Fix.Client/default/layout.default/风环-称重-中心收卷-IBC/scangraph.json
-{"Items":[{"UiModule":"scangraph2","YRangePercent":3.0,"Mix":2,"Number":0,"IsPercent":true,"IsAutoTarget":true,"ID":38906193},{"UiModule":"scangraph2","YRangePercent":3.0,"Mix":2,"Number":0,"IsPercent":true,"IsAutoTarget":true,"ID":28924227},{"UiModule":"scangraph","YRangePercent":3.0,"Mix":2,"Number":0,"IsPercent":true,"IsAutoTarget":true,"ID":19758347},{"UiModule":"scangraph","YRangePercent":3.0,"Mix":2,"Number":0,"IsPercent":true,"IsAutoTarget":true,"ID":42299744},{"UiModule":"scangraph","YRangePercent":3.0,"Mix":2,"Number":0,"IsPercent":true,"IsAutoTarget":true,"ID":55117723},{"UiModule":"scangraph2","YRangePercent":3.0,"Mix":2,"Number":0,"IsPercent":true,"IsAutoTarget":true,"ID":28715689}]}
\ No newline at end of file
+{
+  "Items": [
+    {
+      "UiModule": "scangraph2",
+      "YRangePercent": 3.0,
+      "Mix": 1,
+      "Number": -1,
+      "IsPercent": true,
+      "IsAutoTarget": true,
+      "ID": 38906193
+    },
+    {
+      "UiModule": "scangraph2",
+      "YRangePercent": 3.0,
+      "Mix": 1,
+      "Number": 0,
+      "IsPercent": true,
+      "IsAutoTarget": true,
+      "ID": 28924227
+    },
+    {
+      "UiModule": "scangraph",
+      "YRangePercent": 3.0,
+      "Mix": 1,
+      "Number": -3,
+      "IsPercent": true,
+      "IsAutoTarget": true,
+      "ID": 19758347
+    },
+    {
+      "UiModule": "scangraph",
+      "YRangePercent": 3.0,
+      "Mix": 1,
+      "Number": -2,
+      "IsPercent": true,
+      "IsAutoTarget": true,
+      "ID": 42299744
+    },
+    {
+      "UiModule": "scangraph",
+      "YRangePercent": 3.0,
+      "Mix": 1,
+      "Number": -1,
+      "IsPercent": true,
+      "IsAutoTarget": true,
+      "ID": 55117723
+    },
+    {
+      "UiModule": "scangraph2",
+      "YRangePercent": 3.0,
+      "Mix": 1,
+      "Number": 0,
+      "IsPercent": true,
+      "IsAutoTarget": true,
+      "ID": 28715689
+    }
+  ]
+}
\ No newline at end of file
--- a/脚本/release_conf/FLY.Thick.Blowing.UI.Fix.Client/default/layout.default/风环-称重-中心收卷-IBC/trendgraph.json
+++ b/脚本/release_conf/FLY.Thick.Blowing.UI.Fix.Client/default/layout.default/风环-称重-中心收卷-IBC/trendgraph.json
-{"Items":[{"Len":120,"BeginNo":0,"EndNo":20,"IsAll":true,"Type":1,"XType":0,"BM":0,"YRangePercent":3.0,"Title":"趋势图","Mix":1,"IsAutoTarget":false,"IsPercent":false,"ID":48220637}]}
\ No newline at end of file
+{
+  "Items": [
+    {
+      "Interval": 1,
+      "YRangePercent": 3.0,
+      "Mix": 1,
+      "ID": 48220637
+    },
+    {
+      "Interval": 1,
+      "YRangePercent": 3.0,
+      "Mix": 1,
+      "ID": 38205102
+    }
+  ]
+}
\ No newline at end of file
--- a/脚本/release_conf/FLY.Thick.Blowing.UI.Fix.Client/default/layout.default/风环-称重-收卷-IBC/scangraph.json
+++ b/脚本/release_conf/FLY.Thick.Blowing.UI.Fix.Client/default/layout.default/风环-称重-收卷-IBC/scangraph.json
-{"Items":[{"UiModule":"scangraph2","YRangePercent":3.0,"Mix":2,"Number":0,"IsPercent":true,"IsAutoTarget":true,"ID":38906193},{"UiModule":"scangraph2","YRangePercent":3.0,"Mix":2,"Number":0,"IsPercent":true,"IsAutoTarget":true,"ID":28924227},{"UiModule":"scangraph","YRangePercent":3.0,"Mix":2,"Number":0,"IsPercent":true,"IsAutoTarget":true,"ID":19758347},{"UiModule":"scangraph","YRangePercent":3.0,"Mix":2,"Number":0,"IsPercent":true,"IsAutoTarget":true,"ID":42299744},{"UiModule":"scangraph","YRangePercent":3.0,"Mix":2,"Number":0,"IsPercent":true,"IsAutoTarget":true,"ID":55117723},{"UiModule":"scangraph2","YRangePercent":3.0,"Mix":2,"Number":0,"IsPercent":true,"IsAutoTarget":true,"ID":28715689}]}
\ No newline at end of file
+{
+  "Items": [
+    {
+      "UiModule": "scangraph2",
+      "YRangePercent": 3.0,
+      "Mix": 1,
+      "Number": -1,
+      "IsPercent": true,
+      "IsAutoTarget": true,
+      "ID": 38906193
+    },
+    {
+      "UiModule": "scangraph2",
+      "YRangePercent": 3.0,
+      "Mix": 1,
+      "Number": 0,
+      "IsPercent": true,
+      "IsAutoTarget": true,
+      "ID": 28924227
+    },
+    {
+      "UiModule": "scangraph",
+      "YRangePercent": 3.0,
+      "Mix": 1,
+      "Number": -3,
+      "IsPercent": true,
+      "IsAutoTarget": true,
+      "ID": 19758347
+    },
+    {
+      "UiModule": "scangraph",
+      "YRangePercent": 3.0,
+      "Mix": 1,
+      "Number": -2,
+      "IsPercent": true,
+      "IsAutoTarget": true,
+      "ID": 42299744
+    },
+    {
+      "UiModule": "scangraph",
+      "YRangePercent": 3.0,
+      "Mix": 1,
+      "Number": -1,
+      "IsPercent": true,
+      "IsAutoTarget": true,
+      "ID": 55117723
+    },
+    {
+      "UiModule": "scangraph2",
+      "YRangePercent": 3.0,
+      "Mix": 1,
+      "Number": 0,
+      "IsPercent": true,
+      "IsAutoTarget": true,
+      "ID": 28715689
+    }
+  ]
+}
\ No newline at end of file
--- a/脚本/release_conf/FLY.Thick.Blowing.UI.Fix.Client/default/layout.default/风环-称重-收卷-IBC/trendgraph.json
+++ b/脚本/release_conf/FLY.Thick.Blowing.UI.Fix.Client/default/layout.default/风环-称重-收卷-IBC/trendgraph.json
-{"Items":[{"Len":120,"BeginNo":0,"EndNo":20,"IsAll":true,"Type":1,"XType":0,"BM":0,"YRangePercent":3.0,"Title":"趋势图","Mix":1,"IsAutoTarget":false,"IsPercent":false,"ID":48220637}]}
\ No newline at end of file
+{
+  "Items": [
+    {
+      "Interval": 1,
+      "YRangePercent": 3.0,
+      "Mix": 1,
+      "ID": 48220637
+    },
+    {
+      "Interval": 1,
+      "YRangePercent": 3.0,
+      "Mix": 1,
+      "ID": 38205102
+    }
+  ]
+}
\ No newline at end of file
--- a/脚本/release_conf/FLY.Thick.Blowing.UI.Fix.Client/default/layout.default/风环-称重/graphcustom.json
+++ b/脚本/release_conf/FLY.Thick.Blowing.UI.Fix.Client/default/layout.default/风环-称重/graphcustom.json
@@ -151,6 +151,23 @@
            false
          ],
          "Header": "定点"
+        },
+        {
+          "Graphs": [
+            {
+              "ID": 21144166,
+              "Rect": "0, 0, 1, 1"
+            }
+          ],
+          "ColumnCount": 1,
+          "RowCount": 1,
+          "RowDefinitions": [
+            false
+          ],
+          "ColumnDefinitions": [
+            false
+          ],
+          "Header": "趋势2"
        }
      ],
      "Components": [
@@ -263,6 +280,11 @@
          "ID": 28792051,
          "Module": "FLY.Thick.Base.UI.UiModule.UiModule2_FixGraph",
          "ServiceContainerName": "gage0.service"
+        },
+        {
+          "ID": 21144166,
+          "Module": "FLY.Thick.Blowing.UI.UiModule.UiModule2_TrendGraph2",
+          "ServiceContainerName": "gage0.service"
        }
      ]
    }

--- a/脚本/release_conf/FLY.Thick.Blowing.UI.Fix.Client/default/layout.default/风环-称重/scangraph.json
+++ b/脚本/release_conf/FLY.Thick.Blowing.UI.Fix.Client/default/layout.default/风环-称重/scangraph.json
-{"Items":[{"UiModule":"scangraph2","YRangePercent":3.0,"Mix":2,"Number":0,"IsPercent":true,"IsAutoTarget":true,"ID":48499956},{"UiModule":"scangraph2","YRangePercent":3.0,"Mix":2,"Number":0,"IsPercent":true,"IsAutoTarget":true,"ID":65534206},{"UiModule":"scangraph","YRangePercent":3.0,"Mix":2,"Number":0,"IsPercent":true,"IsAutoTarget":true,"ID":53749713},{"UiModule":"scangraph","YRangePercent":3.0,"Mix":2,"Number":0,"IsPercent":true,"IsAutoTarget":true,"ID":18063994},{"UiModule":"scangraph","YRangePercent":3.0,"Mix":2,"Number":0,"IsPercent":true,"IsAutoTarget":true,"ID":21125878},{"UiModule":"scangraph2","YRangePercent":3.0,"Mix":2,"Number":0,"IsPercent":true,"IsAutoTarget":true,"ID":59933635}]}
\ No newline at end of file
+{
+  "Items": [
+    {
+      "UiModule": "scangraph2",
+      "YRangePercent": 3.0,
+      "Mix": 1,
+      "Number": -1,
+      "IsPercent": true,
+      "IsAutoTarget": true,
+      "ID": 48499956
+    },
+    {
+      "UiModule": "scangraph2",
+      "YRangePercent": 3.0,
+      "Mix": 1,
+      "Number": 0,
+      "IsPercent": true,
+      "IsAutoTarget": true,
+      "ID": 65534206
+    },
+    {
+      "UiModule": "scangraph",
+      "YRangePercent": 3.0,
+      "Mix": 1,
+      "Number": -3,
+      "IsPercent": true,
+      "IsAutoTarget": true,
+      "ID": 53749713
+    },
+    {
+      "UiModule": "scangraph",
+      "YRangePercent": 3.0,
+      "Mix": 1,
+      "Number": -2,
+      "IsPercent": true,
+      "IsAutoTarget": true,
+      "ID": 18063994
+    },
+    {
+      "UiModule": "scangraph",
+      "YRangePercent": 3.0,
+      "Mix": 1,
+      "Number": -1,
+      "IsPercent": true,
+      "IsAutoTarget": true,
+      "ID": 21125878
+    },
+    {
+      "UiModule": "scangraph2",
+      "YRangePercent": 3.0,
+      "Mix": 1,
+      "Number": 0,
+      "IsPercent": true,
+      "IsAutoTarget": true,
+      "ID": 59933635
+    },
+    {
+      "UiModule": "scangraph",
+      "YRangePercent": 3.0,
+      "Mix": 1,
+      "Number": 0,
+      "IsPercent": true,
+      "IsAutoTarget": true,
+      "ID": 21144166
+    }
+  ]
+}
\ No newline at end of file
--- a/脚本/release_conf/FLY.Thick.Blowing.UI.Fix.Client/default/layout.default/风环-称重/scangraphcircular.json
+++ b/脚本/release_conf/FLY.Thick.Blowing.UI.Fix.Client/default/layout.default/风环-称重/scangraphcircular.json
-{"Items":[{"Mix":1,"Number":0,"YRangePercent":3.0,"IsPercent":true,"IsAutoTarget":true,"HasAlianZone":false,"AlianZoneBoltNoOf3oClock":1.0,"AlianZoneBoltCnt":8,"AlianZoneIsCCW":false,"AlianZoneIsShowXStep":false,"ID":59832238}]}
\ No newline at end of file
+{
+  "Items": [
+    {
+      "Mix": 1,
+      "Number": 0,
+      "YRangePercent": 3.0,
+      "IsPercent": true,
+      "IsAutoTarget": true,
+      "HasAlianZone": false,
+      "AlianZoneBoltNoOf3oClock": 1.0,
+      "AlianZoneBoltCnt": 8,
+      "AlianZoneIsCCW": false,
+      "AlianZoneIsShowXStep": false,
+      "ID": 59832238
+    }
+  ]
+}
\ No newline at end of file
--- a/脚本/release_conf/FLY.Thick.Blowing.UI.Fix.Client/default/layout.default/风环-称重/trendgraph.json
+++ b/脚本/release_conf/FLY.Thick.Blowing.UI.Fix.Client/default/layout.default/风环-称重/trendgraph.json
-{"Items":[{"Len":120,"BeginNo":0,"EndNo":20,"IsAll":true,"Type":1,"XType":0,"BM":0,"YRangePercent":3.0,"Title":"趋势图","Mix":1,"IsAutoTarget":false,"IsPercent":false,"ID":48220637}]}
\ No newline at end of file
+{
+  "Items": [
+    {
+      "Interval": 1,
+      "YRangePercent": 3.0,
+      "Mix": 1,
+      "ID": 39249953
+    },
+    {
+      "Interval": 1,
+      "YRangePercent": 3.0,
+      "Mix": 1,
+      "ID": 21144166
+    }
+  ]
+}
\ No newline at end of file
--- a/脚本/release_conf/FLY.Thick.Blowing.UI.Fix.Client/default/layout.default/风环/graphcustom.json
+++ b/脚本/release_conf/FLY.Thick.Blowing.UI.Fix.Client/default/layout.default/风环/graphcustom.json
@@ -79,14 +79,13 @@
        {
          "Graphs": [
            {
-              "ID": 26380169,
+              "ID": 50447774,
              "Rect": "0, 0, 1, 1"
            }
          ],
          "ColumnCount": 1,
-          "RowCount": 2,
+          "RowCount": 1,
          "RowDefinitions": [
-            false,
            false
          ],
          "ColumnDefinitions": [
@@ -207,8 +206,8 @@
          "ServiceContainerName": "gage0.service"
        },
        {
-          "ID": 26380169,
-          "Module": "FLY.Thick.Blowing.UI.UiModule.UiModule2_TrendGraph",
+          "ID": 50447774,
+          "Module": "FLY.Thick.Blowing.UI.UiModule.UiModule2_TrendGraph2",
          "ServiceContainerName": "gage0.service"
        },
        {

--- a/脚本/release_conf/FLY.Thick.Blowing.UI.Fix.Client/default/layout.default/风环/scangraph.json
+++ b/脚本/release_conf/FLY.Thick.Blowing.UI.Fix.Client/default/layout.default/风环/scangraph.json
-{"Items":[{"UiModule":"scangraph2","YRangePercent":3.0,"Mix":2,"Number":0,"IsPercent":true,"IsAutoTarget":true,"ID":10616756},{"UiModule":"scangraph2","YRangePercent":3.0,"Mix":2,"Number":0,"IsPercent":true,"IsAutoTarget":true,"ID":32390328},{"UiModule":"scangraph","YRangePercent":3.0,"Mix":2,"Number":0,"IsPercent":true,"IsAutoTarget":true,"ID":26933797},{"UiModule":"scangraph","YRangePercent":3.0,"Mix":2,"Number":0,"IsPercent":true,"IsAutoTarget":true,"ID":29950811},{"UiModule":"scangraph","YRangePercent":3.0,"Mix":2,"Number":0,"IsPercent":true,"IsAutoTarget":true,"ID":23426098},{"UiModule":"scangraph2","YRangePercent":3.0,"Mix":2,"Number":0,"IsPercent":true,"IsAutoTarget":true,"ID":50354517}]}
\ No newline at end of file
+{
+  "Items": [
+    {
+      "UiModule": "scangraph2",
+      "YRangePercent": 3.0,
+      "Mix": 1,
+      "Number": -1,
+      "IsPercent": true,
+      "IsAutoTarget": true,
+      "ID": 10616756
+    },
+    {
+      "UiModule": "scangraph2",
+      "YRangePercent": 3.0,
+      "Mix": 1,
+      "Number": 0,
+      "IsPercent": true,
+      "IsAutoTarget": true,
+      "ID": 32390328
+    },
+    {
+      "UiModule": "scangraph",
+      "YRangePercent": 3.0,
+      "Mix": 1,
+      "Number": -3,
+      "IsPercent": true,
+      "IsAutoTarget": true,
+      "ID": 26933797
+    },
+    {
+      "UiModule": "scangraph",
+      "YRangePercent": 3.0,
+      "Mix": 1,
+      "Number": -2,
+      "IsPercent": true,
+      "IsAutoTarget": true,
+      "ID": 29950811
+    },
+    {
+      "UiModule": "scangraph",
+      "YRangePercent": 3.0,
+      "Mix": 1,
+      "Number": -1,
+      "IsPercent": true,
+      "IsAutoTarget": true,
+      "ID": 23426098
+    },
+    {
+      "UiModule": "scangraph2",
+      "YRangePercent": 3.0,
+      "Mix": 1,
+      "Number": 0,
+      "IsPercent": true,
+      "IsAutoTarget": true,
+      "ID": 50354517
+    },
+    {
+      "UiModule": "scangraph",
+      "YRangePercent": 3.0,
+      "Mix": 1,
+      "Number": 0,
+      "IsPercent": true,
+      "IsAutoTarget": true,
+      "ID": 50447774
+    }
+  ]
+}
\ No newline at end of file
--- a/脚本/release_conf/FLY.Thick.Blowing.UI.Fix.Client/default/layout.default/风环/trendgraph.json
+++ b/脚本/release_conf/FLY.Thick.Blowing.UI.Fix.Client/default/layout.default/风环/trendgraph.json
-{"Items":[{"Len":120,"BeginNo":0,"EndNo":20,"IsAll":true,"Type":1,"XType":0,"BM":0,"YRangePercent":3.0,"Title":"趋势图","Mix":1,"IsAutoTarget":false,"IsPercent":false,"ID":48220637}]}
\ No newline at end of file
+{
+  "Items": [
+    {
+      "Interval": 1,
+      "YRangePercent": 3.0,
+      "Mix": 1,
+      "ID": 50447774
+    }
+  ]
+}
\ No newline at end of file
--- a/脚本/release_conf/FLY.Thick.Blowing.UI.Fix.Client/layout/graphcustom.json
+++ b/脚本/release_conf/FLY.Thick.Blowing.UI.Fix.Client/layout/graphcustom.json
@@ -79,14 +79,13 @@
        {
          "Graphs": [
            {
-              "ID": 26380169,
+              "ID": 50447774,
              "Rect": "0, 0, 1, 1"
            }
          ],
          "ColumnCount": 1,
-          "RowCount": 2,
+          "RowCount": 1,
          "RowDefinitions": [
-            false,
            false
          ],
          "ColumnDefinitions": [
@@ -207,8 +206,8 @@
          "ServiceContainerName": "gage0.service"
        },
        {
-          "ID": 26380169,
-          "Module": "FLY.Thick.Blowing.UI.UiModule.UiModule2_TrendGraph",
+          "ID": 50447774,
+          "Module": "FLY.Thick.Blowing.UI.UiModule.UiModule2_TrendGraph2",
          "ServiceContainerName": "gage0.service"
        },
        {

--- a/脚本/release_conf/FLY.Thick.Blowing.UI.Fix.Client/layout/scangraph.json
+++ b/脚本/release_conf/FLY.Thick.Blowing.UI.Fix.Client/layout/scangraph.json
-{"Items":[{"UiModule":"scangraph2","YRangePercent":3.0,"Mix":2,"Number":0,"IsPercent":true,"IsAutoTarget":true,"ID":10616756},{"UiModule":"scangraph2","YRangePercent":3.0,"Mix":2,"Number":0,"IsPercent":true,"IsAutoTarget":true,"ID":32390328},{"UiModule":"scangraph","YRangePercent":3.0,"Mix":2,"Number":0,"IsPercent":true,"IsAutoTarget":true,"ID":26933797},{"UiModule":"scangraph","YRangePercent":3.0,"Mix":2,"Number":0,"IsPercent":true,"IsAutoTarget":true,"ID":29950811},{"UiModule":"scangraph","YRangePercent":3.0,"Mix":2,"Number":0,"IsPercent":true,"IsAutoTarget":true,"ID":23426098},{"UiModule":"scangraph2","YRangePercent":3.0,"Mix":2,"Number":0,"IsPercent":true,"IsAutoTarget":true,"ID":50354517}]}
\ No newline at end of file
+{
+  "Items": [
+    {
+      "UiModule": "scangraph2",
+      "YRangePercent": 3.0,
+      "Mix": 1,
+      "Number": -1,
+      "IsPercent": true,
+      "IsAutoTarget": true,
+      "ID": 10616756
+    },
+    {
+      "UiModule": "scangraph2",
+      "YRangePercent": 3.0,
+      "Mix": 1,
+      "Number": 0,
+      "IsPercent": true,
+      "IsAutoTarget": true,
+      "ID": 32390328
+    },
+    {
+      "UiModule": "scangraph",
+      "YRangePercent": 3.0,
+      "Mix": 1,
+      "Number": -3,
+      "IsPercent": true,
+      "IsAutoTarget": true,
+      "ID": 26933797
+    },
+    {
+      "UiModule": "scangraph",
+      "YRangePercent": 3.0,
+      "Mix": 1,
+      "Number": -2,
+      "IsPercent": true,
+      "IsAutoTarget": true,
+      "ID": 29950811
+    },
+    {
+      "UiModule": "scangraph",
+      "YRangePercent": 3.0,
+      "Mix": 1,
+      "Number": -1,
+      "IsPercent": true,
+      "IsAutoTarget": true,
+      "ID": 23426098
+    },
+    {
+      "UiModule": "scangraph2",
+      "YRangePercent": 3.0,
+      "Mix": 1,
+      "Number": 0,
+      "IsPercent": true,
+      "IsAutoTarget": true,
+      "ID": 50354517
+    },
+    {
+      "UiModule": "scangraph",
+      "YRangePercent": 3.0,
+      "Mix": 1,
+      "Number": 0,
+      "IsPercent": true,
+      "IsAutoTarget": true,
+      "ID": 50447774
+    }
+  ]
+}
\ No newline at end of file
--- a/脚本/release_conf/FLY.Thick.Blowing.UI.Fix.Client/layout/trendgraph.json
+++ b/脚本/release_conf/FLY.Thick.Blowing.UI.Fix.Client/layout/trendgraph.json
-{"Items":[{"Len":120,"BeginNo":0,"EndNo":20,"IsAll":true,"Type":1,"XType":0,"BM":0,"YRangePercent":3.0,"Title":"趋势图","Mix":1,"IsAutoTarget":false,"IsPercent":false,"ID":48220637}]}
\ No newline at end of file
+{
+  "Items": [
+    {
+      "Interval": 1,
+      "YRangePercent": 3.0,
+      "Mix": 1,
+      "ID": 50447774
+    }
+  ]
+}
\ No newline at end of file