From 8304fc43850daba13cfbec989e554d720ab62ca4 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期三, 20 九月 2023 08:15:50 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/views/Electrical/Action.vue | 42 +++++++++++++++++++++++++++++++++++++-----
1 files changed, 37 insertions(+), 5 deletions(-)
diff --git a/CanadaMes-ui/src/views/Electrical/Action.vue b/CanadaMes-ui/src/views/Electrical/Action.vue
index fa5270b..1560ce5 100644
--- a/CanadaMes-ui/src/views/Electrical/Action.vue
+++ b/CanadaMes-ui/src/views/Electrical/Action.vue
@@ -17,7 +17,7 @@
<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>
@@ -25,8 +25,9 @@
</div>
</template>
-<script >
+<script >
import LanguageMixin from '../../lang/LanguageMixin'
+import { SelectPassword } from "../../api/home";
let socket;
export default {
name: "Action",
@@ -34,6 +35,7 @@
data () {
return {
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: [
@@ -107,7 +109,9 @@
}
},
created () {
- this.init();
+
+ this.init();
+
},
methods: {
setActiveButton(buttonName) {
@@ -139,6 +143,7 @@
}
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++) {
@@ -148,7 +153,7 @@
this.record.xyData[a].value = this.record.params[0][a].toString();
}
}
-
+ }
// console.log(this.record.xyData);
this.$forceUpdate();
};
@@ -165,9 +170,36 @@
},
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')
+ });
+ });
+
}
}
@@ -181,7 +213,7 @@
</script>
-<style>
+<style scoped>
.kuai_div {
/* width: 30%; */
margin-bottom: 30px;
--
Gitblit v1.8.0