From 3b5339dfe85e14fe3d38f5764cde2b5156c97f36 Mon Sep 17 00:00:00 2001
From: xusd <xu13181496959@163.com>
Date: Wed, 29 May 2024 09:18:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E8=AD=A6=E9=A1=B5=E9=9D=A2=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC=E6=8E=A5=E6=94=B6=E5=8F=82=E6=95=B0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index.vue                | 3 +++
 pages/work/alarm/listAlarm.vue | 9 ++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/pages/index.vue b/pages/index.vue
index c8de4a3..078ef8d 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -424,10 +424,12 @@
 			},
 			//加载可控中高辊底辊液压系统图
 			initBottomScollerCharts() {
+				console.log(1)
 				this.bsxtylCharts = echarts.getInstanceByDom(document.getElementById("bsxtyl")); //可控中高辊底辊液压系统
 				if (this.bsxtylCharts == undefined) {
 					this.bsxtylCharts = echarts.init(document.getElementById("bsxtyl"));
 				}
+				console.log(2)
 				this.bsxtylCharts.setOption(
 					this.generateGaugeOption({
 						color: ["26DE86", "93DDBA"],
@@ -441,6 +443,7 @@
 					true
 				);
 				window.addEventListener("resize", () => {
+					console.log(2)
 					this.bsxtylCharts && this.bsxtylCharts.resize();
 				});
 
diff --git a/pages/work/alarm/listAlarm.vue b/pages/work/alarm/listAlarm.vue
index abf6c91..bf84ae2 100644
--- a/pages/work/alarm/listAlarm.vue
+++ b/pages/work/alarm/listAlarm.vue
@@ -62,6 +62,7 @@
 	export default {
 		data() {
 			return {
+				flag: null,
 				equipId: null,
 				//加载到最后一条
 				finished: false,
@@ -89,6 +90,9 @@
 				this.tipText = "已加载完成";
 			}
 		},
+		onLoad(opts) {
+			this.flag = opts.flag;
+		},
 		methods: {
 			equipChange() {
 				this.getAlarmList();
@@ -111,11 +115,10 @@
 			},
 			getAlarmList() {
 				this.finished = true;
-				const flag = this.$route.query.flag;
 				//flag：0全部 1已处理 2未处理
-				if (flag === "1") {
+				if (this.flag === "1") {
 					this.queryParams.status = 1;
-				} else if (flag === "2") {
+				} else if (this.flag === "2") {
 					this.queryParams.status = 0;
 				}
 				this.queryParams.equipId = this.equipId;