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/7] =?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/7] =?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 d77b9fa5a7ffd8fc755b4be09fa99b6cd4bb6120 Mon Sep 17 00:00:00 2001 From: zhangzhang <1747194829@qq.com> Date: Fri, 26 Apr 2024 20:38:06 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/auditAnalytics/index.vue | 4 +++- .../statistic/components/Sitefiltering/index.vue | 3 ++- .../Sitefiltering/trafficIncidentsChartsPie.js | 12 ++++++++++++ 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/auditAnalytics/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/auditAnalytics/index.vue index 15f0f053..cf0d7073 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/auditAnalytics/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/auditAnalytics/index.vue @@ -260,12 +260,12 @@ export default { } .content-item-right { - overflow: hidden; } } .box-item { position: relative; + height: 8px; width: 289px; background: linear-gradient( @@ -293,6 +293,7 @@ export default { ); border-radius: 2px 2px 2px 2px; opacity: 1; + overflow: hidden; } .box-item:nth-child(2)::before { @@ -308,6 +309,7 @@ export default { ); border-radius: 2px 2px 2px 2px; opacity: 1; + overflow: hidden; } .num { diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Sitefiltering/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Sitefiltering/index.vue index 6792a117..0498fe7a 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Sitefiltering/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Sitefiltering/index.vue @@ -191,7 +191,8 @@ export default { drawRoundRect(context, 385, 372, 320, 24, 10, gr); drawRoundRect(context, 385, 406, 320, 24, 10, gr); drawRoundRect(context, 385, 440, 320, 24, 10, gr); - // drawRoundRect(context, 385, 474, 320, 24, 10, gr); + drawRoundRect(context, 385, 474, 320, 24, 10, gr); + drawRoundRect(context, 385, 510, 320, 24, 10, gr); await this.getNonAutomaticWarningFacility(this.formData); }); }); diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Sitefiltering/trafficIncidentsChartsPie.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Sitefiltering/trafficIncidentsChartsPie.js index 0beee08d..29df6f9b 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Sitefiltering/trafficIncidentsChartsPie.js +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Sitefiltering/trafficIncidentsChartsPie.js @@ -11,6 +11,18 @@ let colors = [ "#05E599", "#219F73", "#7CEDD5", + "#4278F8", + "#5372C4", + "#0046FF", + "#FB9434", + "#854101", + "#05E599", + "#219F73", + "#7CEDD5", + "#854101", + "#05E599", + "#219F73", + "#7CEDD5", ]; var legendData = []; From ac4408cef471b19ed114d1b1322234e4e9c16a93 Mon Sep 17 00:00:00 2001 From: zhoule Date: Fri, 26 Apr 2024 20:41:23 +0800 Subject: [PATCH 4/7] =?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 7785b415511e75277d7c3b556af6c194c0abd56b Mon Sep 17 00:00:00 2001 From: zhangzhang <1747194829@qq.com> Date: Fri, 26 Apr 2024 20:46:36 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E5=AE=8C=E5=96=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commandDispatch/Cards/DisposalProcess/index.vue | 8 +++++++- .../statistic/components/Sitefiltering/index.vue | 4 ++-- .../Sitefiltering/trafficIncidentsChartsPie.js | 12 ------------ 3 files changed, 9 insertions(+), 15 deletions(-) diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DisposalProcess/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DisposalProcess/index.vue index 78ad322b..c1a15cd8 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DisposalProcess/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DisposalProcess/index.vue @@ -70,7 +70,7 @@ > 点击上传 - + Date: Fri, 26 Apr 2024 20:46:37 +0800 Subject: [PATCH 6/7] =?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("成功！"); From 17f01c57c78a33a7a9ff42fd79908bf7b5a6e7c1 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:50:27 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=AE=A1=E6=8E=A7?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/Home/components/HomeFrameControl/index.vue | 6 +++++- ruoyi-ui/vue.config.js | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) 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 22d08e0b..84ffb511 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 @@ -475,7 +475,11 @@ export default { request({ url: `/business/dcOperLog/list`, method: "get", - params: {...this.searchData,operType:this.dataRecord.operType}, + params: { + ...this.searchData, + operType:this.dataRecord.operType, + startTime:this.dataRecord.operTime[0], + endTime:this.dataRecord.operTime[1]} }) .then((result) => { if (result.code != 200) return; diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js index 59319d90..35bf9094 100644 --- a/ruoyi-ui/vue.config.js +++ b/ruoyi-ui/vue.config.js @@ -53,8 +53,8 @@ module.exports = { // target: `http://10.168.69.255:8087`, //正晨后台 连现场物联 刘文阁 // target: `http://10.168.78.135:8087`, //王钦 // target: `http://10.168.66.196:8087`, //正晨后台 连现场物联 刘文阁2 - target: `http://10.168.68.42:8087`, //王思祥 - // target: `http://10.168.72.174:8087`, //赵祥龙 + // target: `http://10.168.68.42:8087`, //王思祥 + target: `http://10.168.72.174:8087`, //赵祥龙 // target: `http://10.168.65.156:8097`, //孟 // target: `http://10.168.56.165:8087`, //王家宝 // target: `http://10.168.77.128:8087`, //王兴琳