From d373a66a35919717a928eaa4f97d8a6b2bedf0c9 Mon Sep 17 00:00:00 2001
From: "HESU\\HESU" <1696136552@qq.com>
Date: Tue, 10 Jun 2025 17:48:34 +0800
Subject: [PATCH] 1

---
 app/controller/VehicleController.php       |  3 +++
 plugin/admin/app/lang/ar/location.php      |  9 ++++++++-
 plugin/admin/app/lang/en/location.php      |  8 +++++++-
 plugin/admin/app/lang/ru/location.php      |  9 ++++++++-
 plugin/admin/app/lang/zh-cn/location.php   | 11 +++++++++--
 plugin/admin/app/view/location/index.html  |  2 +-
 plugin/admin/app/view/location/insert.html | 13 +++++++++++++
 plugin/admin/app/view/location/update.html |  1 +
 8 files changed, 50 insertions(+), 6 deletions(-)

diff --git a/app/controller/VehicleController.php b/app/controller/VehicleController.php
index d16d403..b2289e5 100644
--- a/app/controller/VehicleController.php
+++ b/app/controller/VehicleController.php
@@ -337,6 +337,9 @@ class VehicleController
     public function shipList(Request $request){
         $navigate = LogisticsShip::where(['status' => 0])->get();
         $pending = LogisticsShip::where(['status' => 1])->get();
+        foreach ($pending as &$val) {
+            $pending['count'] = Vehicle::where(['locations_id' => $val->id])->count();
+        }
         $result = ['navigate' => $navigate,'pending' => $pending];
 
         return Util::success($result);
diff --git a/plugin/admin/app/lang/ar/location.php b/plugin/admin/app/lang/ar/location.php
index 191c83a..d7c1a04 100644
--- a/plugin/admin/app/lang/ar/location.php
+++ b/plugin/admin/app/lang/ar/location.php
@@ -36,5 +36,12 @@ return [
     'pagination_next' => 'التالي',
     'pagination_jump' => 'انتقل إلى',
     'pagination_go' => 'انتقل',
-    'data_not_found' => 'لم يتم العثور على البيانات'
+    'data_not_found' => 'لم يتم العثور على البيانات',
+
+
+    'production' => 'Производственные города',
+    'lng' => 'Долгота',
+    'lat' => 'Измерения',
+    'lng_placeholder' => 'Введите долготу.',
+    'lat_placeholder' => 'Введите широту.',
 ]; 
\ No newline at end of file
diff --git a/plugin/admin/app/lang/en/location.php b/plugin/admin/app/lang/en/location.php
index 07aad1f..143ecd6 100644
--- a/plugin/admin/app/lang/en/location.php
+++ b/plugin/admin/app/lang/en/location.php
@@ -36,5 +36,11 @@ return [
     'pagination_next' => 'Next',
     'pagination_jump' => 'Jump to',
     'pagination_go' => 'Go',
-    'data_not_found' => 'Data not found'
+    'data_not_found' => 'Data not found',
+
+    'production' => 'producer city',
+    'lng' => 'longitude',
+    'lat' => 'latitude',
+    'lng_placeholder' => 'Please enter longitude',
+    'lat_placeholder' => 'Please enter latitude',
 ]; 
\ No newline at end of file
diff --git a/plugin/admin/app/lang/ru/location.php b/plugin/admin/app/lang/ru/location.php
index c1d3c7c..120f3c6 100644
--- a/plugin/admin/app/lang/ru/location.php
+++ b/plugin/admin/app/lang/ru/location.php
@@ -36,5 +36,12 @@ return [
     'pagination_next' => 'Следующая',
     'pagination_jump' => 'Перейти к',
     'pagination_go' => 'Перейти',
-    'data_not_found' => 'Данные не найдены'
+    'data_not_found' => 'Данные не найдены',
+
+
+    'production' => 'Производственные города',
+    'lng' => 'Долгота',
+    'lat' => 'Измерения',
+    'lng_placeholder' => 'Введите долготу.',
+    'lat_placeholder' => 'Введите широту.',
 ]; 
\ No newline at end of file
diff --git a/plugin/admin/app/lang/zh-cn/location.php b/plugin/admin/app/lang/zh-cn/location.php
index 9a9b487..2439ca1 100644
--- a/plugin/admin/app/lang/zh-cn/location.php
+++ b/plugin/admin/app/lang/zh-cn/location.php
@@ -36,5 +36,12 @@ return [
     'pagination_next' => '下一页',
     'pagination_jump' => '跳转',
     'pagination_go' => '确定',
-    'data_not_found' => '未找到数据'
-]; 
\ No newline at end of file
+    'data_not_found' => '未找到数据',
+
+
+    'production' => '生产城市',
+    'lng' => '经度',
+    'lat' => '维度',
+    'lng_placeholder' => '请输入经度',
+    'lat_placeholder' => '请输入纬度',
+];
\ No newline at end of file
diff --git a/plugin/admin/app/view/location/index.html b/plugin/admin/app/view/location/index.html
index c2d13be..c9024b5 100644
--- a/plugin/admin/app/view/location/index.html
+++ b/plugin/admin/app/view/location/index.html
@@ -99,7 +99,7 @@
                             if (typeof d[field] == "undefined") return "";
                             let items = [];
                             layui.each((d[field] + "").split(","), function (k , v) {
-                                items.push(v === 'port' ? translations.type_port : translations.type_warehouse);
+                                items.push(v === 'port' ? translations.type_port : (v === 'production' ? translations.production : translations.type_warehouse));
                             });
                             return util.escape(items.join(","));
                         }
diff --git a/plugin/admin/app/view/location/insert.html b/plugin/admin/app/view/location/insert.html
index 02b09b0..f2614e8 100644
--- a/plugin/admin/app/view/location/insert.html
+++ b/plugin/admin/app/view/location/insert.html
@@ -41,8 +41,21 @@
                 <div class="layui-input-block">
                     <input type="checkbox" name="type" value="port" title="<?= $translations['type_port'] ?? '港口' ?>" lay-skin="primary">
                     <input type="checkbox" name="type" value="warehouse" title="<?= $translations['type_warehouse'] ?? '仓库' ?>" lay-skin="primary">
+                    <input type="checkbox" name="type" value="production" title="<?= $translations['production'] ?? '生产城市' ?>" lay-skin="primary">
                 </div>
             </div>
+<!--            <div class="layui-form-item">-->
+<!--                <label class="layui-form-label"><?= $translations['lng'] ?? '经度' ?></label>-->
+<!--                <div class="layui-input-block">-->
+<!--                    <input type="text" name="lng" placeholder="<?= $translations['lng_placeholder'] ?? '请输入经度' ?>" autocomplete="off" class="layui-input">-->
+<!--                </div>-->
+<!--            </div>-->
+<!--            <div class="layui-form-item">-->
+<!--                <label class="layui-form-label"><?= $translations['lat'] ?? '维度' ?></label>-->
+<!--                <div class="layui-input-block">-->
+<!--                    <input type="text" name="lat" placeholder="<?= $translations['lat_placeholder'] ?? '请输入维度' ?>" autocomplete="off" class="layui-input">-->
+<!--                </div>-->
+<!--            </div>-->
 
             <div class="layui-form-item">
                 <div class="layui-input-block">
diff --git a/plugin/admin/app/view/location/update.html b/plugin/admin/app/view/location/update.html
index 67548b7..2e9b752 100644
--- a/plugin/admin/app/view/location/update.html
+++ b/plugin/admin/app/view/location/update.html
@@ -48,6 +48,7 @@
                         <div class="layui-input-block">
                             <input type="checkbox" name="type" value="port" title="<?= $translations['type_port'] ?? '港口' ?>" lay-skin="primary">
                             <input type="checkbox" name="type" value="warehouse" title="<?= $translations['type_warehouse'] ?? '仓库' ?>" lay-skin="primary">
+                            <input type="checkbox" name="type" value="production" title="<?= $translations['production'] ?? '生产城市' ?>" lay-skin="primary">
                         </div>
                     </div>