diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/Dialog/index.vue b/ruoyi-ui/src/views/JiHeExpressway/components/Dialog/index.vue index d96d1c7e..5c086f66 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/components/Dialog/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/components/Dialog/index.vue @@ -165,7 +165,7 @@ export default { .dialog-content { padding: 9px 21px 27px 21px; - max-height: 90vh; + max-height: 75vh; overflow-y: auto; } 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 eaab0514..be21983a 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 @@ -230,7 +230,7 @@ export const eventMap = { iconClass: "el-icon-loading", }); } - const data = await getPerceiveEventList() + const data = await getPerceiveEventList({warningState: 1}) .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 16dc309f..0001db2e 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 @@ -297,12 +297,12 @@ export function getEventTopicList(eventType) { * 感知事件根据类型获取 * @param {number} eventType */ -export function getPerceiveEventList() { +export function getPerceiveEventList(data = {}) { return new Promise((resolve, reject) => { request({ url: `/perceivedEvents/warning/perceivedEventsList`, method: "POST", - data: {}, + data: {...data}, }) .then(({ code, rows }) => { if (code != 200) { diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/emergencyProcessManagement/commonPhrases/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/emergencyProcessManagement/commonPhrases/index.vue index f9a39d87..80265e13 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/emergencyProcessManagement/commonPhrases/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/emergencyProcessManagement/commonPhrases/index.vue @@ -39,9 +39,9 @@ @@ -235,7 +235,8 @@ export default { display: flex; gap: 9px; width: 836px; - height: 768px; + // height: 768px; + min-height: 500px; margin-top: 20px; flex-direction: column; diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/emergencyProcessManagement/disposalProcess/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/emergencyProcessManagement/disposalProcess/index.vue index 8ac44053..2af67d2d 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/emergencyProcessManagement/disposalProcess/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/emergencyProcessManagement/disposalProcess/index.vue @@ -47,9 +47,9 @@ @@ -276,7 +276,8 @@ export default { display: flex; gap: 9px; width: 836px; - height: 768px; + min-height: 500px; + // height: 768px; flex-direction: column; .video-pic { diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/index.vue index aeca27f2..7075db0e 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/index.vue @@ -8,13 +8,13 @@
- - + + @@ -195,7 +195,7 @@ export default { Message.error("提交失败"); }).finally(() => { this.submitting = false; - this.$emit('queryData',true); + this.$emit('queryData', true); }) }) @@ -219,7 +219,7 @@ export default { .EventDetailDialog { gap: 9px; width: 1050px; - height: 810px; + // height: 810px; display: flex; flex-direction: column; diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/index.vue index f952b135..2a359adb 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/index.vue @@ -151,8 +151,8 @@ export default { dateTime: "2024", direction: "1", dataList: [], - selectIndex: 2, - selectId: 2, + selectIndex: 1, + selectId: 1, reset: false, type: "year", chart1List: [], @@ -216,8 +216,8 @@ export default { this.direction = "1"; this.type = "year"; this.dateTime = "2024"; - this.selectId = 2; - this.selectIndex = 2; + this.selectId = 1; + this.selectIndex = 1; this.reset = true; this.searchQuery(); },