diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue index 4889e856..02c741ec 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue @@ -193,10 +193,10 @@ export default { await eventMap[`${key}${status ? "" : "_close"}`]?.call(this, item, this.filterData, isDefault); } await Promise.allSettled(tabContentData.map(item => eventMapCall(item, true))) + Object.keys(lngLatMap).forEach(key => { + addInGraphHandle(lngLatMap[key]); + }); - // Object.keys(lngLatMap).forEach(key => { - // addInGraphHandle(lngLatMap[key]); - // }); }, 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 379ef406..911b1124 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 @@ -243,7 +243,7 @@ export const eventMap = { }); } const warningState = 1; - const data = await getPerceiveEventList({ warningState }) + const data = await getPerceiveEventList({ warningState }, filterData) .then(async (data) => { await delay(600); return data; 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 34e40695..86934eb8 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 @@ -280,28 +280,27 @@ function padZero(num) { * 交通事件 列表 根据类型获取 * @param {number} eventType */ -export function getEventTopicList(eventType, options) { +export function getEventTopicList(eventType, options = {}) { return new Promise((resolve, reject) => { if (!eventType) { Message.error(`事件加载失败!`); return reject(); } - console.log(options, "options xxxx"); + const { endStakeMark, startStakeMark } = options; let url = `/business/trafficIncidents/getEventList?eventType=${eventType}`; if (endStakeMark) { - let formatEndStakeMark = `K${padZero(endStakeMark[0])}+${padZero( + let formatEndStakeMark = `K${padZero(endStakeMark[0])}%2B${padZero( endStakeMark[1] )}`; url += `&endStakeMark=${formatEndStakeMark}`; } if (startStakeMark) { - let formatStartStakeMark = `K${padZero(startStakeMark[0])}+${padZero( + let formatStartStakeMark = `K${padZero(startStakeMark[0])}%2B${padZero( startStakeMark[1] )}`; url += `&startStakeMark=${formatStartStakeMark}`; } - request({ url: url, method: "post", @@ -325,12 +324,27 @@ export function getEventTopicList(eventType, options) { * 感知事件根据类型获取 * @param {number} eventType */ -export function getPerceiveEventList(data = {}, options) { +export function getPerceiveEventList(data = {}, options = {}) { return new Promise((resolve, reject) => { const completeTime = moment().add(1, "d").format("YYYY-MM-DD"); const startTime = moment().add(-30, "d").format("YYYY-MM-DD"); data.startTime = startTime; data.completeTime = completeTime; + + const { endStakeMark, startStakeMark } = options; + if (endStakeMark) { + let formatEndStakeMark = `K${padZero(endStakeMark[0])}+${padZero( + endStakeMark[1] + )}`; + data.endStakeMark = formatEndStakeMark; + } + if (startStakeMark) { + let formatStartStakeMark = `K${padZero(startStakeMark[0])}+${padZero( + startStakeMark[1] + )}`; + data.startStakeMark = formatStartStakeMark; + } + request({ url: `/perceivedEvents/warning/warningList`, method: "POST",