From 502802feaf89cf72bb7ef8d62cd489d27163b7d8 Mon Sep 17 00:00:00 2001 From: zhoule Date: Tue, 6 Feb 2024 17:27:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E5=88=97=E8=A1=A8-=E5=91=8A?= =?UTF-8?q?=E8=AD=A6=E4=BA=8B=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/control/event/event/index.vue | 34 +++++++++++++------ 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/index.vue index a1288fdd..8f2328dd 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/index.vue @@ -128,7 +128,7 @@ export default { this.searchData.eventState = activeName == "-1" ? null : activeName; - this.getData(); + this.getData(activeName); }, getStateCardBind(item) { const { state, textColor, text } = tabMap[this.activeName]; @@ -140,15 +140,29 @@ export default { }; }, getData() { - request({ - url: `/dc/system/event/list`, - method: "get", - params: this.searchData, - }).then((result) => { - if (result.code != 200) return Message.error(result?.msg); - this.data = result.rows; - this.total = result.total; - }); + + if (this.activeName == '-1') { + request({ + url: `/perceivedEvents/warning/perceivedEventsList`, + method: "post", + data: this.searchData, + }).then((result) => { + if (result.code != 200) return Message.error(result?.msg); + this.data = result.rows; + this.total = result.total; + }); + } else { + request({ + url: `/dc/system/event/list`, + method: "get", + params: this.searchData, + }).then((result) => { + if (result.code != 200) return Message.error(result?.msg); + this.data = result.rows; + this.total = result.total; + }); + } + // request({ // url: `/dc/system/event/count`,