diff --git a/src/store/modules/home.js b/src/store/modules/home.js
index ea4d46a..669f429 100644
--- a/src/store/modules/home.js
+++ b/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) {
diff --git a/src/views/copilot/components/charts/BipvOutput.vue b/src/views/copilot/components/charts/BipvOutput.vue
index fd40bef..dba836b 100644
--- a/src/views/copilot/components/charts/BipvOutput.vue
+++ b/src/views/copilot/components/charts/BipvOutput.vue
@@ -6,7 +6,7 @@
-->
-
+
diff --git a/src/views/copilot/components/charts/ChipOutput.vue b/src/views/copilot/components/charts/ChipOutput.vue
index 498c72e..099dd42 100644
--- a/src/views/copilot/components/charts/ChipOutput.vue
+++ b/src/views/copilot/components/charts/ChipOutput.vue
@@ -6,7 +6,7 @@
-->
-
+
diff --git a/src/views/copilot/components/charts/FtoInvest.vue b/src/views/copilot/components/charts/FtoInvest.vue
index fc490dc..7971edc 100644
--- a/src/views/copilot/components/charts/FtoInvest.vue
+++ b/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 == "周"
- ? [
- {
- name: "样例数据--2023年",
- data: Array.from({ length: 7 }, () =>
- Math.floor(Math.random() * 1000)
- ),
- },
- ]
- : [
- {
- name: "样例数据--2023年",
- data: Array.from({ length: 7 }, () =>
- Math.floor(Math.random() * 1000)
- ),
- },
- {
- 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)
- ),
- },
- ];
+ 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 [
+ return getTemplate(this.period, dataList);
+ },
+ },
+};
+
+function getTemplate(period, dataList) {
+ const year = new Date().getFullYear();
+ const month = new Date().getMonth() + 1;
+ return period == "日" || period == "周"
+ ? [
+ {
+ name: period == "日" ? "昨天" : "本周",
+ data: dataList ?? [],
+ },
+ ]
+ : [
{
- name: `${new Date().getFullYear() - 1}年`,
- data: ftoInvest.previous,
+ name: period == "年" ? `${year - 1}年` : `${year - 1}年${month}月`,
+ data: dataList ? dataList[0] : [],
},
{
- name: `${new Date().getFullYear()}年`,
- data: ftoInvest.current,
+ name: period == "年" ? `${year}年` : `${year}年${month}月`,
+ data: dataList ? dataList[1] : [],
+ // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
},
];
- },
- },
-};
+}
diff --git a/src/views/copilot/components/charts/StdOutput.vue b/src/views/copilot/components/charts/StdOutput.vue
index 9ff5e7d..064b8b6 100644
--- a/src/views/copilot/components/charts/StdOutput.vue
+++ b/src/views/copilot/components/charts/StdOutput.vue
@@ -6,7 +6,7 @@
-->
-
+