From 82c2df0968b099bd589936adc5b28c1ac4827a05 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期一, 04 十二月 2023 08:20:07 +0800
Subject: [PATCH] 更新测试后电气管理
---
CanadaMes-ui/src/views/Electrical/Action.vue | 106 ++++++++++++++++++++++++++--------------------------
1 files changed, 53 insertions(+), 53 deletions(-)
diff --git a/CanadaMes-ui/src/views/Electrical/Action.vue b/CanadaMes-ui/src/views/Electrical/Action.vue
index 1560ce5..6fbb39c 100644
--- a/CanadaMes-ui/src/views/Electrical/Action.vue
+++ b/CanadaMes-ui/src/views/Electrical/Action.vue
@@ -2,12 +2,20 @@
<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/ServoManualone" 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('Servo Manual')
+ }}</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,25 +25,27 @@
<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>
</div>
</template>
-<script >
+<script >
import LanguageMixin from '../../lang/LanguageMixin'
-import { SelectPassword } from "../../api/home";
+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: [
@@ -108,15 +118,18 @@
}
},
- created () {
-
- this.init();
-
- },
+ // created () {
+ // this.init();
+ // },
+ activated(){
+
+ this.init();
+ },
methods: {
- setActiveButton(buttonName) {
- this.activeButton = buttonName;
- },
+
+ setActiveButton (buttonName) {
+ this.activeButton = buttonName;
+ },
init () {
let viewname = "action";
@@ -138,24 +151,28 @@
};
// 娴忚鍣ㄧ鏀舵秷鎭紝鑾峰緱浠庢湇鍔＄鍙戦�佽繃鏉ョ殑鏂囨湰娑堟伅
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];
- 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() };
- } else {
+ if (obj.params) {
+ this.record.params[0] = obj.params[0];
+ for (let a = 0; a <= this.record.params[0].length - 1; a++) {
+ this.record.xyData[a].name = this.jsonData.action[a].name;
this.record.xyData[a].value = this.record.params[0][a].toString();
}
+ const language = this.$i18n.locale;
+ if (language === 'en-US') {
+ this.replaceChineseWithEnglish();
+ } else {
+ this.localizedRoles = [...this.record.xyData];
+ }
}
- }
- // console.log(this.record.xyData);
this.$forceUpdate();
+ this.replaceChineseWithEnglish();
};
//鍏抽棴浜嬩欢
@@ -166,41 +183,23 @@
socket.onerror = function () {
console.log("websocket鍙戠敓浜嗛敊璇�");
}
+ this.$router.afterEach(function(){
+ socket.close();
+ })
}
},
send () {
-
-
- 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);
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 }; });
+ console.log(translation);
+ },
}
@@ -237,6 +236,7 @@
.el-input__inner {
border: none;
}
+
.blue-button {
background-color: skyblue;
}
--
Gitblit v1.8.0