From f7d9aabb6e5d8f86579d942e42cc11785b096623 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 15 四月 2024 14:41:15 +0800
Subject: [PATCH] 完成用户管理优化
---
src/components/do/b1-inspect-order-plan/Inspection.vue | 26 +++++++++++++++++++++++---
1 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index 292874e..c405c31 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -364,6 +364,7 @@
methods: {
handleChangeSample(row, column, event) {
this.currentSample = row;
+ this.param = {}
this.currentSample.insProduct.forEach(a => {
this.param[a.id] = {
insValue: [],
@@ -631,7 +632,7 @@
break
}
}
- comValue[(tableCode + c.r)] = parseFloat(c.v.v)
+ comValue[(tableCode + (c.r+1))] = parseFloat(c.v.v)
}
}
})
@@ -695,6 +696,25 @@
comResult = sum
break;
default:
+ let valueList = [];
+ item.valueList.forEach(a => {
+ valueList.push({
+ name:`${this.comparisonList[a.c].label}${a.r+1}`,
+ value:0,
+ })
+ })
+ for (var a in comValue) {
+ valueList.forEach(b => {
+ if(b.name==a){
+ b.value = comValue[a]
+ }
+ })
+ }
+ let str = item.v.f.replace(/=/g,' ');
+ valueList.forEach(b => {
+ str = str.replace(b.name,b.value)
+ })
+ comResult = eval(str)
break;
}
list.forEach(a => {
@@ -742,9 +762,9 @@
item.valueList = valueList;
} else {
valueList = []
- let regex = /[=\+\-\*\%\(\)\s]/g
+ let regex = /[=\+\-\*\%\(\)\/\s]/g
let mode = item.v.f.replace(regex, ' ').split(' ');
- mode.filter(m => m).forEach(m => {
+ mode.filter(m => m&&!Number(m)).forEach(m => {
let r = m.split('')[1] - 1
let c = this.comparisonList.find(j => j.label == m.split('')[0]).value
valueList.push({
--
Gitblit v1.9.3