diff --git a/src/views/enterprise/liftSupervision/operatingData/index.vue b/src/views/enterprise/liftSupervision/operatingData/index.vue
index 026ec2d..dc55b00 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 }}%
+
@@ -179,6 +179,7 @@ const monitorList = ref([]);
const alarmList = ref([]);
const equipList = ref([]);
const equipInfo = ref({});
+const activeValue = ref("eng");
const searchForm = ref({
timeRange: []
});
@@ -280,7 +281,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;
requestData.engineeringSn = searchSn.value;
if (searchForm.value.timeRange && searchForm.value.timeRange.length > 0) {
@@ -301,7 +303,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;
requestData.engineeringSn = searchSn.value;
if (searchForm.value.timeRange && searchForm.value.timeRange.length > 0) {
@@ -322,17 +325,23 @@ const getAlarmList = async () => {
const getEquipList = async () => {
let requestData = {} as any;
requestData.engineeringSn = searchSn.value;
- const res = await lifterEquipAll(requestData);
- console.log(res);
- if (res && res.result && res.result.length > 0) {
- equipList.value = res.result;
- getEquipInfo(res.result[0]);
+ if (searchSn.value) {
+ const res = await lifterEquipAll(requestData);
+ console.log(res);
+ if (res && res.result && res.result.length > 0) {
+ equipList.value = res.result;
+ getEquipInfo(res.result[0]);
+ } else {
+ equipList.value = [];
+ }
} else {
+ equipInfo.value = {};
equipList.value = [];
}
};
// 获取设备信息
const getEquipInfo = async (obj: any) => {
+ equipActive.value = equipList.value.findIndex(item => item.id == obj.id);
let requestData = {
id: obj.id
};
@@ -343,6 +352,11 @@ const getEquipInfo = async (obj: any) => {
} else {
equipInfo.value = { ...obj };
}
+ if (active.value === 0) {
+ getAlarmList();
+ } else {
+ getMonitorList();
+ }
};
// 右侧报警数据搜索
const search = () => {
@@ -371,6 +385,11 @@ const getengineering = async () => {
searchSn.value = res.result[0].engineeringSn;
}
getEquipList();
+ if (active.value === 0) {
+ getAlarmList();
+ } else {
+ getMonitorList();
+ }
console.log(res);
};
// 点击抽屉的工程名称更新页面
diff --git a/src/views/goverment/liftSupervision/operatingData/index.vue b/src/views/goverment/liftSupervision/operatingData/index.vue
index 761f3bd..3b2ef62 100644
--- a/src/views/goverment/liftSupervision/operatingData/index.vue
+++ b/src/views/goverment/liftSupervision/operatingData/index.vue
@@ -57,14 +57,14 @@
额定人数: {{ equipInfo.ratedPeopleNum ? equipInfo.ratedPeopleNum : 0 }}人
当前楼层数: {{ equipInfo.floorNum ? equipInfo.floorNum : 0 }}
最大高度: {{ equipInfo.maxHeight ? equipInfo.maxHeight : 0 }}m
- 高度百分比: {{ equipInfo.heightRatio ? equipInfo.heightRatio : 0 }}%
+
- 备案编号: {{ equipInfo.filingNumber ? equipInfo.filingNumber : "" }}
+ 备案编号: {{ equipInfo.filingNumber ? equipInfo.filingNumber : "" }}
安装日期: {{ equipInfo.installTime ? equipInfo.installTime : "" }}
- 终端编号: {{ equipInfo.devNumber ? equipInfo.devNumber : "" }}
+ 终端编号: {{ equipInfo.devNumber ? equipInfo.devNumber : "" }}
更新时间: {{ equipInfo.realTime ? equipInfo.realTime : "" }}
@@ -326,11 +326,16 @@ const getEquipList = async () => {
} else {
requestData.engineeringSn = searchSn.value;
}
- const res = await lifterEquipAll(requestData);
- console.log(res, "设备列表");
- if (res && res.result && res.result.length > 0) {
- equipList.value = res.result;
- getEquipInfo(res.result[0]);
+ if (searchSn.value) {
+ const res = await lifterEquipAll(requestData);
+ console.log(res);
+ if (res && res.result && res.result.length > 0) {
+ equipList.value = res.result;
+ getEquipInfo(res.result[0]);
+ } else {
+ equipInfo.value = {};
+ equipList.value = [];
+ }
} else {
equipInfo.value = {};
equipList.value = [];
@@ -349,12 +354,18 @@ const getEquipInfo = async (obj: any) => {
} else {
equipInfo.value = { ...obj };
}
+ if (active.value === 0) {
+ getAlarmList();
+ } else {
+ getMonitorList();
+ }
};
// 获取历史检测信息
const getMonitorList = async () => {
let requestData = {
pageNo: pages.value.pageNo,
- pageSize: pages.value.pageSize
+ pageSize: pages.value.pageSize,
+ devId: equipInfo.value.id
} as any;
if (alarmActive.value == 0) {
requestData.projectSn = searchSn.value;
@@ -379,7 +390,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 (alarmActive.value == 0) {
requestData.projectSn = searchSn.value;
@@ -469,7 +481,7 @@ const getEngPage = async () => {
};
const { result } = await getLifterRealTimeEngineeringPage(requestData);
records.value = result.records;
- pages.value.total = Number(result.total);
+ pages.value.total = +result.total;
};
watch(
() => active.value,
diff --git a/src/views/project/liftSupervision/operatingData/index.vue b/src/views/project/liftSupervision/operatingData/index.vue
index aae413c..860c827 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 }}%
+