From 73d8f84cd53e4aadc60e48385dd9ae73aca8e3e5 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 21:47:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0BUG050910?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../components/WarningNotify.vue | 2 +-
.../JiHeExpressway/images/weather/150.svg | 90 +++++++++++++++++++
.../JiHeExpressway/images/weather/151.svg | 90 +++++++++++++++++++
.../components/BroadcastReleases.vue | 7 +-
.../RoadAndEvents/utils/httpList.js | 21 +++--
.../Cards/DisposalProcess/index.vue | 12 ++-
.../components/weatherForecast/index.vue | 6 +-
7 files changed, 210 insertions(+), 18 deletions(-)
create mode 100644 ruoyi-ui/src/views/JiHeExpressway/images/weather/150.svg
create mode 100644 ruoyi-ui/src/views/JiHeExpressway/images/weather/151.svg
diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/WarningNotify.vue b/ruoyi-ui/src/views/JiHeExpressway/components/WarningNotify.vue
index 92aac858..548f436f 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/WarningNotify.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/WarningNotify.vue
@@ -35,7 +35,7 @@ export default {
showNotify(para){
let _this = this;
let eventType = ["trafficAccident", "vehicleBroken", "trafficControl", "trafficJam", "illegalVehicle", "barrierClear", "construction", "serviceAreaAbnormal", "equipmentTrouble", "abnormalWeather", "otherEvent"];
- let time = para.subEvent == "0" ? para.content.event.occurrenceTime : para.content.event.warning_time;
+ let time = para.subEvent == "0" ? para.content.event.occurrenceTime : para.content.event.warningTime;
let obj = {
content: para.content.content,
time,
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/weather/150.svg b/ruoyi-ui/src/views/JiHeExpressway/images/weather/150.svg
new file mode 100644
index 00000000..b4f76297
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/weather/150.svg
@@ -0,0 +1,90 @@
+
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/weather/151.svg b/ruoyi-ui/src/views/JiHeExpressway/images/weather/151.svg
new file mode 100644
index 00000000..b4f76297
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/weather/151.svg
@@ -0,0 +1,90 @@
+
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/components/BroadcastReleases.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/components/BroadcastReleases.vue
index 01cbfb3f..2a0c0977 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/components/BroadcastReleases.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/components/BroadcastReleases.vue
@@ -1,8 +1,8 @@
@@ -85,6 +85,7 @@ export default {
},
created() {
getDeviceList(5).then((data) => {
+ console.log('-00--------------',data)
if (Array.isArray(data))
this.musicList = data.map((item) => ({
...item,
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/httpList.js b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/httpList.js
index e07ab632..b0e9d5b3 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/httpList.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/httpList.js
@@ -213,22 +213,25 @@ export function getDeviceList(deviceType, options) {
}
let newEndStakeMark = [];
let newStartStakeMark = [];
-
- options.endStakeMark.forEach((item) => {
- newEndStakeMark.push(String(item));
- });
- options.startStakeMark.forEach((item) => {
- newStartStakeMark.push(String(item));
- });
+ if(options && options.endStakeMark){
+ options.endStakeMark.forEach((item) => {
+ newEndStakeMark.push(String(item));
+ });
+ }
+ if(options && options.startStakeMark){
+ options.startStakeMark.forEach((item) => {
+ newStartStakeMark.push(String(item));
+ });
+ }
let data = {
deviceType: deviceType,
endStakeMark: newEndStakeMark,
startStakeMark: newStartStakeMark,
};
- if (options.childType && options.childType.split("-")[0] === deviceType) {
+ if (options && options.childType && options.childType.split("-")[0] === deviceType) {
data.childType = options.childType;
}
- if (options.deviceState && options.deviceState !== "") {
+ if (options && options.deviceState && options.deviceState !== "") {
data["deviceState"] = options.deviceState;
}
request(
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 e1864126..8fdbb81a 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
@@ -181,7 +181,7 @@ export default {
},
// 处置过程节点
- getProcess(eventId) {
+ getProcess() {
getProcessNode(this.eventId).then((result) => {
console.log("处置过程节点", result);
if (result.code != 200) return [];
@@ -302,9 +302,13 @@ export default {
},
},
async mounted() {
- this.eventId = this.detailData.id;
- this.getProcess();
- await this.disposalRecords(this.eventId);
+ const self = this;
+ setTimeout(async () => {
+ self.eventId = self.detailData.id;
+ self.getProcess();
+ await self.disposalRecords(self.eventId);
+ }, 500);
+
},
};
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherForecast/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherForecast/index.vue
index f0adc31a..7b70c183 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherForecast/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherForecast/index.vue
@@ -7,7 +7,7 @@
@@ -96,6 +96,7 @@