From b3fb1f3d63937f54d98f556d7561cbaf620cde62 Mon Sep 17 00:00:00 2001 From: cody <648753004@qq.com> Date: Wed, 3 Jul 2024 11:23:13 +0800 Subject: [PATCH] update --- app/Http/Controllers/Admin/ProjectController.php | 14 +++++++++----- resources/views/admin/layouts/layout.blade.php | 3 +++ 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/app/Http/Controllers/Admin/ProjectController.php b/app/Http/Controllers/Admin/ProjectController.php index 3c13b80..1ad25af 100755 --- a/app/Http/Controllers/Admin/ProjectController.php +++ b/app/Http/Controllers/Admin/ProjectController.php @@ -323,10 +323,11 @@ class ProjectController extends CommonController $sheet = $spreadsheet->getActiveSheet(); $sheet->setCellValue('A1', '日期'); $sheet->setCellValue('B1', '名字'); - $sheet->setCellValue('C1', '医院'); - $sheet->setCellValue('D1', '详情'); - $sheet->setCellValue('E1', '建议'); - $sheet->setCellValue('F1', '总分'); + $sheet->setCellValue('C1', '电话'); + $sheet->setCellValue('D1', '医院'); + $sheet->setCellValue('E1', '详情'); + $sheet->setCellValue('F1', '建议'); + $sheet->setCellValue('G1', '总分'); $sheet->getColumnDimension('A')->setWidth(20); $sheet->getColumnDimension('B')->setWidth(20); @@ -334,6 +335,8 @@ class ProjectController extends CommonController $sheet->getColumnDimension('D')->setWidth(60); $sheet->getColumnDimension('E')->setWidth(20); $sheet->getColumnDimension('F')->setWidth(20); + $sheet->getColumnDimension('G')->setWidth(20); + $count = count($data); //计算有多少条数据1 for ($i = 2; $i <= $count + 1; $i++) { @@ -342,7 +345,8 @@ class ProjectController extends CommonController $content .= $item['ask'] . ':' . $item['score'] . "\n"; } $sheet->setCellValue('A' . $i, $data[$i - 2]['date']); - $sheet->setCellValue('B' . $i, $data[$i - 2]['admin']['name']); + $sheet->setCellValue('B' . $i, $data[$i - 2]['name']); + $sheet->setCellValue('B' . $i, $data[$i - 2]['mobile']); $sheet->setCellValue('C' . $i, $data[$i - 2]['project']['name']); $sheet->setCellValue('D' . $i, $content); $sheet->setCellValue('E' . $i, $data[$i - 2]['tip']); diff --git a/resources/views/admin/layouts/layout.blade.php b/resources/views/admin/layouts/layout.blade.php index 5b10cdb..b9bdb1d 100644 --- a/resources/views/admin/layouts/layout.blade.php +++ b/resources/views/admin/layouts/layout.blade.php @@ -39,6 +39,9 @@ word-break: keep-all; white-space: nowrap; } + body[data-leftbar-compact-mode=condensed] .wrapper .content-page{ + margin-left: 0px; + }