From 509633bd9e19c7147e8bdd6b2fe5a7fa08fb7125 Mon Sep 17 00:00:00 2001 From: cjp <3096114695@qq.com> Date: Sat, 9 Sep 2023 18:11:11 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../liftSupervision/operatingData/index.vue | 2 +- .../goverment/liftSupervision/operatingData/index.vue | 2 +- .../project/liftSupervision/operatingData/index.vue | 11 ++++++++--- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/views/enterprise/liftSupervision/operatingData/index.vue b/src/views/enterprise/liftSupervision/operatingData/index.vue index dc55b00..10b1cdb 100644 --- a/src/views/enterprise/liftSupervision/operatingData/index.vue +++ b/src/views/enterprise/liftSupervision/operatingData/index.vue @@ -216,7 +216,7 @@ const aspectList = ref([ value: 10, unit: "°", img: new URL("@/assets/images/onlineSupervision/塔身倾角.png", import.meta.url).href, - prop: "dipAngleX" + prop: "dipAngleY" }, { name: "高度", diff --git a/src/views/goverment/liftSupervision/operatingData/index.vue b/src/views/goverment/liftSupervision/operatingData/index.vue index 3b2ef62..9f8d261 100644 --- a/src/views/goverment/liftSupervision/operatingData/index.vue +++ b/src/views/goverment/liftSupervision/operatingData/index.vue @@ -273,7 +273,7 @@ const aspectList = ref([ value: 10, unit: "°", img: new URL("@/assets/images/onlineSupervision/塔身倾角.png", import.meta.url).href, - prop: "dipAngleX" + prop: "dipAngleY" }, { name: "高度", diff --git a/src/views/project/liftSupervision/operatingData/index.vue b/src/views/project/liftSupervision/operatingData/index.vue index 860c827..fe6e18f 100644 --- a/src/views/project/liftSupervision/operatingData/index.vue +++ b/src/views/project/liftSupervision/operatingData/index.vue @@ -217,7 +217,7 @@ const aspectList = ref([ value: 10, unit: "°", img: new URL("@/assets/images/onlineSupervision/塔身倾角.png", import.meta.url).href, - prop: "dipAngleX" + prop: "dipAngleY" }, { name: "高度", @@ -293,7 +293,8 @@ const getMonitorList = async () => { const getAlarmList = async () => { let requestData = { pageNo: pages.value.pageNo, - pageSize: pages.value.pageSize + pageSize: pages.value.pageSize, + devId: equipInfo.value.id } as any; if (activeValue.value == "eng") { requestData.engineeringSn = searchSn.value; @@ -331,7 +332,6 @@ const getEquipList = async () => { equipList.value = []; } }; - // 获取设备信息 const getEquipInfo = async (obj: any) => { equipActive.value = equipList.value.findIndex(item => item.id == obj.id); @@ -407,6 +407,11 @@ const getengineering = async () => { searchSn.value = res.result[0].engineeringSn; } getEquipList(); + if (active.value === 0) { + getAlarmList(); + } else { + getMonitorList(); + } console.log(res); }; // 点击抽屉的工程名称更新页面