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/views/Electrical/ManualJog.vue | 232 +++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 156 insertions(+), 76 deletions(-)
diff --git a/CanadaMes-ui/src/views/Electrical/ManualJog.vue b/CanadaMes-ui/src/views/Electrical/ManualJog.vue
index a222e42..e23ebb1 100644
--- a/CanadaMes-ui/src/views/Electrical/ManualJog.vue
+++ b/CanadaMes-ui/src/views/Electrical/ManualJog.vue
@@ -1,60 +1,55 @@
<template>
<div class="app">
- <el-breadcrumb separator-class="el-icon-arrow-right" class="el-breadcrumb">
+ <!-- <el-breadcrumb separator-class="el-icon-arrow-right" class="el-breadcrumb">
<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/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('ServoManual')
+ $t('Parameter')
}}</router-link>
- </el-breadcrumb>
+ </el-breadcrumb> -->
- <el-breadcrumb separator-class="el-icon-arrow-right" class="el-breadcrumb">
-
- <router-link to="/Electrical/Servomanualone" tag="el-button" type="text" active-class="blue-button">{{
- $t('Servomanualone')
- }}</router-link>
- <router-link to="/Electrical/Parameter1" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter1')
- }}</router-link>
- <!-- <router-link to="/Electrical/Parameter2" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter2')
- }}</router-link> -->
- <router-link to="/Electrical/Positioning1" tag="el-button" type="text" active-class="blue-button">{{
- $t('Positioning1')
- }}</router-link>
- <router-link to="/Electrical/Positioning2" tag="el-button" type="text" active-class="blue-button">{{
- $t('Positioning2')
- }}</router-link>
- <router-link to="/Electrical/ManualonePosition" tag="el-button" type="text" active-class="blue-button">{{
- $t('ManualonePosition')
- }}</router-link>
- <router-link to="/Electrical/ManualonePosition2" tag="el-button" type="text" active-class="blue-button">{{
- $t('ManualonePosition2')
- }}</router-link>
- <router-link to="/Electrical/AutomaticParameterSetting" tag="el-button" type="text" active-class="blue-button">{{
- $t('AutomaticParameterSetting')
+ <!-- <el-breadcrumb separator-class="el-icon-arrow-right" class="el-breadcrumb">
+ <router-link to="/Electrical/Parameter2" tag="el-button" type="text" active-class="blue-button">{{ $t('Automatic State')
}}</router-link>
<router-link to="/Electrical/ManualJog" tag="el-button" type="text" active-class="blue-button">{{
$t('ManualJog')
}}</router-link>
- </el-breadcrumb>
+
+ <router-link to="/Electrical/ManualonePosition" tag="el-button" type="text" active-class="blue-button">{{
+ $t('ManualonePosition')
+ }}</router-link>
- <el-row :gutter="1">
- <el-col :span="24" v-for="(dataGroup, groupIndex) in jsonData" :key="groupIndex">
+<router-link to="/Electrical/Servomanualone" tag="el-button" type="text" active-class="blue-button">{{
+ $t('Servomanualone')
+ }}</router-link>
+
+
+ <router-link to="/Electrical/Positioning1" tag="el-button" type="text" active-class="blue-button">{{
+ $t('Address parameter settings')
+ }}</router-link>
+
+ <router-link to="/Electrical/AutomaticParameterSetting" tag="el-button" type="text" active-class="blue-button">{{
+ $t('Speed parameter settings')
+ }}</router-link>
+
+ </el-breadcrumb> -->
+
+ <el-row :gutter="40" >
+ <el-col :span="26" v-for="(dataGroup, groupIndex) in jsonData" :key="groupIndex">
<el-card class="json-block" style="width:100%;">
<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" :class="getStatusClass(item.button.value)"
- class="action-button" @click="updateButtonValue(dataGroup, itemIndex); submitDataToBackend();">{{
- item.button.name
- }}</el-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);">{{
+ item.button.name
+ }}</el-button>
</div>
</div>
</el-card>
@@ -67,16 +62,19 @@
<script>
import LanguageMixin from '../../lang/LanguageMixin'
import data from '../../configuration/ManualJog'
+import {SelectPassword} from "../../api/home";
let socket;
export default {
name: "ManualJog",
mixins: [LanguageMixin],
data () {
return {
- jsonData: data // 鍔犺浇鏁翠釜data.json鏂囦欢浣滀负jsonData
+ jsonData: data, // 鍔犺浇鏁翠釜data.json鏂囦欢浣滀负jsonData
+ password: 1,
}
},
activated () {
+
this.initWebSocket();
const language = this.$i18n.locale;
@@ -84,9 +82,10 @@
if (language === 'en-US') {
this.replaceChineseWithEnglish();
}
- this.$forceUpdate();
-
+
+this.load();
+
},
methods: {
closeSocket () {
@@ -94,46 +93,102 @@
socket.close();
},
updateButtonValue (dataGroup, itemIndex) {
- this.$set(dataGroup[itemIndex].button, 'value', 1); // 鐐瑰嚮鎸夐挳鍚庡皢鍊兼敼涓�1
+ if (dataGroup[itemIndex].button.value2 === 0) {
+ // 濡傛灉褰撳墠鎸夐挳鐨勫�兼槸 0锛屽皢鍏惰涓� 1
+ this.$set(dataGroup[itemIndex].button, 'value2', 1);
+ } else {
+ // 鍚﹀垯灏嗗叾璁句负 0
+ 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 };
+ load(){
+
+ SelectPassword().then(res => {
+ this.password = res.data.password;
+ console.log(this.password)
+ });
+
+
+
+
+
+console.log(this.jsonData)
+
+
+
+ },
+ submitDataToBackend (currentButtonName) {
+
+ if (currentButtonName === 'A01 SERVE TRAVEL Home' || currentButtonName === 'A02 SERVE TRAVEL Home' || currentButtonName === 'A01琛岃蛋浼烘湇鍥為浂' || currentButtonName === 'A02琛岃蛋浼烘湇鍥為浂') {
+ this.$prompt(
+ this.$t('Are you sure to perform this operation?'),
+ this.$t('prompt'),
+ {
+ inputType: 'password',
+ inputPlaceholder: this.$t('Please enter the password'),
+ confirmButtonText: this.$t('Yes'),
+ cancelButtonText: this.$t('No'),
+ type: 'warning',
}
- return null;
+ ).then(({ value }) => {
+ // 楠岃瘉瀵嗙爜鏄惁姝ｇ‘
+ if (value !== this.password) {
+ this.$message.error(this.$t('Incorrect password'));
+ return;
+ }
+
+ // 瀵嗙爜姝ｇ‘锛岀户缁彁浜ゆ暟鎹埌鍚庣
+ const inputData = this.jsonData.map(dataGroup => {
+ return dataGroup.map(item => {
+ if (item.type === '3') {
+ return { value: item.button.value2 };
+ }
+ return null;
+ });
+ });
+
+ const values = inputData.flat().filter(item => item !== null).map(item => item.value);
+
+ const jsonObject = { data: values };
+
+ // 鎻愪氦鏁版嵁鍒板悗绔�
+ const jsonString = JSON.stringify(jsonObject);
+ console.log('Type涓�3鐨剉alue:', jsonString);
+ socket?.send(jsonString);
+
+ }).catch(() => {
+ // 鍙栨秷鎿嶄綔
+ console.log('鍙栨秷');
});
- });
+ } else {
+ // 濡傛灉涓嶆槸 A01 SERVE TRAVEL Home 鎸夐挳锛岀户缁彁浜ゆ暟鎹埌鍚庣
+ const inputData = this.jsonData.map(dataGroup => {
+ return dataGroup.map(item => {
+ if (item.type === '3') {
+ return { value: item.button.value2 };
+ }
+ return null;
+ });
+ });
- const values = inputData.flat().filter(item => item !== null).map(item => item.value);
+ const values = inputData.flat().filter(item => item !== null).map(item => item.value);
- const jsonObject = { data: values };
+ const jsonObject = { data: values };
- // 鎻愪氦鏁版嵁鍒板悗绔�
- const jsonString = JSON.stringify(jsonObject);
- console.log('Type涓�3鐨剉alue:', jsonString);
- socket?.send(jsonString);
-
- },
- //鏍规嵁璇诲彇PLC鐨勫�硷紝鏍规嵁鍚嶇О鏀瑰彉棰滆壊1鎵撳紑锛�0鍏抽棴
- getStatusClass (zhuangtai) {
-
- if (zhuangtai === 1) {
- return "op";
+ // 鎻愪氦鏁版嵁鍒板悗绔�
+ const jsonString = JSON.stringify(jsonObject);
+ console.log('Type涓�3鐨剉alue:', jsonString);
+ socket?.send(jsonString);
}
- else {
- return "dow";
- }
-
},
+
initWebSocket () {
let viewname = "ManualJog";
if (typeof WebSocket === "undefined") {
console.log("鎮ㄧ殑娴忚鍣ㄤ笉鏀寔WebSocket");
} else {
- let socketUrl = "ws://" + "localhost:8888" + "/springboot-vue3/api/talk/" + viewname;
+ let socketUrl = "ws://" + this.$t('ip')+":8888" + "/springboot-vue3/api/talk/" + viewname;
if (socket != null) {
socket.close();
@@ -147,7 +202,7 @@
socket.onopen = function () {
console.log("websocket宸叉墦寮�");
};
-
+ let isUpdated = false; // 瀹氫箟鏍囧織鍙橀噺
// 鏀跺埌娑堟伅
socket.onmessage = (msg) => {
if (!msg.data) {
@@ -157,28 +212,53 @@
let obj = JSON.parse(msg.data);
const jsonData2 = this.jsonData;
-
+ const parms = obj.params;
+// console.log(obj)
+//console.log(this.jsonData)
+ if(parms){
// 濡傛灉榧犳爣涓嶅湪杈撳叆妗嗗唴锛屾洿鏂拌緭鍏ユ鐨勫��
// this.submitDataToBackend()
- const parms = obj.params;
- // const xiaoche = obj.params[3];
-
- //console.log(parms);
-
-
+
+
+
for (let i = 0; i < jsonData2.length; i++) {
let arr = jsonData2[i];
for (let j = 0; j < arr.length; j++) {
let obj = arr[j];
obj.button.value = parms[0][j];
+ // obj.button.value2 = parms[0][j];
+ // obj.button.value2 =obj.button.value;
+
}
}
+ jsonData2[1][0].button.value = obj.params[0][26];
+ jsonData2[1][1].button.value = obj.params[0][27];
+
+
+ if (!isUpdated) {
+ for (let i = 0; i < this.jsonData.length; i++) {
+ for (let j = 0; j < this.jsonData[i].length; j++) {
+ this.jsonData[i][j].button.value2 = this.jsonData[i][j].button.value;
+ }
+ }
+ isUpdated = true; // 鏇存柊鏍囧織鍙橀噺鐨勫��
+ }
+
+
+
+ }
+
};
+
+
+
+
+
// 鍏抽棴浜嬩欢
socket.onclose = function () {
@@ -218,7 +298,7 @@
});
- console.log(this.jsonData)
+ // console.log(this.jsonData)
}
},
@@ -236,7 +316,7 @@
.action-button {
margin-right: 10px;
- background: #66b1ff;
+ background: #A0A0A0;
color: #FFF;
}
--
Gitblit v1.8.0