From 0ece3ba8c92df0438af52b8de6b9225d8ada4103 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期四, 30 十一月 2023 08:46:34 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/views/Electrical/Action.vue | 162 +++++++++++++++++++----------------------------------
1 files changed, 58 insertions(+), 104 deletions(-)
diff --git a/CanadaMes-ui/src/views/Electrical/Action.vue b/CanadaMes-ui/src/views/Electrical/Action.vue
index b65c1f1..f27af2a 100644
--- a/CanadaMes-ui/src/views/Electrical/Action.vue
+++ b/CanadaMes-ui/src/views/Electrical/Action.vue
@@ -2,12 +2,21 @@
<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/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>
</el-breadcrumb>
+
<div>Action</div>
<el-form label-width="100px" style="display: flex;flex-wrap: wrap;" :model="{ messagepack }">
<!-- <div class="kuai_div" v-for="item in record.xyData" :key="item.value">
@@ -17,8 +26,10 @@
<div class="kuai_div" v-for="(item, index) in record.xyData" :key="index">
<el-input v-model="item.name" style="width: 240px;" class="in_mc" readonly></el-input>
- <el-switch v-model="item.value" active-value="1" inactive-value="0" @change="send()"></el-switch>
+ <el-switch v-model="item.value" active-value="1" inactive-value="0" @change="send()"></el-switch>
</div>
+
+
</el-form>
@@ -26,73 +37,21 @@
</template>
<script >
-import { SelectPassword } from "../../api/home";
import LanguageMixin from '../../lang/LanguageMixin'
+import data from '../../configuration/Action'
let socket;
export default {
name: "Action",
mixins: [LanguageMixin],
data () {
return {
+ jsonData: data,
activeButton: '',
-
record: {
- params: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
- canshu: [
- 'D01 VFD conveyor',
- 'D02 VFD conveyor',
- 'D03 VFD conveyor',
- 'D04 VFD conveyor',
- 'D05 VFD conveyor',
- 'D06 VFD conveyor',
- 'A01 VFD conveyor',
- 'A02 VFD conveyor',
- 'B01 VFD conveyor',
- 'B02 VFD conveyor',
- 'A01 SERVE TURN JOG+',
- 'A02 SERVE TURN JOG-',
- 'A01 SERVE TRAVEL JOG+',
- 'A02 SERVE TRAVEL JOG-',
- 'B01 SERVE TRAVEL JOG+',
- 'B02 SERVE TRAVEL JOG-',
- 'A01 SERVE TURN POS',
- 'A02 SERVE TURN POS',
- 'A01 SERVE TRAVEL POS',
- 'A02 SERVE TRAVEL POS',
- 'B01 SERVE TRAVEL POS',
- 'B02 SERVE TRAVEL POS',
- 'B01 YV TURN',
- 'B01 YV UP DOWN',
- 'B02 YV TURN',
- 'B02 YV UP DOWN',
- ],
+ params: [],
+
xyData: [
- { name: 'D01 VFD conveyor', value: "0" },
- { name: 'D02 VFD conveyor', value: "0" },
- { name: 'D03 VFD conveyor', value: "0" },
- { name: 'D04 VFD conveyor', value: "0" },
- { name: 'D05 VFD conveyor', value: "0" },
- { name: 'D06 VFD conveyor', value: "0" },
- { name: 'A01 VFD conveyor', value: "0" },
- { name: 'A02 VFD conveyor', value: "0" },
- { name: 'B01 VFD conveyor', value: "0" },
- { name: 'B02 VFD conveyor', value: "0" },
- { name: 'A01 SERVE TURN JOG+', value: "0" },
- { name: 'A02 SERVE TURN JOG-', value: "0" },
- { name: 'A01 SERVE TRAVEL JOG+', value: "0" },
- { name: 'A02 SERVE TRAVEL JOG-', value: "0" },
- { name: 'B01 SERVE TRAVEL JOG+', value: "0" },
- { name: 'B02 SERVE TRAVEL JOG-', value: "0" },
- { name: 'A01 SERVE TURN POS', value: "0" },
- { name: 'A02 SERVE TURN POS', value: "0" },
- { name: 'A01 SERVE TRAVEL POS', value: "0" },
- { name: 'A02 SERVE TRAVEL POS', value: "0" },
- { name: 'B01 SERVE TRAVEL POS', value: "0" },
- { name: 'B02 SERVE TRAVEL POS', value: "0" },
- { name: 'B01 YV TURN', value: "0" },
- { name: 'B01 YV UP DOWN', value: "0" },
- { name: 'B02 YV TURN', value: "0" },
- { name: 'B02 YV UP DOWN', value: "0" },
+
]
,
},
@@ -110,13 +69,12 @@
},
created () {
this.init();
- this.isClickable = false;
-
},
methods: {
- setActiveButton(buttonName) {
- this.activeButton = buttonName;
- },
+
+ setActiveButton (buttonName) {
+ this.activeButton = buttonName;
+ },
init () {
let viewname = "action";
@@ -138,24 +96,40 @@
};
// 娴忚鍣ㄧ鏀舵秷鎭紝鑾峰緱浠庢湇鍔＄鍙戦�佽繃鏉ョ殑鏂囨湰娑堟伅
socket.onmessage = (msg) => {
+ //console.log("鏀跺埌鏁版嵁====" + msg.data);
if (!msg.data) {
return; // 濡傛灉鏀跺埌绌烘暟鎹紝鍒欑洿鎺ヨ繑鍥烇紝涓嶆墽琛屽悗缁�昏緫
}
let obj = JSON.parse(msg.data);
- if (obj.params ){
this.record.params[0] = obj.params[0];
+ // console.log(obj.params);
+ if (obj.params) {
- for (let a = 0; a <= this.record.params[0].length - 1; a++) {
- if (!this.record.xyData[a]) {
- this.record.xyData[a] = { name: this.record.canshu[a], value: this.record.params[0][a].toString() };
+ this.record.xyData = this.jsonData.action;
+
+ for (let a = 0; a < this.record.xyData.length; a++) {
+ if (this.record.params[0][a]) {
+ this.record.xyData[a].value = this.record.params[0][a].toString();
+ }
+
+ }
+
+ this.record.xyData = this.jsonData.action.filter(item => {
+ return item.state != 0;
+ }
+
+ );
+
+ const language = this.$i18n.locale;
+ if (language === 'en-US') {
+ this.replaceChineseWithEnglish();
} else {
- this.record.xyData[a].value = this.record.params[0][a].toString();
+ this.localizedRoles = [...this.record.xyData];
}
}
- }
- // console.log(this.record.xyData);
this.$forceUpdate();
+ this.replaceChineseWithEnglish();
};
//鍏抽棴浜嬩欢
@@ -170,37 +144,16 @@
},
send () {
-
- this.isClickable = true;
- SelectPassword().then(res => {
- this.password = res.data.password;
-});
- 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'
- }).then(({ value }) => {
- if (this.password === value) {
- // 瀵嗙爜姝ｇ‘锛屾墽琛岀浉搴旀搷浣�
-
this.messagepack.data = this.record.xyData.map(item => parseInt(item.value)); // 杞崲涓烘暣鏁版暟缁�
- //console.log(this.messagepack);
+ console.log(this.messagepack);
socket?.send(JSON.stringify(this.messagepack));
- } else {
-
- this.$message.success(this.$t('Password error')); // 瀵嗙爜閿欒
-
- }
- }).catch(() => {
- this.$message({
- type: 'info',
- message: this.$t('Operation canceled')
- });
- });
-
- }
+ },
+ //璇█杞崲
+ replaceChineseWithEnglish () {
+ const translation = this.$t('langActions');
+ this.record.xyData = this.record.xyData.map(item => { return { name: translation[item.name] || item.name, value: item.value }; });
+
+ },
}
@@ -237,6 +190,7 @@
.el-input__inner {
border: none;
}
+
.blue-button {
background-color: skyblue;
}
--
Gitblit v1.8.0