From 5d748fca0e3808a87a7707706bd948113d90152d Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期五, 12 七月 2024 16:01:59 +0800
Subject: [PATCH] 完成三级检验项
---
static/js/worker.js | 6 ++----
src/main.js | 3 ++-
src/components/do/b1-inspect-order-plan/Inspection.vue | 11 ++---------
3 files changed, 6 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 a51e023..c9a54f0 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -1478,8 +1478,7 @@
str += c.v.v
count4 += 1
}
- }else if (c.v.ps != undefined && c.v.ps.value === '妫�楠屽瓙瀛愰」') {
- console.log('妫�楠屽瓙瀛愰」',c)
+ }else if (c.v.ps != undefined && c.v.ps.value === '妫�楠屽瓙瀛愰」'&&this.PROJECT=='瑁呭鐢电紗') {
if (count4 === 2) {
str += c.v.v
count4 += 1
@@ -1490,14 +1489,8 @@
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+this.currentSample.insProduct[i].inspectionItemClass==null?'':this.currentSample.insProduct[i].inspectionItemClass) ===
+ .insProduct[i].inspectionItem +(this.currentSample.insProduct[i].inspectionItemSubclass == null ? '' : this.currentSample.insProduct[i].inspectionItemSubclass)+(this.currentSample.insProduct[i].inspectionItemClass==null||this.PROJECT!='瑁呭鐢电紗'?'':this.currentSample.insProduct[i].inspectionItemClass) ===
str) {
ids.push({
r: b.r,
diff --git a/src/main.js b/src/main.js
index e56851b..d3987dd 100644
--- a/src/main.js
+++ b/src/main.js
@@ -32,7 +32,8 @@
//瑁呭鐢电紗娴嬭瘯搴�
Vue.prototype.LOCATIONVUE = "http://10.16.173.59";
-const javaApi = 'http://10.16.173.59:8001';
+// const javaApi = 'http://10.16.173.59:8001';
+const javaApi = 'http://192.168.47.2:8001';
Vue.prototype.HaveJson = (val) => {
return JSON.parse(JSON.stringify(val))
diff --git a/static/js/worker.js b/static/js/worker.js
index b80cfc3..db988b7 100644
--- a/static/js/worker.js
+++ b/static/js/worker.js
@@ -272,7 +272,7 @@
try {
if(getInspectionValueType(item.i)==1){
let tell = currentSample.insProduct.find(m => m.id == item.i).tell?currentSample.insProduct.find(m => m.id == item.i).tell.split('&'):null;
- isPoint = tell[0].includes('/') // 鍒ゆ柇瑕佹眰鍊兼槸鍚︿负鍒嗘暟
+ isPoint = this.PROJECT=='瑁呭鐢电紗'&&tell&&tell.length>0&&typeof tell[0] =='string'&&tell[0].includes('/') // 鍒ゆ柇瑕佹眰鍊兼槸鍚︿负鍒嗘暟
comResult = compute(item.v.f.replace(/=/g, ' '),comValue, isPoint)
let list3 = list2.map(item=>item+'')
isToExponential = list3.some(val => val.includes('e+'))
@@ -608,8 +608,6 @@
}
}
-
-
/**
* 鏍规嵁鍧愭爣鑾峰彇鍒楀悕
* @param {Object} cellId
@@ -818,9 +816,9 @@
if(str.includes(',,')){
str = str.replace(new RegExp(',,', 'g'),'')
}
+ // console.log('str', str)
if(str.includes('&"/"&')){
return str.replace(new RegExp('&"/"&', 'g'),'/').replace(new RegExp('//', 'g'),'')
- return str.replaceAll('&"/"&', '/').replaceAll('//','')
} else if (isPoint) {
return str.replace('ABS', '').replace(/\(|\)/g, '')
}else {
--
Gitblit v1.9.3