qdintc/fishery-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix： 后端接口对接，问题修复。

Browse Source
This commit is contained in:
tianyongbao
2026-01-12 18:48:03 +08:00
parent 2e9609292e
commit 6d1a6ded2d
8 changed files with 281 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/components/other/index.vue
View File

@@ -75,7 +75,7 @@
正常</nut-tag
>
<nut-tag class="tagErr font_28 m_r_15" v-else-if="item.status == 2">
{{ item.warnCodeInfo.warnDescription }}</nut-tag
{{ item.warnCodeInfo?.warnDescription }}</nut-tag
>
<nut-tag
class="font_28 m_r_15"
@@ -116,7 +116,7 @@
:class="
!item.up
? ''
: alarmJudgeCode(item.warnCodeInfo.warnCode, 7)
: alarmJudgeCode(item.warnCodeInfo?.warnCode, 7)
? 'c_E22323'
: ''
"
@@ -143,8 +143,8 @@
:class="
!item.up
? ''
: alarmJudgeCode(item.warnCodeInfo.warnCode, 9) ||
alarmJudgeCode(item.warnCodeInfo.warnCode, 8)
: alarmJudgeCode(item.warnCodeInfo?.warnCode, 9) ||
alarmJudgeCode(item.warnCodeInfo?.warnCode, 8)
? 'c_E22323'
: ''
"
@@ -169,7 +169,7 @@
:class="
!item.up
? ''
: alarmJudgeCode(item.warnCodeInfo.warnCode, 10)
: alarmJudgeCode(item.warnCodeInfo?.warnCode, 10)
? 'c_E22323'
: ''
"
@@ -803,7 +803,10 @@ function getDeviceList() {
}
// 查询塘口下设备列表
pondDeviceInfo({ id }).then((res: any) => {
if (res.statusCode == 200) {
console.log('塘口设备接口返回:', res);
if (res.code == 200) {
console.log('检测仪列表:', res.data.listDetector);
console.log('控制器列表:', res.data.listController);
setTimeout(() => {
if (
res.data &&
@@ -827,9 +830,9 @@ function getDeviceList() {
oxyIds.push(item.id);
let num = 3;
const devCount = Number(item.deviceCount) + Number(item.switchCount);
const msg = item.warnCodeInfo.warnDescription;
const showPh = !alarmJudgeCode(item.warnCodeInfo.warnCode, 1);
const showSa = !alarmJudgeCode(item.warnCodeInfo.warnCode, 2);
const msg = item.warnCodeInfo?.warnDescription || '';
const showPh = !alarmJudgeCode(item.warnCodeInfo?.warnCode, 1);
const showSa = !alarmJudgeCode(item.warnCodeInfo?.warnCode, 2);
if (msg) {
item.isPh = showPh;
item.isSa = showSa;
@@ -847,10 +850,10 @@ function getDeviceList() {
item.num = num;
item.status = Number(item.deviceCount) == 0 ? 0 : msg ? 2 : 1;
// 判断设备是否离线，异常、断电 0 6 15
const code0 = alarmJudgeCode(item.warnCodeInfo.warnCode, 0);
const code6 = alarmJudgeCode(item.warnCodeInfo.warnCode, 6);
const code11 = alarmJudgeCode(item.warnCodeInfo.warnCode, 15);
const code17 = alarmJudgeCode(item.warnCodeInfo.warnCode, 17);
const code0 = alarmJudgeCode(item.warnCodeInfo?.warnCode, 0);
const code6 = alarmJudgeCode(item.warnCodeInfo?.warnCode, 6);
const code11 = alarmJudgeCode(item.warnCodeInfo?.warnCode, 15);
const code17 = alarmJudgeCode(item.warnCodeInfo?.warnCode, 17);
item.up = true;
if (code0 || code6 || code11 || code17) {
item.up = false;
@@ -860,6 +863,7 @@ function getDeviceList() {
keepNightOpen.value = res.data.keepNightOpen;
doList.value = res.data.listDetector;
controlList.value = res.data.listController;
console.log('赋值后 controlList:', controlList.value);
if (res.data.listDetector && res.data.listDetector.length > 0) {
firstDoId.value = res.data.listDetector[0].id
? res.data.listDetector[0].id
@@ -935,7 +939,7 @@ function selectCharts(e) {
}
getDeviceHistory();
pondDeviceInfo({ id }).then((res: any) => {
if (res.statusCode == 200) {
if (res.code == 200) {
const oxyIds = [];
// setTimeout(() => {
// showTour.value = res.data.length == 0 ? true : false;
@@ -949,9 +953,9 @@ function selectCharts(e) {
res.data.listDetector.forEach((item: any) => {
oxyIds.push(item.id);
let num = 3;
const msg = item.warnCodeInfo.warnDescription;
const showPh = !alarmJudgeCode(item.warnCodeInfo.warnCode, 1);
const showSa = !alarmJudgeCode(item.warnCodeInfo.warnCode, 2);
const msg = item.warnCodeInfo?.warnDescription || '';
const showPh = !alarmJudgeCode(item.warnCodeInfo?.warnCode, 1);
const showSa = !alarmJudgeCode(item.warnCodeInfo?.warnCode, 2);
if (msg) {
item.isPh = showPh;
item.isSa = showSa;
@@ -974,10 +978,10 @@ function selectCharts(e) {
// }
// 判断设备是否离线，异常、断电 0 6 11
const code0 = alarmJudgeCode(item.warnCodeInfo.warnCode, 0);
const code6 = alarmJudgeCode(item.warnCodeInfo.warnCode, 6);
const code11 = alarmJudgeCode(item.warnCodeInfo.warnCode, 15);
const code17 = alarmJudgeCode(item.warnCodeInfo.warnCode, 17);
const code0 = alarmJudgeCode(item.warnCodeInfo?.warnCode, 0);
const code6 = alarmJudgeCode(item.warnCodeInfo?.warnCode, 6);
const code11 = alarmJudgeCode(item.warnCodeInfo?.warnCode, 15);
const code17 = alarmJudgeCode(item.warnCodeInfo?.warnCode, 17);
item.up = true;
if (code0 || code6 || code11 || code17) {
item.up = false;
@@ -1812,6 +1816,7 @@ function setParamsCtr(id) {
});
}
function switchRes(list, index, type) {
console.log('switchRes 调用:', { list, index, type });
if (list.length > 0) {
const info = list.filter((res) => res.index == index);
if (type == "img") {