Browse Source

fix 3181无法关闭图标bug

wangqin
qingzhengli 11 months ago
parent
commit
81a45f82f3
  1. 5
      ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue
  2. 18
      ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/buttonEvent.js

5
ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue

@ -234,7 +234,10 @@ export default {
console.log("%c [ key ]-102-「index.vue」", "font-size:15px; background:#9d63e9; color:#e1a7ff;", key); console.log("%c [ key ]-102-「index.vue」", "font-size:15px; background:#9d63e9; color:#e1a7ff;", key);
if (!eventMap[`${key}${status ? "_close" : ""}`]) return this.$emit("onClickItem", item); if (!eventMap[`${key}${status ? "_close" : ""}`]) {
this.emitter.emit("selectedCompleted", item);
return this.$emit("onClickItem", item);
}
console.log(`${key}${status ? "_close" : ""}`, this.filterData, isDefault) console.log(`${key}${status ? "_close" : ""}`, this.filterData, isDefault)
await eventMap[`${key}${status ? "_close" : ""}`]?.call(this, item, this.filterData, isDefault, this.cb); await eventMap[`${key}${status ? "_close" : ""}`]?.call(this, item, this.filterData, isDefault, this.cb);

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

@ -144,9 +144,11 @@ export const eventMap = {
loadingMessage?.close(); loadingMessage?.close();
if (!data) return; if (!data) return this.emitter.emit("selectedCompleted", item);
if (!data.length && !isDefault) if (!data.length && !isDefault) {
this.emitter.emit("selectedCompleted", item);
return Message.warning(`未查询到${item.title}设备!`); return Message.warning(`未查询到${item.title}设备!`);
}
eventMap[`地图路测设备/map_close`](item); eventMap[`地图路测设备/map_close`](item);
const cbCall = () => const cbCall = () =>
@ -200,10 +202,12 @@ export const eventMap = {
loadingMessage?.close(); loadingMessage?.close();
if (!data) return; if (!data) return this.emitter.emit("selectedCompleted", item);
if (!data.length && !isDefault) if (!data.length && !isDefault) {
this.emitter.emit("selectedCompleted", item);
return Message.warning(`没有${item.title}事件数据!`); return Message.warning(`没有${item.title}事件数据!`);
}
eventMap[`地图事件专题/map_close`](item); eventMap[`地图事件专题/map_close`](item);
const cbCall = () => cb?.(item, { deviceType: `事件专题_${deviceType}` }); const cbCall = () => cb?.(item, { deviceType: `事件专题_${deviceType}` });
@ -257,10 +261,12 @@ export const eventMap = {
.catch(() => {}); .catch(() => {});
loadingMessage?.close(); loadingMessage?.close();
if (!data) return; if (!data) return this.emitter.emit("selectedCompleted", item);
if (!data?.length && !isDefault) if (!data?.length && !isDefault) {
this.emitter.emit("selectedCompleted", item);
return Message.warning(`没有${item.title}数据!`); return Message.warning(`没有${item.title}数据!`);
}
eventMap[`事件专题/感知事件_close`](item); eventMap[`事件专题/感知事件_close`](item);
const cbCall = () => cb?.(item, { deviceType: `感知事件_${warningState}` }); const cbCall = () => cb?.(item, { deviceType: `感知事件_${warningState}` });

Loading…
Cancel
Save