From 4c70d9f0656bbec48fa619f2ec9aa0ee12fca2c1 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 04 十二月 2023 09:04:51 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes

---
 CanadaMes-ui/src/configuration/Action.json |  571 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 544 insertions(+), 27 deletions(-)

diff --git a/CanadaMes-ui/src/configuration/Action.json b/CanadaMes-ui/src/configuration/Action.json
index 91e8990..fb05bb6 100644
--- a/CanadaMes-ui/src/configuration/Action.json
+++ b/CanadaMes-ui/src/configuration/Action.json
@@ -1,88 +1,605 @@
 {
   "action": [
     {
-      "name": "D01 VFD conveyor"
+      "name": "D01 VFD conveyor",
+      "value": 1,
+      "state": "1",
+      "type": "1",
+      "page": "1"
     },
     {
-      "name": "D02 VFD conveyor"
+      "name": "D02 VFD conveyor",
+      "value": 1,
+      "state": "1",
+      "type": "1",
+      "page": "1"
     },
     {
-      "name": "D03 VFD conveyor"
+      "name": "D03 VFD conveyor",
+      "value": 1,
+      "state": "1",
+      "type": "1",
+      "page": "1"
     },
     {
-      "name": "D04 VFD conveyor"
+      "name": "D04 VFD conveyor",
+      "value": 1,
+      "state": "1",
+      "type": "1",
+      "page": "1"
     },
     {
-      "name": "D05 VFD conveyor"
+      "name": "D05 VFD conveyor",
+      "value": 1,
+      "state": "1",
+      "type": "1",
+      "page": "1"
     },
     {
-      "name": "D06 VFD conveyor"
+      "name": "D06 VFD conveyor",
+      "value": 1,
+      "state": "1",
+      "type": "1",
+      "page": "1"
     },
     {
-      "name": "A01 VFD conveyor"
+      "name": "A01 VFD conveyor",
+      "value": 1,
+      "state": "1",
+      "type": "1",
+      "page": "1"
     },
     {
-      "name": "A02 VFD conveyor"
+      "name": "A02 VFD conveyor",
+      "value": 1,
+      "state": "1",
+      "type": "1",
+      "page": "1"
     },
     {
-      "name": "B01 VFD conveyor"
+      "name": "B01 VFD conveyor",
+      "value": 1,
+      "state": "1",
+      "type": "1",
+      "page": "1"
     },
     {
-      "name": "B02 VFD conveyor"
+      "name": "B02 VFD conveyor",
+      "value": 1,
+      "state": "1",
+      "type": "1",
+      "page": "1"
     },
     {
-      "name": "A01 SERVE TURN JOG+"
+      "name": "A01 SERVE TURN JOG+",
+      "value": 1,
+      "state": "1",
+      "type": "1",
+      "page": "1"
     },
     {
-      "name": "A02 SERVE TURN JOG-"
+      "name": "A02 SERVE TURN JOG-",
+      "value": 1,
+      "state": "1",
+      "type": "1",
+      "page": "1"
     },
     {
-      "name": "A01 SERVE TRAVEL JOG+"
+      "name": "A01 SERVE TRAVEL JOG+",
+      "value": 1,
+      "state": "1",
+      "type": "1",
+      "page": "1"
     },
     {
-      "name": "A02 SERVE TRAVEL JOG-"
+      "name": "A02 SERVE TRAVEL JOG-",
+      "value": 1,
+      "state": "1",
+      "type": "1",
+      "page": "1"
     },
     {
-      "name": "B01 SERVE TRAVEL JOG+"
+      "name": "B01 SERVE TRAVEL JOG+",
+      "value": 1,
+      "state": "1",
+      "type": "1",
+      "page": "1"
     },
     {
-      "name": "B02 SERVE TRAVEL JOG-"
+      "name": "B02 SERVE TRAVEL JOG-",
+      "value": 1,
+      "state": "1",
+      "type": "1",
+      "page": "1"
     },
     {
-      "name": "A01 SERVE TURN POS"
+      "name": "A01 SERVE TURN POS",
+      "value": 1,
+      "state": "1",
+      "type": "1",
+      "page": "1"
     },
     {
-      "name": "A02 SERVE TURN POS"
+      "name": "A02 SERVE TURN POS",
+      "value": 1,
+      "state": "1",
+      "type": "1",
+      "page": "1"
     },
     {
-      "name": "A01 SERVE TRAVEL POS"
+      "name": "A01 SERVE TRAVEL POS",
+      "value": 1,
+      "state": "1",
+      "type": "1",
+      "page": "1"
     },
     {
-      "name": "A02 SERVE TRAVEL POS"
+      "name": "A02 SERVE TRAVEL POS",
+      "value": 1,
+      "state": "1",
+      "type": "1",
+      "page": "1"
     },
     {
-      "name": "B01 SERVE TRAVEL POS"
+      "name": "B01 SERVE TRAVEL POS",
+      "value": 1,
+      "state": "1",
+      "type": "1",
+      "page": "1"
     },
     {
-      "name": "B02 SERVE TRAVEL POS"
+      "name": "B02 SERVE TRAVEL POS",
+      "value": 1,
+      "state": "1",
+      "type": "1",
+      "page": "1"
     },
     {
-      "name": "B01 YV TURN"
+      "name": "B01 YV TURN",
+      "value": 1,
+      "state": "1",
+      "type": "1",
+      "page": "1"
     },
     {
-      "name": "B01 YV UP DOWN"
+      "name": "B01 YV UP DOWN",
+      "value": 1,
+      "state": "1",
+      "type": "1",
+      "page": "1"
     },
     {
-      "name": "B02 YV TURN"
+      "name": "B02 YV TURN",
+      "value": 1,
+      "state": "1",
+      "type": "1",
+      "page": "1"
     },
     {
-      "name": "B02 YV UP DOWN"
+      "name": "B02 YV UP DOWN",
+      "value": 1,
+      "state": "1",
+      "type": "1",
+      "page": "1"
+    },
+    {
+      "name": "B01 YV Gassing",
+      "value": 1,
+      "state": "1",
+      "type": "1",
+      "page": "1"
+    },
+    {
+      "name": "B02 YV Gassing",
+      "value": 1,
+      "state": "1",
+      "type": "1",
+      "page": "1"
+    },
+    {
+      "name": "A01 VFD conveyor reverse",
+      "value": 1,
+      "state": "1",
+      "type": "1",
+      "page": "1"
+    },
+    {
+      "name": "A02 VFD conveyor reverse",
+      "value": 1,
+      "state": "1",
+      "type": "1",
+      "page": "1"
+    },
+    {
+      "name": "A01 SERVE TURN reset",
+      "value": 1,
+      "state": "1",
+      "type": "1",
+      "page": "1"
+    },
+    {
+      "name": "A01 SERVE TURN home",
+      "value": 1,
+      "state": "1",
+      "type": "1",
+      "page": "1"
+    },
+    {
+      "name": "A01 SERVE TRAVEL reset",
+      "value": 1,
+      "state": "1",
+      "type": "1",
+      "page": "1"
+    },
+    {
+      "name": "A02 SERVE TURN reset",
+      "value": 1,
+      "state": "1",
+      "type": "1",
+      "page": "1"
+    },
+    {
+      "name": "A02 SERVE TURN home",
+      "value": 1,
+      "state": "1",
+      "type": "1",
+      "page": "1"
+    },
+    {
+      "name": "A02 SERVE TRAVEL reset",
+      "value": 1,
+      "state": "1",
+      "type": "1",
+      "page": "1"
+    },
+    {
+      "name": "B01 SERVE TRAVEL reset",
+      "value": 1,
+      "state": "1",
+      "type": "1",
+      "page": "1"
+    },
+    {
+      "name": "B01 SERVE TRAVEL home",
+      "value": 1,
+      "state": "1",
+      "type": "1",
+      "page": "1"
+    },
+    {
+      "name": "B02 SERVE TRAVEL reset",
+      "value": 1,
+      "state": "1",
+      "type": "1",
+      "page": "1"
+    },
+    {
+      "name": "B02 SERVE TRAVEL home",
+      "value": 1,
+      "state": "1",
+      "type": "1",
+      "page": "1"
+    },
+    {
+      "name": "Manual storage startup",
+      "value": 1,
+      "state": "1",
+      "type": "1",
+      "page": "1"
+    },
+    {
+      "name": "Manual output startup",
+      "value": 1,
+      "state": "1",
+      "type": "1",
+      "page": "1"
+    },
+    {
+      "name": "A01 oil pump",
+      "value": 1,
+      "state": "1",
+      "type": "1",
+      "page": "1"
+    },
+    {
+      "name": "A02 oil pump",
+      "value": 1,
+      "state": "1",
+      "type": "1",
+      "page": "1"
+    },
+    {
+      "name": "A01 get 1# grid address",
+      "value": 1,
+      "state": "1",
+      "type": "1",
+      "page": "1"
+    },
+    {
+      "name": "A01 get 22# grid address",
+      "value": 1,
+      "state": "1",
+      "type": "1",
+      "page": "1"
+    },
+    {
+      "name": "A01 get 43# grid address",
+      "value": 1,
+      "state": "1",
+      "type": "1",
+      "page": "1"
+    },
+    {
+      "name": "A01 get 64# grid address",
+      "value": 1,
+      "state": "1",
+      "type": "1",
+      "page": "1"
+    },
+    {
+      "name": "A01 get 85# grid address",
+      "value": 1,
+      "state": "1",
+      "type": "1",
+      "page": "1"
+    },
+    {
+      "name": "A01 get 106# grid address",
+      "value": 1,
+      "state": "1",
+      "type": "1",
+      "page": "1"
+    },
+    {
+      "name": "A01 get 127# grid address",
+      "value": 1,
+      "state": "1",
+      "type": "1",
+      "page": "1"
+    },
+    {
+      "name": "A01 get 148# grid address",
+      "value": 1,
+      "state": "1",
+      "type": "1",
+      "page": "1"
+    },
+    {
+      "name": "A01 get 169# grid address",
+      "value": 1,
+      "state": "1",
+      "type": "1",
+      "page": "1"
+    },
+    {
+      "name": "A02 get 190# grid address",
+      "value": 1,
+      "state": "1",
+      "type": "1",
+      "page": "1"
+    },
+    {
+      "name": "A02 get 1# grid address",
+      "value": 1,
+      "state": "1",
+      "type": "1",
+      "page": "1"
+    },
+    {
+      "name": "A02 get 22# grid address",
+      "value": 1,
+      "state": "1",
+      "type": "1",
+      "page": "1"
+    },
+    {
+      "name": "A02 get 43# grid address",
+      "value": 1,
+      "state": "1",
+      "type": "1",
+      "page": "1"
+    },
+    {
+      "name": "A02 get 64# grid address",
+      "value": 1,
+      "state": "1",
+      "type": "1",
+      "page": "1"
+    },
+    {
+      "name": "A02 get 85# grid address",
+      "value": 1,
+      "state": "1",
+      "type": "1",
+      "page": "1"
+    },
+    {
+      "name": "A02 get 106# grid address",
+      "value": 1,
+      "state": "1",
+      "type": "1",
+      "page": "1"
+    },
+    {
+      "name": "A02 get 127# grid address",
+      "value": 1,
+      "state": "1",
+      "type": "1",
+      "page": "1"
+    },
+    {
+      "name": "A02 get 148# grid address",
+      "value": 1,
+      "state": "1",
+      "type": "1",
+      "page": "1"
+    },
+    {
+      "name": "A02 get 169# grid address",
+      "value": 1,
+      "state": "1",
+      "type": "1",
+      "page": "1"
+    },
+    {
+      "name": "A02 get 190# grid address",
+      "value": 1,
+      "state": "1",
+      "type": "1",
+      "page": "1"
+    },
+    {
+      "name": "B01 get 1# grid address",
+      "value": 1,
+      "state": "1",
+      "type": "1",
+      "page": "1"
+    },
+    {
+      "name": "B01 get 22# grid address",
+      "value": 1,
+      "state": "1",
+      "type": "1",
+      "page": "1"
+    },
+    {
+      "name": "B01 get 43# grid address",
+      "value": 1,
+      "state": "1",
+      "type": "1",
+      "page": "1"
+    },
+    {
+      "name": "B01 get 64# grid address",
+      "value": 1,
+      "state": "1",
+      "type": "1",
+      "page": "1"
+    },
+    {
+      "name": "B01 get 85# grid address",
+      "value": 1,
+      "state": "1",
+      "type": "1",
+      "page": "1"
+    },
+    {
+      "name": "B02 get 106# grid address",
+      "value": 1,
+      "state": "1",
+      "type": "1",
+      "page": "1"
+    },
+    {
+      "name": "B02 get 127# grid address",
+      "value": 1,
+      "state": "1",
+      "type": "1",
+      "page": "1"
+    },
+    {
+      "name": "B02 get 148# grid address",
+      "value": 1,
+      "state": "1",
+      "type": "1",
+      "page": "1"
+    },
+    {
+      "name": "B02 get 169# grid address",
+      "value": 1,
+      "state": "1",
+      "type": "1",
+      "page": "1"
+    },
+    {
+      "name": "B02 get 190# grid address",
+      "value": 1,
+      "state": "1",
+      "type": "1",
+      "page": "1"
+    },
+    {
+      "name": "D01 ID Clean",
+      "value": 1,
+      "state": "1",
+      "type": "1",
+      "page": "1"
+    },
+    {
+      "name": "D02 ID Clean",
+      "value": 1,
+      "state": "1",
+      "type": "1",
+      "page": "1"
+    },
+    {
+      "name": "D03 ID Clean",
+      "value": 1,
+      "state": "1",
+      "type": "1",
+      "page": "1"
+    },
+    {
+      "name": "D04 ID Clean",
+      "value": 1,
+      "state": "1",
+      "type": "1",
+      "page": "1"
+    },
+    {
+      "name": "D05 ID Clean",
+      "value": 1,
+      "state": "1",
+      "type": "1",
+      "page": "1"
+    },
+    {
+      "name": "D06 ID Clean",
+      "value": 1,
+      "state": "1",
+      "type": "1",
+      "page": "1"
+    },
+    {
+      "name": "A01 ID Clean",
+      "value": 1,
+      "state": "1",
+      "type": "1",
+      "page": "1"
+    },
+    {
+      "name": "A02 ID Clean",
+      "value": 1,
+      "state": "1",
+      "type": "1",
+      "page": "1"
+    },
+    {
+      "name": "B01 ID Clean",
+      "value": 1,
+      "state": "1",
+      "type": "1",
+      "page": "1"
+    },
+    {
+      "name": "B02 ID Clean",
+      "value": 1,
+      "state": "1",
+      "type": "1",
+      "page": "1"
+    },
+    {
+      "name": "abort/resumeTasks",
+      "value": 1,
+      "state": "1",
+      "type": "1",
+      "page": "1"
     }
   ],
   "address": [
     {
       "name": "DB2.0.0",
-      "count": 26
+      "count": 84
     }
   ]
 }
\ No newline at end of file

--
Gitblit v1.8.0