From f37d45b8998ea08a42002579ecc103244bdac17b Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期四, 21 十一月 2024 11:06:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'supervisionVue/hc-dataproduct-v1112' into lsf-dataproduct-1024
---
src/views/fysp/data-product/ProdSceneReport.vue | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/views/fysp/data-product/ProdSceneReport.vue b/src/views/fysp/data-product/ProdSceneReport.vue
index 0c55424..dd38e5c 100644
--- a/src/views/fysp/data-product/ProdSceneReport.vue
+++ b/src/views/fysp/data-product/ProdSceneReport.vue
@@ -351,10 +351,10 @@
const d2 =
i + 1 < deviceList.value.length ? deviceList.value[i + 1] : undefined;
_deviceList.push({
- _showStatusPic_1: d1._showStatusPic,
+ _showStatusPic_1: d1._showStatusPic ? d1._showStatusPic : right_triangle,
_deviceTypeName_1: d1._deviceTypeName,
// hasPic2: d2 ? true : false,
- _showStatusPic_2: d2 ? d2._showStatusPic : right_triangle,
+ _showStatusPic_2: d2 ? (d2._showStatusPic ? d2._showStatusPic : right_triangle) : right_triangle,
_deviceTypeName_2: d2 ? d2._deviceTypeName : '',
});
}
@@ -398,7 +398,6 @@
}
}
const date = dayjs(curSubtask.value.data.stPlanTime).format('MM鏈圖D鏃�');
- console.log(param);
docLoading.value = true;
exportDocx(
--
Gitblit v1.9.3