Browse Source

更新设备在线搜索

wangqin
王钦 7 months ago
parent
commit
82b391c214
  1. 1
      ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/buttonEvent.js
  2. 19
      ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/httpList.js

1
ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/buttonEvent.js

@ -140,7 +140,6 @@ export const eventMap = {
iconClass: "el-icon-loading", iconClass: "el-icon-loading",
}); });
} }
const data = await getDeviceList(config.deviceType, filterData) const data = await getDeviceList(config.deviceType, filterData)
.then(async (data) => { .then(async (data) => {
await delay(600); await delay(600);

19
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]}设备加载失败!`); // Message.error(`${DeviceTypeMap[deviceType]}设备加载失败!`);
return reject(); return reject();
} }
// const data = {
// deviceType,
// ...options,
// };
let newEndStakeMark = []; let newEndStakeMark = [];
let newStartStakeMark = []; let newStartStakeMark = [];
@ -224,16 +219,20 @@ export function getDeviceList(deviceType, options) {
options.startStakeMark.forEach((item) => { options.startStakeMark.forEach((item) => {
newStartStakeMark.push(String(item)); newStartStakeMark.push(String(item));
}); });
let data = {
deviceType,
endStakeMark: newEndStakeMark,
startStakeMark: newStartStakeMark
}
if(options.deviceState && options.deviceState !== ''){
data['deviceState'] = options.deviceState
}
request( request(
Object.keys(options || {}).length Object.keys(options || {}).length
? { ? {
url: "/business/device/pileNumberQuery", url: "/business/device/pileNumberQuery",
method: "POST", method: "POST",
data: { data,
deviceType,
endStakeMark: newEndStakeMark,
startStakeMark: newStartStakeMark,
},
} }
: { : {
url: "/business/device/query", url: "/business/device/query",

Loading…
Cancel
Save