From a249e88530da062979ea7c363a29c0909004b7bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98937886381=E2=80=99?= <‘937886381@qq.com’>
Date: Mon, 1 Jul 2024 14:40:09 +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          | 8 ++++----
 src/views/report/produceConversion.vue          | 8 ++++----
 src/views/report/productionSituationMW.vue      | 6 +++---
 src/views/report/productionSituationTablets.vue | 6 +++---
 src/views/report/productionYield.vue            | 6 +++---
 5 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/views/report/comprehensiveData.vue b/src/views/report/comprehensiveData.vue
index eb92bb0..a15571d 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-01 11:49:38
+ * @LastEditTime: 2024-07-01 14:39:18
  * @LastEditors: zhp
  * @Description:
 -->
@@ -326,12 +326,12 @@ export default {
       }
     },
     async getDataList() {
+      if (this.listQuery.type == null) {
+        return this.$message('请选择时间维度')
+      }
       if (!this.listQuery.startDate && !this.listQuery.endDate) {
         return this.$message('请选择起止时间')
       }
-      if (!this.listQuery.type) {
-        return this.$message('请选择时间维度')
-      }
       this.otherProps = []
       let arr  = []
       this.currentMenu === '邯郸' ? arr.push(1) : arr.push(0)
diff --git a/src/views/report/produceConversion.vue b/src/views/report/produceConversion.vue
index 189f7b6..0755eda 100644
--- a/src/views/report/produceConversion.vue
+++ b/src/views/report/produceConversion.vue
@@ -402,7 +402,7 @@ export default {
     this.getDataList()
   },
   methods: {
-    handleChange() {
+    handleChange(val) {
       this.listQuery.reportTime = []
       this.listQuery.end = null
       this.listQuery.start = null
@@ -529,12 +529,12 @@ export default {
       this.chartMsgYearTarget.series[0].data = []
       this.chartMsgYearTarget.series[1].data = []
       this.title = ''
+      if (this.listQuery.date == null) {
+        return this.$message('请选择时间维度')
+      }
       if (!this.listQuery.beginTime && !this.listQuery.endTime) {
         return this.$message('请选择起止时间')
       }
-      if (!this.listQuery.date) {
-        return this.$message('请选择时间维度')
-      }
       console.log(this.listQuery);
       if (this.listQuery.type == 3) {
         this.listQuery.beginTime = this.listQuery.reportTime[0]
diff --git a/src/views/report/productionSituationMW.vue b/src/views/report/productionSituationMW.vue
index 6fafa40..41be8ad 100644
--- a/src/views/report/productionSituationMW.vue
+++ b/src/views/report/productionSituationMW.vue
@@ -500,12 +500,12 @@ export default {
       this.chartMsgYearTarget.series[0].data = []
       this.chartMsgYearTarget.series[1].data = []
       console.log(this.listQuery);
+      if (this.listQuery.type == null) {
+        return this.$message('请选择时间维度')
+      }
       if (!this.listQuery.startDate && !this.listQuery.endDate) {
         return this.$message('请选择起止时间')
       }
-      if (!this.listQuery.type) {
-        return this.$message('请选择时间维度')
-      }
       let arr = []
       this.currentMenu === '邯郸' ? arr.push(1) : arr.push(0)
       this.listQuery.factory = arr
diff --git a/src/views/report/productionSituationTablets.vue b/src/views/report/productionSituationTablets.vue
index 0e8432c..2a9487b 100644
--- a/src/views/report/productionSituationTablets.vue
+++ b/src/views/report/productionSituationTablets.vue
@@ -632,12 +632,12 @@ export default {
         this.chartMsgYearTarget.series[3].data = []
       }
       // console.log(this.listQuery);
+      if (this.listQuery.type == null) {
+        return this.$message('请选择时间维度')
+      }
       if (!this.listQuery.startDate && !this.listQuery.endDate) {
         return this.$message('请选择起止时间')
       }
-      if (!this.listQuery.type) {
-        return this.$message('请选择时间维度')
-      }
       let arr = []
       this.currentMenu === '邯郸' ? arr.push(1) : arr.push(0)
       this.listQuery.factory = arr
diff --git a/src/views/report/productionYield.vue b/src/views/report/productionYield.vue
index e2dc078..472c64f 100644
--- a/src/views/report/productionYield.vue
+++ b/src/views/report/productionYield.vue
@@ -551,12 +551,12 @@ export default {
       this.chartMsgYearTarget.xData = []
       this.chartMsgYearTarget.series[0].data = []
       this.chartMsgYearTarget.series[1].data = []
+      if (this.listQuery.type == null) {
+        return this.$message('请选择时间维度')
+      }
       if (!this.listQuery.startDate && !this.listQuery.endDate) {
         return this.$message('请选择起止时间')
       }
-      if (!this.listQuery.type) {
-        return this.$message('请选择时间维度')
-      }
       let arr = []
       this.currentMenu === '邯郸' ? arr.push(1) : arr.push(0)
       this.listQuery.factory = arr