From 55cb3079206c8752932b69f9b917d304114fea2d Mon Sep 17 00:00:00 2001
From: liyinglin <liyl@langye.net>
Date: Wed, 3 Jan 2024 17:59:48 +0800
Subject: [PATCH] 1

---
 .../Admin/StatisticsController.php            |  4 +-
 .../views/admin/statistics/huli.blade.php     | 67 +++++++++----------
 2 files changed, 32 insertions(+), 39 deletions(-)

diff --git a/app/Http/Controllers/Admin/StatisticsController.php b/app/Http/Controllers/Admin/StatisticsController.php
index 4afcb31..fbacd68 100755
--- a/app/Http/Controllers/Admin/StatisticsController.php
+++ b/app/Http/Controllers/Admin/StatisticsController.php
@@ -409,12 +409,12 @@ class StatisticsController extends CommonController
             // 获取所有床位id
             $bedIds = Bed::where('area_id', $item->id)->pluck('id');
             $order = Orders::whereIn('bed_id', $bedIds)->where('status', 100)->get();
+            $item->orderTotal = $order->sum('total');
             $item->lies = $this->getLies($project_id, $order->pluck('id'));
         }
         // 获取所有列
         $lie = array_column($data[0]->lies,'name');
-        dd($data->toArray());
-        return view($this->bladePath . ".huli", compact("data"));
+        return view($this->bladePath . ".huli", compact("data","lie"));
     }
 
     /**
diff --git a/resources/views/admin/statistics/huli.blade.php b/resources/views/admin/statistics/huli.blade.php
index 6f90b07..36cc2a7 100644
--- a/resources/views/admin/statistics/huli.blade.php
+++ b/resources/views/admin/statistics/huli.blade.php
@@ -5,51 +5,44 @@
         <div class="col-12">
             <div class="card">
                 <div class="card-body">
-                    <div class="mb-3">
-                        <a class="btn btn-primary" href="{{url($urlPrefix.'/asksubmit_create')}}">
-                            @lang("icons.action_create") @lang('actions.create')新建满意度调查
-                        </a>
-                    </div>
-
                     <table class="table table-bordered" id="data-table">
                         <thead>
                         <tr>
                             <th>
-                                日期
+                                楼层
                             </th>
-                            <th>名字</th>
-                            <th>医院</th>
-                            <th>详情</th>
-                            <th>建议</th>
-                            <th>总分</th>
-                            <th>操作</th>
+                            <th>病区</th>
+                            <th>总收入</th>
+                            @foreach ($lie as $row)
+                            <th>{{$row}}</th>
+                            @endforeach
                         </tr>
                         </thead>
                         <tbody>
-                        @foreach ($data as $row)
-                            <tr data-id="{{$row->id}}">
-                                <td>
-                                    {{ $row->date }}
-                                </td>
-                                <td>
-                                    {{ $row->admin->name }}
-                                </td>
-                                <td>{{ $row->project->name }}</td>
-                                <td>
-                                    @foreach ($row->content as $item)
-                                        {{ $item['ask'] }}：{{ $item['score'] }}<br/>
-                                    @endforeach
-                                </td>
-                                <td>{{ $row->tip }}</td>
-                                <td>{{ $row->score }}</td>
-                                <td>
-                                    <a class="btn btn-sm btn-primary"
-                                       href="{{url("{$urlPrefix}/asksubmit_edit?id={$row['id']}")}}">@lang("icons.action_edit") @lang("actions.edit")</a>
-                                    <a class="btn btn-sm btn-danger btn-delete" data-id="ask-{{$row['id']}}"
-                                       href="javascript:;">@lang("icons.action_delete") @lang("actions.delete")</a>
-                                </td>
-                            </tr>
-                        @endforeach
+{{--                        @foreach ($data as $row)--}}
+{{--                            <tr data-id="{{$row->id}}">--}}
+{{--                                <td>--}}
+{{--                                    {{ $row->date }}--}}
+{{--                                </td>--}}
+{{--                                <td>--}}
+{{--                                    {{ $row->admin->name }}--}}
+{{--                                </td>--}}
+{{--                                <td>{{ $row->project->name }}</td>--}}
+{{--                                <td>--}}
+{{--                                    @foreach ($row->content as $item)--}}
+{{--                                        {{ $item['ask'] }}：{{ $item['score'] }}<br/>--}}
+{{--                                    @endforeach--}}
+{{--                                </td>--}}
+{{--                                <td>{{ $row->tip }}</td>--}}
+{{--                                <td>{{ $row->score }}</td>--}}
+{{--                                <td>--}}
+{{--                                    <a class="btn btn-sm btn-primary"--}}
+{{--                                       href="{{url("{$urlPrefix}/asksubmit_edit?id={$row['id']}")}}">@lang("icons.action_edit") @lang("actions.edit")</a>--}}
+{{--                                    <a class="btn btn-sm btn-danger btn-delete" data-id="ask-{{$row['id']}}"--}}
+{{--                                       href="javascript:;">@lang("icons.action_delete") @lang("actions.delete")</a>--}}
+{{--                                </td>--}}
+{{--                            </tr>--}}
+{{--                        @endforeach--}}
                         </tbody>
                     </table>
                     @include("public._pages")