From 82b391c214045b7aa12be2df031aff8e9b216843 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E9=92=A6?= <360013221@qq.com>
Date: Fri, 26 Apr 2024 23:23:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=AE=BE=E5=A4=87=E5=9C=A8?=
 =?UTF-8?q?=E7=BA=BF=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../RoadAndEvents/utils/buttonEvent.js        |  1 -
 .../RoadAndEvents/utils/httpList.js           | 19 +++++++++----------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/buttonEvent.js b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/buttonEvent.js
index dc74fc65..a1a465f2 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/buttonEvent.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/buttonEvent.js
@@ -140,7 +140,6 @@ export const eventMap = {
         iconClass: "el-icon-loading",
       });
     }
-
     const data = await getDeviceList(config.deviceType, filterData)
       .then(async (data) => {
         await delay(600);
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/httpList.js b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/httpList.js
index d63af653..1e1493e4 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/httpList.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/httpList.js
@@ -210,11 +210,6 @@ export function getDeviceList(deviceType, options) {
       // Message.error(`${DeviceTypeMap[deviceType]}设备加载失败!`);
       return reject();
     }
-
-    // const data = {
-    //   deviceType,
-    //   ...options,
-    // };
     let newEndStakeMark = [];
     let newStartStakeMark = [];
 
@@ -224,16 +219,20 @@ export function getDeviceList(deviceType, options) {
     options.startStakeMark.forEach((item) => {
       newStartStakeMark.push(String(item));
     });
+    let data = {
+      deviceType,
+      endStakeMark: newEndStakeMark,
+      startStakeMark: newStartStakeMark
+    }
+    if(options.deviceState && options.deviceState !== ''){
+      data['deviceState'] = options.deviceState
+    }
     request(
       Object.keys(options || {}).length
         ? {
             url: "/business/device/pileNumberQuery",
             method: "POST",
-            data: {
-              deviceType,
-              endStakeMark: newEndStakeMark,
-              startStakeMark: newStartStakeMark,
-            },
+            data,
           }
         : {
             url: "/business/device/query",