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

修改bug
Merge pull request 'projects/mescc/zhp' (#78 ) from projects/mescc/zhp into projects/mescc/develop
2024-07-01 15:28:12 +08:00 · 2024-07-01 15:27:49 +08:00 · 2024-07-01 14:58:13 +08:00
2 changed files with 3 additions and 2 deletions
--- 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 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('请选择时间维度')
      }
--- a/src/views/report/produceConversion.vue
+++ b/src/views/report/produceConversion.vue
@ -247,7 +247,7 @@ export default {
        yAxis: [
          {
            type: "value",
-            name: "单位/片",
+            name: "单位/MW",
            // min: function (value) {//取最小值向下取整为最小刻度
            //   return 0
            // },
Author	SHA1	Message	Date
‘937886381’	53ba98b01a	Merge branch 'projects/mescc/develop' into projects/mescc/zhp	2024-07-01 15:28:12 +08:00
‘937886381’	23cf4aaa1e	修改bug	2024-07-01 15:27:49 +08:00
juzi	81a110ba45	Merge pull request 'projects/mescc/zhp' (#78 ) from projects/mescc/zhp into projects/mescc/develop All checks were successful continuous-integration/drone/push Build is passing Details Reviewed-on: #78	2024-07-01 14:58:13 +08:00