From 8af5158a1b4babdd8daae85501fbde50783f91be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98937886381=E2=80=99?= <‘937886381@qq.com’>
Date: Wed, 10 Jul 2024 15:46:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/report/comprehensiveData.vue          | 10 ++++++----
 src/views/report/produceConversion.vue          |  8 +++++---
 src/views/report/productionSituationMW.vue      | 10 ++++++----
 src/views/report/productionSituationTablets.vue | 10 ++++++----
 src/views/report/productionYield.vue            |  8 +++++---
 5 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/src/views/report/comprehensiveData.vue b/src/views/report/comprehensiveData.vue
index d017e2f..9492d02 100644
--- a/src/views/report/comprehensiveData.vue
+++ b/src/views/report/comprehensiveData.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-04-15 10:49:13
- * @LastEditTime: 2024-07-09 16:16:14
+ * @LastEditTime: 2024-07-10 15:45:28
  * @LastEditors: zhp
  * @Description:
 -->
@@ -344,11 +344,13 @@ export default {
     },
     async getDataList() {
       console.log(this.listQuery.type);
-      if (this.listQuery.type == null || this.listQuery.type == '') {
-        return this.$message('请选择时间维度')
+      if (this.listQuery.type === '') {
+        this.$message.warning('请选择时间维度！')
+        return
       }
       if (!this.listQuery.startDate && !this.listQuery.endDate) {
-        return this.$message('请选择起止时间')
+        this.$message.warning('请选择起止时间')
+        return
       }
       this.otherProps = []
       let arr  = []
diff --git a/src/views/report/produceConversion.vue b/src/views/report/produceConversion.vue
index 18285d4..121af23 100644
--- a/src/views/report/produceConversion.vue
+++ b/src/views/report/produceConversion.vue
@@ -546,11 +546,13 @@ export default {
       this.chartMsgYearTarget.series[0].data = []
       this.chartMsgYearTarget.series[1].data = []
       this.title = ''
-      if (this.listQuery.date == null || this.listQuery.date == '') {
-        return this.$message('请选择时间维度')
+      if (this.listQuery.date === '') {
+        this.$message.warning('请选择时间维度！')
+        return
       }
       if (!this.listQuery.beginTime && !this.listQuery.endTime) {
-        return this.$message('请选择起止时间')
+        this.$message.warning('请选择起止时间')
+        return
       }
       console.log(this.listQuery);
       if (this.listQuery.type == 3) {
diff --git a/src/views/report/productionSituationMW.vue b/src/views/report/productionSituationMW.vue
index babebe0..b6eb691 100644
--- a/src/views/report/productionSituationMW.vue
+++ b/src/views/report/productionSituationMW.vue
@@ -516,12 +516,14 @@ export default {
       this.chartMsgTarget.series = []
       this.chartMsgYearTarget.series[0].data = []
       this.chartMsgYearTarget.series[1].data = []
-      console.log(this.listQuery);
-      if (this.listQuery.type == null || this.listQuery.type == '') {
-        return this.$message('请选择时间维度')
+      console.log(this.listQuery.type);
+      if (this.listQuery.type === '') {
+        this.$message.warning('请选择时间维度！')
+        return
       }
       if (!this.listQuery.startDate && !this.listQuery.endDate) {
-        return this.$message('请选择起止时间')
+        this.$message.warning('请选择起止时间')
+        return
       }
       let arr = []
       this.currentMenu === '邯郸' ? arr.push(1) : arr.push(0)
diff --git a/src/views/report/productionSituationTablets.vue b/src/views/report/productionSituationTablets.vue
index 77e9797..af5bd70 100644
--- a/src/views/report/productionSituationTablets.vue
+++ b/src/views/report/productionSituationTablets.vue
@@ -648,12 +648,14 @@ export default {
       if (this.chartMsgYearTarget.series[3]) {
         this.chartMsgYearTarget.series[3].data = []
       }
-      // console.log(this.listQuery);
-      if (this.listQuery.type == null || this.listQuery.type == '') {
-        return this.$message('请选择时间维度')
+      console.log(this.listQuery)
+      if (this.listQuery.type === '') {
+        this.$message.warning('请选择时间维度！')
+        return
       }
       if (!this.listQuery.startDate && !this.listQuery.endDate) {
-        return this.$message('请选择起止时间')
+        this.$message.warning('请选择起止时间')
+        return
       }
       let arr = []
       this.currentMenu === '邯郸' ? arr.push(1) : arr.push(0)
diff --git a/src/views/report/productionYield.vue b/src/views/report/productionYield.vue
index cb94ae2..3e5bbd7 100644
--- a/src/views/report/productionYield.vue
+++ b/src/views/report/productionYield.vue
@@ -567,11 +567,13 @@ export default {
       this.chartMsgYearTarget.xData = []
       this.chartMsgYearTarget.series[0].data = []
       this.chartMsgYearTarget.series[1].data = []
-      if (this.listQuery.type == null || this.listQuery.type == '') {
-        return this.$message('请选择时间维度')
+      if (this.listQuery.type === '') {
+        this.$message.warning('请选择时间维度！')
+        return
       }
       if (!this.listQuery.startDate && !this.listQuery.endDate) {
-        return this.$message('请选择起止时间')
+        this.$message.warning('请选择起止时间')
+        return
       }
       let arr = []
       this.currentMenu === '邯郸' ? arr.push(1) : arr.push(0)