From 413add0bc8d7f9b58a1a0c90dc8d979c04f16cdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E9=92=A6?= <360013221@qq.com> Date: Fri, 26 Apr 2024 20:35:08 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E7=AE=A1=E6=8E=A7=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E7=BB=91=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/Home/components/HomeFrameControl/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFrameControl/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFrameControl/index.vue index 67e2b74b..22d08e0b 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFrameControl/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFrameControl/index.vue @@ -153,7 +153,7 @@ export default { }, watch: { dataRecord(e) { - console.log(e) + this.bindRecord() }, }, data() { From 922e5e6e306374bf61e30a0991fd4304899a5d7b Mon Sep 17 00:00:00 2001 From: zhoule Date: Fri, 26 Apr 2024 20:35:20 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Dialogs/TrafficIncidents/index.vue | 55 ++++++++++--------- 1 file changed, 28 insertions(+), 27 deletions(-) diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/TrafficIncidents/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/TrafficIncidents/index.vue index 717baa51..da51bf7a 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/TrafficIncidents/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/TrafficIncidents/index.vue @@ -8,16 +8,16 @@
- - - -
+ + + + @@ -138,15 +138,15 @@ export default { }, methods: { handleClickTabs() { }, - goDispatch(){ + goDispatch() { this.$router.push(`/control/event/commandDispatch`); }, - goStrategy(){ + goStrategy() { this.$router.push(`/control/device/strategy`); }, handleEventRelieve() { - - this.$confirm("确定解除事件吗?", "提示", { + + this.$confirm("确定事件误报吗?", "提示", { confirmButtonText: "确定", cancelButtonText: "取消", type: "warning", @@ -155,13 +155,13 @@ export default { let data = new FormData(); data.append("eventId", this.dialogData.id); postCompleteEvent(data).then((result) => { - console.log('--------',result) + console.log('--------', result) if (result.code != 200) return []; - this.$message.success("事件解除成功"); - this.$emit('traffic-relieve',this.data); + this.$message.success("成功"); + this.$emit('traffic-relieve', this.data); }); }) - .catch(() => {}); + .catch(() => { }); }, }, }; @@ -217,13 +217,14 @@ export default { } } } - .foote{ - display: flex; - align-items: center; - gap: 9px; - width: 100%; - justify-content: flex-end; - margin:20px 0px -20px 0px; - - } + +.foote { + display: flex; + align-items: center; + gap: 9px; + width: 100%; + justify-content: flex-end; + margin: 20px 0px -20px 0px; + +} From ac4408cef471b19ed114d1b1322234e4e9c16a93 Mon Sep 17 00:00:00 2001 From: zhoule Date: Fri, 26 Apr 2024 20:41:23 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E8=AF=AF=E6=8A=A5?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Dialogs/TrafficIncidents/index.vue | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/TrafficIncidents/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/TrafficIncidents/index.vue index da51bf7a..ed2e997e 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/TrafficIncidents/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/TrafficIncidents/index.vue @@ -152,12 +152,21 @@ export default { type: "warning", }) .then(() => { - let data = new FormData(); - data.append("eventId", this.dialogData.id); - postCompleteEvent(data).then((result) => { - console.log('--------', result) - if (result.code != 200) return []; - this.$message.success("成功"); + // let data = new FormData(); + // data.append("eventId", this.dialogData.id); + // postCompleteEvent(data).then((result) => { + // console.log('--------', result) + // if (result.code != 200) return []; + // this.$message.success("成功"); + // this.$emit('traffic-relieve', this.data); + // }); + request({ + url: `dc/system/event/${this.dialogData.eventType}/${this.dialogData.id}`, + method: "delete", + }).then((result) => { + if (result.code == 200) Message.success("成功!"); + else Message.error(result?.msg); + this.$emit('traffic-relieve', this.data); }); }) From ae7a6669941fa413fb71ab3342618a1ae6f5a2b9 Mon Sep 17 00:00:00 2001 From: zhoule Date: Fri, 26 Apr 2024 20:46:37 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E8=AF=AF=E6=8A=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/Home/components/Dialogs/TrafficIncidents/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/TrafficIncidents/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/TrafficIncidents/index.vue index ed2e997e..5844f6ff 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/TrafficIncidents/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/TrafficIncidents/index.vue @@ -161,7 +161,7 @@ export default { // this.$emit('traffic-relieve', this.data); // }); request({ - url: `dc/system/event/${this.dialogData.eventType}/${this.dialogData.id}`, + url: `dc/system/event/${this.data.eventType}/${this.dialogData.id}`, method: "delete", }).then((result) => { if (result.code == 200) Message.success("成功!");