From 8432bafdd573600bfb062a5d11c6dc6062df1162 Mon Sep 17 00:00:00 2001
From: cjp <3096114695@qq.com>
Date: Mon, 11 Sep 2023 17:34:22 +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
---
.../enterprise/liftSupervision/operatingData/index.vue | 2 +-
.../goverment/liftSupervision/operatingData/index.vue | 5 ++---
src/views/project/liftSupervision/operatingData/index.vue | 7 ++++---
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/views/enterprise/liftSupervision/operatingData/index.vue b/src/views/enterprise/liftSupervision/operatingData/index.vue
index 10b1cdb..0b5a244 100644
--- a/src/views/enterprise/liftSupervision/operatingData/index.vue
+++ b/src/views/enterprise/liftSupervision/operatingData/index.vue
@@ -18,7 +18,7 @@
额定人数: {{ equipInfo.ratedPeopleNum ? equipInfo.ratedPeopleNum : 0 }}人
当前楼层数: {{ equipInfo.floorNum ? equipInfo.floorNum : 0 }}
最大高度: {{ equipInfo.height ? equipInfo.height : 0 }}m
-
+ 高度百分比: {{ equipInfo.heightRatio ? equipInfo.heightRatio : 0 }}%
diff --git a/src/views/goverment/liftSupervision/operatingData/index.vue b/src/views/goverment/liftSupervision/operatingData/index.vue
index 9f8d261..f58fcdd 100644
--- a/src/views/goverment/liftSupervision/operatingData/index.vue
+++ b/src/views/goverment/liftSupervision/operatingData/index.vue
@@ -57,7 +57,7 @@
额定人数: {{ equipInfo.ratedPeopleNum ? equipInfo.ratedPeopleNum : 0 }}人
当前楼层数: {{ equipInfo.floorNum ? equipInfo.floorNum : 0 }}
最大高度: {{ equipInfo.maxHeight ? equipInfo.maxHeight : 0 }}m
-
+ 高度百分比: {{ equipInfo.heightRatio ? equipInfo.heightRatio : 0 }}%
@@ -403,7 +403,7 @@ const getAlarmList = async () => {
requestData.createTime_end = searchForm.value.timeRange[1];
}
const res = await lifterAlarmPage(requestData);
- console.log(res);
+ // console.log(res);
if (res && res.result && res.result.records.length > 0) {
alarmList.value = res.result.records;
pages.value.total = +res.result.total;
@@ -462,7 +462,6 @@ const search = () => {
getMonitorList();
}
};
-
// 获取项目名称分页
const getProPage = async () => {
let requestData = {
diff --git a/src/views/project/liftSupervision/operatingData/index.vue b/src/views/project/liftSupervision/operatingData/index.vue
index fe6e18f..4cd9700 100644
--- a/src/views/project/liftSupervision/operatingData/index.vue
+++ b/src/views/project/liftSupervision/operatingData/index.vue
@@ -18,7 +18,7 @@
额定人数: {{ equipInfo.ratedPeopleNum ? equipInfo.ratedPeopleNum : 0 }}人
当前楼层数: {{ equipInfo.floorNum ? equipInfo.floorNum : 0 }}
最大高度: {{ equipInfo.maxHeight ? equipInfo.maxHeight : 0 }}m
-
+ 高度百分比: {{ equipInfo.heightRatio ? equipInfo.heightRatio : 0 }}%
@@ -268,7 +268,8 @@ const alarmTransform = (obj: any) => {
const getMonitorList = 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;
@@ -280,7 +281,7 @@ const getMonitorList = async () => {
requestData.createTime_end = searchForm.value.timeRange[1];
}
const res = await lifterDataPage(requestData);
- console.log(res);
+ // console.log(res);
if (res && res.result && res.result.records.length > 0) {
monitorList.value = res.result.records;
pages.value.total = +res.result.total;