Merge branch 'develop' of http://39.106.31.193:9211/mengff/jihe-hs into develop

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);

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: {
+            data,
-              deviceType,
-              endStakeMark: newEndStakeMark,
-              startStakeMark: newStartStakeMark,
-            },
           }
         : {
             url: "/business/device/query",