景龙 / xiaofang · 提交

转到一个项目

作者 景龙
提交 c54359c40874eb67da93148866fd4a096f80547a 1 个父辈 34c76d37
1 个管道 的构建 通过 耗费 19 秒

修改月检错误字段

内嵌 并排对比
正在显示 2 个修改的文件 包含 10 行增加 和 9 行删除
@@ -114,7 +114,7 @@ class AdminCheckController extends AdminBaseController @@ -114,7 +114,7 @@ class AdminCheckController extends AdminBaseController
114 $adminCommon = new AdminCommonController(); 114 $adminCommon = new AdminCommonController();
115 $adminExcel = new AdminExcelDataController(); 115 $adminExcel = new AdminExcelDataController();
116 116
117 - $res_ins = $adminCommon->exportCheckList('check',$param,'t.*,p name project_name'); 117 + $res_ins = $adminCommon->exportCheckList('check',$param,'t.*,p.name project_name');
118 118
119 $arr_url = []; 119 $arr_url = [];
120 $arr_time = []; 120 $arr_time = [];
@@ -63,7 +63,7 @@ class AdminExcelDataController extends AdminBaseController @@ -63,7 +63,7 @@ class AdminExcelDataController extends AdminBaseController
63 //***********************画出单元格边框结束***************************** 63 //***********************画出单元格边框结束*****************************
64 64
65 //***********************背景填充颜色***************************** 65 //***********************背景填充颜色*****************************
66 - $sheet->getStyle( 'A1:M8')->getFill()->setFillType(\PHPExcel_Style_Fill::FILL_SOLID); 66 + $sheet->getStyle( 'A1:M8')->getFill()->setFillType(\PhpOffice\PhpSpreadsheet\Style\Fill::FILL_SOLID);
67 $sheet->getStyle( 'A1:M8')->getFill()->getStartColor()->setRGB('222B35');//背景颜色 67 $sheet->getStyle( 'A1:M8')->getFill()->getStartColor()->setRGB('222B35');//背景颜色
68 //***********************画出单元格边框结束***************************** 68 //***********************画出单元格边框结束*****************************
69 69
@@ -183,7 +183,7 @@ class AdminExcelDataController extends AdminBaseController @@ -183,7 +183,7 @@ class AdminExcelDataController extends AdminBaseController
183 183
184 $cols += $col+1; 184 $cols += $col+1;
185 } 185 }
186 - $sheet->getStyle( 'A9:M'.$cols)->getFill()->setFillType(\PHPExcel_Style_Fill::FILL_SOLID); 186 + $sheet->getStyle( 'A9:M'.$cols)->getFill()->setFillType(\PhpOffice\PhpSpreadsheet\Style\Fill::FILL_SOLID);
187 $sheet->getStyle( 'A9:M'.$cols)->getFill()->getStartColor()->setRGB('F3F3F4');//背景颜色浅灰色 187 $sheet->getStyle( 'A9:M'.$cols)->getFill()->getStartColor()->setRGB('F3F3F4');//背景颜色浅灰色
188 188
189 189
@@ -344,7 +344,7 @@ class AdminExcelDataController extends AdminBaseController @@ -344,7 +344,7 @@ class AdminExcelDataController extends AdminBaseController
344 // $sheet->getRowDimension(2)->setRowHeight(55); 344 // $sheet->getRowDimension(2)->setRowHeight(55);
345 345
346 //***********************背景填充颜色***************************** 346 //***********************背景填充颜色*****************************
347 - $sheet->getStyle( 'A1:M11')->getFill()->setFillType(\PHPExcel_Style_Fill::FILL_SOLID); 347 + $sheet->getStyle( 'A1:M11')->getFill()->setFillType(\PhpOffice\PhpSpreadsheet\Style\Fill::FILL_SOLID);
348 $sheet->getStyle( 'A1:M11')->getFill()->getStartColor()->setRGB('222B35');//背景颜色 348 $sheet->getStyle( 'A1:M11')->getFill()->getStartColor()->setRGB('222B35');//背景颜色
349 //***********************画出单元格边框结束***************************** 349 //***********************画出单元格边框结束*****************************
350 350
@@ -498,7 +498,8 @@ class AdminExcelDataController extends AdminBaseController @@ -498,7 +498,8 @@ class AdminExcelDataController extends AdminBaseController
498 $cols += $col+1; 498 $cols += $col+1;
499 } 499 }
500 } 500 }
501 - $sheet->getStyle( 'A12:M'.$cols)->getFill()->setFillType(\PHPExcel_Style_Fill::FILL_SOLID); 501 +// $sheet->getStyle( 'A12:M'.$cols)->getFill()->setFillType(\PHPExcel_Style_Fill::FILL_SOLID);
  502 + $sheet->getStyle( 'A12:M'.$cols)->getFill()->setFillType(\PhpOffice\PhpSpreadsheet\Style\Fill::FILL_SOLID);
502 $sheet->getStyle( 'A12:M'.$cols)->getFill()->getStartColor()->setRGB('F3F3F4');//背景颜色浅灰色 503 $sheet->getStyle( 'A12:M'.$cols)->getFill()->getStartColor()->setRGB('F3F3F4');//背景颜色浅灰色
503 504
504 $objWrite = IOFactory::createWriter($spreadsheet, 'Xls'); 505 $objWrite = IOFactory::createWriter($spreadsheet, 'Xls');
@@ -588,7 +589,7 @@ class AdminExcelDataController extends AdminBaseController @@ -588,7 +589,7 @@ class AdminExcelDataController extends AdminBaseController
588 // $sheet->getRowDimension(2)->setRowHeight(55); 589 // $sheet->getRowDimension(2)->setRowHeight(55);
589 590
590 //***********************背景填充颜色***************************** 591 //***********************背景填充颜色*****************************
591 - $sheet->getStyle( 'A1:M11')->getFill()->setFillType(\PHPExcel_Style_Fill::FILL_SOLID); 592 + $sheet->getStyle( 'A1:M11')->getFill()->setFillType(\PhpOffice\PhpSpreadsheet\Style\Fill::FILL_SOLID);
592 $sheet->getStyle( 'A1:M11')->getFill()->getStartColor()->setRGB('222B35');//背景颜色 593 $sheet->getStyle( 'A1:M11')->getFill()->getStartColor()->setRGB('222B35');//背景颜色
593 //***********************画出单元格边框结束***************************** 594 //***********************画出单元格边框结束*****************************
594 595
@@ -762,7 +763,7 @@ class AdminExcelDataController extends AdminBaseController @@ -762,7 +763,7 @@ class AdminExcelDataController extends AdminBaseController
762 $cols += $col+1; 763 $cols += $col+1;
763 } 764 }
764 } 765 }
765 - $sheet->getStyle( 'A12:M'.$cols)->getFill()->setFillType(\PHPExcel_Style_Fill::FILL_SOLID); 766 + $sheet->getStyle( 'A12:M'.$cols)->getFill()->setFillType(\PhpOffice\PhpSpreadsheet\Style\Fill::FILL_SOLID);
766 $sheet->getStyle( 'A12:M'.$cols)->getFill()->getStartColor()->setRGB('F3F3F4');//背景颜色浅灰色 767 $sheet->getStyle( 'A12:M'.$cols)->getFill()->getStartColor()->setRGB('F3F3F4');//背景颜色浅灰色
767 768
768 $objWrite = IOFactory::createWriter($spreadsheet, 'Xls'); 769 $objWrite = IOFactory::createWriter($spreadsheet, 'Xls');
@@ -852,7 +853,7 @@ class AdminExcelDataController extends AdminBaseController @@ -852,7 +853,7 @@ class AdminExcelDataController extends AdminBaseController
852 // $sheet->getRowDimension(2)->setRowHeight(55); 853 // $sheet->getRowDimension(2)->setRowHeight(55);
853 854
854 //***********************背景填充颜色***************************** 855 //***********************背景填充颜色*****************************
855 - $sheet->getStyle( 'A1:M11')->getFill()->setFillType(\PHPExcel_Style_Fill::FILL_SOLID); 856 + $sheet->getStyle( 'A1:M11')->getFill()->setFillType(\PhpOffice\PhpSpreadsheet\Style\Fill::FILL_SOLID);
856 $sheet->getStyle( 'A1:M11')->getFill()->getStartColor()->setRGB('222B35');//背景颜色 857 $sheet->getStyle( 'A1:M11')->getFill()->getStartColor()->setRGB('222B35');//背景颜色
857 //***********************画出单元格边框结束***************************** 858 //***********************画出单元格边框结束*****************************
858 859
@@ -1032,7 +1033,7 @@ class AdminExcelDataController extends AdminBaseController @@ -1032,7 +1033,7 @@ class AdminExcelDataController extends AdminBaseController
1032 $cols += $col+1; 1033 $cols += $col+1;
1033 } 1034 }
1034 } 1035 }
1035 - $sheet->getStyle( 'A12:M'.$cols)->getFill()->setFillType(\PHPExcel_Style_Fill::FILL_SOLID); 1036 + $sheet->getStyle( 'A12:M'.$cols)->getFill()->setFillType(\PhpOffice\PhpSpreadsheet\Style\Fill::FILL_SOLID);
1036 $sheet->getStyle( 'A12:M'.$cols)->getFill()->getStartColor()->setRGB('F3F3F4');//背景颜色浅灰色 1037 $sheet->getStyle( 'A12:M'.$cols)->getFill()->getStartColor()->setRGB('F3F3F4');//背景颜色浅灰色
1037 1038
1038 $objWrite = IOFactory::createWriter($spreadsheet, 'Xls'); 1039 $objWrite = IOFactory::createWriter($spreadsheet, 'Xls');