src/store/modules/home.js

@@ -87,7 +87,6 @@ function splitCurrentAndPrevious(factoryListResponse, targetListResponse) {
   const { chipInvest, ftoInvest, chipOutput, stdOutput, bipvOutput } = init();
   if (factoryListResponse) {
     for (const factory of factoryListResponse) {
-      debugger;
       const fId = getFactoryId(factory);
       // 获取目标值
       if (targetListResponse) {

src/views/copilot/components/charts/BipvOutput.vue

@@ -6,7 +6,7 @@
 -->
 
 <template>
-  <DoubleRingWrapperVue :data-source="dataBundle" :period="period" />
+  <DoubleRingWrapperVue data-source="BIPV产出" :period="period" />
 </template>
 
 <script>
@@ -22,7 +22,7 @@ export default {
     },
   },
   data() {
-    return { dataBundle: null };
+    return {};
   },
 };
 </script>

src/views/copilot/components/charts/ChipOutput.vue

@@ -6,7 +6,7 @@
 -->
 
 <template>
-  <DoubleRingWrapperVue :data-source="dataBundle" :period="period" />
+  <DoubleRingWrapperVue data-source="芯片产出" :period="period" />
 </template>
 
 <script>
@@ -22,7 +22,7 @@ export default {
     },
   },
   data() {
-    return { dataBundle: null };
+    return {};
   },
 };
 </script>

src/views/copilot/components/charts/FtoInvest.vue

@@ -44,8 +44,8 @@ export default {
           const year = new Date().getFullYear();
           const month = new Date().getMonth() + 1;
           return [
-            { label: `${year}年${month}月`, color: "#12f7f1" },
-            { label: `${year - 1}年${month}月`, color: "#58adfa" },
+            { label: `${year - 1}年${month}月`, color: "#12f7f1" },
+            { label: `${year}年${month}月`, color: "#58adfa" },
           ];
         }
         case "年": {
@@ -63,59 +63,45 @@ export default {
       }
     },
     series() {
-      const template =
-        this.period == "日" || this.period == "周"
+      const { ftoInvest } = this.$store.getters.copilot.yield;
+      let dataList = null;
+
+      switch (this.period) {
+        case "日":
+        case "周":
+          dataList = ftoInvest?.current;
+          break;
+        default:
+          dataList = [];
+          dataList[0] = ftoInvest?.pervious;
+          dataList[1] = ftoInvest?.current;
+      }
+
+      return getTemplate(this.period, dataList);
+    },
+  },
+};
+
+function getTemplate(period, dataList) {
+  const year = new Date().getFullYear();
+  const month = new Date().getMonth() + 1;
+  return period == "日" || period == "周"
     ? [
         {
-                name: "样例数据--2023年",
-                data: Array.from({ length: 7 }, () =>
-                  Math.floor(Math.random() * 1000)
-                ),
+          name: period == "日" ? "昨天" : "本周",
+          data: dataList ?? [],
         },
       ]
     : [
         {
-                name: "样例数据--2023年",
-                data: Array.from({ length: 7 }, () =>
-                  Math.floor(Math.random() * 1000)
-                ),
+          name: period == "年" ? `${year - 1}年` : `${year - 1}年${month}月`,
+          data: dataList ? dataList[0] : [],
         },
         {
-                name: "样例数据--2024年",
-                data: Array.from({ length: 7 }, () =>
-                  Math.floor(Math.random() * 1000)
-                ),
-              },
-            ];
-      const ftoInvest = this.$store.getters.home.ftoInvest;
-      if (!ftoInvest || !ftoInvest.current || !ftoInvest.previous) {
-        return [
-          {
-            name: "样例数据--2023年",
-            data: Array.from({ length: 7 }, () =>
-              Math.floor(Math.random() * 1000)
-            ),
-          },
-          {
-            name: "样例数据--2024年",
-            data: Array.from({ length: 7 }, () =>
-              Math.floor(Math.random() * 1000)
-            ),
+          name: period == "年" ? `${year}年` : `${year}年${month}月`,
+          data: dataList ? dataList[1] : [],
+          // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
         },
       ];
 }
-
-      return [
-        {
-          name: `${new Date().getFullYear() - 1}年`,
-          data: ftoInvest.previous,
-        },
-        {
-          name: `${new Date().getFullYear()}年`,
-          data: ftoInvest.current,
-        },
-      ];
-    },
-  },
-};
 </script>

src/views/copilot/components/charts/StdOutput.vue

@@ -6,7 +6,7 @@
 -->
 
 <template>
-  <DoubleRingWrapperVue data-source="标准组件输出" :period="period" />
+  <DoubleRingWrapperVue data-source="标准组件产出" :period="period" />
 </template>
 
 <script>

src/views/copilot/components/charts/base/BarChartBase.vue

@@ -197,8 +197,8 @@ export default {
       const actualOptions = JSON.parse(JSON.stringify(this.options));
       actualOptions.series[0].data = val[0].data;
       actualOptions.series[0].name = val[0].name;
-      actualOptions.series[1].data = val[1].data;
-      actualOptions.series[1].name = val[1].name;
+      actualOptions.series[1].data = val?.[1]?.data || [];
+      actualOptions.series[1].name = val?.[1]?.name || '';
       this.actualOptions = actualOptions;
       this.initOptions(actualOptions);
     },

src/views/copilot/components/charts/base/CityData.vue

@@ -57,13 +57,13 @@ export default {
     headquarterValue() {
       let getterName = "";
       switch (this.dataSource) {
-        case "标准组件输出":
+        case "标准组件产出":
           getterName = "stdOutput";
           break;
-        case "芯片输出":
+        case "芯片产出":
           getterName = "chipOutput";
           break;
-        case "BIPV输出":
+        case "BIPV产出":
           getterName = "bipvOutput";
           break;
       }
@@ -74,13 +74,13 @@ export default {
     cities() {
       let getterName = "";
       switch (this.dataSource) {
-        case "标准组件输出":
+        case "标准组件产出":
           getterName = "stdOutput";
           break;
-        case "芯片输出":
+        case "芯片产出":
           getterName = "chipOutput";
           break;
-        case "BIPV输出":
+        case "BIPV产出":
           getterName = "bipvOutput";
           break;
       }