baoxiu22

@@ -128,7 +128,9 @@ class Dashboard extends Backend
                 $data[$k]['baoxiu_num'] = 0;
                 $data[$k]['BaoXiuStr'] = '';
                 $data[$k]['Round'] = '无记录';
+                $data[$k]['RoundOrder'] = 0;
                 $data[$k]['WRound'] = '无记录';
+                $data[$k]['WRoundOrder'] = 0;
 
             } else {
                 $data[$k]['baoxiu_num'] = count($BaoXiuZhandian);
@@ -140,6 +142,8 @@ class Dashboard extends Backend
                 $data[$k]['BaoXiuStr'] = implode($StrArr, ',');
                 $data[$k]['Round'] = $Round . '%';
                 $data[$k]['WRound'] = $WRound . '%';
+                $data[$k]['RoundOrder'] = count($BaoxiuWancheng);
+                $data[$k]['WRoundOrder'] = count($BaoxiuWeiWancheng);
             }
         }
         $Time = date('Y/m/d');
@@ -152,8 +156,10 @@ class Dashboard extends Backend
         $objPHPExcel->getActiveSheet()->setCellValue('A1', '站点');
         $objPHPExcel->getActiveSheet()->setCellValue('B1', '报修单数量');
         $objPHPExcel->getActiveSheet()->setCellValue('C1', '报修完成率');
-        $objPHPExcel->getActiveSheet()->setCellValue('D1', '报修未完成率');
-        $objPHPExcel->getActiveSheet()->setCellValue('E1', '故障设备名称');
+        $objPHPExcel->getActiveSheet()->setCellValue('D1', '报修完成数量');
+        $objPHPExcel->getActiveSheet()->setCellValue('E1', '报修未完成数量');
+        $objPHPExcel->getActiveSheet()->setCellValue('F1', '报修未完成率');
+        $objPHPExcel->getActiveSheet()->setCellValue('G1', '故障设备名称');
 
         //改变此处设置的长度数值
         $objPHPExcel->getActiveSheet()->getColumnDimension('A')->setWidth(10);
@@ -166,8 +172,10 @@ class Dashboard extends Backend
                 $objPHPExcel->getActiveSheet()->setCellValue('A' . $i, $val['zhandian_name']);
                 $objPHPExcel->getActiveSheet()->setCellValue('B' . $i, $val['baoxiu_num']);
                 $objPHPExcel->getActiveSheet()->setCellValue('C' . $i, $val['Round']);
-                $objPHPExcel->getActiveSheet()->setCellValue('D' . $i, $val['WRound']);
-                $objPHPExcel->getActiveSheet()->setCellValue('E' . $i, $val['BaoXiuStr']);
+                $objPHPExcel->getActiveSheet()->setCellValue('D' . $i, $val['RoundOrder']);
+                $objPHPExcel->getActiveSheet()->setCellValue('E' . $i, $val['WRound']);
+                $objPHPExcel->getActiveSheet()->setCellValue('F' . $i, $val['WRoundOrder']);
+                $objPHPExcel->getActiveSheet()->setCellValue('G' . $i, $val['BaoXiuStr']);
             }
         }
         header("Pragma: public");