From f66c565a395e10901fc71abcfa37f4ff5a15be09 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期五, 26 一月 2024 11:34:06 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/views/Electrical/Positioning1.vue | 77 +++++++++++++++++++++++++++++++++++---
1 files changed, 70 insertions(+), 7 deletions(-)
diff --git a/CanadaMes-ui/src/views/Electrical/Positioning1.vue b/CanadaMes-ui/src/views/Electrical/Positioning1.vue
index c38c23a..7d1bfa0 100644
--- a/CanadaMes-ui/src/views/Electrical/Positioning1.vue
+++ b/CanadaMes-ui/src/views/Electrical/Positioning1.vue
@@ -114,13 +114,13 @@
>
</el-breadcrumb>
- <el-row :gutter="18" class="card">
+ <el-row :gutter="18" class="card" style="width: 1400px">
<el-col
:span="7"
v-for="(dataGroup, groupIndex) in jsonData"
:key="groupIndex"
>
- <el-card class="json-block">
+ <el-card class="json-block" style="width: 400px">
<div
class="button-row"
style="display: flex; justify-content: space-between"
@@ -143,15 +143,17 @@
<span class="name" style="width: 250px">{{ item.name }}</span>
<el-input
v-if="item.type === '0'"
+ style="width: 120px"
v-model="item.value"
class="input-box" :oninput="`value=value.replace(/^0|[^0-9]/g,'');if(value<`+item.min+`){value=`+item.value+`}else if(value>`+item.max+`){value=`+item.value+`}`"
@keyup.enter.native="submitDataToBackend($event)"
></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> -->
+ <el-button
+ v-if="item.type === '0' && item.name !== '鏍煎瓙闂磋窛' && item.name !== 'GridSpacing' "
+
+ class="input-box" @click="updateButtonValue(dataGroup, itemIndex,groupIndex);">{{ $t("Set") }}</el-button>
</div>
</div>
</el-card>
@@ -172,6 +174,12 @@
data() {
return {
jsonData: data, // 鍔犺浇鏁翠釜data.json鏂囦欢浣滀负jsonData
+ A01:"",
+ A02:"",
+ B01:"",
+ B02:"",
+ jianju:""
+
};
},
activated() {
@@ -184,8 +192,45 @@
this.$forceUpdate();
},
methods: {
- updateButtonValue(dataGroup, itemIndex) {
- this.$set(dataGroup[itemIndex].button, "value", 1); // 鐐瑰嚮鎸夐挳鍚庡皢鍊兼敼涓�1
+ updateButtonValue(dataGroup, itemIndex,groupIndex) {
+
+ if(groupIndex==1){
+ const value = parseFloat(this.A01);
+
+ this.$set(dataGroup[itemIndex], "value", value);
+ console.log(value)
+}
+if(groupIndex==2){
+ const value = parseFloat(this.A02) ;
+
+ this.$set(dataGroup[itemIndex], "value", value);
+ console.log(value)
+}
+
+if(groupIndex==3){
+ const value = parseFloat(this.A01) + parseFloat(this.jianju);
+
+ this.$set(dataGroup[itemIndex], "value", value);
+ console.log(value)
+}
+if(groupIndex==4){
+ const value=parseFloat(this.A02)+parseFloat(this.jianju)
+
+this.$set(dataGroup[itemIndex], "value", value);
+}
+if(groupIndex==5){
+ const value=parseFloat(this.B01)-parseFloat(this.jianju)
+
+this.$set(dataGroup[itemIndex], "value", value);
+}
+if(groupIndex==6){
+ const value=parseFloat(this.B02)+parseFloat(this.jianju)
+
+this.$set(dataGroup[itemIndex], "value", value);
+}
+
+ this.submitDataToBackend(event);
+
},
//鎻愪氦鏁版嵁鍒板悗绔�
submitDataToBackend(event) {
@@ -287,6 +332,24 @@
}
}
}
+
+
+
+
+ this.A01 = obj.shishi1[0][0];
+
+ this.A02 = obj.shishi1[0][1];
+
+ this.B01= obj.shishi1[0][2];
+
+ this.B02 = obj.shishi1[0][3];
+ this.jianju = obj.params[0][0];
+
+
+
+
+
+
}
};
--
Gitblit v1.8.0