From fb32fb5bb4be336171dca41e62d3d6c6c5803f34 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期二, 12 十二月 2023 17:02:55 +0800
Subject: [PATCH] A01启动 B01启动 增加plc地址 单独写入
---
CanadaMes-ui/src/views/Electrical/Positioning1.vue | 317 ++++++++++++++++++++++++++++++++--------------------
1 files changed, 197 insertions(+), 120 deletions(-)
diff --git a/CanadaMes-ui/src/views/Electrical/Positioning1.vue b/CanadaMes-ui/src/views/Electrical/Positioning1.vue
index c0c51e7..f4febfd 100644
--- a/CanadaMes-ui/src/views/Electrical/Positioning1.vue
+++ b/CanadaMes-ui/src/views/Electrical/Positioning1.vue
@@ -1,70 +1,151 @@
<template>
<div class="app">
<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')
- }}</router-link>
+ <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("Parameter") }}</router-link
+ >
</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">{{
+ <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
+ >
+
+ <router-link
+ to="/Electrical/ManualonePosition"
+ tag="el-button"
+ type="text"
+ active-class="blue-button"
+ >{{ $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
+ to="/Electrical/Positioning1"
+ 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/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')
- }}</router-link>
- <router-link to="/Electrical/ManualJog" tag="el-button" type="text" active-class="blue-button">{{
- $t('ManualJog')
- }}</router-link>
+ }}</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
+ >
</el-breadcrumb>
- <el-row :gutter="18" class='card'>
- <el-col :span="7" v-for="(dataGroup, groupIndex) in jsonData" :key="groupIndex">
+ <el-row :gutter="18" class="card">
+ <el-col
+ :span="7"
+ v-for="(dataGroup, groupIndex) in jsonData"
+ :key="groupIndex"
+ >
<el-card class="json-block">
- <div class="button-row" style="display: flex; justify-content: space-between;">
+ <div
+ class="button-row"
+ style="display: flex; justify-content: space-between"
+ >
<div v-for="(item, itemIndex) in dataGroup" :key="itemIndex">
- <span v-if="item.title" :name="item.title.name" class="action-button">{{ item.title.name }}</span>
+ <span
+ v-if="item.title"
+ :name="item.title.name"
+ class="action-button"
+ >{{ item.title.name }}</span
+ >
</div>
</div>
- <div v-for="(item, itemIndex) in dataGroup" :key="itemIndex" class="item-container">
+ <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'" v-model="item.value" class="input-box" @keyup.enter.native="submitDataToBackend" ></el-input>
-
-
+ <span class="name" style="width: 250px">{{ item.name }}</span>
+ <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>
<!-- <el-button
v-if="item.type === '0' && item.name !== '鏍煎瓙闂磋窛' && item.name !== '鍑虹墖鎺ョ墖鍦板潃' && item.name !== '瀛樼墖鎺ョ墖鍦板潃'"
class="input-box" @click="submitDataToBackend();">鍙栧湴鍧�</el-button> -->
</div>
</div>
-
</el-card>
</el-col>
</el-row>
@@ -74,35 +155,35 @@
<script>
let socket;
-import LanguageMixin from '../../lang/LanguageMixin'
-import data from '../../configuration/Positioning1'
+import LanguageMixin from "../../lang/LanguageMixin";
+import data from "../../configuration/Positioning1";
export default {
name: "Positioning1",
mixins: [LanguageMixin],
- data () {
+ data() {
return {
- jsonData: data // 鍔犺浇鏁翠釜data.json鏂囦欢浣滀负jsonData
- }
+ jsonData: data, // 鍔犺浇鏁翠釜data.json鏂囦欢浣滀负jsonData
+ };
},
- activated(){
-
- this.initWebSocket ();
- const language = this.$i18n.locale;
- console.log(language);
- if (language === 'en-US') {
- this.replaceChineseWithEnglish();
- }
- this.$forceUpdate();
- },
+ activated() {
+ this.initWebSocket();
+ const language = this.$i18n.locale;
+ console.log(language);
+ if (language === "en-US") {
+ this.replaceChineseWithEnglish();
+ }
+ this.$forceUpdate();
+ },
methods: {
- updateButtonValue (dataGroup, itemIndex) {
- this.$set(dataGroup[itemIndex].button, 'value', 1); // 鐐瑰嚮鎸夐挳鍚庡皢鍊兼敼涓�1
+ updateButtonValue(dataGroup, itemIndex) {
+ this.$set(dataGroup[itemIndex].button, "value", 1); // 鐐瑰嚮鎸夐挳鍚庡皢鍊兼敼涓�1
},
- submitDataToBackend () {
- const inputData = this.jsonData.map(dataGroup => {
- return dataGroup.map(item => {
- if (item.type === '0') {
+ //鎻愪氦鏁版嵁鍒板悗绔�
+ submitDataToBackend() {
+ const inputData = this.jsonData.map((dataGroup) => {
+ return dataGroup.map((item) => {
+ if (item.type === "0") {
return { value: parseInt(item.value) };
} else if (item.button) {
return { value: parseInt(item.title.value) };
@@ -112,8 +193,8 @@
});
// 灏唅nputData杞崲涓烘暣鏁版暟缁�
- const integerArray = inputData.map(dataGroup => {
- return dataGroup.map(item => {
+ const integerArray = inputData.map((dataGroup) => {
+ return dataGroup.map((item) => {
if (item !== null) {
return item.value;
}
@@ -128,14 +209,18 @@
// console.log('鎻愪氦浠ヤ笅鏁版嵁鍒板悗绔�:', jsonString);
socket?.send(jsonString);
},
- initWebSocket () {
-
+ initWebSocket() {
let viewname = "Positioning1";
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();
@@ -158,40 +243,39 @@
let obj = JSON.parse(msg.data);
const jsonData2 = this.jsonData;
- document.addEventListener('mouseover', function (event) {
- const inputBox = document.querySelectorAll('.el-card__body');
+ document.addEventListener("mouseover", function (event) {
+ const inputBox = document.querySelectorAll(".input-box");
const target = event.target;
- if (inputBox && Array.from(inputBox).every(box => !box.contains(target))) {
+ const parms = obj.params;
+ if (
+ parms &&
+ inputBox &&
+ Array.from(inputBox).every((box) => !box.contains(target))
+ ) {
// 濡傛灉榧犳爣涓嶅湪杈撳叆妗嗗唴锛屾洿鏂拌緭鍏ユ鐨勫��
// this.submitDataToBackend()
- const parms = obj.params;
- // console.log(parms)
+ // console.log(parms)
let index = 0;
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' && Object.prototype.hasOwnProperty.call(obj, 'value')) {
+ if (
+ obj.type === "0" &&
+ Object.prototype.hasOwnProperty.call(obj, "value")
+ ) {
obj.value = parms[0][index];
index++;
}
}
}
-
-
-
-
// console.log(jsonData2);
-
}
});
};
-
-
-
// 鍏抽棴浜嬩欢
socket.onclose = function () {
@@ -202,45 +286,38 @@
socket.onerror = function () {
console.log("websocket鍙戠敓浜嗛敊璇�");
};
- this.$router.afterEach(function(){
+ this.$router.afterEach(function () {
socket.close();
- })
-
+ });
}
},
+ //璇█鏇挎崲
replaceChineseWithEnglish() {
-
-
- const nameMap= this.$t('langPositioning1')
- this.jsonData = this.jsonData.map((item) => {
- return item.map((obj) => {
- if (obj.name) {
- const newName = nameMap[obj.name] || obj.name;
- return { ...obj, name: newName };
- } else if (obj.button && obj.button.name) {
- const newName = nameMap[obj.button.name] || obj.button.name;
- return { ...obj, button: { ...obj.button, name: newName } };
- } else if (obj.title && obj.title.name) {
- const newName = nameMap[obj.title.name] || obj.title.name;
- return { ...obj, title: { ...obj.title, name: newName } };
- } else {
- return obj;
- }
- });
-});
+ const nameMap = this.$t("langPositioning1");
+ this.jsonData = this.jsonData.map((item) => {
+ return item.map((obj) => {
+ if (obj.name) {
+ const newName = nameMap[obj.name] || obj.name;
+ return { ...obj, name: newName };
+ } else if (obj.button && obj.button.name) {
+ const newName = nameMap[obj.button.name] || obj.button.name;
+ return { ...obj, button: { ...obj.button, name: newName } };
+ } else if (obj.title && obj.title.name) {
+ const newName = nameMap[obj.title.name] || obj.title.name;
+ return { ...obj, title: { ...obj.title, name: newName } };
+ } else {
+ return obj;
+ }
+ });
+ });
-
-// console.log(this.jsonData)
-
-},
- send () {
-
-
+ // console.log(this.jsonData)
+ },
+ send() {
socket?.send(JSON.stringify(this.messagepack));
},
-
- }
-}
+ },
+};
</script>
<style scoped>
@@ -254,7 +331,7 @@
.action-button {
margin-right: 30px;
background: #66b1ff;
- color: #FFF;
+ color: #fff;
}
.blue-button {
--
Gitblit v1.8.0