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..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 @@ -8,16 +8,16 @@
- - - -
+ + + + @@ -138,30 +138,39 @@ 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", }) .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("事件解除成功"); - this.$emit('traffic-relieve',this.data); + // 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.data.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); }); }) - .catch(() => {}); + .catch(() => { }); }, }, }; @@ -217,13 +226,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; + +} 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() {