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",