From b403195a75a452b54fe2112158b454f6d80c0e11 Mon Sep 17 00:00:00 2001
From: gaoluyang <gaoluyang@rengu.cc>
Date: 星期四, 11 七月 2024 15:03:55 +0800
Subject: [PATCH] 科学计数法逻辑修改
---
src/components/do/b1-inspect-order-plan/Inspection.vue | 370 ++++++++++++++++------------------------------------
1 files changed, 113 insertions(+), 257 deletions(-)
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index 3ce4408..dd44df3 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -276,13 +276,13 @@
<el-radio-button :label="item.id" v-for="(item,index) in fiber" :key="index"
size="small">{{ item.color }}</el-radio-button>
</el-radio-group>
- <el-form :inline="true" :model="otherForm" class="form-inline" label-width="50px" style="padding-top: 0;padding-left: 10px;">
+ <el-form :inline="true" :model="otherForm" class="form-inline" label-width="50px" style="padding-top: 0;padding-left: 10px;" v-if="PROJECT=='妫�娴嬩腑蹇�'">
<el-form-item label="娓╁害:" style="margin-bottom: 0;">
- <el-input clearable v-model="otherForm.temperature" size="small" placeholder="" style="width: 50px;" @change="m=>subOtherForm(m,'temperature')"></el-input>
+ <el-input v-model="otherForm.temperature" size="small" placeholder="" style="width: 90px;" @change="m=>subOtherForm(m,'temperature')"></el-input>
<span style="margin-left: 4px;">鈩�</span>
</el-form-item>
<el-form-item label="婀垮害:" style="margin-bottom: 0;">
- <el-input clearable v-model="otherForm.humidity" size="small" placeholder="" style="width: 50px;" @change="m=>subOtherForm(m,'humidity')"></el-input>
+ <el-input v-model="otherForm.humidity" size="small" placeholder="" style="width: 90px;" @change="m=>subOtherForm(m,'humidity')"></el-input>
<span style="margin-left: 4px;">%</span>
</el-form-item>
</el-form>
@@ -300,9 +300,9 @@
:style="`width:${handleWidth(n)}px !important;min-height:${item.style.rowlen[n.r]}px;`">
<template v-if="n.v.ps!=undefined && n.v.ps.value==='妫�楠屽��' && state==1">
<el-input v-if="getInspectionValueType(n.i) == 1" class="table_input" v-model="n.v.v"
- :disabled="getInspectionItemType(n.i) == 1 || (n.u != userId && n.u != undefined && n.u != '')"
+ :disabled="getInspectionItemType(n.i) == 1 || (n.u != userId && n.u != undefined && n.u != '')"
@input="handleInput(n)"
- @change="m=>changeInput(m,`${item.templateId}-${n.r}-${n.c}-${n.i}`)" @mousewheel.native.prevent :key="'abc-'+'000'+index+'000'+i+'000'+j">
+ @change="m=>changeInput(m,`${item.templateId}-${n.r}-${n.c}-${n.i}`, n)" @mousewheel.native.prevent :key="'abc-'+'000'+index+'000'+i+'000'+j">
<el-button slot="append" type="primary" icon="el-icon-edit" size="mini"
v-if="getInspectionItemType(n.i) == 1" @click="getSystemValue(n)"></el-button>
</el-input>
@@ -319,12 +319,12 @@
v-else-if="getInspectionValueType(n.i) == 4">/</span>
</template>
<template v-else-if="n.v.ps!=undefined && n.v.ps.value==='缁撹'">
- <!-- <el-select v-if="(getInspectionValueType(n.i) == 2 || getInspectionValueType(n.i) == 5) && state==1"
+ <el-select v-if="(getInspectionValueType(n.i) == 2 || getInspectionValueType(n.i) == 5) && state==1&&PROJECT=='瑁呭鐢电紗'"
class="table_input" v-model="n.v.v" @change="saveInsContext()">
<el-option label="鍚堟牸" :value="1"></el-option>
<el-option label="涓嶅悎鏍�" :value="0"></el-option>
- </el-select> -->
- <template>
+ </el-select>
+ <template v-if="PROJECT=='妫�娴嬩腑蹇�'||PROJECT=='瑁呭鐢电紗'&&getInspectionValueType(n.i) != 2 ">
<span v-if="n.v.v===1" :style="`font-family:${n.v.ff} !important;color: green;`">鍚堟牸</span>
<span v-else-if="n.v.v===0" :style="`font-family:${n.v.ff} !important;color: red;`">涓嶅悎鏍�</span>
<span v-else :style="`font-family:${n.v.ff} !important;`">寰呭畾</span>
@@ -397,7 +397,7 @@
</div>
<div class="center-box" v-loading="tableLoading" v-else>
<el-divider></el-divider>
- <h4 style="margin-bottom: 20px;">娓╁害寰幆妫�楠屽師濮嬭褰�</h4>
+ <h4 style="margin-bottom: 20px;font-size: 24px;font-weight: 400;">娓╁害寰幆妫�楠屽師濮嬭褰�</h4>
<el-form :inline="true" :model="wareForm" class="form-inline" label-width="100px" style="justify-content: flex-start;display: flex;align-items: center;width: 100%;">
<el-form-item label="鍨嬪彿:" style="margin-bottom: 0;">
<el-input clearable v-model="wareForm0.model" disabled size="small" placeholder=""></el-input>
@@ -445,7 +445,7 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="浠櫒鍚嶇О:" style="margin-left: 80px;">
+ <el-form-item label="浠櫒鍚嶇О:" >
<el-input clearable v-model="equipForm.value1" disabled size="small" placeholder=""></el-input>
</el-form-item>
<el-form-item label="浠櫒缂栧彿:">
@@ -517,21 +517,21 @@
<el-table-column
prop="comValue"
align="center"
- label="骞冲潎鍊�"
+ label="琛板噺绯绘暟"
min-width="150">
</el-table-column>
<el-table-column
prop="resValue"
label="琛板噺宸�"
align="center"
- v-if="wareForm.inspectionItemSubclass!=20"
+ v-if="wareForm.inspectionItemSubclass!='20(甯告俯)'"
min-width="150">
</el-table-column>
<el-table-column
prop="insResult"
label="缁撹"
align="center"
- min-width="150" v-if="wareForm.inspectionItemSubclass!=20">
+ min-width="150" v-if="wareForm.inspectionItemSubclass!='20(甯告俯)'">
<template slot-scope="scope">
<span v-if="scope.row.insResult===1" style="color: green;">鍚堟牸</span>
<span v-else-if="scope.row.insResult===0" style="color: red;">涓嶅悎鏍�</span>
@@ -793,7 +793,7 @@
currentTab:null,
wareForm:{
inspectionItem:1,
- inspectionItemSubclass:20,
+ inspectionItemSubclass:'20(甯告俯)',
},
wareForm0:{},
numOptions:[],
@@ -810,7 +810,9 @@
code0:null,
value1:null,
code1:null,
- }
+ },
+ result: null,
+ worker: null,
}
},
computed: {
@@ -950,10 +952,27 @@
}
}
},
+ beforeDestroy() {
+ // 鍦ㄧ粍浠堕攢姣佸墠纭繚鍋滄 Worker锛岄伩鍏嶅唴瀛樻硠婕�
+ this.stopWorker();
+ },
methods: {
+ startWorker() {
+ if (this.worker) {
+ this.stopWorker(); // 纭繚涔嬪墠鐨� Worker 宸插仠姝�
+ }
+ // 鍒涘缓 Worker 瀹炰緥
+ this.worker = new Worker('/static/js/worker.js');
+ },
+ stopWorker() {
+ if (this.worker) {
+ this.worker.terminate();
+ this.worker = null;
+ }
+ },
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
}
@@ -977,8 +996,8 @@
v:row.comValue
}
}]
- if(this.wareForm.inspectionItemSubclass!=20){
- row.resValue = row.comValue?Math.abs(row.comValue-20).toFixed(5):''
+ if(this.wareForm.inspectionItemSubclass!='20(甯告俯)'){
+ 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('<')){
@@ -1005,10 +1024,14 @@
return
}
if(m&&type){
- this.wareForm[type] = Number(m)
+ this.wareForm[type] = m
}
let wareForm = {...this.wareForm}
- wareForm.inspectionItemSubclass = wareForm.inspectionItemSubclass+'鈩�'
+ if(this.wareForm.inspectionItemSubclass=='20(甯告俯)'){
+ wareForm.inspectionItemSubclass ='20鈩�(甯告俯)'
+ }else{
+ wareForm.inspectionItemSubclass = wareForm.inspectionItemSubclass+'鈩�'
+ }
this.wareTableDataLoading = true
this.$axios.post(this.$api.insOrderPlan.temCycle,{
sampleId:this.currentSample.id,
@@ -1398,7 +1421,7 @@
this.temperatureOptions = []
mySet1.forEach(m => {
this.temperatureOptions.push({
- value:m,
+ value:String(m),
label:m
})
})
@@ -1433,7 +1456,6 @@
count++
})
})
- // 闂寮�濮�
this.tableList.forEach(a => {
let dels = new Set()
let ids = []
@@ -1490,7 +1512,6 @@
}
}
})
- // return
ids.forEach(id => {
for (let b = 0; b < a.template.length; b++) {
if (a.template[b].r === id.r) {
@@ -1525,7 +1546,6 @@
}
})
})
- // 闂缁撴潫
this.tableList.forEach(a => {
let arrs = []
let set = new Set()
@@ -1648,237 +1668,72 @@
})
this.handleExcelMethod()
},
- changeInput(m, code) {
- let str = code.split('-')
- let r = str[1]
- let c = str[2]
- let id = str[0]
- let pId = str[3]
- var list = []
- for (let a in this.tableList) {
- if (this.tableList[a].templateId == id) {
- list = this.tableList[a].arr
- break
+ changeInput(m, code, n) {
+ if (n) {
+ // if (this.PROJECT === '瑁呭鐢电紗') {
+ // let num2 = new this.$Big(n.v.v)
+ // n.v.v = num2.toExponential()
+ // }
+ // 瀹氫箟涓�涓嚱鏁版潵楠岃瘉鍒嗘暟鏄惁鏈夋晥
+ function isValidFraction(fraction) {
+ const [numerator, denominator] = fraction.split('/'); // 鍒嗗瓙鍜屽垎姣�
+ return !(!denominator || !numerator);
+ }
+ const isTrue = isValidFraction(n.v.v)
+ if (!isTrue) {
+ n.v.v = n.v.v.replace('/', '')
}
}
- this.excelMethodList.forEach(item => {
- if (item.valueList.find(m => m.r == r && m.c == c)) {
- var comValue = {}
- item.valueList.forEach(a => {
- list.forEach(b => {
- if (b[0].r == a.r) {
- b.forEach(c => {
- if (c.c == a.c) {
- var tableCode = ''
- for (var d in this.comparisonList) {
- if (c.c == this.comparisonList[d].value) {
- tableCode = this.comparisonList[d].label
- break
- }
- }
- if(this.getInspectionValueType(item.i)==1){
- if (!isNaN(parseFloat(c.v.v))) {
- if(c.v.v.includes('^') || c.v.v.includes('/')){
- comValue[(tableCode + (c.r + 1))] = c.v.v
- }else{
- comValue[(tableCode + (c.r + 1))] = parseFloat(c.v.v)
- }
- }
- }else{
- comValue[(tableCode + (c.r + 1))] = c.v.v
- }
- }
- })
- }
- })
- })
- if (item.v.ps != undefined && item.v.ps.value == '缁撹') {
- try {
- if (this.currentSample.insProduct.find(m => m.id == item.i)) {
- let ask = this.currentSample.insProduct.find(m => m.id == item.i).ask?this.currentSample.insProduct.find(m => m.id == item.i).ask.split('&'):null;
- let res = Object.values(comValue)[0]
- let comp = []
- if(res==''||res==null||res==undefined||res=='Infinity'){
- item.v.v = ''
- }else{
- if(ask){
- comp = ask.map((m, i) => {
- if (m.includes('=')) {
- let str = m.split('=')[1]
- if(typeof res == 'string'&&typeof str == 'string'){
- return res.trim() == str.trim()
- }else{
- return eval(res) == eval(str)
- }
- } else if (m.includes('鈮�')) {
- return eval(res) >= eval(m.split('鈮�')[1])
- }else if (m.includes('鈮�')) {
- return eval(res) <= eval(m.split('鈮�')[1])
- }else if (m.includes('<')) {
- return eval(res) < eval(m.split('<')[1])
- }else if (m.includes('>')) {
- return eval(res) > eval(m.split('>')[1])
- }else if (m.includes('~')) {
- let k = m.split('~')
- return eval(res) >= eval(k[0]) && eval(res) <= eval(k[1])
- }else if(m.includes('-')){
- let k = m.split('-')
- return eval(res) >= eval(k[0]) && eval(res) <= eval(k[1])
- }else if(m.includes('卤')){
- let k = m.split('卤')
- return eval(res) >= eval((k[0] - k[1])) && eval(res) <= eval((k[0] + k[1]))
- }else if(m.includes('锛�')){
- return eval(res) > eval(m.split('锛�')[1])
- }else if(m.includes('锛�')){
- return eval(res) < eval(m.split('锛�')[1])
- }
- })
- }
- if (comp.every(m => m)) {
- item.v.v = 1
- } else {
- item.v.v = 0
- }
- }
+ this.startWorker()
+
+ // 鍚� Worker 鍙戦�佹秷鎭紝寮�濮嬪鐞嗛�昏緫
+ this.worker.postMessage(JSON.stringify({
+ code: code,
+ tableList:this.tableList,
+ excelMethodList:this.excelMethodList,
+ comparisonList:this.comparisonList,
+ currentSample:this.currentSample,
+ PROJECT:this.PROJECT,
+ param:this.param
+ }));
+
+ // 鐩戝惉 Worker 杩斿洖鐨勭粨鏋�
+ this.worker.onmessage = (event) => {
+ this.result = JSON.parse(event.data);
+ switch (this.result.method){
+ case 'saveInsContext':
+ this.$nextTick(()=>{
+ this.tableList = this.result.value.tableList
+ this.param = this.result.value.param
this.saveInsContext()
- }
- } catch (error) {
-
- }
-
- } else {
- let comResult = ''
- try {
- if(this.getInspectionValueType(item.i)==1){
- comResult = excelFunction.compute(item.v.f.replace(/=/g, ' '),comValue)
- }else{
- let valueList = [];
- item.valueList.forEach(a => {
- valueList.push({
- name: `${this.comparisonList.find(e=>e.value==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 = str
- }
- } catch (error) {
-
- }
- // comResult = excelFunction.compute(item.v.f.replace(/=/g, ' '),comValue);
- // switch (item.methodName) {
- // case 'AVERAGE':
- // let num = 0
- // for (var a in comValue) {
- // num += comValue[a]
- // }
- // comResult = num / Object.keys(comValue).length
- // break;
- // case 'SUM':
- // let sum = 0
- // for (var a in comValue) {
- // sum += comValue[a]
- // }
- // comResult = sum
- // break;
- // case 'MEDIAN':
- // let arr = []
- // for (var a in comValue) {
- // arr.push(comValue[a])
- // }
- // comResult = this.median(arr)
- // break;
- // case 'APS':
- // let arr0 = []
- // for (var a in comValue) {
- // arr0.push(comValue[a])
- // }
- // comResult = Math.abs(arr0[0])
- // break;
- // // case 'MAX':
- // // let arr1 = []
- // // for (var a in comValue) {
- // // arr1.push(eval(comValue[a]))
- // // }
- // // comResult = Math.max(...arr1)
- // // break;
- // // case 'MIN':
- // // let arr2 = []
- // // for (var a in comValue) {
- // // arr2.push(eval(comValue[a]))
- // // }
- // // comResult = Math.median(...arr2)
- // // break;
- // default:
- // let valueList = [];
- // item.valueList.forEach(a => {
- // valueList.push({
- // name: `${this.comparisonList.find(e=>e.value==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)
- // })
- // str = str.replaceAll('MAX', 'Math.max')
- // str = str.replaceAll('MIN', 'Math.min')
- // str = str.replaceAll('锛�', ',')
- // try {
- // if(this.getInspectionValueType(item.i)==1){
- // comResult = eval(str)
- // }else{
- // comResult = str
- // }
- // } catch (error) {
-
- // }
- // break;
- // }
- try {
- list.forEach(a => {
- if (a[0].r == item.r && comResult !== '') {
- for (var b in a) {
- if (a[b].c == item.c) {
- try{
- let val = parseFloat(comResult.toFixed(3))
- a[b].v.v = isNaN(val) ? '' : val
- }catch(e){
- a[b].v.v = comResult
- }
- break
- }
- }
- }
- })
- this.changeInput(comResult, `${id}-${item.r}-${item.c}-${pId}`) //鏀瑰彉鏈�缁堝��
- } catch (error) {
-
- }
- }
+ })
+ break;
+ case 'tableList':
+ this.$nextTick(()=>{
+ this.tableList = this.result.value
+ })
+ break;
+ case 'getCurrentInsProduct':
+ this.getCurrentInsProduct(this.result.value)
+ break;
}
- })
- try {
- this.getCurrentInsProduct(pId)
- } catch (error) {
-
+ // if(this.result.method=='saveInsContext'){
+ // this.stopWorker(); // 澶勭悊瀹屾垚鍚庡仠姝� Worker
+ // }
+ };
+ },
+ handleFraction(str){
+ if(str&&typeof(str)=='string'&&str.includes('/')){
+ return eval(str.split('/')[0]/str.split('/')[1])
+ } 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
}
},
getCurrentInsProduct(pId) {
@@ -1969,7 +1824,8 @@
}
},
getValue(v){
- let str = v.v?v.v:(v.ct&&v.ct.s?v.ct.s.length>0&&v.ct.s[0].v:'').replaceAll('\n','<br/>')
+ let str = v.v?v.v:(v.ct&&v.ct.s?v.ct.s.length>0&&v.ct.s[0].v.replace(new RegExp('\n', 'g'), '<br/>'):'')
+ // str.replace(new RegExp(search, 'g'), replace)
return str
},
getInspectionValueType(id) {
@@ -1999,11 +1855,11 @@
return sum
},
handleInput (n) {
- if (n.v.v > 10000 && this.PROJECT === '瑁呭鐢电紗') {
- let num2 = new this.$Big(n.v.v)
- n.v.v = num2.toExponential()
- }
- n.v.v = n.v.v.replace(/[^\d.^e/]/g, '');
+ n.v.v = n.v.v.replace(/[^\d.^e\-/+]/g, '');
+ n.v.v = n.v.v.replace(/\.{2,}/g,"."); //鍙繚鐣欑涓�涓�. 娓呴櫎澶氫綑鐨�
+ n.v.v = n.v.v.replace(".","$#$").replace(/\./g,"").replace("$#$",".");
+ n.v.v = n.v.v.replace(/\/{2,}/g,"/"); //鍙繚鐣欑涓�涓�/娓呴櫎澶氫綑鐨�
+ n.v.v = n.v.v.replace("/","$#$").replace(/\//g,"").replace("$#$","/");
},
getInspectionItemType(id) {
for (var a in this.currentSample.insProduct) {
--
Gitblit v1.9.3