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

Reviewed-on: #78

src/views/report/comprehensiveData.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-04-15 10:49:13
- * @LastEditTime: 2024-07-01 14:39:18
+ * @LastEditTime: 2024-07-01 14:43:42
  * @LastEditors: zhp
  * @Description:
 -->
@@ -326,6 +326,7 @@ export default {
       }
     },
     async getDataList() {
+      console.log(this.listQuery.type);
       if (this.listQuery.type == null) {
         return this.$message('请选择时间维度')
       }

src/views/report/produceConversion.vue

@@ -247,7 +247,7 @@ export default {
         yAxis: [
           {
             type: "value",
-            name: "单位/片",
+            name: "单位/MW",
             // min: function (value) {//取最小值向下取整为最小刻度
             //   return 0
             // },