From ab9838c1bc5ae12c1fa7b3261b8534bef53070c8 Mon Sep 17 00:00:00 2001
From: amirghasempoor <amirghasempoor@gmail.com>
Date: Sun, 14 Jun 2026 14:13:44 +0330
Subject: [PATCH] create

---
 .../Mission/Report/Machine/machineReport.php  | 10 ++++----
 .../Report/Machine/ActivityReport.blade.php   | 23 +++++++++++--------
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/app/Exports/V3/Mission/Report/Machine/machineReport.php b/app/Exports/V3/Mission/Report/Machine/machineReport.php
index 5d11323a..f6fd812a 100644
--- a/app/Exports/V3/Mission/Report/Machine/machineReport.php
+++ b/app/Exports/V3/Mission/Report/Machine/machineReport.php
@@ -18,14 +18,16 @@ class machineReport implements FromView, ShouldAutoSize, WithDrawings, WithEvent
     }
 
     public function view(): View
-    { $exportRows = [];
+    {
+        $exportRows = [];
 
         foreach ($this->data as $r) {
             $exportRows[] = [
-                'city_name' => $r->c_name ?? '',
-                'province_name' => $r->p_name ?? '',
+                'machine_id' => $r->c_name ?? '',
+                'machine_code' => $r->machine_code ?? '',
+                'car_name' => $r->car_name ?? '',
                 'missions' => $r->missions ?? 0,
-                'distance' => (int) ($r->distance ?? 0),
+                'func' => (int) ($r->func ?? 0),
             ];
         }
 
diff --git a/resources/views/v3/Reports/Mission/Report/Machine/ActivityReport.blade.php b/resources/views/v3/Reports/Mission/Report/Machine/ActivityReport.blade.php
index a3ffc93b..53091d8b 100644
--- a/resources/views/v3/Reports/Mission/Report/Machine/ActivityReport.blade.php
+++ b/resources/views/v3/Reports/Mission/Report/Machine/ActivityReport.blade.php
@@ -46,19 +46,23 @@
     <tr>
         <th rowspan="1"
             style="text-align: center;border: 1px solid black;background-color: #EBF1DE;font-weight: bold;">
-            استان
+            کدیکتا
         </th>
         <th rowspan="1"
             style="text-align: center;border: 1px solid black;background-color: #EBF1DE;font-weight: bold;">
-            شهر
+             مدل ماشین </th>
+        <th rowspan="1"
+            style="text-align: center;border: 1px solid black;background-color: #EBF1DE;font-weight: bold;">
+            کد ماشین
+        </th>
+        <th rowspan="1"
+            style="text-align: center;border: 1px solid black;background-color: #EBF1DE;font-weight: bold;">
+            کارکرد
         </th>
         <th rowspan="1"
             style="text-align: center;border: 1px solid black;background-color: #EBF1DE;font-weight: bold;">
             تعداد ماموریت </th>
-        <th rowspan="1"
-            style="text-align: center;border: 1px solid black;background-color: #EBF1DE;font-weight: bold;">
-            جمع کارکرد
-        </th>
+
 
     </tr>
     </thead>
@@ -66,10 +70,11 @@
     <tbody>
     @foreach ($rows as $item)
         <tr>
-            <td style="border: 1px solid black;text-align: center;">{{ $item['province_name'] ?? '-' }}</td>
-            <td style="border: 1px solid black;text-align: center;">{{ $item['city_name'] ?? '-' }}</td>
+            <td style="border: 1px solid black;text-align: center;">{{ $item['machine_id'] ?? '-' }}</td>
+            <td style="border: 1px solid black;text-align: center;">{{ $item['car_name'] ?? '-' }}</td>
+            <td style="border: 1px solid black;text-align: center;">{{ $item['machine_code'] ?? '-' }}</td>
+            <td style="border: 1px solid black;text-align: center;">{{ $item['func'] ?? '-' }}</td>
             <td style="border: 1px solid black;text-align: center;">{{ $item['missions'] ?? '-' }}</td>
-            <td style="border: 1px solid black;text-align: center;">{{ $item['distance'] ?? '-' }}</td>
         </tr>
     @endforeach
     </tbody>