From 89f70f154bf778afb0d5b45455f1a0929aec4817 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期三, 17 一月 2024 14:23:02 +0800
Subject: [PATCH] 更新合并
---
CanadaMes-ui/src/configuration/Sign.json | 793 +++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 670 insertions(+), 123 deletions(-)
diff --git a/CanadaMes-ui/src/configuration/Sign.json b/CanadaMes-ui/src/configuration/Sign.json
index c634375..dc57259 100644
--- a/CanadaMes-ui/src/configuration/Sign.json
+++ b/CanadaMes-ui/src/configuration/Sign.json
@@ -3,293 +3,840 @@
{
"name": "D01.SR dec",
"value": "1",
- "state": "1"
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
"name": "D01.SR in pos",
"value": "0",
- "state": "1"
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
"name": "D02.SR dec",
"value": "0",
- "state": "1"
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
"name": "D02.SR in pos",
"value": "1",
- "state": "1"
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
"name": "D03.SR into",
"value": "1",
- "state": "1"
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
"name": "D03.SR dec",
"value": "1",
- "state": "1"
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
"name": "D03.SR in pos",
"value": "1",
- "state": "1"
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
"name": "D04.SR dec",
"value": "1",
- "state": "1"
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
"name": "D04.SR in pos",
"value": "1",
- "state": "1"
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
"name": "D05.SR dec",
"value": "1",
- "state": "1"
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
"name": "D05.SR in pos",
"value": "1",
- "state": "1"
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
"name": "D06.SR dec",
"value": "1",
- "state": "1"
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
"name": "D06.SR in pos",
"value": "1",
- "state": "1"
- },
- {
- "name": "B01.SR out dec",
- "value": "1",
- "state": "1"
- },
- {
- "name": "B01.SR out in pos",
- "value": "1",
- "state": "1"
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
"name": "B01.SR in dec",
"value": "1",
- "state": "1"
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
"name": "B01.SR in in pos",
"value": "1",
- "state": "1"
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "B01.SR out dec",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "B01.SR out in pos",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
"name": "B01.SR turn on",
"value": "1",
- "state": "1"
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
"name": "B01.SR turn off",
"value": "1",
- "state": "1"
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
"name": "B01.SR up",
"value": "1",
- "state": "1"
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
"name": "B01.SR down",
"value": "1",
- "state": "1"
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
"name": "B02.SR out dec",
"value": "1",
- "state": "1"
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
"name": "B02.SR out in pos",
"value": "1",
- "state": "1"
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
"name": "B02.SR in dec",
"value": "1",
- "state": "1"
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
"name": "B02.SR in in pos",
"value": "1",
- "state": "1"
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
"name": "B02.SR turn on",
"value": "1",
- "state": "1"
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
"name": "B02.SR turn off",
"value": "1",
- "state": "1"
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
"name": "B02.SR up",
"value": "1",
- "state": "1"
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
"name": "B02.SR down",
"value": "1",
- "state": "1"
- },
- {
- "name": "B01.SR out safety",
- "value": "1",
- "state": "1"
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
"name": "B01.SR in safety",
"value": "1",
- "state": "1"
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
- "name": "B02.SR out safety",
+ "name": "B01.SR out safety",
"value": "1",
- "state": "1"
- },
- {
- "name": "SB.start(+)",
- "value": "1",
- "state": "1"
- },
- {
- "name": "SB.stop(1)",
- "value": "1",
- "state": "1"
- },
- {
- "name": "SB.reset",
- "value": "1",
- "state": "1"
- },
- {
- "name": "SB.auto/manul",
- "value": "1",
- "state": "1"
- },
- {
- "name": "SB.pause",
- "value": "1",
- "state": "1"
- },
- {
- "name": "SB.emg",
- "value": "1",
- "state": "1"
- },
- {
- "name": "D01.SB.start",
- "value": "1",
- "state": "1"
- },
- {
- "name": "D06.SB.start",
- "value": "1",
- "state": "1"
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
"name": "B02.SR in safety",
"value": "1",
- "state": "1"
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
- "name": "SAFETYDOOR.requset",
+ "name": "SB.start(+)",
"value": "1",
- "state": "1"
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
- "name": "SAFETYDOOR.confirm",
+ "name": "SB.stop(1)",
"value": "1",
- "state": "1"
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
- "name": "SAFETYDOOR.reset",
+ "name": "SB.reset",
"value": "1",
- "state": "1"
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
+ {
+ "name": "SB.auto/manul",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "space",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "SB.emg",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "D01.SB.start",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "D06.SB.start",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "B02.SR out safety",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "SafetyDoor.requset",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "SafetyDoor.confirm",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "SafetyDoor.reset",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "Sspace",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "Sspce",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "Sspce",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "Sspce",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A01.SR left dec",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A01.SR left in pos",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A01.SR left safety",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A01.SR right dec",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A01.SR right in pos",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A01.SR right safety",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A01.SR turn home",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A01.SR turn up",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A01.SR turn down",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A01.SR travel home",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A01.SR travel left dec",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A01.SR travel left limit",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A01.SR travel right dec",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A01.SR travel right limit",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "space",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "space",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ }
+ ,
+ {
+ "name": "A02.SR left dec",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ }
+ ,
+ {
+ "name": "A02.SR left in pos",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ }
+ ,
+ {
+ "name": "A02.SR left safety",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ }
+ ,
+ {
+ "name": "A02.SR right dec",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ }
+ ,
+ {
+ "name": "A02.SR right in pos",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ }
+ ,
+ {
+ "name": "A02.SR right safety",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ }
+ ,
+ {
+ "name": "A02.SR turn home",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ }
+ ,
+ {
+ "name": "A02.SR turn up",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ }
+ ,
+ {
+ "name": "A02.SR turn down",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ }
+ ,
+ {
+ "name": "A02.SR travel home",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ }
+ ,
+ {
+ "name": "A02.SR travel left dec",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ }
+ ,
+ {
+ "name": "A02.SR travel left limit",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ }
+ ,
+ {
+ "name": "A02.SR travel right dec",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ }
+ ,
+ {
+ "name": "A02.SR travel right limit",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ }
+ ,
+ {
+ "name": "space",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ }
+ ,
+ {
+ "name": "space",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ }
+ ,
+ {
+ "name": "B01.SR origin",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ }
+ ,
+ {
+ "name": "B01.SR left limit",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ }
+ ,
+ {
+ "name": "B01.SR right limit",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ }
+ ,
+ {
+ "name": "B02.SR origin",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ }
+ ,
+ {
+ "name": "B02.SR left limit",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ }
+ ,
+ {
+ "name": "B02.SR right limit",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ }
+ ,
+ {
+ "name": "space",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ }
+ ,
+ {
+ "name": "space",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ }
+ ,
{
"name": "LED.red",
"value": "1",
- "state": "1"
- },
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ }
+ ,
{
"name": "LED.green",
"value": "1",
- "state": "1"
- },
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ }
+ ,
{
"name": "LED.yellow",
"value": "1",
- "state": "1"
- },
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ }
+ ,
{
"name": "D01.LED.green",
"value": "1",
- "state": "1"
- },
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ }
+ ,
{
"name": "D06.LED.green",
"value": "1",
- "state": "1"
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
"name": "B01.YV.turn",
"value": "1",
- "state": "1"
- },
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ }
+ ,
{
"name": "B01.YV.up down",
"value": "1",
- "state": "1"
- },
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ }
+ ,
{
"name": "B01.YV.gassing",
"value": "1",
- "state": "1"
- },
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ }
+ ,
{
"name": "B02.YV.turn",
"value": "1",
- "state": "1"
- },
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ }
+ ,
{
"name": "B02.YV.up down",
"value": "1",
- "state": "1"
- },
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ }
+ ,
{
"name": "B02.YV.gassing",
"value": "1",
- "state": "1"
- },
- {
- "name": "SAFETYDOOR.led",
- "value": "1",
- "state": "1"
- },
- {
- "name": "SAFETYDOOR.open",
- "value": "1",
- "state": "1"
+ "state": "1",
+ "type": "1",
+ "page": "1"
}
+ ,
+ {
+ "name": "SafetyDoor.Led",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ }
+ ,
+ {
+ "name": "SafetyDoor.open",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ }
+ ,
+ {
+ "name": "D01 SB.confirm",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ }
+ ,
+ {
+ "name": "space",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ }
+ ,
+ {
+ "name": "space",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ }
+ ,
+ {
+ "name": "A01 oilPump",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ }
+ ,
+ {
+ "name": "A01 motorCtr",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ }
+ ,
+ {
+ "name": "space",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ }
+ ,
+ {
+ "name": "space",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ }
+ ,
+ {
+ "name": "A02 oilPump",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ }
+ ,
+ {
+ "name": "A02 motorCtr",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ }
+ ,
+ {
+ "name": "space",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "space",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ }
+
+
],
"address": [
{
"name": "DB102.0.0",
- "count": 58
+ "count": 64
}
]
}
\ No newline at end of file
--
Gitblit v1.8.0