From ae5b589624ab07b0da34a08b15980eee689eb3d9 Mon Sep 17 00:00:00 2001
From: 19173159168 <majian314@163.com>
Date: Sun, 7 Sep 2025 13:35:25 +0800
Subject: [PATCH] =?UTF-8?q?BRS=E8=BD=A6=E8=BE=86=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/templates/operation/car/add.html    |  9 ++++++++-
 .../resources/templates/operation/car/car.html    | 15 +++++++++++++--
 .../resources/templates/operation/car/edit.html   |  9 ++++++++-
 3 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/operation/car/add.html b/ruoyi-admin/src/main/resources/templates/operation/car/add.html
index 13415b2..c541f20 100644
--- a/ruoyi-admin/src/main/resources/templates/operation/car/add.html
+++ b/ruoyi-admin/src/main/resources/templates/operation/car/add.html
@@ -67,7 +67,14 @@
                     </select>
                 </div>
             </div>
-
+            <div class="form-group">
+                <label class="col-sm-3 control-label">BRS车辆状态：</label>
+                <div class="col-sm-8">
+                    <select name="brsStatus" class="form-control m-b" th:with="type=${@dict.getType('key_car_brs_status')}">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                    </select>
+                </div>
+            </div>
             <div class="form-group">    
                 <label class="col-sm-3 control-label">IoT识别码：</label>
                 <div class="col-sm-8">
diff --git a/ruoyi-admin/src/main/resources/templates/operation/car/car.html b/ruoyi-admin/src/main/resources/templates/operation/car/car.html
index e0cf346..ed3414e 100644
--- a/ruoyi-admin/src/main/resources/templates/operation/car/car.html
+++ b/ruoyi-admin/src/main/resources/templates/operation/car/car.html
@@ -37,6 +37,13 @@
                                 <label>所属门店：</label>
                                 <input type="text" name="storeName"/>
                             </li>
+                            <li>
+                                <label>BRS车辆状态：</label>
+                                <select name="brsStatus" th:with="type=${@dict.getType('key_car_brs_status')}">
+                                    <option value="">所有</option>
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                                </select>
+                            </li>
                             <li>
                                 <label>车辆状态：</label>
                                 <select name="status" th:with="type=${@dict.getType('key_car_status')}">
@@ -81,6 +88,7 @@
         var distributeFlag = [[${@permission.hasPermi('operation:car:distribute')}]];
         var removeFlag = [[${@permission.hasPermi('operation:car:remove')}]];
         var statusDatas = [[${@dict.getType('key_car_status')}]];
+        var brsStatusDatas = [[${@dict.getType('key_car_brs_status')}]];
         var batteryTypeDatas = [[${@dict.getType('key_car_battery_type')}]];
         var belongTypeDatas = [[${@dict.getType('key_car_belong_type')}]];
         var prefix = ctx + "operation/car";
@@ -140,7 +148,10 @@
                 },
                 {
                     field: 'brsStatus',
-                    title: 'BRS车辆状态'
+                    title: 'BRS车辆状态',
+                    formatter: function(value, row, index) {
+                        return $.table.selectDictLabel(brsStatusDatas, value);
+                    }
                 },
                 {
                     field: 'iotStatus',
@@ -160,7 +171,7 @@
                 },
                 {
                     field: 'status',
-                    title: '车辆状态',
+                    title: '状态',
                     formatter: function(value, row, index) {
                         return $.table.selectDictLabel(statusDatas, value);
                     }
diff --git a/ruoyi-admin/src/main/resources/templates/operation/car/edit.html b/ruoyi-admin/src/main/resources/templates/operation/car/edit.html
index 6e12129..2f29b5b 100644
--- a/ruoyi-admin/src/main/resources/templates/operation/car/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/operation/car/edit.html
@@ -69,7 +69,14 @@
                     </select>
                 </div>
             </div>
-
+            <div class="form-group">
+                <label class="col-sm-3 control-label">BRS车辆状态：</label>
+                <div class="col-sm-8">
+                    <select name="brsStatus" class="form-control m-b" th:with="type=${@dict.getType('key_car_brs_status')}">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{brsStatus}"></option>
+                    </select>
+                </div>
+            </div>
             <div class="form-group">    
                 <label class="col-sm-3 control-label">IoT识别码：</label>
                 <div class="col-sm-8">