admin/wisdomisitezwfront-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'kun_dev' of http://139.9.66.234:18023/dhp/wisdomisitezwfront into kun_dev

Browse Source
This commit is contained in:
kun 2023-09-13 18:44:32 +08:00
commit 1a11fa06cc
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/views/enterprise/liftSupervision/operatingData/index.vue
View File

@ -299,7 +299,7 @@ const getMonitorList = async () => {
} }
const res = await lifterDataPage(requestData); const res = await lifterDataPage(requestData);
console.log(res); console.log(res);
if (res && res.result && res.result.records.length > 0) { if (requestData.engineeringSn !== "" && res && res.result && res.result.records.length > 0) {
monitorList.value = res.result.records; monitorList.value = res.result.records;
pages.value.total = +res.result.total; pages.value.total = +res.result.total;
} else { } else {
@ -321,7 +321,7 @@ const getAlarmList = async () => {
} }
const res = await lifterAlarmPage(requestData); const res = await lifterAlarmPage(requestData);
console.log(res); console.log(res);
if (res && res.result && res.result.records.length > 0) { if (requestData.engineeringSn !== "" && res && res.result && res.result.records.length > 0) {
alarmList.value = res.result.records; alarmList.value = res.result.records;
pages.value.total = +res.result.total; pages.value.total = +res.result.total;
} else { } else {
@ -336,7 +336,7 @@ const getEquipList = async () => {
if (searchSn.value) { if (searchSn.value) {
const res = await lifterEquipAll(requestData); const res = await lifterEquipAll(requestData);
console.log(res); console.log(res);
if (res && res.result && res.result.length > 0) { if (requestData.engineeringSn !== "" && res && res.result && res.result.length > 0) {
equipList.value = res.result; equipList.value = res.result;
getEquipInfo(res.result[0]); getEquipInfo(res.result[0]);
} else { } else {

7
src/views/goverment/liftSupervision/operatingData/index.vue
View File

@ -377,8 +377,9 @@ const getMonitorList = async () => {
requestData.createTime_end = searchForm.value.timeRange[1]; requestData.createTime_end = searchForm.value.timeRange[1];
} }
const res = await lifterDataPage(requestData); const res = await lifterDataPage(requestData);
console.log(res); console.log(requestData, "历史监测信息");
if (res && res.result && res.result.records.length > 0) { // console.log(res);
if (searchSn.value !== "" && res && res.result && res.result.records.length > 0) {
monitorList.value = res.result.records; monitorList.value = res.result.records;
pages.value.total = +res.result.total; pages.value.total = +res.result.total;
} else { } else {
@ -404,7 +405,7 @@ const getAlarmList = async () => {
} }
const res = await lifterAlarmPage(requestData); const res = await lifterAlarmPage(requestData);
// console.log(res); // console.log(res);
if (res && res.result && res.result.records.length > 0) { if (searchSn.value !== "" && res && res.result && res.result.records.length > 0) {
alarmList.value = res.result.records; alarmList.value = res.result.records;
pages.value.total = +res.result.total; pages.value.total = +res.result.total;
} else { } else {

6
src/views/project/liftSupervision/operatingData/index.vue
View File

@ -290,7 +290,7 @@ const getMonitorList = async () => {
} }
const res = await lifterDataPage(requestData); const res = await lifterDataPage(requestData);
// console.log(res); // console.log(res);
if (res && res.result && res.result.records.length > 0) { if (requestData.engineeringSn !== "" && res && res.result && res.result.records.length > 0) {
monitorList.value = res.result.records; monitorList.value = res.result.records;
pages.value.total = +res.result.total; pages.value.total = +res.result.total;
} else { } else {
@ -316,7 +316,7 @@ const getAlarmList = async () => {
} }
const res = await lifterAlarmPage(requestData); const res = await lifterAlarmPage(requestData);
console.log(res); console.log(res);
if (res && res.result && res.result.records.length > 0) { if (requestData.engineeringSn !== "" && res && res.result && res.result.records.length > 0) {
alarmList.value = res.result.records; alarmList.value = res.result.records;
pages.value.total = +res.result.total; pages.value.total = +res.result.total;
} else { } else {
@ -334,7 +334,7 @@ const getEquipList = async () => {
} }
const res = await lifterEquipAll(requestData); const res = await lifterEquipAll(requestData);
console.log(res); console.log(res);
if (res && res.result && res.result.length > 0) { if (requestData.engineeringSn !== "" && res && res.result && res.result.length > 0) {
equipList.value = res.result; equipList.value = res.result;
getEquipInfo(res.result[0]); getEquipInfo(res.result[0]);
} else { } else {