From 22bd0dc7f97fb4508458039b5120ff6d5ffb43f8 Mon Sep 17 00:00:00 2001
From: gaoluyang <gaoluyang@rengu.cc>
Date: 星期五, 05 七月 2024 09:36:29 +0800
Subject: [PATCH] 温度循环表格标题修改
---
src/components/do/b1-inspect-order-plan/Inspection.vue | 22 +++++++++++++++++++---
1 files changed, 19 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 7e56d4e..05a6303 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -953,7 +953,7 @@
methods: {
changeItem(row){
if(row.value0&&row.value1){
- this.$set(row,'comValue',((Number(row.value0)+Number(row.value1))/2).toFixed(5))
+ this.$set(row,'comValue',((Number(row.value0)+Number(row.value1))/2).toFixed(3))
}else{
return
}
@@ -978,7 +978,7 @@
}
}]
if(this.wareForm.inspectionItemSubclass!=20){
- row.resValue = row.comValue?Math.abs(row.comValue-20).toFixed(5):''
+ row.resValue = row.comValue?Math.abs(row.comValue-20).toFixed(3):''
this.param[row.id].resValue.v.v = row.resValue
if(row.ask&&row.resValue){
if(row.ask.includes('<')){
@@ -1697,6 +1697,9 @@
}else{
if(ask){
comp = ask.map((m, i) => {
+ if (m.includes('RTS')) {
+ m = m.replace('RTS*', '')
+ }
if (m.includes('=')) {
let str = this.handleFraction(m.split('=')[1])
if(typeof res == 'string'&&typeof str == 'string'){
@@ -1750,7 +1753,13 @@
let comResult = ''
try {
if(this.getInspectionValueType(item.i)==1){
+ let ask = this.currentSample.insProduct.find(m => m.id == item.i).ask?this.currentSample.insProduct.find(m => m.id == item.i).ask.split('&'):null;
comResult = excelFunction.compute(item.v.f.replace(/=/g, ' '),comValue)
+ // 瑁呭椤圭洰妫�楠屽�艰浆鍖�
+ if (this.PROJECT === '瑁呭鐢电紗' && ask[0].includes('RTS')) {
+ let num2 = new this.$Big(comResult)
+ comResult = num2.toExponential()
+ }
}else{
let valueList = [];
item.valueList.forEach(a => {
@@ -1809,7 +1818,14 @@
handleFraction(str){
if(str&&typeof(str)=='string'&&str.includes('/')){
return eval(str.split('/')[0]/str.split('/')[1])
- }else{
+ } else if (str && typeof(str) == 'string' && str.includes('*') && str.includes('^')) {
+ const num1 = str.split('*')
+ const num2 = num1[1].split('^')
+ let num3 = new this.$Big(num2[0]);
+ let num4 = new this.$Big(num2[1]);
+ let num5 = Math.pow(num3, num4) // 璁＄畻娆℃柟
+ return num1[0] * num5 // 鏈�鍚庤绠椾箻娉�
+ } else{
return str
}
},
--
Gitblit v1.9.3