去掉批注只生成颜色和多行map

ruoyi-ui/src/views/system/supplies/indexupload.vue

@@ -247,10 +247,12 @@ export default {
                 for(let i=0;i<value.length;i++){
                     let row=value[i][0]-1,cell=this.stringTonum(value[i][1])-1;
                     //let row=value[i][0]-1,cell=value[i][1]-1;
-                    let sd=luckysheet.getCellValue(row,cell,{type:"ps"});
-                    if(sd===null){
-                        luckysheet.setCellValue(row, cell, {bg: "#e85f5f"})
-                        luckysheet.setCellValue(row, cell, {
+                    let sd=luckysheet.getCellValue(row,cell,{type:"bg"});
+                    //用批注进行比较的时候把下面的!==判断去掉
+                    //let sd=luckysheet.getCellValue(row,cell,{type:"ps"});
+                    if(sd===null || sd!=="#e85f61"){
+                        luckysheet.setCellValue(row, cell, {bg: "#e85f61"})
+                     /*  luckysheet.setCellValue(row, cell, {
                             ps: { //批注
                                 "left": 92, //批注框左边距
                                 "top": 10, //批注框上边距
@@ -259,11 +261,11 @@ export default {
                                 "value": key+"表有误", //批准内容
                                 "isshow": false //批注框为显示状态
                             }
-                        })
+                        })*/
                         maper.set("("+(row+1)+","+value[i][1]+")",1);
                     }else{
-                        let sd=luckysheet.getCellValue(row,cell,{type:"ps"}).value;
-                        luckysheet.setCellValue(row, cell, {
+                        //let sd=luckysheet.getCellValue(row,cell,{type:"ps"}).value;
+                        /*luckysheet.setCellValue(row, cell, {
                             ps: { //批注
                                 "left": 92, //批注框左边距
                                 "top": 10, //批注框上边距
@@ -272,7 +274,7 @@ export default {
                                 "value": sd+'\n；'+key+"表有误", //批准内容
                                 "isshow": false //批注框为显示状态
                             }
-                        })
+                        })*/
                         maper.set("("+(row+1)+","+value[i][1]+")",maper.get("("+(row+1)+","+value[i][1]+")")+1);
                     }
                 }
@@ -288,7 +290,11 @@ export default {
                 }
             }
             //生成多少条数据添加多少行
-            for (let i=0;i<=maper.size+map.size;i++){
+            let asd=maper.size+map.size;
+            if(row+asd>=num){
+                for (let i=0;i<=row+asd-num;i++){
+                    luckysheet.insertRow(row + 1);
+                }
                 luckysheet.insertRow(row + 1);
             }
             row=row+1;