From 0f3ea8b9dd921b942015d30c5dfce06af25cd71c Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期三, 13 十二月 2023 09:15:00 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes

---
 CanadaMes-ui/src/configuration/AutomaticParameterSetting.json |  171 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 170 insertions(+), 1 deletions(-)

diff --git a/CanadaMes-ui/src/configuration/AutomaticParameterSetting.json b/CanadaMes-ui/src/configuration/AutomaticParameterSetting.json
index c9b9d14..87ec239 100644
--- a/CanadaMes-ui/src/configuration/AutomaticParameterSetting.json
+++ b/CanadaMes-ui/src/configuration/AutomaticParameterSetting.json
@@ -7,6 +7,7 @@
       "type": "0",
       "address": "DB100.0",
       "count": 3,
+      "unit": "掳",
       "value": ""
     },
     {
@@ -14,6 +15,7 @@
       "read": 11,
       "sending": "",
       "address": "DB100.0",
+      "unit": "掳",
       "type": "0",
       "value": ""
     },
@@ -21,6 +23,7 @@
       "name": "A01杈撻�佹帴鐗囪搴�",
       "read": 22,
       "sending": "",
+      "unit": "掳",
       "address": "DB100.0",
       "type": "0",
       "value": ""
@@ -29,6 +32,7 @@
       "name": "A01绗煎瓙瑙掑害",
       "read": 22,
       "sending": "",
+      "unit": "掳",
       "address": "DB100.0",
       "type": "0",
       "value": ""
@@ -40,6 +44,7 @@
       "read": 33,
       "sending": "",
       "type": "0",
+      "unit": "掳",
       "address": "DB100.0",
       "count": 3,
       "value": ""
@@ -48,6 +53,7 @@
       "name": "A02琛岃蛋浣庨�熻搴�",
       "read": 11,
       "sending": "",
+      "unit": "掳",
       "address": "DB100.0",
       "type": "0",
       "value": ""
@@ -56,6 +62,7 @@
       "name": "A02杈撻�佹帴鐗囪搴�",
       "read": 22,
       "sending": "",
+      "unit": "掳",
       "address": "DB100.0",
       "type": "0",
       "value": ""
@@ -64,6 +71,7 @@
       "name": "A02绗煎瓙瑙掑害",
       "read": 22,
       "sending": "",
+      "unit": "掳",
       "address": "DB100.0",
       "type": "0",
       "value": ""
@@ -75,6 +83,7 @@
       "read": 100,
       "sending": "",
       "type": "0",
+      "unit": "m/min",
       "address": "DB100.0",
       "count": 3,
       "value": ""
@@ -85,6 +94,7 @@
       "name": "灏忚溅鑷姩閫熷害",
       "read": 11,
       "sending": "",
+      "unit": "m/min",
       "address": "DB100.0",
       "type": "0",
       "value": ""
@@ -95,9 +105,168 @@
       "name": "鑷姩缈昏浆閫熷害",
       "read": 33,
       "sending": "",
+      "unit": "m/min",
       "address": "DB100.0",
       "type": "0",
       "value": ""
     }
-  ]
+  ],
+  [
+    {
+        "title": {
+          "name": "D01~D06杈撻��"
+          
+        }
+      },
+  {
+    "name": "鏈�楂橀�熷害",
+    "read": 33,
+    "sending": 0,
+    "type": "0",
+    "unit": "m/min",
+    "count":3,
+    "value":0
+  },
+  {
+    "name": "楂橀�熺嚎閫熷害",
+    "read": 11,
+    "sending": 0,
+    "type": "0",
+    "unit": "m/min",
+    "value":0
+  },
+  {
+    "name": "浣庨�熺嚎閫熷害",
+    "read": 11,
+    "sending": 0,
+    "type": "0",
+    "unit": "m/min",
+    "value":0
+  },
+  {
+    "name": "鎵嬪姩閫熷害",
+    "read": 22,
+    "sending": 0,
+    "type": "0",
+    "unit": "m/min",
+    "value":0
+  }
+  
+ 
+],
+
+[
+  {
+      "title": {
+        "name": "A01~A02杈撻��"
+        
+      }
+    },
+{
+  "name": "鏈�楂橀�熷害",
+  "read": 33,
+  "sending": 0,
+  "type": "0",
+  "unit": "m/min",
+  "count":3,
+  "value":0
+},
+{
+  "name": "楂橀�熺嚎閫熷害",
+  "read": 11,
+  "sending": 0,
+  "unit": "m/min",
+  "type": "0",
+  "value":0
+},
+{
+  "name": "浣庨�熺嚎閫熷害",
+  "read": 11,
+  "sending": 0,
+  "unit": "m/min",
+  "type": "0",
+  "value":0
+},
+{
+  "name": "鎵嬪姩閫熷害",
+  "read": 22,
+  "sending": 0,
+  "unit": "m/min",
+  "type": "0",
+  "value":0
+}
+
+
+],[
+{
+    "title": {
+      "name": "B01~B02杈撻��"
+      
+    }
+  },
+{
+"name": "鏈�楂橀�熷害",
+"read": 33,
+"sending": 0,
+"type": "0",
+"unit": "m/min",
+"count":3,
+"value":0
+},
+{
+"name": "楂橀�熺嚎閫熷害",
+"read": 11,
+"sending": 0,
+"type": "0",
+"unit": "m/min",
+"value":0
+},
+{
+"name": "浣庨�熺嚎閫熷害",
+"read": 11,
+"sending": 0,
+"type": "0",
+"unit": "m/min",
+"value":0
+},
+{
+"name": "鎵嬪姩閫熷害",
+"read": 22,
+"sending": 0,
+"type": "0",
+"unit": "m/min",
+"value":0
+}
+
+
+]
+,[
+
+{
+"name": "缈昏浆鐐瑰姩閫熷害",
+"read": 33,
+"sending": 0,
+"type": "0",
+"unit": "mm/S",
+
+"count":3,
+"value":0
+}
+
+
+],
+[
+
+
+{
+"name": "灏忚溅鐐瑰姩閫熷害",
+"read": 11,
+"sending": 0,
+"unit": "mm/S",
+"type": "0",
+"value":0
+}
+
+
+]
 ]
\ No newline at end of file

--
Gitblit v1.8.0