From ea46f28356e2acb3bc7cc69b9af3c52fab38c0b0 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 18 一月 2024 16:56:47 +0800
Subject: [PATCH] 终止任务功能测试

---
 CanadaMes-ui/src/configuration/Manualoneposition.json |  118 ++++++++++++++++++++++++++---------------------------------
 1 files changed, 52 insertions(+), 66 deletions(-)

diff --git a/CanadaMes-ui/src/configuration/Manualoneposition.json b/CanadaMes-ui/src/configuration/Manualoneposition.json
index c9a50e8..b16d0ea 100644
--- a/CanadaMes-ui/src/configuration/Manualoneposition.json
+++ b/CanadaMes-ui/src/configuration/Manualoneposition.json
@@ -8,6 +8,7 @@
       "address": "DB100.0",
       "count": 3,
       "state": 1
+  
     },
     {
       "name": "A01瀹氫綅閫熷害",
@@ -15,7 +16,9 @@
       "sending": 0,
       "address": "DB100.0",
       "type": "0",
-      "state": 1
+      "state": 1,
+      "min":0,
+      "max":3000
     },
     {
       "name": "A01褰撳墠鏍煎瓙",
@@ -24,6 +27,7 @@
       "address": "DB100.0",
       "type": "0",
       "state": 1
+    
     },
     {
       "button": {
@@ -35,15 +39,7 @@
     },
     {
       "button": {
-        "name": "A01鏁呴殰",
-        "value": 1,
-        "address": "DB10.0",
-        "state": 1
-      }
-    },
-    {
-      "button": {
-        "name": "A01澶嶄綅",
+        "name": "鏁呴殰",
         "value": 0,
         "address": "DB10.0",
         "state": 1
@@ -51,18 +47,10 @@
     },
     {
       "button": {
-        "name": "A01鏈洖闆�",
+        "name": "澶嶄綅",
         "value": 0,
         "address": "DB10.0",
-        "state": 0
-      }
-    },
-    {
-      "button": {
-        "name": "A01鍥為浂",
-        "value": 0,
-        "address": "DB10.0",
-        "state": 0
+        "state": 1
       }
     }
   ],
@@ -75,6 +63,8 @@
       "address": "DB100.0",
       "count": 3,
       "state": 1
+     
+      
     },
     {
       "name": "A02瀹氫綅閫熷害",
@@ -82,7 +72,9 @@
       "sending": 0,
       "address": "DB100.0",
       "type": "0",
-      "state": 1
+      "state": 1,
+      "min":0,
+      "max":3000
     },
     {
       "name": "A02褰撳墠鏍煎瓙",
@@ -91,6 +83,7 @@
       "address": "DB100.0",
       "type": "0",
       "state": 1
+      
     },
     {
       "button": {
@@ -102,7 +95,7 @@
     },
     {
       "button": {
-        "name": "A02鏁呴殰",
+        "name": "鏁呴殰",
         "value": 0,
         "address": "DB10.0",
         "state": 1
@@ -110,26 +103,10 @@
     },
     {
       "button": {
-        "name": "A02澶嶄綅",
+        "name": "澶嶄綅",
         "value": 0,
         "address": "DB10.0",
         "state": 1
-      }
-    },
-    {
-      "button": {
-        "name": "鏈洖闆�",
-        "value": 0,
-        "address": "DB10.0",
-        "state": 0
-      }
-    },
-    {
-      "button": {
-        "name": "鍥為浂",
-        "value": 0,
-        "address": "DB10.0",
-        "state": 0
       }
     }
   ],
@@ -141,7 +118,9 @@
       "type": "0",
       "address": "DB100.0",
       "count": 3,
-      "state": 1
+      "state": 1,
+      "min":1,
+      "max":105
     },
     {
       "name": "B01瀹氫綅閫熷害",
@@ -149,7 +128,9 @@
       "sending": 0,
       "address": "DB100.0",
       "type": "0",
-      "state": 1
+      "state": 1,
+      "min":0,
+      "max":2000
     },
     {
       "name": "B01褰撳墠鏍煎瓙",
@@ -158,6 +139,7 @@
       "address": "DB100.0",
       "type": "0",
       "state": 1
+
     },
     {
       "button": {
@@ -169,7 +151,7 @@
     },
     {
       "button": {
-        "name": "B01鏁呴殰",
+        "name": "鏁呴殰",
         "value": 0,
         "address": "DB10.0",
         "state": 1
@@ -177,7 +159,7 @@
     },
     {
       "button": {
-        "name": "B01澶嶄綅",
+        "name": "澶嶄綅",
         "value": 0,
         "address": "DB10.0",
         "state": 1
@@ -185,15 +167,15 @@
     },
     {
       "button": {
-        "name": "B01鏈洖闆�",
-        "value": 0,
+        "name": "鏈洖闆�",
+        "value": 1,
         "address": "DB10.0",
         "state": 1
       }
     },
     {
       "button": {
-        "name": "B01鍥為浂",
+        "name": "鍥為浂",
         "value": 0,
         "address": "DB10.0",
         "state": 1
@@ -203,12 +185,13 @@
   [
     {
       "name": "B02鎵嬪姩鏍煎瓙",
-      "value": 0,
+      "value": "",
       "sending": 0,
       "type": "0",
       "address": "DB100.0",
       "count": 3,
       "state": 1
+     
     },
     {
       "name": "B02瀹氫綅閫熷害",
@@ -216,7 +199,9 @@
       "sending": 0,
       "address": "DB100.0",
       "type": "0",
-      "state": 1
+      "state": 1,
+      "min":0,
+      "max":2000
     },
     {
       "name": "B02褰撳墠鏍煎瓙",
@@ -225,6 +210,7 @@
       "address": "DB100.0",
       "type": "0",
       "state": 1
+     
     },
     {
       "button": {
@@ -236,7 +222,23 @@
     },
     {
       "button": {
-        "name": "B02鏁呴殰",
+        "name": "鏁呴殰",
+        "value": 0,
+        "address": "DB10.0",
+        "state": 1
+      }
+    },
+    {
+      "button": {
+        "name": "澶嶄綅",
+        "value": 0,
+        "address": "DB10.0",
+        "state": 1
+      }
+    },
+    {
+      "button": {
+        "name": "鏈洖闆�",
         "value": 1,
         "address": "DB10.0",
         "state": 1
@@ -244,23 +246,7 @@
     },
     {
       "button": {
-        "name": "B02澶嶄綅",
-        "value": 0,
-        "address": "DB10.0",
-        "state": 1
-      }
-    },
-    {
-      "button": {
-        "name": "B02鏈洖闆�",
-        "value": 0,
-        "address": "DB10.0",
-        "state": 1
-      }
-    },
-    {
-      "button": {
-        "name": "B02鍥為浂",
+        "name": "鍥為浂",
         "value": 0,
         "address": "DB10.0",
         "state": 1

--
Gitblit v1.8.0