From b48ae202df66d4a2bf923f53893f9c12e9e1c92e Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 05 八月 2024 19:37:20 +0800
Subject: [PATCH] 修改数采
---
static/js/worker0.js | 17 ++++----
src/components/do/b1-inspect-order-plan/Inspection.vue | 54 +++++++++++++-------------
2 files changed, 36 insertions(+), 35 deletions(-)
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index 779e09f..a8be03c 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -2563,33 +2563,33 @@
this.handleExcelMethod()
},
changeInput(m, code, n) {
- let str = code.split('-')
- let pId = str[3]
- if(!this.param[pId].equipValue||this.param[pId].equipValue.length==0||!this.param[pId].equipValue[0].v.v){
- let inspectionItem = ''
- let idS = []
- let child = 0
- for (let i in this.currentSample.insProduct) {
- if(this.currentSample.insProduct[i].id==pId){
- inspectionItem = this.currentSample.insProduct[i].inspectionItem
- }
- }
- for (let i in this.currentSample.insProduct) {
- if(this.currentSample.insProduct[i].inspectionItem==inspectionItem&&this.currentSample.insProduct[i].id!=pId){
- idS.push(this.currentSample.insProduct[i].id)
- }
- }
- for (let i = 0;i<idS.length;i++) {
- if(this.param[idS[i]].equipValue&&this.param[idS[i]].equipValue.length>0&&this.param[idS[i]].equipValue[0].v.v){
- child++
- }
- }
- if(child==0){
- n.v.v = null
- this.$message.error('璇峰厛濉啓璁惧淇℃伅')
- return
- }
- }
+ // let str = code.split('-')
+ // let pId = str[3]
+ // if(!this.param[pId].equipValue||this.param[pId].equipValue.length==0||!this.param[pId].equipValue[0].v.v){
+ // let inspectionItem = ''
+ // let idS = []
+ // let child = 0
+ // for (let i in this.currentSample.insProduct) {
+ // if(this.currentSample.insProduct[i].id==pId){
+ // inspectionItem = this.currentSample.insProduct[i].inspectionItem
+ // }
+ // }
+ // for (let i in this.currentSample.insProduct) {
+ // if(this.currentSample.insProduct[i].inspectionItem==inspectionItem&&this.currentSample.insProduct[i].id!=pId){
+ // idS.push(this.currentSample.insProduct[i].id)
+ // }
+ // }
+ // for (let i = 0;i<idS.length;i++) {
+ // if(this.param[idS[i]].equipValue&&this.param[idS[i]].equipValue.length>0&&this.param[idS[i]].equipValue[0].v.v){
+ // child++
+ // }
+ // }
+ // if(child==0){
+ // n.v.v = null
+ // this.$message.error('璇峰厛濉啓璁惧淇℃伅')
+ // return
+ // }
+ // }
if (n) {
// if (this.PROJECT === '瑁呭鐢电紗') {
// let num2 = new this.$Big(n.v.v)
diff --git a/static/js/worker0.js b/static/js/worker0.js
index d29f483..d3ae118 100644
--- a/static/js/worker0.js
+++ b/static/js/worker0.js
@@ -9,6 +9,7 @@
const data = JSON.parse(event.data);
dataAcquisitionInfo = data.dataAcquisitionInfo;
list = data.list;
+ // console.log(111,dataAcquisitionInfo)
handleData()
}
@@ -45,9 +46,9 @@
setTimeout(()=>{
let num0 = 0
if(n.v.ct&&n.v.ct.fa&&typeof n.v.ct.fa == 'string'&&n.v.ct.fa.includes('.')){
- let str = n.v.ct.fa.split('.')[1]
- num0 = str.length
- n.v.v = dataAcquisitionInfo[str].value[i]?dataAcquisitionInfo[str].value[i].toFixed(num0):dataAcquisitionInfo[str].value[i]
+ let str0 = n.v.ct.fa.split('.')[1]
+ num0 = str0.length
+ n.v.v = dataAcquisitionInfo[str].value[i]?Number(dataAcquisitionInfo[str].value[i]).toFixed(num0):dataAcquisitionInfo[str].value[i]
}else{
n.v.v = dataAcquisitionInfo[str].value[i]
}
@@ -67,9 +68,9 @@
setTimeout(()=>{
let num0 = 0
if(n.v.ct&&n.v.ct.fa&&typeof n.v.ct.fa == 'string'&&n.v.ct.fa.includes('.')){
- let str = n.v.ct.fa.split('.')[1]
- num0 = str.length
- n.v.v = dataAcquisitionInfo[str].value?dataAcquisitionInfo[str].value.toFixed(num0):dataAcquisitionInfo[str].value
+ let str0 = n.v.ct.fa.split('.')[1]
+ num0 = str0.length
+ n.v.v = dataAcquisitionInfo[str].value?Number(dataAcquisitionInfo[str].value).toFixed(num0):dataAcquisitionInfo[str].value
}else{
n.v.v = dataAcquisitionInfo[str].value
}
@@ -87,8 +88,8 @@
setTimeout(()=>{
let num0 = 0
if(n.v.ct&&n.v.ct.fa&&typeof n.v.ct.fa == 'string'&&n.v.ct.fa.includes('.')){
- let str = n.v.ct.fa.split('.')[1]
- num0 = str.length
+ let str0 = n.v.ct.fa.split('.')[1]
+ num0 = str0.length
n.v.v = dataAcquisitionInfo[str].value?Number(dataAcquisitionInfo[str].value).toFixed(num0):dataAcquisitionInfo[str].value
}else{
n.v.v = dataAcquisitionInfo[str].value
--
Gitblit v1.9.3