From 3bed56034d0a79b2748edb747b463a2cf42bc5a5 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期一, 04 十二月 2023 09:04:11 +0800
Subject: [PATCH] 更新测试后电气管理
---
CanadaMes-ui/src/views/Electrical/Sign.vue | 28 ++++++++++++++++++----------
1 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/CanadaMes-ui/src/views/Electrical/Sign.vue b/CanadaMes-ui/src/views/Electrical/Sign.vue
index 3ee386e..4ee28d3 100644
--- a/CanadaMes-ui/src/views/Electrical/Sign.vue
+++ b/CanadaMes-ui/src/views/Electrical/Sign.vue
@@ -9,8 +9,8 @@
}}</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/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')
@@ -21,7 +21,7 @@
<div style="padding-right: 30px;display: flex;flex-wrap: wrap;" class="neir">
<div class="kuai_sb" v-for="item in record.xyData" :key="item.name">
<el-col class="deng" :class="getStatusClass(item.value)"></el-col>
- <el-input v-model="item.name" style="width: 280px;" class="in_mc"></el-input>
+ <el-input v-model="item.name" style="width: 100%;" class="in_mc"></el-input>
</div>
@@ -59,9 +59,13 @@
}
},
created () {
- this.init();
+
//this.showdata();
},
+ activated(){
+ this.init();
+
+ },
methods: {
showdata () {
console.log(1111);
@@ -114,7 +118,7 @@
this.record.params[0] = obj.sig[0];
this.record.xyData = this.jsonData.sign;
-
+ console.log(this.jsonData.sign)
for (let a = 0; a < this.record.xyData.length; a++) {
this.record.xyData[a].value = this.record.params[0][a];
@@ -149,10 +153,14 @@
},
//璇█杞崲
replaceChineseWithEnglish () {
+
const translation = this.$t('Signlang');
- this.record.xyData = this.record.xyData.map(item => { return { name: translation[item.name] || item.name, value: item.value }; });
- //console.log(translation);
+ if (translation != null) {
+ this.record.xyData = this.record.xyData.map(item => { return { name: translation[item.name] || item.name, value: item.value }; });
+ //console.log(translation);
+ }
+
}
}
@@ -187,7 +195,7 @@
.kuai_sb {
text-align: center;
- width: 25%;
+ width: 15%;
margin-bottom: 15px;
}
@@ -212,8 +220,8 @@
background: #A0A0A0;
border: 0.1875em solid white;
border-radius: 50%;
- height: 5em;
- width: 5em;
+ height: 4em;
+ width: 4em;
box-shadow: 0.375em 0.375em 0 0 rgba(214, 214, 214, 0.125);
}
--
Gitblit v1.8.0