From 2a6d8a858ca7e41436548b35db147b5cdad4e4be Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期四, 14 十二月 2023 14:08:17 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes

---
 CanadaMes-ui/src/configuration/AutomaticParameterSetting.json |  288 +++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 259 insertions(+), 29 deletions(-)

diff --git a/CanadaMes-ui/src/configuration/AutomaticParameterSetting.json b/CanadaMes-ui/src/configuration/AutomaticParameterSetting.json
index 72ce6d5..57ad2f0 100644
--- a/CanadaMes-ui/src/configuration/AutomaticParameterSetting.json
+++ b/CanadaMes-ui/src/configuration/AutomaticParameterSetting.json
@@ -1,52 +1,49 @@
 [
   [
     {
-      "name": "澶ц溅鑷姩閫熷害",
-      "read": 33,
-      "sending": "",
-      "type": "0",
-      "address": "DB100.0",
-      "count": 3
-    }
-  ],
-  [
-    {
-      "name": "灏忚溅鑷姩閫熷害",
-      "read": 11,
-      "sending": "",
-      "address": "DB100.0",
-      "type": "0"
-    }
-  ],
-  [
-    {
       "name": "A01琛岃蛋楂橀�熻搴�",
       "read": 33,
       "sending": "",
       "type": "0",
       "address": "DB100.0",
-      "count": 3
+      "count": 3,
+      "unit": "掳",
+      "value": "",
+      "min": 0,
+      "max": 100
     },
     {
       "name": "A01琛岃蛋浣庨�熻搴�",
       "read": 11,
       "sending": "",
       "address": "DB100.0",
-      "type": "0"
+      "unit": "掳",
+      "type": "0",
+      "value": "",
+      "min": 0,
+      "max": 100
     },
     {
       "name": "A01杈撻�佹帴鐗囪搴�",
       "read": 22,
       "sending": "",
+      "unit": "掳",
       "address": "DB100.0",
-      "type": "0"
+      "type": "0",
+      "value": "",
+      "min": 0,
+      "max": 100
     },
     {
       "name": "A01绗煎瓙瑙掑害",
       "read": 22,
       "sending": "",
+      "unit": "掳",
       "address": "DB100.0",
-      "type": "0"
+      "type": "0",
+      "value": "",
+      "min": 0,
+      "max": 100
     }
   ],
   [
@@ -55,29 +52,72 @@
       "read": 33,
       "sending": "",
       "type": "0",
+      "unit": "掳",
       "address": "DB100.0",
-      "count": 3
+      "count": 3,
+      "value": "",
+      "min": 0,
+      "max": 100
     },
     {
       "name": "A02琛岃蛋浣庨�熻搴�",
       "read": 11,
       "sending": "",
+      "unit": "掳",
       "address": "DB100.0",
-      "type": "0"
+      "type": "0",
+      "value": "",
+      "min": 0,
+      "max": 100
     },
     {
       "name": "A02杈撻�佹帴鐗囪搴�",
       "read": 22,
       "sending": "",
+      "unit": "掳",
       "address": "DB100.0",
-      "type": "0"
+      "type": "0",
+      "value": "",
+      "min": 0,
+      "max": 100
     },
     {
       "name": "A02绗煎瓙瑙掑害",
       "read": 22,
       "sending": "",
+      "unit": "掳",
       "address": "DB100.0",
-      "type": "0"
+      "type": "0",
+      "value": "",
+      "min": 0,
+      "max": 100
+    }
+  ],
+  [
+    {
+      "name": "澶ц溅鑷姩閫熷害",
+      "read": 100,
+      "sending": "",
+      "type": "0",
+      "unit": "m/min",
+      "address": "DB100.0",
+      "count": 3,
+      "value": "",
+      "min": 0,
+      "max": 100
+    }
+  ],
+  [
+    {
+      "name": "灏忚溅鑷姩閫熷害",
+      "read": 11,
+      "sending": "",
+      "unit": "m/min",
+      "address": "DB100.0",
+      "type": "0",
+      "value": "",
+      "min": 0,
+      "max": 100
     }
   ],
   [
@@ -85,8 +125,198 @@
       "name": "鑷姩缈昏浆閫熷害",
       "read": 33,
       "sending": "",
+      "unit": "m/min",
       "address": "DB100.0",
-      "type": "0"
+      "type": "0",
+      "value": "",
+      "min": 0,
+      "max": 100
     }
-  ]
+  ],
+  [
+    {
+        "title": {
+          "name": "D01~D06杈撻��"
+          
+        }
+      },
+  {
+    "name": "鏈�楂橀�熷害",
+    "read": 33,
+    "sending": 0,
+    "type": "0",
+    "unit": "m/min",
+    "count":3,
+    "value":0,
+    "min": 0,
+    "max": 1000
+  },
+  {
+    "name": "楂橀�熺嚎閫熷害",
+    "read": 11,
+    "sending": 0,
+    "type": "0",
+    "unit": "m/min",
+    "value":0,
+    "min": 0,
+    "max": 100
+  },
+  {
+    "name": "浣庨�熺嚎閫熷害",
+    "read": 11,
+    "sending": 0,
+    "type": "0",
+    "unit": "m/min",
+    "value":0,
+    "min": 0,
+    "max": 100
+  },
+  {
+    "name": "鎵嬪姩閫熷害",
+    "read": 22,
+    "sending": 0,
+    "type": "0",
+    "unit": "m/min",
+    "value":0,
+    "min": 0,
+    "max": 100
+  }
+  
+ 
+],
+
+[
+  {
+      "title": {
+        "name": "A01~A02杈撻��"
+        
+      }
+    },
+{
+  "name": "鏈�楂橀�熷害",
+  "read": 33,
+  "sending": 0,
+  "type": "0",
+  "unit": "m/min",
+  "count":3,
+  "value":0,
+  "min": 0,
+  "max": 100
+},
+{
+  "name": "楂橀�熺嚎閫熷害",
+  "read": 11,
+  "sending": 0,
+  "unit": "m/min",
+  "type": "0",
+  "value":0,
+  "min": 0,
+  "max": 100
+},
+{
+  "name": "浣庨�熺嚎閫熷害",
+  "read": 11,
+  "sending": 0,
+  "unit": "m/min",
+  "type": "0",
+  "value":0,
+  "min": 0,
+  "max": 100
+},
+{
+  "name": "鎵嬪姩閫熷害",
+  "read": 22,
+  "sending": 0,
+  "unit": "m/min",
+  "type": "0",
+  "value":0,
+  "min": 0,
+  "max": 100
+}
+
+
+],[
+{
+    "title": {
+      "name": "B01~B02杈撻��"
+      
+    }
+  },
+{
+"name": "鏈�楂橀�熷害",
+"read": 33,
+"sending": 0,
+"type": "0",
+"unit": "m/min",
+"count":3,
+"value":0,
+"min": 0,
+"max": 100
+},
+{
+"name": "楂橀�熺嚎閫熷害",
+"read": 11,
+"sending": 0,
+"type": "0",
+"unit": "m/min",
+"value":0,
+"min": 0,
+"max": 100
+},
+{
+"name": "浣庨�熺嚎閫熷害",
+"read": 11,
+"sending": 0,
+"type": "0",
+"unit": "m/min",
+"value":0,
+"min": 0,
+"max": 100
+},
+{
+"name": "鎵嬪姩閫熷害",
+"read": 22,
+"sending": 0,
+"type": "0",
+"unit": "m/min",
+"value":0,
+"min": 0,
+"max": 100
+}
+
+
+]
+,[
+
+{
+"name": "缈昏浆鐐瑰姩閫熷害",
+"read": 33,
+"sending": 0,
+"type": "0",
+"unit": "mm/S",
+
+"count":3,
+"value":0,
+"min": 0,
+"max": 100
+}
+
+
+],
+[
+
+
+{
+"name": "灏忚溅鐐瑰姩閫熷害",
+"read": 11,
+"sending": 0,
+"unit": "mm/S",
+"type": "0",
+"value":0,
+"min": 0,
+"max": 100
+}
+
+
+]
 ]
\ No newline at end of file

--
Gitblit v1.8.0