From e512ad5858137d02376cf9adb1eb72942cf5a769 Mon Sep 17 00:00:00 2001
From: juzi <819872918@qq.com>
Date: Thu, 20 Jun 2024 16:51:44 +0800
Subject: [PATCH] 1

---
 src/views/report/chipOEEBM/index.vue              |  3 +++
 src/views/report/chipOutputBM/index.vue           |  3 +++
 src/views/report/chipPerCapitaBM/index.vue        |  3 +++
 src/views/report/chipYieldBM/index.vue            |  3 +++
 src/views/report/completionStatusIntrBM/index.vue | 12 ++----------
 src/views/report/conversionEfficiencyBM/index.vue |  3 +++
 src/views/report/ftoOutputBM/index.vue            |  3 +++
 src/views/report/packageOEEBM/index.vue           |  3 +++
 src/views/report/scOutputBM/index.vue             |  3 +++
 src/views/report/scPerCapitaBM/index.vue          |  3 +++
 src/views/report/scYieldBM/index.vue              |  3 +++
 src/views/report/turnoverRateBM/index.vue         |  4 ++++
 12 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/src/views/report/chipOEEBM/index.vue b/src/views/report/chipOEEBM/index.vue
index 7f8cecb..cee6997 100644
--- a/src/views/report/chipOEEBM/index.vue
+++ b/src/views/report/chipOEEBM/index.vue
@@ -187,16 +187,19 @@ export default {
             {
               prop: "yoy",
               label: msg.yoyColumn,
+              filter: (val) => (val || val === 0 ? val : "-"),
               minWidth: 150,
             },
             {
               prop: "queryValue",
               label: msg.queryColumn,
+              filter: (val) => (val || val === 0 ? val : "-"),
               minWidth: 150,
             },
             {
               prop: "target",
               label: msg.targetColumn,
+              filter: (val) => (val || val === 0 ? val : "-"),
               minWidth: 150,
             },
           ];
diff --git a/src/views/report/chipOutputBM/index.vue b/src/views/report/chipOutputBM/index.vue
index 85f2627..a321f91 100644
--- a/src/views/report/chipOutputBM/index.vue
+++ b/src/views/report/chipOutputBM/index.vue
@@ -182,16 +182,19 @@ export default {
             {
               prop: "lastone",
               label: msg.lastone.reportTime,
+              filter: (val) => (val || val === 0 ? val : "-"),
               minWidth: 150,
             },
             {
               prop: "currentone",
               label: msg.currentone.reportTime,
+              filter: (val) => (val || val === 0 ? val : "-"),
               minWidth: 150,
             },
             {
               prop: "targetone",
               label: msg.targetone.reportTime,
+              filter: (val) => (val || val === 0 ? val : "-"),
               minWidth: 150,
             },
           ];
diff --git a/src/views/report/chipPerCapitaBM/index.vue b/src/views/report/chipPerCapitaBM/index.vue
index 4b46789..ca9ffbd 100644
--- a/src/views/report/chipPerCapitaBM/index.vue
+++ b/src/views/report/chipPerCapitaBM/index.vue
@@ -181,16 +181,19 @@ export default {
             {
               prop: "yoy",
               label: msg.yoyColumn,
+              filter: (val) => (val || val === 0 ? val : "-"),
               minWidth: 150,
             },
             {
               prop: "queryValue",
               label: msg.queryColumn,
+              filter: (val) => (val || val === 0 ? val : "-"),
               minWidth: 150,
             },
             {
               prop: "target",
               label: msg.targetColumn,
+              filter: (val) => (val || val === 0 ? val : "-"),
               minWidth: 150,
             },
           ];
diff --git a/src/views/report/chipYieldBM/index.vue b/src/views/report/chipYieldBM/index.vue
index 294f6ae..dd86f68 100644
--- a/src/views/report/chipYieldBM/index.vue
+++ b/src/views/report/chipYieldBM/index.vue
@@ -187,16 +187,19 @@ export default {
             {
               prop: "yoy",
               label: msg.yoyColumn,
+              filter: (val) => (val || val === 0 ? val : "-"),
               minWidth: 150,
             },
             {
               prop: "queryValue",
               label: msg.queryColumn,
+              filter: (val) => (val || val === 0 ? val : "-"),
               minWidth: 150,
             },
             {
               prop: "target",
               label: msg.targetColumn,
+              filter: (val) => (val || val === 0 ? val : "-"),
               minWidth: 150,
             },
           ];
diff --git a/src/views/report/completionStatusIntrBM/index.vue b/src/views/report/completionStatusIntrBM/index.vue
index fa8cdb5..f83fcb7 100644
--- a/src/views/report/completionStatusIntrBM/index.vue
+++ b/src/views/report/completionStatusIntrBM/index.vue
@@ -74,11 +74,6 @@ export default {
             data: [],
             type: "bar",
             barWidth: 20,
-            label: {
-              show: true,
-              position: "top",
-              color: "#2789FF",
-            },
           },
           {
             name: "2",
@@ -104,11 +99,6 @@ export default {
             data: [],
             type: "bar",
             barWidth: 20,
-            label: {
-              show: true,
-              position: "top",
-              color: "#2789FF",
-            },
           },
           {
             name: "2",
@@ -186,11 +176,13 @@ export default {
             {
               prop: "queryValue",
               label: msg.queryColumn,
+              filter: (val) => (val || val === 0 ? val : "-"),
               minWidth: 150,
             },
             {
               prop: "target",
               label: msg.targetColumn,
+              filter: (val) => (val || val === 0 ? val : "-"),
               minWidth: 150,
             },
           ];
diff --git a/src/views/report/conversionEfficiencyBM/index.vue b/src/views/report/conversionEfficiencyBM/index.vue
index e09b727..f75ca59 100644
--- a/src/views/report/conversionEfficiencyBM/index.vue
+++ b/src/views/report/conversionEfficiencyBM/index.vue
@@ -187,16 +187,19 @@ export default {
             {
               prop: "yoy",
               label: msg.yoyColumn,
+              filter: (val) => (val || val === 0 ? val : "-"),
               minWidth: 150,
             },
             {
               prop: "queryValue",
               label: msg.queryColumn,
+              filter: (val) => (val || val === 0 ? val : "-"),
               minWidth: 150,
             },
             {
               prop: "target",
               label: msg.targetColumn,
+              filter: (val) => (val || val === 0 ? val : "-"),
               minWidth: 150,
             },
           ];
diff --git a/src/views/report/ftoOutputBM/index.vue b/src/views/report/ftoOutputBM/index.vue
index d2e3514..a8f4adb 100644
--- a/src/views/report/ftoOutputBM/index.vue
+++ b/src/views/report/ftoOutputBM/index.vue
@@ -182,16 +182,19 @@ export default {
             {
               prop: "lastone",
               label: msg.lastone.reportTime,
+              filter: (val) => (val || val === 0 ? val : "-"),
               minWidth: 150,
             },
             {
               prop: "currentone",
               label: msg.currentone.reportTime,
+              filter: (val) => (val || val === 0 ? val : "-"),
               minWidth: 150,
             },
             {
               prop: "targetone",
               label: msg.targetone.reportTime,
+              filter: (val) => (val || val === 0 ? val : "-"),
               minWidth: 150,
             },
           ];
diff --git a/src/views/report/packageOEEBM/index.vue b/src/views/report/packageOEEBM/index.vue
index dff6433..56beb5f 100644
--- a/src/views/report/packageOEEBM/index.vue
+++ b/src/views/report/packageOEEBM/index.vue
@@ -187,16 +187,19 @@ export default {
             {
               prop: "yoy",
               label: msg.yoyColumn,
+              filter: (val) => (val || val === 0 ? val : "-"),
               minWidth: 150,
             },
             {
               prop: "queryValue",
               label: msg.queryColumn,
+              filter: (val) => (val || val === 0 ? val : "-"),
               minWidth: 150,
             },
             {
               prop: "target",
               label: msg.targetColumn,
+              filter: (val) => (val || val === 0 ? val : "-"),
               minWidth: 150,
             },
           ];
diff --git a/src/views/report/scOutputBM/index.vue b/src/views/report/scOutputBM/index.vue
index 068dd5d..3afaadb 100644
--- a/src/views/report/scOutputBM/index.vue
+++ b/src/views/report/scOutputBM/index.vue
@@ -182,16 +182,19 @@ export default {
             {
               prop: "lastone",
               label: msg.lastone.reportTime,
+              filter: (val) => (val || val === 0 ? val : "-"),
               minWidth: 150,
             },
             {
               prop: "currentone",
               label: msg.currentone.reportTime,
+              filter: (val) => (val || val === 0 ? val : "-"),
               minWidth: 150,
             },
             {
               prop: "targetone",
               label: msg.targetone.reportTime,
+              filter: (val) => (val || val === 0 ? val : "-"),
               minWidth: 150,
             },
           ];
diff --git a/src/views/report/scPerCapitaBM/index.vue b/src/views/report/scPerCapitaBM/index.vue
index 313018a..d710b72 100644
--- a/src/views/report/scPerCapitaBM/index.vue
+++ b/src/views/report/scPerCapitaBM/index.vue
@@ -181,16 +181,19 @@ export default {
             {
               prop: "yoy",
               label: msg.yoyColumn,
+              filter: (val) => (val || val === 0 ? val : "-"),
               minWidth: 150,
             },
             {
               prop: "queryValue",
               label: msg.queryColumn,
+              filter: (val) => (val || val === 0 ? val : "-"),
               minWidth: 150,
             },
             {
               prop: "target",
               label: msg.targetColumn,
+              filter: (val) => (val || val === 0 ? val : "-"),
               minWidth: 150,
             },
           ];
diff --git a/src/views/report/scYieldBM/index.vue b/src/views/report/scYieldBM/index.vue
index e4bd8f7..a15a1ee 100644
--- a/src/views/report/scYieldBM/index.vue
+++ b/src/views/report/scYieldBM/index.vue
@@ -187,16 +187,19 @@ export default {
             {
               prop: "yoy",
               label: msg.yoyColumn,
+              filter: (val) => (val || val === 0 ? val : "-"),
               minWidth: 150,
             },
             {
               prop: "queryValue",
               label: msg.queryColumn,
+              filter: (val) => (val || val === 0 ? val : "-"),
               minWidth: 150,
             },
             {
               prop: "target",
               label: msg.targetColumn,
+              filter: (val) => (val || val === 0 ? val : "-"),
               minWidth: 150,
             },
           ];
diff --git a/src/views/report/turnoverRateBM/index.vue b/src/views/report/turnoverRateBM/index.vue
index 28fa09f..524de21 100644
--- a/src/views/report/turnoverRateBM/index.vue
+++ b/src/views/report/turnoverRateBM/index.vue
@@ -207,16 +207,19 @@ export default {
             {
               prop: "yoy",
               label: msg.yoyColumn,
+              filter: (val) => (val || val === 0 ? val : "-"),
               minWidth: 150,
             },
             {
               prop: "queryValue",
               label: msg.queryColumn,
+              filter: (val) => (val || val === 0 ? val : "-"),
               minWidth: 150,
             },
             {
               prop: "target",
               label: msg.targetColumn,
+              filter: (val) => (val || val === 0 ? val : "-"),
               minWidth: 150,
             },
           ];
@@ -224,6 +227,7 @@ export default {
             {
               prop: "yearTarget",
               label: msg.yearTargetColumn,
+              filter: (val) => (val || val === 0 ? val : "-"),
               minWidth: 150,
             },
           ];
-- 
2.45.2