src/views/report/comprehensiveData.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-04-15 10:49:13
- * @LastEditTime: 2024-07-10 15:45:28
+ * @LastEditTime: 2024-07-09 16:16:14
  * @LastEditors: zhp
  * @Description:
 -->
@@ -344,13 +344,11 @@ export default {
     },
     async getDataList() {
       console.log(this.listQuery.type);
-      if (this.listQuery.type === '') {
+      if (this.listQuery.type == null || this.listQuery.type == '') {
-        this.$message.warning('请选择时间维度！')
+        return this.$message('请选择时间维度')
-        return
       }
       if (!this.listQuery.startDate && !this.listQuery.endDate) {
-        this.$message.warning('请选择起止时间')
+        return this.$message('请选择起止时间')
-        return
       }
       this.otherProps = []
       let arr  = []

src/views/report/produceConversion.vue

@@ -546,13 +546,11 @@ export default {
       this.chartMsgYearTarget.series[0].data = []
       this.chartMsgYearTarget.series[1].data = []
       this.title = ''
-      if (this.listQuery.date === '') {
+      if (this.listQuery.date == null || this.listQuery.date == '') {
-        this.$message.warning('请选择时间维度！')
+        return this.$message('请选择时间维度')
-        return
       }
       if (!this.listQuery.beginTime && !this.listQuery.endTime) {
-        this.$message.warning('请选择起止时间')
+        return this.$message('请选择起止时间')
-        return
       }
       console.log(this.listQuery);
       if (this.listQuery.type == 3) {

src/views/report/productionSituationMW.vue

@@ -516,14 +516,12 @@ export default {
       this.chartMsgTarget.series = []
       this.chartMsgYearTarget.series[0].data = []
       this.chartMsgYearTarget.series[1].data = []
-      console.log(this.listQuery.type);
+      console.log(this.listQuery);
-      if (this.listQuery.type === '') {
+      if (this.listQuery.type == null || this.listQuery.type == '') {
-        this.$message.warning('请选择时间维度！')
+        return this.$message('请选择时间维度')
-        return
       }
       if (!this.listQuery.startDate && !this.listQuery.endDate) {
-        this.$message.warning('请选择起止时间')
+        return this.$message('请选择起止时间')
-        return
       }
       let arr = []
       this.currentMenu === '邯郸' ? arr.push(1) : arr.push(0)

src/views/report/productionSituationTablets.vue

@@ -648,14 +648,12 @@ export default {
       if (this.chartMsgYearTarget.series[3]) {
         this.chartMsgYearTarget.series[3].data = []
       }
-      console.log(this.listQuery)
+      // console.log(this.listQuery);
-      if (this.listQuery.type === '') {
+      if (this.listQuery.type == null || this.listQuery.type == '') {
-        this.$message.warning('请选择时间维度！')
+        return this.$message('请选择时间维度')
-        return
       }
       if (!this.listQuery.startDate && !this.listQuery.endDate) {
-        this.$message.warning('请选择起止时间')
+        return this.$message('请选择起止时间')
-        return
       }
       let arr = []
       this.currentMenu === '邯郸' ? arr.push(1) : arr.push(0)

src/views/report/productionYield.vue

@@ -567,13 +567,11 @@ export default {
       this.chartMsgYearTarget.xData = []
       this.chartMsgYearTarget.series[0].data = []
       this.chartMsgYearTarget.series[1].data = []
-      if (this.listQuery.type === '') {
+      if (this.listQuery.type == null || this.listQuery.type == '') {
-        this.$message.warning('请选择时间维度！')
+        return this.$message('请选择时间维度')
-        return
       }
       if (!this.listQuery.startDate && !this.listQuery.endDate) {
-        this.$message.warning('请选择起止时间')
+        return this.$message('请选择起止时间')
-        return
       }
       let arr = []
       this.currentMenu === '邯郸' ? arr.push(1) : arr.push(0)