From 84bb4d6cb579ee49e9a28c7507eabdf793a3a21e Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期四, 14 十二月 2023 14:07:20 +0800
Subject: [PATCH] action 去除
---
springboot-vue3/src/main/resources/config.properties | 2
CanadaMes-ui/src/views/Electrical/Positioning2.vue | 4
CanadaMes-ui/src/views/home/index.vue | 2
CanadaMes-ui/src/configuration/ManualJog.json | 26 ++++
CanadaMes-ui/src/views/Electrical/Servomanual.vue | 4
CanadaMes-ui/src/views/Electrical/Sign.vue | 4
CanadaMes-ui/src/views/Electrical/ManualonePosition.vue | 4
CanadaMes-ui/src/views/Electrical/Parameter2.vue | 6
CanadaMes-ui/src/views/Electrical/State.vue | 4
/dev/null | 187 -------------------------------
CanadaMes-ui/src/views/Electrical/Positioning1.vue | 4
springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java | 24 ++--
CanadaMes-ui/src/views/Electrical/AutomaticParameterSetting.vue | 13 +
CanadaMes-ui/src/views/Electrical/alarm.vue | 2
CanadaMes-ui/src/views/Electrical/Action.vue | 4
CanadaMes-ui/src/views/Electrical/ManualJog.vue | 32 ++--
CanadaMes-ui/src/views/Electrical/Parameter1.vue | 4
CanadaMes-ui/src/views/Electrical/ServoManualone.vue | 10 +
18 files changed, 92 insertions(+), 244 deletions(-)
diff --git a/CanadaMes-ui/src/configuration/ManualJog.json b/CanadaMes-ui/src/configuration/ManualJog.json
index 36a392a..ef9457c 100644
--- a/CanadaMes-ui/src/configuration/ManualJog.json
+++ b/CanadaMes-ui/src/configuration/ManualJog.json
@@ -4,6 +4,7 @@
"button": {
"name": "D01杈撻��",
"value": 0,
+ "value2": 0,
"address": "DB10.0",
"state": 0
},
@@ -13,6 +14,7 @@
"button": {
"name": "D02杈撻��",
"value": 0,
+ "value2": 0,
"address": "DB10.0",
"state": 0
},
@@ -22,6 +24,7 @@
"button": {
"name": "D03杈撻��",
"value": 0,
+ "value2": 0,
"address": "DB10.0",
"state": 1
},
@@ -31,6 +34,7 @@
"button": {
"name": "D04杈撻��",
"value": 0,
+ "value2": 0,
"address": "DB10.0",
"state": 1
},
@@ -40,6 +44,7 @@
"button": {
"name": "D05杈撻��",
"value": 0,
+ "value2": 0,
"address": "DB10.0",
"state": 1
},
@@ -49,6 +54,7 @@
"button": {
"name": "D06杈撻��",
"value": 0,
+ "value2": 0,
"address": "DB10.0",
"state": 1
},
@@ -58,6 +64,7 @@
"button": {
"name": "A01杈撻�佹鍚�",
"value": 0,
+ "value2": 0,
"address": "DB10.0",
"state": 0
},
@@ -67,6 +74,7 @@
"button": {
"name": "A01杈撻�佸弽鍚�",
"value": 0,
+ "value2": 0,
"address": "DB10.0",
"state": 1
},
@@ -77,6 +85,7 @@
"button": {
"name": "A01琛岃蛋鐐瑰姩",
"value": 0,
+ "value2": 0,
"address": "DB10.0",
"state": 0
},
@@ -86,6 +95,7 @@
"button": {
"name": "A01缈昏浆",
"value": 0,
+ "value2": 0,
"address": "DB10.0",
"state": 1
},
@@ -95,6 +105,7 @@
"button": {
"name": "A01娉ㄧ數娉�",
"value": 0,
+ "value2": 0,
"address": "DB10.0",
"state": 0
},
@@ -104,6 +115,7 @@
"button": {
"name": "A02杈撻�佹鍚�",
"value": 0,
+ "value2": 0,
"address": "DB10.0",
"state": 0
},
@@ -113,6 +125,7 @@
"button": {
"name": "A02杈撻�佸弽鍚�",
"value": 0,
+ "value2": 0,
"address": "DB10.0",
"state": 1
},
@@ -122,6 +135,7 @@
"button": {
"name": "A02琛岃蛋鐐瑰姩",
"value": 0,
+ "value2": 0,
"address": "DB10.0",
"state": 0
},
@@ -131,6 +145,7 @@
"button": {
"name": "A02缈昏浆",
"value": 0,
+ "value2": 0,
"address": "DB10.0",
"state": 1
},
@@ -143,6 +158,7 @@
"button": {
"name": "A02娉ㄧ數娉�",
"value": 0,
+ "value2": 0,
"address": "DB10.0",
"state": 0
},
@@ -152,6 +168,7 @@
"button": {
"name": "B01杈撻��",
"value": 0,
+ "value2": 0,
"address": "DB10.0",
"state": 1
},
@@ -161,6 +178,7 @@
"button": {
"name": "B01琛岃蛋鐐瑰姩",
"value": 0,
+ "value2": 0,
"address": "DB10.0",
"state": 1
},
@@ -171,6 +189,7 @@
"button": {
"name": "B01缈昏浆姘旂几",
"value": 0,
+ "value2": 0,
"address": "DB10.0",
"state": 0
},
@@ -180,6 +199,7 @@
"button": {
"name": "B01鍗囬檷姘旂几",
"value": 0,
+ "value2": 0,
"address": "DB10.0",
"state": 0
},
@@ -188,6 +208,7 @@
"button": {
"name": "B01鍚规皵",
"value": 0,
+ "value2": 0,
"address": "DB10.0",
"state": 1
},
@@ -197,6 +218,7 @@
"button": {
"name": "B02杈撻��",
"value": 0,
+ "value2": 0,
"address": "DB10.0",
"state": 1
},
@@ -210,6 +232,7 @@
"button": {
"name": "B02琛岃蛋鐐瑰姩",
"value": 0,
+ "value2": 0,
"address": "DB10.0",
"state": 1
},
@@ -219,6 +242,7 @@
"button": {
"name": "B02缈昏浆姘旂几",
"value": 0,
+ "value2": 0,
"address": "DB10.0",
"state": 0
},
@@ -228,6 +252,7 @@
"button": {
"name": "B02鍗囬檷姘旂几",
"value": 0,
+ "value2": 0,
"address": "DB10.0",
"state": 0
},
@@ -237,6 +262,7 @@
"button": {
"name": "B02鍚规皵",
"value": 0,
+ "value2": 0,
"address": "DB10.0",
"state": 1
},
diff --git a/CanadaMes-ui/src/views/Electrical/Action.vue b/CanadaMes-ui/src/views/Electrical/Action.vue
index 4f9a45d..14bdbb6 100644
--- a/CanadaMes-ui/src/views/Electrical/Action.vue
+++ b/CanadaMes-ui/src/views/Electrical/Action.vue
@@ -6,8 +6,8 @@
}}</router-link>
<router-link to="/Electrical/State" tag="el-button" type="text" active-class="blue-button">{{ $t('State')
}}</router-link>
- <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action')
- }}</router-link>
+ <!-- <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action')
+ }}</router-link> -->
<!-- <router-link to="/Electrical/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter')
}}</router-link> -->
<router-link to="/Electrical/Sign" tag="el-button" type="text" active-class="blue-button">{{ $t('Sign')
diff --git a/CanadaMes-ui/src/views/Electrical/AutomaticParameterSetting.vue b/CanadaMes-ui/src/views/Electrical/AutomaticParameterSetting.vue
index 217c7eb..1f018a1 100644
--- a/CanadaMes-ui/src/views/Electrical/AutomaticParameterSetting.vue
+++ b/CanadaMes-ui/src/views/Electrical/AutomaticParameterSetting.vue
@@ -5,8 +5,8 @@
}}</router-link>
<router-link to="/Electrical/State" tag="el-button" type="text" active-class="blue-button">{{ $t('State')
}}</router-link>
- <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action')
- }}</router-link>
+ <!-- <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action')
+ }}</router-link> -->
<!-- <router-link to="/Electrical/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter')
}}</router-link> -->
<router-link to="/Electrical/Sign" tag="el-button" type="text" active-class="blue-button">{{ $t('Sign')
@@ -60,11 +60,18 @@
<div v-for="(item, itemIndex) in dataGroup" :key="itemIndex" class="item-container">
<div class="item-row">
<span class="name" style="width:250px;">{{ item.name }}</span>
- <el-input v-if="item.type === '0'"
+ <!-- <el-input v-if="item.type === '0'"
v-model="item.value"
class="input-box"
:oninput="`value=value.replace(/^0|[^0-9]/g,'');if(value<`+item.min+`){value=`+item.value+`}else if(value>`+item.max+`){value=`+item.value+`}`"
@keyup.enter.native="submitDataToBackend">
+ </el-input> -->
+
+ <el-input v-if="item.type === '0'"
+ v-model="item.value"
+ class="input-box"
+
+ @keyup.enter.native="submitDataToBackend">
</el-input>
<span v-if="item.unit" :name="item.unit" >{{ item.unit }}</span>
diff --git a/CanadaMes-ui/src/views/Electrical/ManualJog.vue b/CanadaMes-ui/src/views/Electrical/ManualJog.vue
index 2506b90..3cb9fc1 100644
--- a/CanadaMes-ui/src/views/Electrical/ManualJog.vue
+++ b/CanadaMes-ui/src/views/Electrical/ManualJog.vue
@@ -5,8 +5,8 @@
}}</router-link>
<router-link to="/Electrical/State" tag="el-button" type="text" active-class="blue-button">{{ $t('State')
}}</router-link>
- <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action')
- }}</router-link>
+ <!-- <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action')
+ }}</router-link> -->
<!-- <router-link to="/Electrical/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter')
}}</router-link> -->
<router-link to="/Electrical/Sign" tag="el-button" type="text" active-class="blue-button">{{ $t('Sign')
@@ -55,8 +55,8 @@
<div class="button-row" style="display: flex; justify-content: flex-start;flex-wrap:wrap;">
<div v-for="(item, itemIndex) in dataGroup" :key="itemIndex" style="margin: 10px;">
- <el-button v-if="item.button" :name="item.button.name" style='width:200px;'
- :class="{ 'dow': false, 'op': item.button.value === 1 }" class="action-button"
+ <el-button v-if="item.button" v-model="item.button.value" :name="item.button.name" style='width:200px;'
+ :class="{ 'dow': item.button.value === 0, 'op': item.button.value === 1 }" class="action-button"
@click="updateButtonValue(dataGroup, itemIndex); submitDataToBackend();">{{
item.button.name
}}</el-button>
@@ -89,7 +89,7 @@
if (language === 'en-US') {
this.replaceChineseWithEnglish();
}
- this.$forceUpdate();
+ // this.$forceUpdate();
},
@@ -99,19 +99,19 @@
socket.close();
},
updateButtonValue (dataGroup, itemIndex) {
- if (dataGroup[itemIndex].button.value === 1) {
+ if (dataGroup[itemIndex].button.value2 === 0) {
// 濡傛灉褰撳墠鎸夐挳鐨勫�兼槸 0锛屽皢鍏惰涓� 1
- this.$set(dataGroup[itemIndex].button, 'value', 0);
+ this.$set(dataGroup[itemIndex].button, 'value2', 1);
} else {
// 鍚﹀垯灏嗗叾璁句负 0
- this.$set(dataGroup[itemIndex].button, 'value', 1);
+ this.$set(dataGroup[itemIndex].button, 'value2', 0);
}
},
submitDataToBackend () {
const inputData = this.jsonData.map(dataGroup => {
return dataGroup.map(item => {
if (item.type === '3') {
- return { value: item.button.value };
+ return { value: item.button.value2 };
}
return null;
});
@@ -168,16 +168,14 @@
let obj = JSON.parse(msg.data);
const jsonData2 = this.jsonData;
-
+ const parms = obj.params;
+ console.log(obj)
+ if(parms){
// 濡傛灉榧犳爣涓嶅湪杈撳叆妗嗗唴锛屾洿鏂拌緭鍏ユ鐨勫��
// this.submitDataToBackend()
- const parms = obj.params;
- // const xiaoche = obj.params[3];
-
- // console.log(parms);
-
-if(obj.params){
-
+
+
+
for (let i = 0; i < jsonData2.length; i++) {
let arr = jsonData2[i];
for (let j = 0; j < arr.length; j++) {
diff --git a/CanadaMes-ui/src/views/Electrical/ManualonePosition.vue b/CanadaMes-ui/src/views/Electrical/ManualonePosition.vue
index 48cd9cb..3598959 100644
--- a/CanadaMes-ui/src/views/Electrical/ManualonePosition.vue
+++ b/CanadaMes-ui/src/views/Electrical/ManualonePosition.vue
@@ -5,8 +5,8 @@
}}</router-link>
<router-link to="/Electrical/State" tag="el-button" type="text" active-class="blue-button">{{ $t('State')
}}</router-link>
- <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action')
- }}</router-link>
+ <!-- <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action')
+ }}</router-link> -->
<!-- <router-link to="/Electrical/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter')
}}</router-link> -->
<router-link to="/Electrical/Sign" tag="el-button" type="text" active-class="blue-button">{{ $t('Sign')
diff --git a/CanadaMes-ui/src/views/Electrical/Parameter1.vue b/CanadaMes-ui/src/views/Electrical/Parameter1.vue
index 8cdd45d..c40f7b9 100644
--- a/CanadaMes-ui/src/views/Electrical/Parameter1.vue
+++ b/CanadaMes-ui/src/views/Electrical/Parameter1.vue
@@ -5,8 +5,8 @@
}}</router-link>
<router-link to="/Electrical/State" tag="el-button" type="text" active-class="blue-button">{{ $t('State')
}}</router-link>
- <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action')
- }}</router-link>
+ <!-- <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action')
+ }}</router-link> -->
<!-- <router-link to="/Electrical/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter')
}}</router-link> -->
<router-link to="/Electrical/Sign" tag="el-button" type="text" active-class="blue-button">{{ $t('Sign')
diff --git a/CanadaMes-ui/src/views/Electrical/Parameter2.vue b/CanadaMes-ui/src/views/Electrical/Parameter2.vue
index 406b45d..c8ae4de 100644
--- a/CanadaMes-ui/src/views/Electrical/Parameter2.vue
+++ b/CanadaMes-ui/src/views/Electrical/Parameter2.vue
@@ -15,13 +15,13 @@
active-class="blue-button"
>{{ $t("State") }}</router-link
>
- <router-link
+ <!-- <router-link
to="/Electrical/Action"
tag="el-button"
type="text"
active-class="blue-button"
- >{{ $t("Action") }}</router-link
- >
+ >{{ $t("Action") }}</router-link -->
+
<!-- <router-link to="/Electrical/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter')
}}</router-link> -->
<router-link
diff --git a/CanadaMes-ui/src/views/Electrical/Positioning1.vue b/CanadaMes-ui/src/views/Electrical/Positioning1.vue
index f4febfd..d88d057 100644
--- a/CanadaMes-ui/src/views/Electrical/Positioning1.vue
+++ b/CanadaMes-ui/src/views/Electrical/Positioning1.vue
@@ -15,13 +15,13 @@
active-class="blue-button"
>{{ $t("State") }}</router-link
>
- <router-link
+ <!-- <router-link
to="/Electrical/Action"
tag="el-button"
type="text"
active-class="blue-button"
>{{ $t("Action") }}</router-link
- >
+ > -->
<!-- <router-link to="/Electrical/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter')
}}</router-link> -->
<router-link
diff --git a/CanadaMes-ui/src/views/Electrical/Positioning2.vue b/CanadaMes-ui/src/views/Electrical/Positioning2.vue
index 767a4e4..1212fc2 100644
--- a/CanadaMes-ui/src/views/Electrical/Positioning2.vue
+++ b/CanadaMes-ui/src/views/Electrical/Positioning2.vue
@@ -5,8 +5,8 @@
}}</router-link>
<router-link to="/Electrical/State" tag="el-button" type="text" active-class="blue-button">{{ $t('State')
}}</router-link>
- <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action')
- }}</router-link>
+ <!-- <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action')
+ }}</router-link> -->
<!-- <router-link to="/Electrical/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter')
}}</router-link> -->
<router-link to="/Electrical/Sign" tag="el-button" type="text" active-class="blue-button">{{ $t('Sign')
diff --git a/CanadaMes-ui/src/views/Electrical/ServoManualone.vue b/CanadaMes-ui/src/views/Electrical/ServoManualone.vue
index 10525dd..dbceb33 100644
--- a/CanadaMes-ui/src/views/Electrical/ServoManualone.vue
+++ b/CanadaMes-ui/src/views/Electrical/ServoManualone.vue
@@ -5,8 +5,8 @@
}}</router-link>
<router-link to="/Electrical/State" tag="el-button" type="text" active-class="blue-button">{{ $t('State')
}}</router-link>
- <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action')
- }}</router-link>
+ <!-- <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action')
+ }}</router-link> -->
<!-- <router-link to="/Electrical/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter')
}}</router-link> -->
<router-link to="/Electrical/Sign" tag="el-button" type="text" active-class="blue-button">{{ $t('Sign')
@@ -215,6 +215,10 @@
submitDataToBackend(currentButtonName) {
const data = [];
let jsonObject;
+ if (currentButtonName === '鏁呴殰' || currentButtonName === 'Fault') {
+ return false;
+
+ }
if (currentButtonName === 'A01鍗婅嚜鍔ㄥ惎鍔�' || currentButtonName === 'A01 Semi-Auto Start') {
const values = [this.jsonData[0][10].button.value];
@@ -428,7 +432,7 @@
}
let obj = JSON.parse(msg.data);
- // console.log(obj)
+// console.log(obj)
const weihuiling=obj.weihuiling;
const jsonData2 = this.jsonData;
diff --git a/CanadaMes-ui/src/views/Electrical/Servomanual.vue b/CanadaMes-ui/src/views/Electrical/Servomanual.vue
index 1164bb0..cd03f42 100644
--- a/CanadaMes-ui/src/views/Electrical/Servomanual.vue
+++ b/CanadaMes-ui/src/views/Electrical/Servomanual.vue
@@ -5,8 +5,8 @@
}}</router-link>
<router-link to="/Electrical/State" tag="el-button" type="text" active-class="blue-button">{{ $t('State')
}}</router-link>
- <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action')
- }}</router-link>
+ <!-- <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action')
+ }}</router-link> -->
<!-- <router-link to="/Electrical/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter')
}}</router-link> -->
<router-link to="/Electrical/Sign" tag="el-button" type="text" active-class="blue-button">{{ $t('Sign')
diff --git a/CanadaMes-ui/src/views/Electrical/Sign.vue b/CanadaMes-ui/src/views/Electrical/Sign.vue
index fdccfad..f5e3edd 100644
--- a/CanadaMes-ui/src/views/Electrical/Sign.vue
+++ b/CanadaMes-ui/src/views/Electrical/Sign.vue
@@ -7,8 +7,8 @@
}}</router-link>
<router-link to="/Electrical/State" tag="el-button" type="text" active-class="blue-button">{{ $t('State')
}}</router-link>
- <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action')
- }}</router-link>
+ <!-- <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action')
+ }}</router-link> -->
<!-- <router-link to="/Electrical/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter')
}}</router-link> -->
<router-link to="/Electrical/Sign" tag="el-button" type="text" active-class="blue-button">{{ $t('Sign')
diff --git a/CanadaMes-ui/src/views/Electrical/State.vue b/CanadaMes-ui/src/views/Electrical/State.vue
index aa1079f..585edd4 100644
--- a/CanadaMes-ui/src/views/Electrical/State.vue
+++ b/CanadaMes-ui/src/views/Electrical/State.vue
@@ -7,8 +7,8 @@
}}</router-link>
<router-link to="/Electrical/State" tag="el-button" type="text" active-class="blue-button">{{ $t('State')
}}</router-link>
- <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action')
- }}</router-link>
+ <!-- <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action')
+ }}</router-link> -->
<!-- <router-link to="/Electrical/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter')
}}</router-link> -->
<router-link to="/Electrical/Sign" tag="el-button" type="text" active-class="blue-button">{{ $t('Sign')
diff --git a/CanadaMes-ui/src/views/Electrical/alarm.vue b/CanadaMes-ui/src/views/Electrical/alarm.vue
index 4ded8cc..4c3eff5 100644
--- a/CanadaMes-ui/src/views/Electrical/alarm.vue
+++ b/CanadaMes-ui/src/views/Electrical/alarm.vue
@@ -5,7 +5,7 @@
<router-link to="/Electrical/alarm" tag="el-button" type="text" active-class="blue-button">{{ $t('Alarm') }}</router-link>
<router-link to="/Electrical/State" tag="el-button" type="text" active-class="blue-button">{{ $t('State') }}</router-link>
- <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action') }}</router-link>
+ <!-- <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action') }}</router-link> -->
<!-- <router-link to="/Electrical/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter') }}</router-link> -->
<router-link to="/Electrical/Sign" tag="el-button" type="text" active-class="blue-button">{{ $t('Sign') }}</router-link>
<router-link to="/Electrical/Servomanual" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter')
diff --git a/CanadaMes-ui/src/views/home/index.vue b/CanadaMes-ui/src/views/home/index.vue
index e9a4965..bf8547b 100644
--- a/CanadaMes-ui/src/views/home/index.vue
+++ b/CanadaMes-ui/src/views/home/index.vue
@@ -878,6 +878,7 @@
if(this.alarm.length>0){
this.dialogFormVisible2=true;
}
+ console.log(obj.countdown[0],this.CountDowns);
//澶嶄綅鍊掕鏃�
if (obj.countdown[0] == true&&this.CountDowns==0) {
this.CountDown();
@@ -1717,6 +1718,7 @@
});
},
CountDown(){
+ this.dialogFormCountDown=true;
//50绉掑�掓暟璁℃椂
let count = 45;
let timer = setInterval(
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java b/springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java
deleted file mode 100644
index 2cf3a03..0000000
--- a/springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java
+++ /dev/null
@@ -1,187 +0,0 @@
-package com.example.springboot.component;
-
-import cn.hutool.json.JSONObject;
-
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-
-import com.example.springboot.entity.Out_slice;
-import com.example.springboot.entity.Queue;
-import com.example.springboot.entity.StorageCage;
-import com.example.springboot.entity.alarmmg;
-import com.example.springboot.mapper.HomeMapper;
-import com.example.springboot.mapper.SpianMapper;
-import com.example.springboot.service.JdbcConnections;
-import com.example.springboot.service.North_Glass_Buffer1Service;
-import com.example.springboot.service.OutSliceServive;
-import com.example.springboot.service.SpianService;
-
-public class Plchome extends Thread {
-
- @Autowired
- private HomeMapper homeMapper;
- private OutSliceServive outSliceServive;
- private SpianMapper spianMapper;
- private SpianService spianService;
- private North_Glass_Buffer1Service north_Glass_Buffer1Service;
- private JdbcConnections dbserve;
- // 鍑虹墖闃熷垪鏄惁鍏佽鍑虹墖
- public static Boolean isAllowQueue = true;
- // 閾濇id
- public static String FrameNo;
- // 鏄惁闇�瑕佹墜鍔ㄧ‘璁ょ幓鐠�
- public static Boolean isConfirm = false;
-
- // public static Map b=new HashMap<>();
- // b.put()
- @Override
- public void run() {
- while (this != null) {
- try {
- Thread.sleep(1000);
-
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- JSONObject jsonObject = new JSONObject();
-
- // 娉ㄥ叆mapper
- homeMapper = WebSocketServer.applicationContext.getBean(HomeMapper.class);
- spianMapper = WebSocketServer.applicationContext.getBean(SpianMapper.class);
- spianService = WebSocketServer.applicationContext.getBean(SpianService.class);
- outSliceServive = WebSocketServer.applicationContext.getBean(OutSliceServive.class);
- north_Glass_Buffer1Service = WebSocketServer.applicationContext.getBean(North_Glass_Buffer1Service.class);
- // 绗煎瓙浣跨敤鎯呭喌
- List<StorageCage> tableData = homeMapper.selectAll();
- jsonObject.append("tableData", tableData);
- // 鏍肩悊鐗囩鏍煎瓙鐘舵��
- List<StorageCage> cagelist1 = homeMapper.selectRack1();
- List<StorageCage> cagelist2 = homeMapper.selectRack2();
- List<StorageCage> cagelist3 = homeMapper.selectRack3();
- List<StorageCage> cagelist4 = homeMapper.selectRack4();
- jsonObject.append("cagelist1", cagelist1);
- jsonObject.append("cagelist2", cagelist2);
- jsonObject.append("cagelist3", cagelist3);
- jsonObject.append("cagelist4", cagelist4);
- // 杩涘嚭鐗囦换鍔�
- List<StorageCage> tasklist1 = homeMapper.selectinout(3);
- List<StorageCage> tasklist2 = homeMapper.selectinout(2);
- jsonObject.append("tasklist1", tasklist1);
- jsonObject.append("tasklist2", tasklist2);
- // 鏌ヨ鎶ヨ淇℃伅
- List<alarmmg> alarmmg = homeMapper.SelectAlarmmgInfo();
- jsonObject.append("alarmmg", alarmmg);
- // 璇诲幓Plc杩涚墖杞︿笌鍑虹墖杞︿綅缃甒
- List<String> addressList = new ArrayList<String>();
- addressList.add("DB106.12");
- addressList.add("DB106.0");
- List<Short> paramlist = S7control.getinstance().ReadWord(addressList);
- if (paramlist != null) {
- jsonObject.append("params", paramlist);
- }
- // 鑾峰彇杩涚墖杞︾姸鎬�
- List<Short> datas1ListState = S7control.getinstance().ReadWord("DB106.8",
- 1);// 鑾峰彇杩涚墖杞︾姸鎬�
- boolean exist1 = datas1ListState.contains((short) 0);
- jsonObject.append("zhuangtai", exist1);
- // 鑾峰彇杩涚墖鐜荤拑淇℃伅
- List<Short> inglassInfo = S7control.getinstance().ReadWord("DB106.24", 1);
- if (inglassInfo != null) {
- if (inglassInfo.size() > 0)
- jsonObject.append("loadglassheight", inglassInfo.get(0) * 70);
- }
- // 浼� 鑾峰彇杩涙槸鍚︽湁寰呯‘璁ょ殑鐜荤拑id
- String queid = spianMapper.Selectqueueid();
- int state = spianMapper.Selectqueuestate();
- jsonObject.append("queid", queid);
- jsonObject.append("state", state);
- // 鑾峰彇鎵爜浣嶄笌涓婄墖浣嶇幓鐠冧俊鎭�
- Queue form2 = homeMapper.GetQueueInfo(2);
- Queue form3 = homeMapper.GetQueueInfo(1);
- if (form2.getglassId() != null && form2.getglassId() != "") {
- jsonObject.append("form2", form2);
- }
- if (form3.getglassId() != null && form3.getglassId() != "") {
- jsonObject.append("form3", form3);
- }
- // 鑾峰彇鍑虹墖闃熷垪淇℃伅
- List<Out_slice> listoutslice = outSliceServive.SelectProductionqueue();
- jsonObject.append("listoutslice", listoutslice);
- // 鑾峰彇褰撳墠鍑虹墖闃熷垪鐘舵��
- jsonObject.append("isAllowQueue", Plchome.isAllowQueue);
-
- // 鑾峰彇閾濇idDB106.DBW64
- // String frameno=spianService.queGlassid("DB103.270",14).toString();
- // if(frameno!=Plchome.FrameNo&&frameno!=""){
- // Plchome.FrameNo=frameno;
- // }
- // try {
- // north_Glass_Buffer1Service.AddOutSliceS(Plchome.FrameNo);
- // } catch (SQLException e) {
- // // TODO Auto-generated catch block
- // e.printStackTrace();
- // }
- // 鏄惁闇�瑕佷汉宸ョ‘璁や笂鐗囩幓鐠�
- jsonObject.append("isConfirm", isConfirm);
-
- //鑾峰彇杩涚墖璇锋眰鐘舵��
- List<Short> D01Request = S7control.getinstance().ReadWord("DB106.24", 1);
- boolean D01RequestState = D01Request.contains((short) 1);
- // boolean D01RequestState =true;
- jsonObject.append("D01RequestState", D01RequestState);
-
- //澶嶄綅鍊掕鏃�
- // 鍦板潃104.9.6
- List<Boolean> countdown = S7control.getinstance().ReadBits("DB104.9.6", 1);
- for (Boolean countdowns : countdown) {
- jsonObject.append("countdown", countdowns);
- }
- // jsonObject.append("countdown", true);
- // 閾濇绾夸氦浜�
-
- // //閾濇id璇锋眰瀛�
- // List<Short> framerequest = S7control.getinstance().ReadWord("閾濇id璇锋眰瀛楀湴鍧�", 1);
- // if(framerequest!=null){
- // //閾濇id
- // String franmeno= spianService.queGlassid("閾濇id鍦板潃", 14).toString();
- // String position;
- // try {
- // position=dbserve.SelectPositionByFrameBarcode(franmeno);
- // } catch (SQLException e) {
- // // TODO Auto-generated catch block
- // position="0";
- // e.printStackTrace();
- // }
- // Short send;
- // if(position=="0"){
- // send=0;
- // }else{
- // send=1;
- // }
- // S7control.getinstance().WriteWord("閾濇缈昏浆鍙戦�佸湴鍧�", (short)send);
- // }
-
- dbserve = WebSocketServer.applicationContext.getBean(JdbcConnections.class);
- boolean dbconnected = false;
- try {
- dbserve.getConn();
- dbconnected = true;
- } catch (Exception e) {
- // TODO: handle exception
- dbconnected = false;
- }
- jsonObject.append("dbconnected", dbconnected);
- // jsonObject.append("params", new short[] { 30, 40, });
- ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("Home");
- if (sendwServer != null) {
- for (WebSocketServer webserver : sendwServer) {
- webserver.sendMessage(jsonObject.toString());
- }
- }
-
- }
- }
-}
diff --git a/springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java b/springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java
index d0572b6..0f76ee7 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java
@@ -17,25 +17,25 @@
//
System.out.println("鍚姩瀹屾垚");
- new PlcHold().start();
+ // new PlcHold().start();
new Plchome().start();
-// new Plcalarm().start();
+ new Plcalarm().start();
-// new Plcsign().start();
+ new Plcsign().start();
-// new Plcaction().start();
-// new Plcstate().start();
-// new PlcPositioning1().start();
+
+ new Plcstate().start();
+ new PlcPositioning1().start();
-// new PlcParameter2().start();
+ new PlcParameter2().start();
-// new PLCAutomaticParameterSetting().start();
+ new PLCAutomaticParameterSetting().start();
-// new PlcManualonePosition().start();
-// new PlcManualonePosition2().start();
-// new PlcServoManualone().start();
-// new PLCManualJog().start();
+ new PlcManualonePosition().start();
+ new PlcManualonePosition2().start();
+ new PlcServoManualone().start();
+ new PLCManualJog().start();
}
}
\ No newline at end of file
diff --git a/springboot-vue3/src/main/resources/config.properties b/springboot-vue3/src/main/resources/config.properties
index 7bbde96..1a025c2 100644
--- a/springboot-vue3/src/main/resources/config.properties
+++ b/springboot-vue3/src/main/resources/config.properties
@@ -54,8 +54,6 @@
-
-
#Parameter2--------------------------
#id
--
Gitblit v1.8.0