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/Parameter2.vue | 430 ++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 292 insertions(+), 138 deletions(-)
diff --git a/CanadaMes-ui/src/views/Electrical/Parameter2.vue b/CanadaMes-ui/src/views/Electrical/Parameter2.vue
index 12173e8..ddcf02d 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
@@ -48,13 +48,13 @@
active-class="blue-button"
>{{ $t("Automatic State") }}</router-link
>
- <router-link
+ <!-- <router-link
to="/Electrical/ManualJog"
tag="el-button"
type="text"
active-class="blue-button"
>{{ $t("ManualJog") }}</router-link
- >
+ > -->
<router-link
to="/Electrical/ManualonePosition"
@@ -64,36 +64,25 @@
>{{ $t("ManualonePosition") }}</router-link
>
- <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 v-if="hasPermission" to="/Electrical/Servomanualone" tag="el-button" type="text" active-class="blue-button">
+ {{ $t('Servomanualone') }}
+ </router-link>
+
+
+ <router-link v-if="hasPermission" to="/Electrical/Positioning1" tag="el-button" type="text" active-class="blue-button">{{
+ $t('Address parameter settings')
+ }}</router-link>
+
+ <router-link v-if="hasPermission" to="/Electrical/AutomaticParameterSetting" tag="el-button" type="text" active-class="blue-button">{{
+ $t('Speed parameter settings')
+ }}</router-link>
- <router-link
- to="/Electrical/Positioning1"
+<router-link v-if="hasPermission"
+ to="/Electrical/InteractionState"
tag="el-button"
type="text"
active-class="blue-button"
- >{{ $t("Address parameter settings") }}</router-link
- >
- <!-- <router-link to="/Electrical/Positioning2" tag="el-button" type="text" active-class="blue-button">{{
- $t('Positioning2')
- }}</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("Speed parameter settings") }}</router-link
+ >{{ $t("InteractionState") }}</router-link
>
</el-breadcrumb>
@@ -102,10 +91,9 @@
:span="6"
v-for="(dataGroup, groupIndex) in jsonData"
:key="groupIndex"
-
- style="margin-bottom: -20px;"
+ style="margin-bottom: -20px"
>
- <el-card class="json-block" style="width: 300px; margin-bottom: 2px">
+ <el-card class="json-block" style="width: 300px; margin-bottom: 2px;height:200px" :height="groupIndex === 12 ? '190px' : '170px'" >
<div
class="button-row"
style="display: flex; justify-content: space-between"
@@ -141,7 +129,15 @@
item.button.value === 2 && item.button.name !== 'Clear ID',
'yellow-button':
item.button.value === 1 && item.button.name !== 'Clear ID',
- id: item.button.value === 1 && item.button.name == 'Clear ID',
+ 'id':
+ item.button.value === 1 && item.button.name === 'Clear ID',
+ 'A01jiting':item.button.value === 0 && item.button.name === 'A01Abort/ResumeTasks',
+ 'A02jiting':item.button.value === 0 && item.button.name === 'A02Abort/ResumeTasks',
+ 'emgHMI':item.button.value === 0 && item.button.name === 'emgHMI',
+ 'GA01jiting':item.button.value ===1 && item.button.name === 'A01Abort/ResumeTasks',
+ 'GA02jiting':item.button.value === 1 && item.button.name === 'A02Abort/ResumeTasks',
+ 'GemgHMI':item.button.value === 1 && item.button.name === 'emgHMI'
+
}"
>{{ item.button.name }}</el-button
>
@@ -162,7 +158,14 @@
item.button.value === 2 && item.button.name !== '娓呴櫎ID',
'yellow-button':
item.button.value === 1 && item.button.name !== '娓呴櫎ID',
- id: item.button.value === 1 && item.button.name == '娓呴櫎ID',
+ 'id': item.button.value === 1 && item.button.name === '娓呴櫎ID',
+ 'A01jiting':item.button.value === 0 && item.button.name === 'A01缁堟/缁х画',
+ 'A02jiting':item.button.value === 0 && item.button.name === 'A02缁堟/缁х画',
+ 'emgHMI':item.button.value === 0 && item.button.name === '杞�ュ仠',
+ 'GA01jiting':item.button.value === 1 && item.button.name === 'A01缁堟/缁х画',
+ 'GA02jiting':item.button.value === 1 && item.button.name === 'A02缁堟/缁х画',
+ 'GemgHMI':item.button.value === 1 && item.button.name === '杞�ュ仠'
+
}"
>{{ item.button.name }}</el-button
>
@@ -177,15 +180,21 @@
<span
class="name"
v-if="groupIndex === 12"
- style="width: 250px"
+ style="width: 350px"
>{{ item.name }}</span
>
<span class="name" v-else style="width: 150px">{{
item.name
}}</span>
-
+ <el-input
+ v-if="item.type === '0' && groupIndex==15"
+ v-model="item.value"
+ @keyup.enter.native="timeout($event)"
+ style="width: 300px"
+ class="input-box2"
+ ></el-input>
<el-input
- v-if="item.type === '0'"
+ v-else-if="item.type === '0' "
v-model="item.value"
readonly="readonly"
style="width: 300px"
@@ -203,6 +212,9 @@
<script>
import LanguageMixin from "../../lang/LanguageMixin";
import data from "../../configuration/parameter2";
+import {
+SelectPermissionByUserName, currentUsername
+} from "../../api/home";
// import { throttle } from 'lodash';
let socket;
@@ -220,6 +232,9 @@
jsonData: data,
inputValue: "",
language: this.$i18n.locale,
+
+
+ hasPermission: false // 榛樿娌℃湁鏉冮檺
// 鍔犺浇鏁翠釜data.json鏂囦欢浣滀负jsonData
};
@@ -234,6 +249,17 @@
this.replaceChineseWithEnglish();
}
this.$forceUpdate();
+ currentUsername().then(res => {
+ SelectPermissionByUserName(res.data).then(res => {
+ res.data.permission.forEach(item => {
+ if (item.permissionId == "36" && item.state == 1) {
+ this.hasPermission = true;
+ }
+
+ });
+ });
+
+ });
},
computed: {},
@@ -259,14 +285,52 @@
},
updateButtonValue(dataGroup, itemIndex) {
- if (dataGroup[itemIndex].button.value === 0) {
+ if (dataGroup[itemIndex].button.value2 === 1) {
// 濡傛灉褰撳墠鎸夐挳鐨勫�兼槸 0锛屽皢鍏惰涓� 1
- this.$set(dataGroup[itemIndex].button, "value", 1);
+ this.$set(dataGroup[itemIndex].button, "value2", 0);
} else {
// 鍚﹀垯灏嗗叾璁句负 0
- this.$set(dataGroup[itemIndex].button, "value", 0);
+ this.$set(dataGroup[itemIndex].button, "value2", 1);
}
},
+ //鑼冨洿 0-100
+ timeout(event){
+
+
+ const data3 = [];
+ const resetButtonValues3 = [this.jsonData[15][0].value];
+
+ if (resetButtonValues3.length > 0) {
+
+let firstValue = resetButtonValues3[0];
+if (!(firstValue >= "0" && firstValue <= "100")) {
+ resetButtonValues3.shift();
+ this.$message.error("Out of range");
+
+ return false;
+}
+}
+
+ // 灏嗗緱鍒扮殑鍊兼坊鍔犲埌 data 鏁扮粍涓�
+ data3.push(resetButtonValues3.flat());
+ data3.unshift([],[]);
+ // 鍦� data3 鏁扮粍鍓嶉潰娣诲姞涓や釜绌烘暟缁�
+
+ // 鍒涘缓 jsonObject3 瀵硅薄锛屽苟娣诲姞 data3 灞炴��
+ const jsonObject3 = { data: data3 };
+
+ // 鎻愪氦鏁版嵁鍒板悗绔�
+ const jsonString3 = JSON.stringify(jsonObject3);
+ console.log("Storage wait delay:", jsonString3);
+ socket?.send(jsonString3);
+ // setTimeout(()=>
+ // window.location.reload(),2000
+ // )
+ event.target.blur(); // 鍙栨秷杈撳叆妗嗙劍鐐�
+ },
+
+
+
submitDataToBackend(currentButtonName) {
if (currentButtonName === "娓呴櫎ID" || currentButtonName === "Clear ID") {
const data2 = [];
@@ -278,13 +342,13 @@
["娓呴櫎ID", "Clear ID"].includes(subItem.button.name)
);
- return buttonItem ? buttonItem.button.value : null;
+ return buttonItem ? buttonItem.button.value2 : null;
})
- .filter((value) => value !== null);
+ .filter((value2) => value2 !== null);
// 灏嗗緱鍒扮殑鍊兼坊鍔犲埌 data 鏁扮粍涓�
data2.push(resetButtonValues.flat());
- data2.push([]);
+ data2.push([],[]);
// 鍦� data2 鏁扮粍鍓嶉潰娣诲姞涓や釜绌烘暟缁�
// 鍒涘缓 jsonObject2 瀵硅薄锛屽苟娣诲姞 data2 灞炴��
@@ -294,18 +358,32 @@
const jsonString2 = JSON.stringify(jsonObject2);
console.log("鎵�鏈塗ype涓�0鐨剉alue:", jsonString2);
socket?.send(jsonString2);
+
+ // 寤惰繜2绉掑彂閫佹寚瀹氬唴瀹�
+setTimeout(() => {
+ const jsonObject = { data: [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [], []] };
+ const jsonString = JSON.stringify(jsonObject);
+ console.log("鍙戦�佺殑鍐呭:", jsonString);
+ socket?.send(jsonString);
+}, 1000);
+
}
if (
- currentButtonName === "Abort/ResumeTasks" ||
- currentButtonName === "鎬ュ仠鍚庝腑姝�/缁х画閫夋嫨"
+ currentButtonName === "A01Abort/ResumeTasks" ||
+ currentButtonName === "A01缁堟/缁х画" ||
+ currentButtonName === "A02Abort/ResumeTasks" ||
+ currentButtonName === "A02缁堟/缁х画" ||
+ currentButtonName === "杞�ュ仠" ||
+ currentButtonName === "emgHMI"
) {
const data3 = [];
- const resetButtonValues3 = [this.jsonData[13][0].button.value];
+ const resetButtonValues3 = [this.jsonData[13][0].button.value2,this.jsonData[14][0].button.value2,this.jsonData[16][0].button.value2];
// 灏嗗緱鍒扮殑鍊兼坊鍔犲埌 data 鏁扮粍涓�
data3.push(resetButtonValues3.flat());
data3.unshift([]);
+ data3.push([]);
// 鍦� data3 鏁扮粍鍓嶉潰娣诲姞涓や釜绌烘暟缁�
// 鍒涘缓 jsonObject3 瀵硅薄锛屽苟娣诲姞 data3 灞炴��
@@ -315,11 +393,25 @@
const jsonString3 = JSON.stringify(jsonObject3);
console.log("鎬ュ仠鍚庝腑姝�/缁х画閫夋嫨:", jsonString3);
socket?.send(jsonString3);
+
+ setTimeout(() => {
+ const jsonObject = { data: [ [],[0, 0, 0], []] };
+ const jsonString = JSON.stringify(jsonObject);
+ console.log("鍙戦�佺殑鍥炲脊鍐呭:", jsonString);
+ socket?.send(jsonString);
+}, 1000);
+
+
+
// setTimeout(()=>
// window.location.reload(),2000
// )
}
+
+
},
+
+
initWebSocket() {
let viewname = "Parameter2";
@@ -345,12 +437,25 @@
socket.onopen = function () {
console.log("websocket宸叉墦寮�");
};
-
+// let isMouseInInputBox = false; // 鏍囪榧犳爣鏄惁鍦ㄨ緭鍏ユ鍐�
+ let isUpdated = false; // 瀹氫箟鏍囧織鍙橀噺
+// const inputBox = document.querySelectorAll('.input-box2');
+// inputBox.forEach(box => {
+// box.addEventListener('mouseenter', () => {
+// isMouseInInputBox = true;
+// });
+// box.addEventListener('mouseleave', () => {
+// isMouseInInputBox = false;
+// });
+// });
// 鏀跺埌娑堟伅
socket.onmessage = (msg) => {
if (!msg.data) {
return; // 濡傛灉鏀跺埌绌烘暟鎹紝鍒欑洿鎺ヨ繑鍥烇紝涓嶆墽琛屽悗缁�昏緫
}
+ if (document.activeElement.tagName.toLowerCase() === 'input') {
+ return;
+ }
let obj = JSON.parse(msg.data);
@@ -358,122 +463,150 @@
const parms = obj.params;
- console.log(obj);
+ //console.log(obj);
// const handleMouseMove = throttle(function(event) {
// const inputBox = document.querySelectorAll('.id');
// const target = event.target;
- // if (parms && inputBox && Array.from(inputBox).every(box => !box.contains(target))) {
- //鎬ュ仠鎸夐挳
- jsonData2[13][0].button.value = obj.jiting[0][0];
+ if (parms ) {
+ //鎬ュ仠鎸夐挳
+ jsonData2[13][0].button.value = obj.jiting[0][0];
+ jsonData2[14][0].button.value = obj.jiting[0][1];
+ jsonData2[16][0].button.value = obj.jiting[0][2];
+
- //娓呴櫎id
+
+
+
+ //娓呴櫎id
- for (let i = 0; i < jsonData2.length; i++) {
- let arr = jsonData2[i];
- for (let j = 0; j < arr.length; j++) {
- let obj = arr[j];
- if (obj.type === "3") {
- obj.button.value = parms[0][i];
- // console.log(obj.button.value);
- }
- }
- }
-
- //ID
- const specialChars = /[^\w\s]/g; // 姝ｅ垯琛ㄨ揪寮忓尮閰嶉潪瀛楁瘝銆佹暟瀛椼�佷笅鍒掔嚎鍜岀┖鏍肩殑瀛楃
-
- for (let i = 0; i < jsonData2.length; i++) {
- let arr = jsonData2[i];
- for (let j = 0; j < arr.length; j++) {
- let obj = arr[j];
-
- if (obj.type === "0") {
- if (parms[1] && parms[1][i]) {
- obj.value = parms[1][i].replace(specialChars, "");
- // console.log(obj.value);
- }
- if (obj.name === "ID2") {
- obj.value = parms[1][7].replace(specialChars, ""); // 灏咺D2瀵瑰簲鐨勫�艰祴涓簆arms[1][7]
- }
-
- if (obj.name === "A02ID") {
- obj.value = parms[1][8].replace(specialChars, "");
- }
- if (obj.name === "B01ID") {
- obj.value = parms[1][9].replace(specialChars, "");
- }
- if (obj.name === "B02ID") {
- obj.value = parms[1][10].replace(specialChars, "");
+ for (let i = 0; i < jsonData2.length; i++) {
+ let arr = jsonData2[i];
+ for (let j = 0; j < arr.length; j++) {
+ let obj = arr[j];
+ if (obj.type === "3") {
+ obj.button.value = parms[0][i];
+ // console.log(obj.button.value);
}
}
}
- }
- //鎵嬪姩鐘舵��
- for (let i = 0; i < jsonData2.length; i++) {
- let arr = jsonData2[i];
- for (let j = 0; j < arr.length; j++) {
- let obj = arr[j];
- if (obj.type === "4") {
- obj.button.value = parms[2][i];
- }
- }
- }
- //鏀瑰彉鐘舵�佹枃瀛�
- for (let i = 0; i < jsonData2.length; i++) {
- let arr = jsonData2[i];
- for (let j = 0; j < arr.length; j++) {
- let obj = arr[j];
- if (obj.type === "4" && obj.button.value === 1) {
- if (
- obj.button.name.includes("鐘舵��") &&
- this.language === "zh-CN"
- ) {
- obj.button.name = obj.button.name.replace("鎵嬪姩", "鑷姩");
- }
- if (obj.button.name.includes("Status")) {
- obj.button.name = obj.button.name.replace("Manual", "Auto");
+ //ID
+ const specialChars = /[^\w\s]/g; // 姝ｅ垯琛ㄨ揪寮忓尮閰嶉潪瀛楁瘝銆佹暟瀛椼�佷笅鍒掔嚎鍜岀┖鏍肩殑瀛楃
+
+ for (let i = 0; i < jsonData2.length; i++) {
+ let arr = jsonData2[i];
+ for (let j = 0; j < arr.length; j++) {
+ let obj = arr[j];
+
+ if (obj.type === "0") {
+ if (parms[1] && parms[1][i]) {
+ obj.value = parms[1][i].replace(specialChars, "");
+ // console.log(obj.value);
+ }
+ if (obj.name === "ID2") {
+ obj.value = parms[1][7].replace(specialChars, ""); // 灏咺D2瀵瑰簲鐨勫�艰祴涓簆arms[1][7]
+ }
+
+ if (obj.name === "A02ID") {
+ obj.value = parms[1][8].replace(specialChars, "");
+ }
+ if (obj.name === "B01ID") {
+ obj.value = parms[1][9].replace(specialChars, "");
+ }
+ if (obj.name === "B02ID") {
+ obj.value = parms[1][10].replace(specialChars, "");
+ }
}
}
}
- }
- //鎵弿鏋壂鐮佺殑ID
- jsonData2.forEach((item) => {
- item.forEach((subItem) => {
- if (subItem.read === 66) {
- subItem.value = parms[3][0].replace(specialChars, "");
+ //鎵嬪姩鐘舵��
+ for (let i = 0; i < jsonData2.length; i++) {
+ let arr = jsonData2[i];
+ for (let j = 0; j < arr.length; j++) {
+ let obj = arr[j];
+ if (obj.type === "4") {
+ obj.button.value = parms[2][i];
+ }
}
+ }
+ //鏀瑰彉鐘舵�佹枃瀛�
+ for (let i = 0; i < jsonData2.length; i++) {
+ let arr = jsonData2[i];
+ for (let j = 0; j < arr.length; j++) {
+ let obj = arr[j];
+ if (obj.type === "4" && obj.button.value === 1) {
+ if (
+ obj.button.name.includes("鐘舵��") &&
+ this.language === "zh-CN"
+ ) {
+ obj.button.name = obj.button.name.replace("鎵嬪姩", "鑷姩");
+ }
+ if (obj.button.name.includes("Status")) {
+ obj.button.name = obj.button.name.replace("Manual", "Auto");
+ }
+ }
+ }
+ }
+ this.$forceUpdate();
+
+ //鎵弿鏋壂鐮佺殑ID
+
+ jsonData2.forEach((item) => {
+ item.forEach((subItem) => {
+ if (subItem.read === 66) {
+ subItem.value = parms[3][0].replace(specialChars, "");
+ }
+ });
});
- });
- jsonData2.forEach((item) => {
- item.forEach((subItem) => {
- if (subItem.read === 666) {
- subItem.value = parms[3][1].replace(specialChars, "");
- }
+ jsonData2.forEach((item) => {
+ item.forEach((subItem) => {
+ if (subItem.read === 666) {
+ subItem.value = parms[3][1].replace(specialChars, "");
+ }
+ });
});
- });
- //A01褰撳墠鏍煎瓙
- let lastParmsArray = parms[parms.length - 1];
+ //A01褰撳墠鏍煎瓙
+ let lastParmsArray = parms[parms.length - 1];
- let lastParmsIndex = 0;
+ let lastParmsIndex = 0;
- for (let i = 0; i < jsonData2.length; i++) {
- for (let j = 0; j < jsonData2[i].length; j++) {
- if (jsonData2[i][j].read === 333) {
- jsonData2[i][j].value = lastParmsArray[lastParmsIndex];
- lastParmsIndex++;
- if (lastParmsIndex === lastParmsArray.length) {
- lastParmsIndex = 0;
+ for (let i = 0; i < jsonData2.length; i++) {
+ for (let j = 0; j < jsonData2[i].length; j++) {
+ if (jsonData2[i][j].read === 333) {
+ jsonData2[i][j].value = lastParmsArray[lastParmsIndex];
+ lastParmsIndex++;
+ if (lastParmsIndex === lastParmsArray.length) {
+ lastParmsIndex = 0;
+ }
}
}
}
+
+
+ jsonData2[15][0].value = obj.timeout[0];
+
+ if (!isUpdated) {
+ for (let i = 0; i < jsonData2.length; i++) {
+ for (let j = 0; j < jsonData2[i].length; j++) {
+ if(jsonData2[i][j].button){
+
+
+ jsonData2[i][j].button.value2 = jsonData2[i][j].button.value;
+ }
+ }
+ }
+ isUpdated = true; // 鏇存柊鏍囧織鍙橀噺鐨勫��
+ }
+
+
}
};
+
// console.log(jsonData2);
// }, 50);
@@ -555,5 +688,26 @@
.id {
background-color: green;
}
+.A02jiting{
+ background-color: #66b1ff;
+}
+.A01jiting{
+
+background-color: #66b1ff;
+}
+.emgHMI{
+
+ background-color: #66b1ff;
+}
+.GA02jiting{
+
+ background-color: green;
+}
+.GA01jiting{
+ background-color: green;
+}
+.GemgHMI{
+ background-color: green;
+}
</style>
\ No newline at end of file
--
Gitblit v1.8.0