Merge branch 'projects/mescc/develop' into projects/mescc/zhp

Reviewed-on: #76

src/views/report/comprehensiveData.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-04-15 10:49:13
- * @LastEditTime: 2024-06-28 14:43:36
+ * @LastEditTime: 2024-07-01 11:49:38
  * @LastEditors: zhp
  * @Description:
 -->
@@ -329,6 +329,9 @@ export default {
       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)

src/views/report/produceConversion.vue

@@ -290,7 +290,7 @@ export default {
             barWidth: 20,
             label: {
               show: true,
-              position: [-50, -16],
+              position: [-20, -16],
               color: "#68C483",
               formatter: function (params) {
                 return params.value.toFixed(2)
@@ -532,6 +532,9 @@ export default {
       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]
@@ -568,10 +571,10 @@ export default {
         })
       })
       if (res.data[0].list.length != 0) {
-        this.chartMsg.xData.push(res.data[0].list[res.data[0].list.length-1].reportTimep + '目标')
+        this.chartMsg.xData.push(res.data[0].list[res.data[0].list.length - 1].reportTimep + '年目标')
         if (this.listQuery.date === 0 || this.listQuery.date === 1 || this.listQuery.date === 2) {
           this.otherProps.push({
-            label: res.data[0].list[res.data[0].list.length - 1].reportTimep + '目标',
+            label: res.data[0].list[res.data[0].list.length - 1].reportTimep + '年目标',
             prop: 'dayData'
           })
           dataArr[0]['dayData'] = res.data[0].list[res.data[0].list.length - 1].chipTarget
@@ -607,7 +610,7 @@ export default {
             // })
           })
         })
-        this.title = res.data[0].yearTarget.targetTime ? res.data[0].yearTarget.targetTime + '目标值' : ''
+        this.title = res.data[0].yearTarget.targetTime ? res.data[0].yearTarget.targetTime + '年目标值' : ''
         this.chartMsgYearTarget.series[0].data = [
           {
             value: res.data[0].yearTarget.chipTotalPower,

src/views/report/productionSituationMW.vue

@@ -503,6 +503,9 @@ export default {
       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

src/views/report/productionSituationTablets.vue

@@ -635,6 +635,9 @@ export default {
       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

src/views/report/productionYield.vue

@@ -554,6 +554,9 @@ export default {
       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