From fa65b80b69bedfe06c3ade486e9bdca918eded61 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期五, 12 七月 2024 13:20:47 +0800
Subject: [PATCH] 三级检验项目调试
---
static/js/worker.js | 8 ++++----
src/main.js | 14 +++++++-------
src/components/do/b1-inspect-order-plan/Inspection.vue | 12 +++++++++++-
src/util/excelFountion.js | 4 ++--
4 files changed, 24 insertions(+), 14 deletions(-)
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index e70a6a0..a51e023 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -1478,16 +1478,26 @@
str += c.v.v
count4 += 1
}
+ }else if (c.v.ps != undefined && c.v.ps.value === '妫�楠屽瓙瀛愰」') {
+ console.log('妫�楠屽瓙瀛愰」',c)
+ if (count4 === 2) {
+ str += c.v.v
+ count4 += 1
+ }
}
}
})
if (str != '') {
let count2 = 0
for (let i in this.currentSample.insProduct) {
+ console.log(this.currentSample
+ .insProduct[i].inspectionItem,'---',this.currentSample
+ .insProduct[i].inspectionItemSubclass,'---',this.currentSample.insProduct[i].inspectionItemClass,'===',str,this.currentSample
+ .insProduct[i])
if (this.currentSample.insProduct[i].templateId === a.templateId && this.currentSample
.insProduct[i].inspectionItem +
(this.currentSample.insProduct[i].inspectionItemSubclass == null ? '' : this.currentSample
- .insProduct[i].inspectionItemSubclass) ===
+ .insProduct[i].inspectionItemSubclass+this.currentSample.insProduct[i].inspectionItemClass==null?'':this.currentSample.insProduct[i].inspectionItemClass) ===
str) {
ids.push({
r: b.r,
diff --git a/src/main.js b/src/main.js
index cd3e476..e56851b 100644
--- a/src/main.js
+++ b/src/main.js
@@ -15,24 +15,24 @@
Vue.prototype.$Big = Big;
// 椤圭洰鍒囨崲
-Vue.prototype.PROJECT = '妫�娴嬩腑蹇�'
-// Vue.prototype.PROJECT = '瑁呭鐢电紗'
+// Vue.prototype.PROJECT = '妫�娴嬩腑蹇�'
+Vue.prototype.PROJECT = '瑁呭鐢电紗'
//鏈湴
-Vue.prototype.LOCATIONVUE = "http://127.0.0.1:80";
+// Vue.prototype.LOCATIONVUE = "http://127.0.0.1:80";
// const javaApi = 'http://127.0.0.1:8001';
-const javaApi = 'http://192.168.47.249:8001';
+// const javaApi = 'http://192.168.47.249:8001';
//浜�
// Vue.prototype.LOCATIONVUE = "http://114.132.189.42:8080";
// const javaApi = 'http://114.132.189.42:1234';
-//妫�娴嬩腑蹇冩寮忓簱
+// //妫�娴嬩腑蹇冩寮忓簱
// Vue.prototype.LOCATIONVUE = "http://10.1.200.86:8080";
// const javaApi = 'http://10.1.200.86:8001';
//瑁呭鐢电紗娴嬭瘯搴�
-// Vue.prototype.LOCATIONVUE = "http://10.16.173.59";
-// const javaApi = 'http://10.16.173.59:8001';
+Vue.prototype.LOCATIONVUE = "http://10.16.173.59";
+const javaApi = 'http://10.16.173.59:8001';
Vue.prototype.HaveJson = (val) => {
return JSON.parse(JSON.stringify(val))
diff --git a/src/util/excelFountion.js b/src/util/excelFountion.js
index d0d6f53..05a3e7c 100644
--- a/src/util/excelFountion.js
+++ b/src/util/excelFountion.js
@@ -51,7 +51,7 @@
let min = null;
if(val&&val.length>0){
val = val.filter(item=>item!=null&&item!=='')
- console.log(val)
+ // console.log(val)
if(val.length>0){
min = Math.min(...val)
}
@@ -275,7 +275,7 @@
fouList.forEach(item=>{
f = f.replace(new RegExp(item, 'g'),'')
})
- console.log('f',f)
+ // console.log('f',f)
let arr = f.split(',').filter(item=>{
return item&& /[a-zA-Z]/.test(item)&&item!='undefined'&&item!='null'
});
diff --git a/static/js/worker.js b/static/js/worker.js
index fcf7735..b80cfc3 100644
--- a/static/js/worker.js
+++ b/static/js/worker.js
@@ -93,7 +93,7 @@
// console.log(ask,res,item.v.f)
if(ask){
comp = ask.map((m, i) => {
- console.log('m----', m)
+ // console.log('m----', m)
if (m.includes('RTS')) {
m = m.replace('RTS*', '')
}
@@ -116,9 +116,9 @@
} else if (m.includes('鈮�')) {
if(typeof res =='string'&&res.includes('/')){
if (m.includes('/')) {
- console.log('eval(res)----', eval(res))
+ // console.log('eval(res)----', eval(res))
let str = handleFraction(m.split('鈮�')[1])
- console.log('eval(str)----', eval(str))
+ // console.log('eval(str)----', eval(str))
return eval(res) >= eval(str)
} else {
return handleMoreParam(res,m.split('鈮�')[1],'鈮�')
@@ -310,7 +310,7 @@
if (a[0].r == item.r && comResult !== '') {
for (var b in a) {
if (a[b].c == item.c) {
- console.log('comResult---', comResult)
+ // console.log('comResult---', comResult)
try{
let val = parseFloat(comResult.toFixed(3))
a[b].v.v = isNaN(val) ? '' : val
--
Gitblit v1.9.3