Skip to content

K
klck
Commit e2e6436b authored by lvzhuangzhuang's avatar lvzhuangzhuang
Browse files
Options

清除console

parent f9f06365
Show whitespace changes
Inline Side-by-side
Showing with 40 additions and 44 deletions
ruoyi-ui/src/views/system/supplies/index.vue
View file @ e2e6436b
...@@ -535,8 +535,7 @@ export default { ...@@ -535,8 +535,7 @@ export default {
message: error.message, message: error.message,
type: "error" type: "error"
}); });
console.log(error.message);
console.log("这里是最外面的地方");
}) })
.finally(() => { .finally(() => {
// 导入完成后关闭遮罩层 // 导入完成后关闭遮罩层
...@@ -564,8 +563,7 @@ export default { ...@@ -564,8 +563,7 @@ export default {
message: error.message, message: error.message,
type: "error" type: "error"
}); });
console.log(error.message);
console.log("这里是最外面的地方");
}) })
.finally(() => { .finally(() => {
// 导入完成后关闭遮罩层 // 导入完成后关闭遮罩层
...@@ -780,7 +778,7 @@ export default { ...@@ -780,7 +778,7 @@ export default {
.then(response => { .then(response => {
let array = response.rows; let array = response.rows;
//console.log(array);
//luckysheet.setCellValue(12, 1, {bg:"#FF0000"}) //luckysheet.setCellValue(12, 1, {bg:"#FF0000"})
for (let i = parseFloat(sysRulez[0].re) + 1, k = 0; i < data.length; i++, k++) { for (let i = parseFloat(sysRulez[0].re) + 1, k = 0; i < data.length; i++, k++) {
let values = []; let values = [];
...@@ -809,7 +807,7 @@ export default { ...@@ -809,7 +807,7 @@ export default {
} }
//循环得到汇总结果 //循环得到汇总结果
console.log(map);
if (map.size === 0) { if (map.size === 0) {
throw new Error("导入失败,导入文件错误"); throw new Error("导入失败,导入文件错误");
} }
...@@ -822,7 +820,7 @@ export default { ...@@ -822,7 +820,7 @@ export default {
map.forEach((value, key) => { map.forEach((value, key) => {
const suffixArr = key.split('/'), mat = suffixArr[2], depp = suffixArr[1], const suffixArr = key.split('/'), mat = suffixArr[2], depp = suffixArr[1],
expp = suffixArr[0]; expp = suffixArr[0];
//console.log(expp);console.log(depp);console.log(mat);
let searchResult = luckysheet.find(expp); let searchResult = luckysheet.find(expp);
if (searchResult.length !== 0 ) { if (searchResult.length !== 0 ) {
rowws = searchResult[0].row; rowws = searchResult[0].row;
...@@ -913,7 +911,7 @@ export default { ...@@ -913,7 +911,7 @@ export default {
}catch(err){ }catch(err){
throw new Error("导入失败,导入文件与模板规则不匹"); throw new Error("导入失败,导入文件与模板规则不匹");
} }
//console.log(smallMat);
asyncTasks.push( asyncTasks.push(
new Promise((innerResolve, innerReject) => { new Promise((innerResolve, innerReject) => {
const allNull = smallMat.every(item =>item===null); const allNull = smallMat.every(item =>item===null);
...@@ -923,7 +921,7 @@ export default { ...@@ -923,7 +921,7 @@ export default {
materialConvert(smallMat) materialConvert(smallMat)
.then(response => { .then(response => {
let array = response.rows; let array = response.rows;
//console.log(array);
//luckysheet.setCellValue(12, 1, {bg:"#FF0000"}) //luckysheet.setCellValue(12, 1, {bg:"#FF0000"})
for (let i = parseInt(sysRulez[0].re) + 1; i < data.length; i++) { for (let i = parseInt(sysRulez[0].re) + 1; i < data.length; i++) {
let values = []; let values = [];
...@@ -962,7 +960,7 @@ export default { ...@@ -962,7 +960,7 @@ export default {
let row; let row;
let con; let con;
let warn=0; let warn=0;
//console.log(map);
map.forEach((value,key)=>{ map.forEach((value,key)=>{
let searchResult; let searchResult;
searchResult= luckysheet.find(key); searchResult= luckysheet.find(key);
...@@ -1042,7 +1040,7 @@ export default { ...@@ -1042,7 +1040,7 @@ export default {
if (map2.size === 0) { if (map2.size === 0) {
throw new Error("导入失败,导入文件错误"); throw new Error("导入失败,导入文件错误");
} }
//console.log(map2);
map2.forEach((value, key) => { map2.forEach((value, key) => {
let searchResult; let searchResult;
searchResult= luckysheet.find(key); searchResult= luckysheet.find(key);
...@@ -1070,7 +1068,7 @@ export default { ...@@ -1070,7 +1068,7 @@ export default {
resolve(response.rows); resolve(response.rows);
innerResolve(); // 标记当前异步任务完成 innerResolve(); // 标记当前异步任务完成
}).catch(Error => { }).catch(Error => {
console.log("这里是单个异步请求出错处");
//必须加,不能删除 //必须加,不能删除
innerReject(Error); // 异步请求出错 innerReject(Error); // 异步请求出错
}); });
...@@ -1138,13 +1136,12 @@ export default { ...@@ -1138,13 +1136,12 @@ export default {
} }
} }
} }
//console.log(newSmasll)
for (let k = 0; k < newSmasll.length; k++) { for (let k = 0; k < newSmasll.length; k++) {
SixList[newSmasll[k].index]='11'; SixList[newSmasll[k].index]='11';
m++; m++;
} }
//console.log(m)
//console.log(SixList,'1231231231231')
this.NewSixList=SixList*/ this.NewSixList=SixList*/
let SixMateriel=[]; let SixMateriel=[];
...@@ -1154,7 +1151,7 @@ export default { ...@@ -1154,7 +1151,7 @@ export default {
let newSmasll =smallMat; let newSmasll =smallMat;
SixMateriel=response.rows; SixMateriel=response.rows;
NewMarterielCode= sortArray(SixMateriel) NewMarterielCode= sortArray(SixMateriel)
console.log("新的转换规则有"+NewMarterielCode.length+"条");
// //转化编码 // //转化编码
let p=0; let p=0;
for(var i=0;i<newSmasll.length;i++){ for(var i=0;i<newSmasll.length;i++){
...@@ -1171,9 +1168,9 @@ export default { ...@@ -1171,9 +1168,9 @@ export default {
} }
} }
} }
console.log(p)
let newSixList=SixList let newSixList=SixList
console.log(newSixList)
for (let i = parseFloat(sysRulez[0].re) + 1, k = 0; i < data.length; i++, k++) { for (let i = parseFloat(sysRulez[0].re) + 1, k = 0; i < data.length; i++, k++) {
...@@ -1191,7 +1188,7 @@ export default { ...@@ -1191,7 +1188,7 @@ export default {
innerReject(error); // 异步请求出错 innerReject(error); // 异步请求出错
} }
} }
//console.log(SixList)
let key = SixList[k] + '/' + deps[k]; let key = SixList[k] + '/' + deps[k];
if (map.has(key)) { if (map.has(key)) {
let oldValues = map.get(key); let oldValues = map.get(key);
...@@ -1205,7 +1202,7 @@ export default { ...@@ -1205,7 +1202,7 @@ export default {
} }
} }
console.log(map);
//循环得到汇总结果 //循环得到汇总结果
if (map.size === 0) { if (map.size === 0) {
throw new Error("导入失败,导入文件错误"); throw new Error("导入失败,导入文件错误");
...@@ -1301,7 +1298,7 @@ export default { ...@@ -1301,7 +1298,7 @@ export default {
// 计算执行时间（以毫秒为单位） // 计算执行时间（以毫秒为单位）
const executionTime = endTime - startTime; const executionTime = endTime - startTime;
// 输出执行时间 // 输出执行时间
console.log(`代码执行时间：${executionTime} 毫秒`);
resolve(response.rows); resolve(response.rows);
innerResolve(); // 标记当前异步任务完成 innerResolve(); // 标记当前异步任务完成
...@@ -1335,7 +1332,7 @@ export default { ...@@ -1335,7 +1332,7 @@ export default {
} }
} }
//console.log("smallMat="+smallMat);
}catch(err){ }catch(err){
throw new Error("导入失败,导入文件与模板规则不匹"); throw new Error("导入失败,导入文件与模板规则不匹");
} }
...@@ -1346,15 +1343,15 @@ export default { ...@@ -1346,15 +1343,15 @@ export default {
throw new Error("导入失败,导入文件错误,所选文件与模板规则不匹"); throw new Error("导入失败,导入文件错误,所选文件与模板规则不匹");
} }
//一部分报表的数据 //一部分报表的数据
//console.log('----->',smallMat);
materialList().then( response => { materialList().then( response => {
//六矿物料编码数据 //六矿物料编码数据
// console.log(response.rows,'ymy');
let array = response.rows; let array = response.rows;
//有code的数据 //有code的数据
// console.log(array,"<-------->");
//六矿六位编码 //六矿六位编码
let newSix = []; let newSix = [];
for (let i = 0; i < array.length; i++) { for (let i = 0; i < array.length; i++) {
...@@ -1362,7 +1359,7 @@ export default { ...@@ -1362,7 +1359,7 @@ export default {
newSix.push(array[i]); newSix.push(array[i]);
} }
} }
// console.log('6666666666666',newSix);
//六矿四位编码 //六矿四位编码
let newFour = []; let newFour = [];
for (let u = 0; u < array.length; u++) { for (let u = 0; u < array.length; u++) {
...@@ -1370,7 +1367,7 @@ export default { ...@@ -1370,7 +1367,7 @@ export default {
newFour.push(array[u]); newFour.push(array[u]);
} }
} }
// console.log('444444444444444',newFour);
//六矿二位编码 //六矿二位编码
let newTwo = []; let newTwo = [];
for (let l = 0; l < array.length; l++) { for (let l = 0; l < array.length; l++) {
...@@ -1378,7 +1375,7 @@ export default { ...@@ -1378,7 +1375,7 @@ export default {
newTwo.push(array[l]); newTwo.push(array[l]);
} }
} }
// console.log('22222222222222',newTwo);
//转换六位 //转换六位
let a = []; let a = [];
for (let h = 0; h < smallMat.length; h++) { for (let h = 0; h < smallMat.length; h++) {
...@@ -1389,7 +1386,7 @@ export default { ...@@ -1389,7 +1386,7 @@ export default {
} }
} }
} }
//console.log('ssssssssss',a);
//删除方法 //删除方法
const result = smallMat.filter(item => item.code.length <= 4).map(item =>({index:item.index,code:item.code}) ); const result = smallMat.filter(item => item.code.length <= 4).map(item =>({index:item.index,code:item.code}) );
let i = 0; let i = 0;
...@@ -1401,7 +1398,7 @@ export default { ...@@ -1401,7 +1398,7 @@ export default {
i++; i++;
} }
} }
//console.log(smallMat);
//转换四位 //转换四位
let b = []; let b = [];
for (let h = 0; h < smallMat.length; h++) { for (let h = 0; h < smallMat.length; h++) {
...@@ -1413,11 +1410,10 @@ export default { ...@@ -1413,11 +1410,10 @@ export default {
} }
} }
//console.log('fffffffffffff',b);
//console.log('原数组',smallMat);
let uniqueB = [...new Set(b.map(obj => obj.index))].map(index => b.find(obj => obj.index === index)); let uniqueB = [...new Set(b.map(obj => obj.index))].map(index => b.find(obj => obj.index === index));
// 622
//console.log('fffffffffffff', uniqueB);
//删除方法 //删除方法
const re = smallMat.filter(item => item.code.length <= 4).map(item =>({index:item.index,code:item.code}) ); const re = smallMat.filter(item => item.code.length <= 4).map(item =>({index:item.index,code:item.code}) );
...@@ -1430,7 +1426,7 @@ export default { ...@@ -1430,7 +1426,7 @@ export default {
ii++; ii++;
} }
} }
//console.log(smallMat);
//转换二位 //转换二位
let c = []; let c = [];
...@@ -1442,7 +1438,7 @@ export default { ...@@ -1442,7 +1438,7 @@ export default {
} }
} }
} }
//console.log('tttttttttt',c);
//删除方法 //删除方法
const sult = smallMat.filter(item => item.code.length <= 4).map(item =>({index:item.index,code:item.code}) ); const sult = smallMat.filter(item => item.code.length <= 4).map(item =>({index:item.index,code:item.code}) );
let iii = 0; let iii = 0;
...@@ -1454,24 +1450,24 @@ export default { ...@@ -1454,24 +1450,24 @@ export default {
iii++; iii++;
} }
} }
//console.log(smallMat);
//转换其他 //转换其他
for (let other = 0; other < smallMat.length; other++) { for (let other = 0; other < smallMat.length; other++) {
if( smallMat[other].code.length == '10'){ if( smallMat[other].code.length == '10'){
smallMat[other].code = 11; smallMat[other].code = 11;
} }
} }
//console.log(smallMat);
//合并 //合并
let newSmallMat = [...a,...uniqueB,...c,...smallMat]; let newSmallMat = [...a,...uniqueB,...c,...smallMat];
//console.log(newSmallMat);
//索引排序 //索引排序
function newSort(arr){ function newSort(arr){
arr.sort((a,b) => a.index - b.index) arr.sort((a,b) => a.index - b.index)
return arr; return arr;
} }
let newSortArray = newSort(newSmallMat); let newSortArray = newSort(newSmallMat);
//console.log(newSortArray);
for (let i = parseFloat(sysRulez[0].re) + 1, k = 0; i < data.length; i++, k++) { for (let i = parseFloat(sysRulez[0].re) + 1, k = 0; i < data.length; i++, k++) {
let values = []; let values = [];
if (data[i][key_i] != null) { if (data[i][key_i] != null) {
...@@ -1506,7 +1502,7 @@ export default { ...@@ -1506,7 +1502,7 @@ export default {
} }
//循环得到汇总结果 //循环得到汇总结果
console.log(map);
if (map.size === 0) { if (map.size === 0) {
throw new Error("导入失败,导入文件错误"); throw new Error("导入失败,导入文件错误");
} }
...@@ -1529,7 +1525,7 @@ export default { ...@@ -1529,7 +1525,7 @@ export default {
let warn=0; let warn=0;
map.forEach((value, key) => { map.forEach((value, key) => {
const suffixArr = key.split('/'), mat = suffixArr[0], depp = suffixArr[1]; const suffixArr = key.split('/'), mat = suffixArr[0], depp = suffixArr[1];
//console.log(mat);console.log(depp);
let searchResult = luckysheet.find(mat); let searchResult = luckysheet.find(mat);
if (searchResult.length != 0 && key != null) { if (searchResult.length != 0 && key != null) {
rowws = searchResult[0].row; rowws = searchResult[0].row;
...@@ -1589,14 +1585,14 @@ export default { ...@@ -1589,14 +1585,14 @@ export default {
// 计算执行时间（以毫秒为单位） // 计算执行时间（以毫秒为单位）
const executionTime = endTime - startTime; const executionTime = endTime - startTime;
// 输出执行时间 // 输出执行时间
console.log(`代码执行时间：${executionTime} 毫秒`);
resolve(response.rows); resolve(response.rows);
innerResolve(); // 标记当前异步任务完成 innerResolve(); // 标记当前异步任务完成
/!*let find1 = luckysheet.find("合计"); /!*let find1 = luckysheet.find("合计");
let number = parseInt(find1[0].row)-1; let number = parseInt(find1[0].row)-1;
luckysheet.setCellValue(find1[0].row, sysRules[sysRules.length-1].ct, "=SUM(F2:F"+number+")")*!/ luckysheet.setCellValue(find1[0].row, sysRules[sysRules.length-1].ct, "=SUM(F2:F"+number+")")*!/
}).catch(Error => { }).catch(Error => {
console.log("这里是单个异步请求出错处");
//必须加,不能删除 //必须加,不能删除
innerReject(Error); // 异步请求出错 innerReject(Error); // 异步请求出错
}); });
......
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