Commit 0f353d42 authored by xiangjiaojunxp's avatar xiangjiaojunxp

物料转换bug修改

parent 1c966dc7
...@@ -225,9 +225,10 @@ export default { ...@@ -225,9 +225,10 @@ export default {
}, },
/** 生成标签*/ /** 生成标签*/
addToMap(){ addToMap(){
console.debug(map);
map.forEach((value,key)=>{ map.forEach((value,key)=>{
for(let i=0;i<value.length;i++){ for(let i=0;i<value.length;i++){
let row=value[i][0],cell=value[i][1]; let row=value[i][0]-1,cell=value[i][1]-1;
let sd=luckysheet.getCellValue(row,cell,{type:"ps"}); let sd=luckysheet.getCellValue(row,cell,{type:"ps"});
if(sd===null){ if(sd===null){
luckysheet.setCellValue(row, cell, {bg: "#e85f5f"}) luckysheet.setCellValue(row, cell, {bg: "#e85f5f"})
...@@ -288,7 +289,7 @@ export default { ...@@ -288,7 +289,7 @@ export default {
let k=0; let k=0;
for (let [key,value] of map.entries()) { for (let [key,value] of map.entries()) {
let a="("+value.join(")(")+")"; let a="("+value.join("),(")+")";
luckysheet.setCellValue(k,cell,key); luckysheet.setCellValue(k,cell,key);
luckysheet.setCellValue(k,cell+1 ,a); luckysheet.setCellValue(k,cell+1 ,a);
k++ k++
...@@ -362,7 +363,7 @@ export default { ...@@ -362,7 +363,7 @@ export default {
}else if (d1[i][j].m==undefined || d2[i][j].m==undefined){ }else if (d1[i][j].m==undefined || d2[i][j].m==undefined){
luckysheet.setCellValue(i, j, {bg: "#e85f5f"}) luckysheet.setCellValue(i, j, {bg: "#e85f5f"})
as++ as++
array.push([i,j]); array.push([i+1,j+1]);
}else { }else {
if (d1[i][j].m!= d2[i][j].m) { if (d1[i][j].m!= d2[i][j].m) {
luckysheet.setCellValue(i, j, {bg: "#e85f5f"}) luckysheet.setCellValue(i, j, {bg: "#e85f5f"})
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment