From 6a9673433a07ec7edb07322b41ce2e07d556bfc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E9=92=A6?= <360013221@qq.com>
Date: Thu, 9 May 2024 19:52:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../images/shareWith/message-active.svg | 12 +++++-------
.../images/shareWith/message-active2.svg | 9 ---------
.../images/shareWith/message-active3.svg | 11 +++++++++++
.../Dialogs/TrafficIncidents/index.vue | 2 +-
.../Home/components/RoadAndEvents/index.vue | 2 +-
.../RoadAndEvents/utils/buttonEvent.js | 15 ++++++++-------
.../Cards/DisposalProcess/index.vue | 3 +++
.../control/event/commandDispatch/index.vue | 16 ++++++++++++----
ruoyi-ui/vue.config.js | 4 ++--
9 files changed, 43 insertions(+), 31 deletions(-)
delete mode 100644 ruoyi-ui/src/views/JiHeExpressway/images/shareWith/message-active2.svg
create mode 100644 ruoyi-ui/src/views/JiHeExpressway/images/shareWith/message-active3.svg
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/shareWith/message-active.svg b/ruoyi-ui/src/views/JiHeExpressway/images/shareWith/message-active.svg
index 53329e6a..e07f38e9 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/images/shareWith/message-active.svg
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/shareWith/message-active.svg
@@ -1,11 +1,9 @@
-
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/shareWith/message-active2.svg b/ruoyi-ui/src/views/JiHeExpressway/images/shareWith/message-active2.svg
deleted file mode 100644
index e07f38e9..00000000
--- a/ruoyi-ui/src/views/JiHeExpressway/images/shareWith/message-active2.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/shareWith/message-active3.svg b/ruoyi-ui/src/views/JiHeExpressway/images/shareWith/message-active3.svg
new file mode 100644
index 00000000..53329e6a
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/shareWith/message-active3.svg
@@ -0,0 +1,11 @@
+
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 61307ba5..fc25dace 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
@@ -139,7 +139,7 @@ export default {
methods: {
handleClickTabs() { },
goDispatch() {
- this.$router.push(`/control/event/commandDispatch`);
+ this.$router.push(`/control/event/commandDispatch?id=${this.dialogData.id}`);
},
goStrategy() {
this.$router.push(`/control/device/strategy`);
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue
index d3128498..1bd6844e 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue
@@ -274,7 +274,7 @@ export default {
} catch(e){
}
tab.forEach(async item=>{
- await this.handleDeviceImmediate(item);
+ await this.handleDeviceImmediate(item,true);
})
},
handleCleared() {
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 4b14cc68..9a6a25b3 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
@@ -328,13 +328,14 @@ export const eventMap = {
// 感知事件
async "事件专题/感知事件"(item, filterData, isDefault, cb) {
let loadingMessage;
-
- loadingMessage = Message.info({
- message: `${item.title}位置${!isDefault?'加载':'更新'}中...`,
- duration: 0,
- customClass: "loading-message",
- iconClass: "el-icon-loading",
- });
+ if(!isDefault){
+ loadingMessage = Message.info({
+ message: `${item.title}位置${!isDefault?'加载':'更新'}中...`,
+ duration: 0,
+ customClass: "loading-message",
+ iconClass: "el-icon-loading",
+ });
+ }
// if (!isDefault) {
// }
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 5ed1dc2d..e1864126 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
@@ -115,9 +115,11 @@ import {
// import { provideMixin } from "./../../mixin";
import { timeLine2List } from "./data";
import request from "@/utils/request";
+import { provideMixin } from "./../../mixin"
export default {
name: "DisposalProcess",
+ mixins: [provideMixin],
inject: ["adpScale"],
// mixins: [provideMixin],
components: {
@@ -300,6 +302,7 @@ export default {
},
},
async mounted() {
+ this.eventId = this.detailData.id;
this.getProcess();
await this.disposalRecords(this.eventId);
},
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/index.vue
index e248883b..ff282185 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/index.vue
@@ -40,10 +40,10 @@ export default {
...components,
},
props: {
- detailId: {
- type: [String, Number],
- default: "162cb8824ea141f3a96a74ad81c22796",
- },
+ // detailId: {
+ // type: [String, Number],
+ // default: "162cb8824ea141f3a96a74ad81c22796",
+ // },
},
provide() {
return {
@@ -59,10 +59,18 @@ export default {
provideData: {
detail: null,
},
+ detailId: ''
};
},
created() {
+ let h = window.location.href.split('=');
+ if(h.length === 2){
+ this.detailId = window.location.href.split('=')[1];
+ } else {
+ this.detailId = 'b825c7bbf4de43cdb8f689e270adf7a1';
+ }
this.getDetail();
+
},
methods: {
getDetail() {
diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js
index 77f27227..35bf9094 100644
--- a/ruoyi-ui/vue.config.js
+++ b/ruoyi-ui/vue.config.js
@@ -52,9 +52,9 @@ module.exports = {
// target: `http://10.0.81.204:8087`, //现场后台 刘文阁
// 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.66.196:8087`, //正晨后台 连现场物联 刘文阁2
// target: `http://10.168.68.42:8087`, //王思祥
- // target: `http://10.168.72.174: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`, //王兴琳