修改bug

src/views/report/produceConversion.vue

@@ -84,7 +84,7 @@
             :chartMsg="chartMsgYearTarget" :chartId=" 'yearData'" :chartNum="chartNum" />
         </el-col> -->
       </el-row>
-      <base-table :key="showTable" :span-method="objectSpanMethod" :table-props="tableProps" :page="listQuery.current"
+      <base-table :key="showTable" :table-props="tableProps" :page="listQuery.current"
         :limit="listQuery.size" :table-data="tableData" :max-height="tableH" />
     </div>
     <!-- <div class="containerBottom">
@@ -174,7 +174,7 @@ export default {
         yAxis: [
           {
             type: "value",
-            name: "单位/片",
+            name: "单位/MW",
             nameTextStyle: {
               fontSize: 12,
               align: "right",
@@ -204,7 +204,7 @@ export default {
               position: [-18, -16],
               color: "#68C483",
               formatter: function (params) {
-                return params.value + "MW";
+                return params.value
               },
             },
           },
@@ -219,7 +219,7 @@ export default {
               position: [-18, -16],
               color: "#68C483",
               formatter: function (params) {
-                return params.value + "%";
+                return params.value
               },
             },
             yAxisIndex: 1
@@ -233,7 +233,16 @@ export default {
         yAxis: [
           {
             type: "value",
-          name: "单位/片",
+            name: "单位/片",
+            min: function (value) {//取最小值向下取整为最小刻度
+              return Math.floor(value.min)
+            },
+            max: function (value) {//取最大值向上取整为最大刻度
+              return Math.ceil(value.max)
+            },
+            alignTicks: true,
+            // splitNumber: 5,
+            scale: true,
             nameTextStyle: {
               fontSize: 12,
               align: "right",
@@ -241,8 +250,16 @@ export default {
             axisLabel: {},
           },
           {
-            type: "value",
+            type: 'value',
+            // inverse: true,
             name: "单位/%",
+            scale: true,
+            alignTicks: true,
+            min: 0,
+            max: 100,
+            // scale: true,
+            interval: 20,//间隔
+            // splitNumber: 8,
             nameTextStyle: {
               fontSize: 12,
               align: "right",
@@ -259,10 +276,10 @@ export default {
             barWidth: 20,
             label: {
               show: true,
-              position: [-18, -16],
+              position: [-50, -16],
               color: "#68C483",
               formatter: function (params) {
-                return params.value.toFixed(2) + "MW";
+                return params.value.toFixed(2)
               },
             },
           },
@@ -274,10 +291,10 @@ export default {
             barWidth: 20,
             label: {
               show: true,
-              position: [0, -16],
+              position: [10, -16],
               color: "#288AFF",
               formatter: function (params) {
-                return params.value.toFixed(2) + "MW";
+                return params.value.toFixed(2)
               },
             },
           },
@@ -294,7 +311,7 @@ export default {
               show: true,
               color: "#FFAE17",
               formatter: function (params) {
-                return params.value.toFixed(2) + "%";
+                return params.value.toFixed(2)
               },
             },
           },
@@ -313,13 +330,6 @@ export default {
   computed: {
     tableProps() {
       return [
-        {
-          prop: "factory",
-          label: "工厂名称",
-          // filter: (val) => factoryList[val],
-          minWidth: 200,
-          showOverflowtooltip: true,
-        },
         {
           prop: "item",
           label: "科目",
@@ -345,6 +355,9 @@ export default {
   },
   watch: {
     // 监听左侧菜单栏是否展开
+    currentMenu() {
+      this.getDataList()
+    },
     isOpen(val) {
       if (this.$route.name === "produceConversion") {
         this.chartNum++;
@@ -494,7 +507,9 @@ export default {
       this.chartMsg.series[2].data = []
       this.chartMsgYearTarget.series[0].data = []
       this.chartMsgYearTarget.series[1].data = []
-
+      if (!this.listQuery.beginTime && !this.listQuery.endTime) {
+        return this.$message('请选择起止时间')
+      }
       console.log(this.listQuery);
       if (this.listQuery.type == 3) {
         this.listQuery.beginTime = this.listQuery.reportTime[0]
@@ -560,9 +575,6 @@ export default {
             dataArr[0]['' + m + ''] = item.chipTotalPowers
             dataArr[1]['' + m + ''] = item.scTotalPowers
             dataArr[2]['' + m + ''] = item.conversionEfficiency
-            dataArr[0].factory = ele.factory === 1 ? '邯郸' : '瑞昌'
-            dataArr[1].factory = ele.factory === 1 ? '邯郸' : '瑞昌'
-            dataArr[2].factory = ele.factory === 1 ? '邯郸' : '瑞昌'
 
             // dataArr[3]['' + m + ''] = ele.comprehensiveYieldRate
             // })
@@ -573,7 +585,7 @@ export default {
             // })
           })
         })
-        this.title = 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,
@@ -618,7 +630,7 @@ export default {
           if (i.search('value') === 0) {
             this.chartMsg.series[0].data.push({
               name: dataArr[0]['item'],
-              value: dataArr[0][i]
+              value: dataArr[0][i] === 0 ? null : dataArr[0][i]
             })
           }
         }
@@ -627,7 +639,7 @@ export default {
           if (i.search('value') === 0) {
             this.chartMsg.series[1].data.push({
               name: dataArr[1]['item'],
-              value: dataArr[1][i]
+              value: dataArr[1][i] === 0 ? null : dataArr[1][i]
             })
           }
         }
@@ -636,7 +648,7 @@ export default {
           if (i.search('value') === 0) {
             this.chartMsg.series[2].data.push({
               name: dataArr[2]['item'],
-              value: dataArr[2][i]
+              value: dataArr[2][i] === 0 ? null : dataArr[2][i]
             })
           }
         }