Merge branch 'master' into develop1.0

z1415143022

2025-03-25 7b0346ed6bac6b451b3f6f5f1504a51bc88063ec

 zhitan-vue/src/views/poweranalysis/pariPassu/index.vue

@@ -228,7 +228,7 @@
          color: ["#2979ff", "#19be6b", "#ff9900", "#fa3534"],
          grid: {
            top: "45",
            left: "7%",
            left: "4%",
            right: "5%",
            bottom: "10",
            containLabel: true,