From f66c565a395e10901fc71abcfa37f4ff5a15be09 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期五, 26 一月 2024 11:34:06 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/configuration/AutomaticParameterSetting.json | 82 +++++++++++++----------------------------
1 files changed, 26 insertions(+), 56 deletions(-)
diff --git a/CanadaMes-ui/src/configuration/AutomaticParameterSetting.json b/CanadaMes-ui/src/configuration/AutomaticParameterSetting.json
index 57ad2f0..190f2f3 100644
--- a/CanadaMes-ui/src/configuration/AutomaticParameterSetting.json
+++ b/CanadaMes-ui/src/configuration/AutomaticParameterSetting.json
@@ -10,7 +10,7 @@
"unit": "掳",
"value": "",
"min": 0,
- "max": 100
+ "max": 99
},
{
"name": "A01琛岃蛋浣庨�熻搴�",
@@ -21,7 +21,7 @@
"type": "0",
"value": "",
"min": 0,
- "max": 100
+ "max": 99
},
{
"name": "A01杈撻�佹帴鐗囪搴�",
@@ -32,7 +32,7 @@
"type": "0",
"value": "",
"min": 0,
- "max": 100
+ "max": 99
},
{
"name": "A01绗煎瓙瑙掑害",
@@ -43,7 +43,7 @@
"type": "0",
"value": "",
"min": 0,
- "max": 100
+ "max": 99
}
],
[
@@ -57,7 +57,7 @@
"count": 3,
"value": "",
"min": 0,
- "max": 100
+ "max": 99
},
{
"name": "A02琛岃蛋浣庨�熻搴�",
@@ -68,7 +68,7 @@
"type": "0",
"value": "",
"min": 0,
- "max": 100
+ "max": 99
},
{
"name": "A02杈撻�佹帴鐗囪搴�",
@@ -79,7 +79,7 @@
"type": "0",
"value": "",
"min": 0,
- "max": 100
+ "max": 99
},
{
"name": "A02绗煎瓙瑙掑害",
@@ -90,7 +90,7 @@
"type": "0",
"value": "",
"min": 0,
- "max": 100
+ "max": 99
}
],
[
@@ -104,7 +104,7 @@
"count": 3,
"value": "",
"min": 0,
- "max": 100
+ "max": 3000
}
],
[
@@ -117,7 +117,7 @@
"type": "0",
"value": "",
"min": 0,
- "max": 100
+ "max": 2000
}
],
[
@@ -130,7 +130,7 @@
"type": "0",
"value": "",
"min": 0,
- "max": 100
+ "max": 99
}
],
[
@@ -140,17 +140,7 @@
}
},
- {
- "name": "鏈�楂橀�熷害",
- "read": 33,
- "sending": 0,
- "type": "0",
- "unit": "m/min",
- "count":3,
- "value":0,
- "min": 0,
- "max": 1000
- },
+
{
"name": "楂橀�熺嚎閫熷害",
"read": 11,
@@ -159,7 +149,7 @@
"unit": "m/min",
"value":0,
"min": 0,
- "max": 100
+ "max": 60
},
{
"name": "浣庨�熺嚎閫熷害",
@@ -169,7 +159,7 @@
"unit": "m/min",
"value":0,
"min": 0,
- "max": 100
+ "max": 60
},
{
"name": "鎵嬪姩閫熷害",
@@ -179,7 +169,7 @@
"unit": "m/min",
"value":0,
"min": 0,
- "max": 100
+ "max": 60
}
@@ -192,17 +182,7 @@
}
},
-{
- "name": "鏈�楂橀�熷害",
- "read": 33,
- "sending": 0,
- "type": "0",
- "unit": "m/min",
- "count":3,
- "value":0,
- "min": 0,
- "max": 100
-},
+
{
"name": "楂橀�熺嚎閫熷害",
"read": 11,
@@ -211,7 +191,7 @@
"type": "0",
"value":0,
"min": 0,
- "max": 100
+ "max": 60
},
{
"name": "浣庨�熺嚎閫熷害",
@@ -221,7 +201,7 @@
"type": "0",
"value":0,
"min": 0,
- "max": 100
+ "max": 60
},
{
"name": "鎵嬪姩閫熷害",
@@ -231,7 +211,7 @@
"type": "0",
"value":0,
"min": 0,
- "max": 100
+ "max": 60
}
@@ -242,17 +222,7 @@
}
},
-{
-"name": "鏈�楂橀�熷害",
-"read": 33,
-"sending": 0,
-"type": "0",
-"unit": "m/min",
-"count":3,
-"value":0,
-"min": 0,
-"max": 100
-},
+
{
"name": "楂橀�熺嚎閫熷害",
"read": 11,
@@ -261,7 +231,7 @@
"unit": "m/min",
"value":0,
"min": 0,
-"max": 100
+"max": 60
},
{
"name": "浣庨�熺嚎閫熷害",
@@ -271,7 +241,7 @@
"unit": "m/min",
"value":0,
"min": 0,
-"max": 100
+"max": 60
},
{
"name": "鎵嬪姩閫熷害",
@@ -281,7 +251,7 @@
"unit": "m/min",
"value":0,
"min": 0,
-"max": 100
+"max": 60
}
@@ -293,12 +263,12 @@
"read": 33,
"sending": 0,
"type": "0",
-"unit": "mm/S",
+"unit": "掳/S",
"count":3,
"value":0,
"min": 0,
-"max": 100
+"max": 99
}
@@ -314,7 +284,7 @@
"type": "0",
"value":0,
"min": 0,
-"max": 100
+"max": 2000
}
--
Gitblit v1.8.0