From dffebea9d82562eca1d1bfc6323cdaef5b863f51 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 15 四月 2025 09:39:51 +0800
Subject: [PATCH] 饼图数据添加非空判断
---
UI-Project/src/views/largescreendisplay/screendisplay.vue | 125 +++++++++++++++++++++++++++--------------
1 files changed, 82 insertions(+), 43 deletions(-)
diff --git a/UI-Project/src/views/largescreendisplay/screendisplay.vue b/UI-Project/src/views/largescreendisplay/screendisplay.vue
index bbdbab3..a257c4b 100644
--- a/UI-Project/src/views/largescreendisplay/screendisplay.vue
+++ b/UI-Project/src/views/largescreendisplay/screendisplay.vue
@@ -54,17 +54,25 @@
let twoFinish = ref();
let oneunFinish = ref();
let twounFinish = ref();
- if (load.value) {
- oneFinish = pieChartVOS.value[0].oneCompletedQuantity;
- twoFinish = pieChartVOS.value[0].twoCompletedQuantity;
- oneunFinish = pieChartVOS.value[0].oneUncompletedQuantity;
- twounFinish = pieChartVOS.value[0].twoUncompletedQuantity;
+ if (pieChartVOS.length > 0) {
+ if (load.value) {
+ oneFinish = pieChartVOS.value[0].oneCompletedQuantity;
+ twoFinish = pieChartVOS.value[0].twoCompletedQuantity;
+ oneunFinish = pieChartVOS.value[0].oneUncompletedQuantity;
+ twounFinish = pieChartVOS.value[0].twoUncompletedQuantity;
+ } else {
+ oneFinish = pieChartVOS.value[0].oneCompletedArea;
+ twoFinish = pieChartVOS.value[0].twoCompletedArea;
+ oneunFinish = pieChartVOS.value[0].oneUncompletedArea;
+ twounFinish = pieChartVOS.value[0].twoUncompletedArea;
+ }
} else {
- oneFinish = pieChartVOS.value[0].oneCompletedArea;
- twoFinish = pieChartVOS.value[0].twoCompletedArea;
- oneunFinish = pieChartVOS.value[0].oneUncompletedArea;
- twounFinish = pieChartVOS.value[0].twoUncompletedArea;
+ oneFinish = 0;
+ twoFinish = 0;
+ oneunFinish = 0;
+ twounFinish = 0;
}
+
const chartDomOne = chartOne.value;
if (!chartDomOne) {
@@ -152,15 +160,22 @@
let oneFinish = ref();
let ondDamage = ref();
let oneunFinish = ref();
- if (temp.value) {
- oneFinish = pieChartVOS.value[0].oneCompletedQuantity;
- ondDamage = pieChartVOS.value[0].oneDamageQuantity;
- oneunFinish = pieChartVOS.value[0].oneUncompletedQuantity;
+ if (pieChartVOS.length > 0) {
+ if (temp.value) {
+ oneFinish = pieChartVOS.value[0].oneCompletedQuantity;
+ ondDamage = pieChartVOS.value[0].oneDamageQuantity;
+ oneunFinish = pieChartVOS.value[0].oneUncompletedQuantity;
+ } else {
+ oneFinish = pieChartVOS.value[0].oneCompletedArea;
+ ondDamage = pieChartVOS.value[0].oneDamageArea;
+ oneunFinish = pieChartVOS.value[0].oneUncompletedArea;
+ }
} else {
- oneFinish = pieChartVOS.value[0].oneCompletedArea;
- ondDamage = pieChartVOS.value[0].oneDamageArea;
- oneunFinish = pieChartVOS.value[0].oneUncompletedArea;
+ oneFinish = 0;
+ ondDamage = 0;
+ oneunFinish = 0;
}
+
const chartDomOne = chartThree.value;
if (!chartDomOne) {
@@ -235,17 +250,25 @@
let twoFinish = ref();
let oneunFinish = ref();
let twounFinish = ref();
- if (edg.value) {
- oneFinish = pieChartVOS.value[0].oneCompletedQuantity;
- twoFinish = pieChartVOS.value[0].twoCompletedQuantity;
- oneunFinish = pieChartVOS.value[0].oneUncompletedQuantity;
- twounFinish = pieChartVOS.value[0].twoUncompletedQuantity;
+ if (pieChartVOS.length > 0) {
+ if (edg.value) {
+ oneFinish = pieChartVOS.value[0].oneCompletedQuantity;
+ twoFinish = pieChartVOS.value[0].twoCompletedQuantity;
+ oneunFinish = pieChartVOS.value[0].oneUncompletedQuantity;
+ twounFinish = pieChartVOS.value[0].twoUncompletedQuantity;
+ } else {
+ oneFinish = pieChartVOS.value[0].oneCompletedArea;
+ twoFinish = pieChartVOS.value[0].twoCompletedArea;
+ oneunFinish = pieChartVOS.value[0].oneUncompletedArea;
+ twounFinish = pieChartVOS.value[0].twoUncompletedArea;
+ }
} else {
- oneFinish = pieChartVOS.value[0].oneCompletedArea;
- twoFinish = pieChartVOS.value[0].twoCompletedArea;
- oneunFinish = pieChartVOS.value[0].oneUncompletedArea;
- twounFinish = pieChartVOS.value[0].twoUncompletedArea;
+ oneFinish = 0;
+ twoFinish = 0;
+ oneunFinish = 0;
+ twounFinish = 0;
}
+
const chartDomOne = chartTwo.value;
if (!chartDomOne) {
@@ -321,17 +344,25 @@
let twoFinish = ref();
let oneunFinish = ref();
let twounFinish = ref();
- if (hollow.value) {
- oneFinish = pieChartVOS.value[0].oneCompletedQuantity;
- twoFinish = pieChartVOS.value[0].twoCompletedQuantity;
- oneunFinish = pieChartVOS.value[0].oneUncompletedQuantity;
- twounFinish = pieChartVOS.value[0].twoUncompletedQuantity;
+ if (pieChartVOS.length > 0) {
+ if (hollow.value) {
+ oneFinish = pieChartVOS.value[0].oneCompletedQuantity;
+ twoFinish = pieChartVOS.value[0].twoCompletedQuantity;
+ oneunFinish = pieChartVOS.value[0].oneUncompletedQuantity;
+ twounFinish = pieChartVOS.value[0].twoUncompletedQuantity;
+ } else {
+ oneFinish = pieChartVOS.value[0].oneCompletedArea;
+ twoFinish = pieChartVOS.value[0].twoCompletedArea;
+ oneunFinish = pieChartVOS.value[0].oneUncompletedArea;
+ twounFinish = pieChartVOS.value[0].twoUncompletedArea;
+ }
} else {
- oneFinish = pieChartVOS.value[0].oneCompletedArea;
- twoFinish = pieChartVOS.value[0].twoCompletedArea;
- oneunFinish = pieChartVOS.value[0].oneUncompletedArea;
- twounFinish = pieChartVOS.value[0].twoUncompletedArea;
+ oneFinish = 0;
+ twoFinish = 0;
+ oneunFinish = 0;
+ twounFinish = 0;
}
+
const chartDomOne = chartFour.value;
if (!chartDomOne) {
@@ -955,46 +986,54 @@
<div style="width: 50%;">
<div class="img-screen" alt="Screen">
<!-- 閽㈠寲鍗婇�忔槑鑹插潡 -->
- <div style="width: 80px;height: 40px;top: 130px;left: 130px;position: absolute;background-color: rgba(0, 0, 0, 0.5);color: white;font-size: 12px;z-index: 999;">
+ <div
+ style="width: 80px;height: 40px;top: 130px;left: 130px;position: absolute;background-color: rgba(0, 0, 0, 0.5);color: white;font-size: 12px;z-index: 999;">
<div>{{ $t('large.quantity') }}:{{ productionVO.length > 0 ? productionVO[6].countOut : 0 }}鐗�</div>
<div>{{ $t('large.are') }}:{{ productionVO.length > 0 ? productionVO[6].totalAreaOut : 0 }}m虏</div>
</div>
<!-- 涓┖涓�绾垮崐閫忔槑鑹插潡 -->
- <div style="width: 80px;height: 40px;top: 315px;left: 450px;position: absolute;background-color: rgba(0, 0, 0, 0.5);color: white;font-size: 12px;z-index: 999;">
+ <div
+ style="width: 80px;height: 40px;top: 315px;left: 450px;position: absolute;background-color: rgba(0, 0, 0, 0.5);color: white;font-size: 12px;z-index: 999;">
<div>{{ $t('large.quantity') }}:{{ productionVO.length > 0 ? productionVO[6].hollowCountOutOne : 0 }}鐗�</div>
<div>{{ $t('large.are') }}:{{ productionVO.length > 0 ? productionVO[6].hollowTotalAreaOutOne : 0 }}m虏</div>
</div>
<!-- 涓┖浜岀嚎鍗婇�忔槑鑹插潡 -->
- <div style="width: 80px;height: 40px;top: 230px;left: 450px;position: absolute;background-color: rgba(0, 0, 0, 0.5);color: white;font-size: 12px;z-index: 999;">
+ <div
+ style="width: 80px;height: 40px;top: 230px;left: 450px;position: absolute;background-color: rgba(0, 0, 0, 0.5);color: white;font-size: 12px;z-index: 999;">
<div>{{ $t('large.quantity') }}:{{ productionVO.length > 0 ? productionVO[6].hollowCountOutTwo : 0 }}鐗�</div>
<div>{{ $t('large.are') }}:{{ productionVO.length > 0 ? productionVO[6].hollowTotalAreaOutTwo : 0 }}m虏</div>
</div>
<!-- 鍒囧壊浜岀嚎鍗婇�忔槑鑹插潡 -->
- <div style="width: 80px;height: 40px;top: 542px;left: 410px;position: absolute;background-color: rgba(0, 0, 0, 0.5);color: white;font-size: 12px;z-index: 999;">
+ <div
+ style="width: 80px;height: 40px;top: 542px;left: 410px;position: absolute;background-color: rgba(0, 0, 0, 0.5);color: white;font-size: 12px;z-index: 999;">
<div>{{ $t('large.quantity') }}:{{ productionVO.length > 0 ? productionVO[6].countOutOne : 0 }}鐗�</div>
<div>{{ $t('large.are') }}:{{ productionVO.length > 0 ? productionVO[6].totalAreaOutOne : 0 }}m虏</div>
</div>
<!-- 鍒囧壊涓�绾垮崐閫忔槑鑹插潡 -->
- <div style="width: 80px;height: 40px;top: 490px;left: 410px;position: absolute;background-color: rgba(0, 0, 0, 0.5);color: white;font-size: 12px;z-index: 999;">
+ <div
+ style="width: 80px;height: 40px;top: 490px;left: 410px;position: absolute;background-color: rgba(0, 0, 0, 0.5);color: white;font-size: 12px;z-index: 999;">
<div>{{ $t('large.quantity') }}:{{ productionVO.length > 0 ? productionVO[6].countOutTwo : 0 }}鐗�</div>
<div>{{ $t('large.are') }}:{{ productionVO.length > 0 ? productionVO[6].totalAreaOutTwo : 0 }}m虏</div>
</div>
<!-- 纾ㄨ竟涓�绾垮崐閫忔槑鑹插潡 -->
- <div style="width: 80px;height: 40px;top: 410px;left: 450px;position: absolute;background-color: rgba(0, 0, 0, 0.5);color: white;font-size: 12px;z-index: 999;">
+ <div
+ style="width: 80px;height: 40px;top: 410px;left: 450px;position: absolute;background-color: rgba(0, 0, 0, 0.5);color: white;font-size: 12px;z-index: 999;">
<div>{{ $t('large.quantity') }}:{{ productionVO.length > 0 ? productionVO[6].countOutOne : 0 }}鐗�</div>
<div>{{ $t('large.are') }}:{{ productionVO.length > 0 ? productionVO[6].totalAreaOutOne : 0 }}m虏</div>
</div>
<!-- 纾ㄨ竟浜岀嚎鍗婇�忔槑鑹插潡 -->
- <div style="width: 80px;height: 40px;top: 369px;left: 450px;position: absolute;background-color: rgba(0, 0, 0, 0.5);color: white;font-size: 12px;z-index: 999;">
+ <div
+ style="width: 80px;height: 40px;top: 369px;left: 450px;position: absolute;background-color: rgba(0, 0, 0, 0.5);color: white;font-size: 12px;z-index: 999;">
<div>{{ $t('large.quantity') }}:{{ productionVO.length > 0 ? productionVO[6].countOutTwo : 0 }}鐗�</div>
<div>{{ $t('large.are') }}:{{ productionVO.length > 0 ? productionVO[6].totalAreaOutTwo : 0 }}m虏</div>
</div>
<!-- 閽㈠寲鍓嶅ぇ鐞嗙墖鍗婇�忔槑鑹插潡 -->
- <div style="width: 80px;height: 40px;top: 380px;left: 290px;position: absolute;background-color: rgba(0, 0, 0, 0.5);color: white;font-size: 12px;z-index: 999;">
+ <div
+ style="width: 80px;height: 40px;top: 380px;left: 290px;position: absolute;background-color: rgba(0, 0, 0, 0.5);color: white;font-size: 12px;z-index: 999;">
<div>{{ $t('large.quantity') }}:{{ productionVO.length > 0 ? productionVO[6].countIn : 0 }}鐗�</div>
<div>{{ $t('large.are') }}:{{ productionVO.length > 0 ? productionVO[6].totalAreaIn : 0 }}m虏</div>
</div>
-
+
<!-- 閽㈠寲鑹插潡 -->
<div v-if="temperingGlassInfoInList > 0" class="tempering"
style="width: 44px;height: 19px;top: 284px;left: 178px;position: absolute;background-color: #911005;"></div>
--
Gitblit v1.8.0