From 81d97f833594777f6f90a00717001ab0d3200af5 Mon Sep 17 00:00:00 2001
From: wanghongjun <1445693971@qq.com>
Date: Wed, 24 Jun 2026 17:50:03 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=B8=E6=9C=BA=E7=AE=A1=E7=90=86=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E8=BF=94=E5=9B=9E4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Services/ParkingGateControlService.php | 23 ++++++++++++++++++++--
 resources/lang/en/service.php              |  2 ++
 resources/lang/zh-CN/service.php           |  2 ++
 resources/lang/zh-TW/service.php           |  2 ++
 4 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/app/Services/ParkingGateControlService.php b/app/Services/ParkingGateControlService.php
index ec4e020..d5f46a6 100644
--- a/app/Services/ParkingGateControlService.php
+++ b/app/Services/ParkingGateControlService.php
@@ -21,6 +21,12 @@ class ParkingGateControlService extends BaseService
             2 => 'manual'
         ];
 
+    public static array $leaveTypeArr
+                                   = [
+            1 => 'automatic2',
+            2 => 'manual2'
+        ];
+
     public static array $leaveRemarkArr
                                    = [
             1 => 'leave_remark1',
@@ -33,6 +39,7 @@ class ParkingGateControlService extends BaseService
     public function getItem($item)
     {
         $typeArr = $this->getType();
+        $leaveTypeArr = $this->getLeaveType();
 
         $item['reserve_id'] = '';
         if ($item['reservation_id']) {
@@ -56,7 +63,7 @@ class ParkingGateControlService extends BaseService
             $item['parking'] = Parking::getName($ParkingChannel['parking_id']);
         }
         $item['enter_type_str'] = $typeArr[$item['enter_type']] ?? '';
-        $item['leave_type_str'] = $typeArr[$item['leave_type']] ?? '';
+        $item['leave_type_str'] = $leaveTypeArr[$item['leave_type']] ?? '';
         $item['dwell_time'] = get_time_difference_str(
             $item['enter_at'],
             $item['leave_at'] ?: ''
@@ -82,6 +89,18 @@ class ParkingGateControlService extends BaseService
         return $typeArr;
     }
 
+    /**
+     * @return array|string[]
+     */
+    public function getLeaveType(): array
+    {
+        $typeArr = self::$leaveTypeArr;
+        foreach ($typeArr as $key => $value) {
+            $typeArr[$key] = __service($this->menuTitle . '.' . $value);
+        }
+        return $typeArr;
+    }
+
     /**
      * @return array|string[]
      */
@@ -231,7 +250,7 @@ class ParkingGateControlService extends BaseService
     ) {
         $time_key = $key . '_at';
         $type_key = $key . '_type';
-        $typeArr = $this->getType();
+        $typeArr = $key == 'leave' ? $this->getLeaveType() :$this->getType();
         $data = [
             'channel_name'     => '', // 车道名称
             'equipment_name'   => '', // 设备名称
diff --git a/resources/lang/en/service.php b/resources/lang/en/service.php
index d623664..9bd0aba 100644
--- a/resources/lang/en/service.php
+++ b/resources/lang/en/service.php
@@ -174,6 +174,8 @@ return [
     'gate_control' => [
         'automatic'       => 'Automatic entry',
         'manual'          => 'Manual entry',
+        'automatic2'      => 'Automatic exit',
+        'manual2'         => 'Manual exit',
         'cat_exists'      => 'The current vehicle has not left yet',
         'cat_not_exists'  => 'The current vehicle has not entered the venue',
         'not_reservation' => 'No appointment available',
diff --git a/resources/lang/zh-CN/service.php b/resources/lang/zh-CN/service.php
index 2b31f24..7be81ae 100644
--- a/resources/lang/zh-CN/service.php
+++ b/resources/lang/zh-CN/service.php
@@ -174,6 +174,8 @@ return [
     'gate_control' => [
         'automatic'       => '自动入场',
         'manual'          => '手动入场',
+        'automatic2'      => '自动出场',
+        'manual2'         => '手动出场',
         'cat_exists'      => '当前车辆还未离场',
         'cat_not_exists'  => '当前车辆未入场',
         'not_reservation' => '无预约',
diff --git a/resources/lang/zh-TW/service.php b/resources/lang/zh-TW/service.php
index 91bc32d..61c5916 100644
--- a/resources/lang/zh-TW/service.php
+++ b/resources/lang/zh-TW/service.php
@@ -174,6 +174,8 @@ return [
     'gate_control' => [
         'automatic'       => '自動入場',
         'manual'          => '手動入場',
+        'automatic2'      => '自動出場',
+        'manual2'         => '手動出場',
         'cat_exists'      => '當前車輛還未離場',
         'cat_not_exists'  => '當前車輛未入場',
         'not_reservation' => '無預約',