制造成本分析修改

src/views/home/electricityCostAnalysisComponents/operatingTopBar.vue

@@ -23,23 +23,51 @@ export default {
     currentDataSource() {
       console.log('yyyy', this.chartData);
 
-      return this.chartData.group
+      return this.chartData
     },
     locations() {
-      console.log('this.chartData', this.chartData);
+      console.log('this.1111', this.chartData);
 
-      return this.chartData.group.locations
+      return this.chartData.locations
     },
     // 根据按钮切换生成对应的 chartData
     chartD() {
       // 销量场景数据
       const data = this.currentDataSource;
-      const diff = this.currentDataSource.diff[0]
-      const rate = this.currentDataSource.rate[0]
+      const diff = data.diff[0]
+      const rate = data.rate[0]
+      console.log(this.currentDataSource, 'currentDataSource');
 
       const salesData = {
         allPlaceNames: this.locations,
         series: [
+          // 1. 完成率（折线图）
+          // {
+          //   name: '完成率',
+          //   type: 'line',
+          //   yAxisIndex: 1, // 绑定右侧Y轴（需在子组件启用配置）
+          //   lineStyle: {
+          //     color: 'rgba(40, 138, 255, .5)',
+          //     width: 2
+          //   },
+          //   itemStyle: {
+          //     color: 'rgba(40, 138, 255, 1)',
+          //     borderColor: 'rgba(40, 138, 255, 1)',
+          //     borderWidth: 2,
+          //     radius: 4
+          //   },
+          //   areaStyle: {
+          //     opacity: 0.2,
+          //     color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+          //       { offset: 0, color: 'rgba(40, 138, 255, .9)' },
+          //       { offset: 1, color: 'rgba(40, 138, 255, 0)' }
+          //     ])
+          //   },
+          //   data: data.rates, // 完成率（%）
+          //   symbol: 'circle',
+          //   symbolSize: 6
+          // },
+          // 2. 目标（柱状图）
           {
             name: '预算',
             type: 'bar',
@@ -135,7 +163,7 @@ export default {
             name: '预算',
             type: 'bar',
             yAxisIndex: 0,
-            barWidth: 65,
+            barWidth: 14,
             itemStyle: {
               color: {
                 type: 'linear',
@@ -155,7 +183,7 @@ export default {
             name: '实际',
             type: 'bar',
             yAxisIndex: 0,
-            barWidth: 65,
+            barWidth: 14,
             itemStyle: {
               color: (params) => {
                 const safeFlag = [1, 0, 1, 1, 0, 1]; // 达标状态