From 1cd0b6a91bda57e9f99fdbe2b5faff144d64a477 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期三, 27 三月 2024 09:32:20 +0800
Subject: [PATCH] 完成表格参数项参数值获取
---
src/components/do/b1-inspect-order-plan/Inspection.vue | 123 +++++++++++++++++++++++-----------------
1 files changed, 71 insertions(+), 52 deletions(-)
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index 950995a..dc04d13 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -413,6 +413,16 @@
dels.forEach(del=>{
for(let b=0;b<a.template.length;b++){
if(a.template[b].r === del.r){
+ if(a.template[b].v.mc!=undefined){
+ if(a.template[b].v.mc.rs!=undefined&&a.template[b].v.mc.rs>1){
+ if(a.template[b].r === a.template[b].v.mc.r){
+ a.template[b].r += 1
+ a.template[b].v.mc.r += 1
+ a.template[b].v.mc.rs -= 1
+ continue
+ }
+ }
+ }
a.template.splice(b, 1)
b-=1
}
@@ -426,60 +436,63 @@
}
})
})
- console.log(this.tableList);
- // return
- this.tableList.map(item=>{
- const mySet0 = new Set();
- let arr = [];
- let arrItem = [];
- item.template.forEach((m,i)=>{
- if(m.v.f){
- this.excelMethodList.push(m)
+ this.tableList.forEach(a=>{
+ let arrs = []
+ let set = new Set()
+ a.template.forEach(b=>{
+ set.add(b.r)
+ if(b.v.f){
+ this.excelMethodList.push(b)
}
- let num0 = mySet0.size;
- mySet0.add(m.r)
- let num1 = mySet0.size;
- if(num0<num1){
- if(arrItem.length>0){
- arr.push(arrItem)
- arrItem = []
- }
- if(m.v.mc){
- if(m.v.mc.rs||m.v.mc.cs){
- arrItem.push(m)
- }
- }else{
- arrItem.push(m)
- }
- }else{
- if(m.v.mc){
- if(m.v.mc.rs||m.v.mc.cs){
- arrItem.push(m)
- }
- }else{
- arrItem.push(m)
- }
- }
- })
- arr.push(arrItem)
- item.arr = arr;
- return item
- })
- console.log(this.tableList);
+ })
+ set = Array.sort(set)
+ set.forEach(b=>{
+ let arr = []
+ a.template.forEach(c=>{
+ if(c.r === b){
+ if(arr.length===0){
+ if(c.v.mc==undefined||Object.keys(c.v.mc).length==4) arr.push(c)
+ }else{
+ for(let d=0;d<arr.length;d++){
+ if(c.c<arr[d].c){
+ if(c.v.mc==undefined||Object.keys(c.v.mc).length==4) arr.splice(d, 0, c)
+ break
+ }
+ if(d === arr.length-1){
+ if(c.v.mc==undefined||Object.keys(c.v.mc).length==4) arr.push(c)
+ break
+ }
+ }
+ }
+ }
+ })
+ arrs.push(arr)
+ })
+ a.arr = arrs
+ })
this.handleExcelMethod()
},
changeInput(m,code){
- console.log(2222222222,m,code)
+ console.log(m,'code:',code,this.excelMethodList)
let r = code.split('-')[1]
let c = code.split('-')[2]
+ this.excelMethodList.forEach(item=>{
+ if(item.valueList.find(m=>m.r==r&&m.c==c)){
+ console.log('褰撳墠鐨勬柟娉�',item.methodName)
+ console.log('褰撳墠鐨勬暟鎹」',item.valueList)
+ console.log('褰撳墠鐨勬暟鍊奸」','r:',item.r,'c:',item.c)
+ this.changeInput('璁＄畻鐨勭粨鏋�',`${code.split('-')[0]}-${item.r}-${item.c}`)//鏀瑰彉鏈�缁堝��
+ }
+ })
},
- // 褰撳墠妯℃澘excel鍑芥暟闆嗗鐞�
handleExcelMethod(){
if(this.excelMethodList.length>0){
this.excelMethodList.map(item=>{
- item.methodName = item.v.f.split('=')[1].split('(')[0];
+ if(item.v.f.includes(':')){}
+ item.methodName = item.v.f.split('=')[1].split('(')&&item.v.f.split('=')[1].split('(')[0]?item.v.f.split('=')[1].split('(')[0]:'鑷畾涔夋柟娉�';
let valueList = [];
if(item.v.f.includes(':')){
+ valueList = [];
let r0 = null;
let c0 = null;
let r1 = null;
@@ -487,12 +500,12 @@
let mode = item.v.f.split('(')[1].split(')')[0];
let start = mode.split(':')[0]
let end = mode.split(':')[1]
- r0 = this.comparisonList.find(j=>j['1']==start.split('')[0])[`0`]
- c0 = start.split('')[1]-1
- r1 = this.comparisonList.find(j=>j['1']==end.split('')[0])[`0`]
- c1 = end.split('')[1]-1
+ c0 = this.comparisonList.find(j=>j['1']==start.split('')[0])[`0`]
+ r0 = start.split('')[1]-1
+ c1 = this.comparisonList.find(j=>j['1']==end.split('')[0])[`0`]
+ r1 = end.split('')[1]-1
for (let i=Number(r0);i<=r1;i++){
- for(let u=c0;u<c1+1;u++){
+ for(let u=c0;u<=c1;u++){
valueList.push({
r:i,
c:u
@@ -501,13 +514,19 @@
}
item.valueList = valueList;
}else{
- let mode = item.v.f.split('(')[1].split(')')[0];
- // const result = item.v.f.replace(/+|-|*|%|\/|(|)/g, ' ')
+ valueList = []
+ let regex= /[\+\-\*\%\(\)\s]/g
+ let mode = item.v.f.replace(regex, ' ').split(' ');
+ mode.forEach(m=>{
+ let r = m.split('')[1]-1
+ let c = this.comparisonList.find(j=>j['1']==m.split('')[0])[`0`]
+ valueList.push({c,r})
+ })
}
return item;
})
}
- }
- }
- }
+ }
+ },
+}
</script>
--
Gitblit v1.9.3