From 30af8faa4916cb45261f1de15f374dee1eec3eb1 Mon Sep 17 00:00:00 2001
From: "DESKTOP-FUDKNA8\\znjsz" <tonystark@starkindustries.mil>
Date: Wed, 24 Apr 2024 16:31:27 +0800
Subject: [PATCH 1/7] =?UTF-8?q?update=20=E4=BA=A7=E9=87=8F=E9=A9=BE?=
 =?UTF-8?q?=E9=A9=B6=E8=88=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/modules/home.js                     |  73 ++++-
 .../copilot/components/charts/FtoInvest.vue   | 121 +++++++++
 .../copilot/components/charts/StdOutput.vue   |  11 +-
 .../components/charts/base/BarChartBase.vue   | 253 ++++++++++++++++++
 .../components/charts/base/CityData.vue       |  96 +++++++
 .../components/charts/base/CityItem.vue       |  81 ++++++
 .../charts/base/DoubleRingChart.vue           |  52 +++-
 .../charts/base/DoubleRingWrapper.vue         |  36 ++-
 .../components/charts/base/GradientText.vue   |  56 ++++
 src/views/copilot/components/select.vue       |  12 +-
 src/views/copilot/yield/index.vue             |  30 ++-
 11 files changed, 793 insertions(+), 28 deletions(-)
 create mode 100644 src/views/copilot/components/charts/FtoInvest.vue
 create mode 100644 src/views/copilot/components/charts/base/BarChartBase.vue
 create mode 100644 src/views/copilot/components/charts/base/CityData.vue
 create mode 100644 src/views/copilot/components/charts/base/CityItem.vue
 create mode 100644 src/views/copilot/components/charts/base/GradientText.vue

diff --git a/src/store/modules/home.js b/src/store/modules/home.js
index e9f8163..c9342ba 100644
--- a/src/store/modules/home.js
+++ b/src/store/modules/home.js
@@ -34,6 +34,17 @@ async function getHomeTarget() {
   return null;
 }
 
+async function getCopilotYield(params) {
+  const { code, data } = await axios.post("/ip/prod-output/query-by-date", {
+    ...params,
+  });
+  if (code == 0) {
+    return data;
+  }
+  console.warn("getCopilotYield failed, code: ", code);
+  return null;
+}
+
 /* 状态 */
 const state = {
   copilot: {
@@ -61,7 +72,19 @@ const mutations = {
     state.home.stdOutput = payload.stdOutput;
     state.home.bipvOutput = payload.bipvOutput;
   },
-  SET_COPILOT_INFO: (state) => {},
+  SET_COPILOT_INFO: (state, payload) => {
+    switch (payload.type) {
+      case "yield":
+        state.copilot.yield = payload.data;
+        break;
+      case "energy":
+        state.copilot.energy = payload.data;
+        break;
+      case "efficiency":
+        state.copilot.efficiency = payload.data;
+        break;
+    }
+  },
 };
 
 const actions = {
@@ -104,7 +127,11 @@ const actions = {
           if (target) {
             chipOutput.target.splice(factoryId, 1, target.chipYield ?? 0);
             stdOutput.target.splice(factoryId, 1, target.componentYield ?? 0);
-            bipvOutput.target.splice(factoryId, 1, target.bipvProductOutput ?? 0);
+            bipvOutput.target.splice(
+              factoryId,
+              1,
+              target.bipvProductOutput ?? 0
+            );
           }
         }
         /* 收集芯片投入数据 */
@@ -184,7 +211,47 @@ const actions = {
     }
   },
   /** 初始化驾驶舱数据 */
-  async initCopilot({ commit }) {},
+  async initCopilot({ commit }, payload) {
+    const { period } = payload;
+    let dummyData = null;
+    let type = null;
+    // 请求参数，直接一次性获取所有工厂
+    let queryParams = {
+      factorys: [],
+      date: 4,
+    };
+
+    switch (period) {
+      case "日":
+        queryParams.date = 1;
+        break;
+      case "周":
+        queryParams.date = 2;
+        break;
+      case "月":
+        queryParams.date = 3;
+        break;
+      case "年":
+        queryParams.date = 4;
+        break;
+      default:
+        queryParams.date = 1;
+        break;
+    }
+
+    const data = await getCopilotYield(queryParams);
+    if (data) {
+      dummyData = data;
+      type = "yield";
+    }
+
+    console.log("[copilot yield data]: ", dummyData, type);
+    // commit
+    // commit('SET_COPILOT_INFO', {
+    //   type,
+    //   data: dummyData
+    // })
+  },
 };
 
 export default {
diff --git a/src/views/copilot/components/charts/FtoInvest.vue b/src/views/copilot/components/charts/FtoInvest.vue
new file mode 100644
index 0000000..fc490dc
--- /dev/null
+++ b/src/views/copilot/components/charts/FtoInvest.vue
@@ -0,0 +1,121 @@
+<!-- 
+    filename: FtoInvest.vue
+    author: liubin
+    date: 2024-04-10 08:59:28
+    description: 
+-->
+
+<template>
+  <bar-chart-base
+    :legend="legend"
+    :series="series"
+    :xAxis="xAxis"
+    class="fto-chart"
+  />
+</template>
+
+<script>
+import BarChartBase from "./base/BarChartBase.vue";
+
+export default {
+  name: "FtoInvest",
+  components: { BarChartBase },
+  data() {
+    // 城市数组的顺序必须是固定的
+    const cities = ["瑞昌", "邯郸", "株洲", "佳木斯", "成都", "凯盛", "蚌埠"];
+    return {
+      xAxis: cities,
+    };
+  },
+  props: {
+    period: {
+      type: String,
+      default: "日",
+    },
+  },
+  computed: {
+    legend() {
+      switch (this.period) {
+        case "日":
+          return [{ label: "昨日", color: "#12f7f1" }];
+        case "周":
+          return [{ label: "本周", color: "#12f7f1" }];
+        case "月": {
+          const year = new Date().getFullYear();
+          const month = new Date().getMonth() + 1;
+          return [
+            { label: `${year}年${month}月`, color: "#12f7f1" },
+            { label: `${year - 1}年${month}月`, color: "#58adfa" },
+          ];
+        }
+        case "年": {
+          const year = new Date().getFullYear();
+          return [
+            { label: `${year - 1}年`, color: "#12f7f1" },
+            { label: `${year}年`, color: "#58adfa" },
+          ];
+        }
+        default:
+          return [
+            { label: `${year - 1}年`, color: "#12f7f1" },
+            { label: `${year}年`, color: "#58adfa" },
+          ];
+      }
+    },
+    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)
+            ),
+          },
+        ];
+      }
+
+      return [
+        {
+          name: `${new Date().getFullYear() - 1}年`,
+          data: ftoInvest.previous,
+        },
+        {
+          name: `${new Date().getFullYear()}年`,
+          data: ftoInvest.current,
+        },
+      ];
+    },
+  },
+};
+</script>
diff --git a/src/views/copilot/components/charts/StdOutput.vue b/src/views/copilot/components/charts/StdOutput.vue
index e09df94..97c787b 100644
--- a/src/views/copilot/components/charts/StdOutput.vue
+++ b/src/views/copilot/components/charts/StdOutput.vue
@@ -6,7 +6,7 @@
 -->
 
 <template>
-  <DoubleRingWrapperVue />
+  <DoubleRingWrapperVue :data-source="dataBundle" :period="period" />
 </template>
 
 <script>
@@ -15,9 +15,14 @@ import DoubleRingWrapperVue from "./base/DoubleRingWrapper.vue";
 export default {
   name: "StdOutput",
   components: { DoubleRingWrapperVue },
-  props: {},
+  props: {
+    period: {
+      type: String,
+      default: "日",
+    },
+  },
   data() {
-    return {};
+    return { dataBundle: null };
   },
 };
 </script>
diff --git a/src/views/copilot/components/charts/base/BarChartBase.vue b/src/views/copilot/components/charts/base/BarChartBase.vue
new file mode 100644
index 0000000..77d693e
--- /dev/null
+++ b/src/views/copilot/components/charts/base/BarChartBase.vue
@@ -0,0 +1,253 @@
+<!-- 
+    filename: BarChartBase.vue
+    author: liubin
+    date: 2024-04-10 08:59:28
+    description: 
+-->
+
+<template>
+  <chart-container class="bar-chart-base">
+    <div class="legend">
+      <span
+        v-for="item in legend"
+        :key="item.label"
+        class="legend-item"
+        :style="{ fontSize: isFullscreen ? '0.58vw' : '0.54vw' }"
+        >{{ item.label }}</span
+      >
+    </div>
+    <div
+      ref="chart"
+      style="max-width: 50vw"
+      :style="{ height: vHeight + 'vh' }"
+    ></div>
+  </chart-container>
+</template>
+
+<script>
+import screenfull from "screenfull";
+import ChartContainerVue from "../../../../components/ChartContainer.vue";
+import chartMixin from "@/mixins/chart.js";
+
+export default {
+  name: "BarChartBase",
+  components: {
+    ChartContainer: ChartContainerVue,
+  },
+  mixins: [chartMixin],
+  props: {
+    vHeight: {
+      type: Number,
+      default: 34,
+    },
+    legend: {
+      type: Array,
+      required: true,
+    },
+    xAxis: {
+      type: Array,
+      required: true,
+    },
+    series: {
+      type: Array,
+      required: true,
+    },
+  },
+  data() {
+    return {
+      isFullscreen: false,
+      actualOptions: null,
+      options: {
+        grid: {
+          left: "5%",
+          right: "4%",
+          bottom: "3%",
+          top: "15%",
+          containLabel: true,
+        },
+        tooltip: {},
+        xAxis: {
+          axisTick: {
+            show: false,
+          },
+          axisLine: {
+            lineStyle: {
+              color: "#4561AE",
+            },
+          },
+          axisLabel: {
+            color: "#fff",
+            fontSize: 12,
+          },
+          data: this.xAxis,
+        },
+        yAxis: {
+          name: "单位/片",
+          nameTextStyle: {
+            color: "#fff",
+            fontSize: 12,
+          },
+          axisTick: {
+            show: false,
+          },
+          axisLabel: {
+            color: "#fff",
+            fontSize: 12,
+          },
+          axisLine: {
+            show: true,
+            lineStyle: {
+              color: "#4561AE",
+            },
+          },
+          splitLine: {
+            lineStyle: {
+              color: "#4561AE",
+            },
+          },
+        },
+        series: [
+          {
+            name: "", // this.series[0].name,
+            type: "bar",
+            barWidth: 12,
+            itemStyle: {
+              borderRadius: [10, 10, 0, 0],
+              color: {
+                type: "linear",
+                x: 0,
+                y: 0,
+                x2: 0,
+                y2: 1,
+                colorStops: [
+                  {
+                    offset: 0,
+                    color: "#12f7f1", // 0% 处的颜色
+                  },
+                  {
+                    offset: 0.35,
+                    color: "#12f7f177", // 100% 处的颜色
+                  },
+                  {
+                    offset: 0.75,
+                    color: "#12f7f133", // 100% 处的颜色
+                  },
+                  {
+                    offset: 1,
+                    color: "transparent", // 100% 处的颜色
+                  },
+                ],
+                global: false, // 缺省为 false
+              },
+            },
+            data: [], // this.series[0].data,
+          },
+          {
+            name: "", // this.series[1].name,
+            type: "bar",
+            barWidth: 12,
+            // tooltip: {
+            //   valueFormatter: function (value) {
+            //     return value + " ml";
+            //   },
+            // },
+            itemStyle: {
+              borderRadius: [10, 10, 0, 0],
+              color: {
+                type: "linear",
+                x: 0,
+                y: 0,
+                x2: 0,
+                y2: 1,
+                colorStops: [
+                  {
+                    offset: 0,
+                    color: "#57abf8", // 0% 处的颜色
+                  },
+                  {
+                    offset: 1,
+                    color: "#364BFE66", // 100% 处的颜色
+                  },
+                ],
+                global: false, // 缺省为 false
+              },
+            },
+            data: [], // this.series[1].data,
+          },
+        ],
+      },
+    };
+  },
+  watch: {
+    /** 全屏状态切换时，对柱子粗细和字体大小进行相应调整 */
+    isFullscreen(val) {
+      this.actualOptions.series.map((item) => {
+        item.barWidth = val ? 18 : 12;
+      });
+      this.actualOptions.xAxis.axisLabel.fontSize = val ? 18 : 12;
+      this.actualOptions.yAxis.axisLabel.fontSize = val ? 18 : 12;
+      this.actualOptions.yAxis.nameTextStyle.fontSize = val ? 18 : 12;
+      this.initOptions(this.actualOptions);
+    },
+    series(val) {
+      if (!val) {
+        this.initOptions(this.options);
+        return;
+      }
+      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;
+      this.actualOptions = actualOptions;
+      this.initOptions(actualOptions);
+    },
+  },
+  mounted() {
+    this.actualOptions = this.options;
+    this.initOptions(this.options);
+
+    if (screenfull.isEnabled) {
+      screenfull.on("change", () => {
+        this.isFullscreen = screenfull.isFullscreen;
+      });
+    }
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.bar-chart-base {
+  // position: relative;
+
+  .legend {
+    position: absolute;
+    top: 5.2vh;
+    right: 1vw;
+  }
+
+  .legend-item {
+    position: relative;
+    // font-size: 12px;
+    margin-right: 0.67vw;
+
+    &::before {
+      content: "";
+      display: inline-block;
+      width: 0.531vw;
+      height: 0.531vw;
+      background-color: #ccc;
+      border-radius: 2px;
+      margin-right: 0.22vw;
+    }
+  }
+
+  .legend-item:nth-child(1):before {
+    background-color: #12f7f1;
+  }
+
+  .legend-item:nth-child(2):before {
+    background-color: #58adfa;
+  }
+}
+</style>
diff --git a/src/views/copilot/components/charts/base/CityData.vue b/src/views/copilot/components/charts/base/CityData.vue
new file mode 100644
index 0000000..502388c
--- /dev/null
+++ b/src/views/copilot/components/charts/base/CityData.vue
@@ -0,0 +1,96 @@
+<!-- 
+    filename: CityData.vue
+    author: liubin
+    date: 2024-04-17 09:55:12
+    description: 
+-->
+
+<template>
+  <div class="city-data">
+    <div class="headquarter">
+      <div class="inner-shadow w-1"></div>
+      <div class="inner-shadow flex-1">凯盛光伏</div>
+      <div class="inner-shadow w-1"></div>
+    </div>
+
+    <div class="city-item-container">
+      <CityItem
+        v-for="city in cities"
+        :key="city.name"
+        :location="city.name"
+        :value="city.value"
+        :period="period"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+import CityItemVue from "./CityItem.vue";
+export default {
+  name: "CityData",
+  components: { CityItem: CityItemVue },
+  props: {
+    dataSource: {
+      type: Object,
+      default: () => ({}),
+    },
+    period: {
+      type: String,
+      default: "日",
+    },
+  },
+  data() {
+    return {
+      cities: [
+        { name: "蚌埠兴科", value: 93111 },
+        { name: "成都", value: 32212 },
+        { name: "邯郸", value: 7732 },
+        { name: "株洲", value: 71732 },
+        { name: "瑞昌", value: 23421 },
+        { name: "佳木斯", value: 340 },
+      ],
+    };
+  },
+  computed: {},
+  mounted() {},
+  methods: {},
+};
+</script>
+
+<style scoped lang="scss">
+.city-data {
+  width: 100%;
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+}
+
+.headquarter {
+  flex: 1;
+  display: flex;
+  gap: 8px;
+}
+
+.w-1 {
+  width: 70px;
+}
+
+.flex-1 {
+  flex: 1;
+}
+
+.inner-shadow {
+  box-shadow: inset 0 0 12px 2px #fff3;
+  border-radius: 4px;
+}
+
+.city-item-container {
+  flex: 3;
+  display: grid;
+  grid-template-columns: repeat(2, 1fr);
+  background: #ccc3;
+  gap: 8px;
+}
+</style>
diff --git a/src/views/copilot/components/charts/base/CityItem.vue b/src/views/copilot/components/charts/base/CityItem.vue
new file mode 100644
index 0000000..6978a48
--- /dev/null
+++ b/src/views/copilot/components/charts/base/CityItem.vue
@@ -0,0 +1,81 @@
+<!-- 
+    filename: CityItem.vue
+    author: liubin
+    date: 2024-04-17 09:55:12
+    description: 
+-->
+
+<template>
+  <div class="city-item inner-shadow">
+    <div class="item-location">
+      <img src="#" alt="" />
+      <span>{{ location }}</span>
+    </div>
+    <div class="item-value" style="position: relative; flex: 1">
+      <div
+        class=""
+        style="
+          width: 100%;
+          position: absolute;
+          top: 12%;
+          left: 50%;
+          transform: translateX(-25%);
+          overflow: hidden;
+        "
+      >
+        <GradientTextVue :text="'' + value" />
+      </div>
+      <span
+        style="
+          width: 100%;
+          font-size: 14px;
+          line-height: 16px;
+          position: absolute;
+          top: 56%;
+          left: 24%;
+        "
+        >{{ period == "日" ? "今日产出" : "本周产出" }}</span
+      >
+    </div>
+  </div>
+</template>
+
+<script>
+import GradientTextVue from "./GradientText.vue";
+export default {
+  name: "CityItem",
+  components: { GradientTextVue },
+  props: {
+    location: {
+      type: String,
+      default: "",
+    },
+    value: {
+      type: Number,
+      default: 0,
+    },
+    period: {
+      type: String,
+      default: "日",
+    },
+  },
+  data() {
+    return {};
+  },
+  computed: {},
+  mounted() {},
+  methods: {},
+};
+</script>
+
+<style scoped lang="scss">
+.city-item {
+  display: flex;
+  gap: 8px;
+}
+
+.inner-shadow {
+  box-shadow: inset 0 0 12px 2px #fff3;
+  border-radius: 4px;
+}
+</style>
diff --git a/src/views/copilot/components/charts/base/DoubleRingChart.vue b/src/views/copilot/components/charts/base/DoubleRingChart.vue
index 15b90d5..be15fca 100644
--- a/src/views/copilot/components/charts/base/DoubleRingChart.vue
+++ b/src/views/copilot/components/charts/base/DoubleRingChart.vue
@@ -33,19 +33,19 @@ export default {
       type: Number,
       default: 24,
     },
-    legendItems: {
-      type: Array,
-      default: () => [
-        { label: "2023年累计", value: 88002 },
-        { label: "2024年累计", value: 88002 },
-        { label: "2025年累计", value: 88002 },
-      ],
+    period: {
+      type: String,
+      default: "日",
     },
   },
   data() {
     return {};
   },
-  computed: {},
+  computed: {
+    legendItems() {
+      return calculateItems(this.period);
+    },
+  },
   mounted() {
     this.initOptions(options);
   },
@@ -56,6 +56,42 @@ export default {
     },
   },
 };
+
+function calculateItems(period) {
+  let items = [];
+  const today = new Date().getDate();
+  const month = new Date().getMonth() + 1;
+  const year = new Date().getFullYear();
+  switch (period) {
+    case "日":
+      items = [
+        { label: `${month}月${today}日累计`, value: 24 },
+        { label: `去年${month}月${today}日累计`, value: 33 },
+      ];
+      break;
+    case "周":
+      items = [
+        { label: `本周累计`, value: 32 },
+        { label: `去年本周累计`, value: 12 },
+      ];
+      break;
+    case "月":
+      items = [
+        { label: `${month}月累计`, value: 24 },
+        { label: `去年${month}月累计`, value: 33 },
+        { label: `${month}月目标`, value: 12334 },
+      ];
+      break;
+    case "年":
+      items = [
+        { label: `${year - 1}年累计`, value: 23234 },
+        { label: `${year}年累计`, value: 4324 },
+        { label: `${year}年目标`, value: 12334 },
+      ];
+      break;
+  }
+  return items;
+}
 </script>
 
 <style scoped>
diff --git a/src/views/copilot/components/charts/base/DoubleRingWrapper.vue b/src/views/copilot/components/charts/base/DoubleRingWrapper.vue
index 2adcacf..10d3fc7 100644
--- a/src/views/copilot/components/charts/base/DoubleRingWrapper.vue
+++ b/src/views/copilot/components/charts/base/DoubleRingWrapper.vue
@@ -7,10 +7,18 @@
 
 <template>
   <div class="double-ring-wrapper">
-    <copilot-select :options="cityOptions" />
-    <div class="flex-1 stretch">
-      <DoubleRingChartVue />
-    </div>
+    <template v-if="period == '月' || period == '年'">
+      <copilot-select
+        @update:active="handleActiveUpdate"
+        :options="cityOptions"
+      />
+      <div class="flex-1 stretch">
+        <DoubleRingChartVue :period="period" />
+      </div>
+    </template>
+    <template v-else>
+      <CityData :data-source="dataSource" :period="period" />
+    </template>
   </div>
 </template>
 
@@ -18,11 +26,21 @@
 import CopilotSelect from "../../select.vue";
 import fetcher from "./fetcherDoubleRing";
 import DoubleRingChartVue from "./DoubleRingChart.vue";
+import CityData from './CityData.vue';
 
 export default {
   name: "DoubleRingWrapper",
-  components: { CopilotSelect, DoubleRingChartVue },
-  props: {},
+  components: { CopilotSelect, DoubleRingChartVue, CityData },
+  props: {
+    dataSource: {
+      type: Object,
+      default: () => ({}),
+    },
+    period: {
+      type: String,
+      default: "日",
+    },
+  },
   data() {
     return {
       cityOptions: [
@@ -42,7 +60,11 @@ export default {
       console.log("getData--->", res);
     });
   },
-  methods: {},
+  methods: {
+    handleActiveUpdate(val) {
+      console.log("handleActiveUpdate--->", val);
+    },
+  },
 };
 </script>
 
diff --git a/src/views/copilot/components/charts/base/GradientText.vue b/src/views/copilot/components/charts/base/GradientText.vue
new file mode 100644
index 0000000..111cda9
--- /dev/null
+++ b/src/views/copilot/components/charts/base/GradientText.vue
@@ -0,0 +1,56 @@
+<!-- 
+    filename: GradientText.vue
+    author: liubin
+    date: 2024-04-24 16:33:25
+    description: 
+-->
+
+<template>
+  <svg height="32" width="100%">
+    <defs>
+      <linearGradient id="smoke-text" x1="0%" y1="0%" x2="0%" y2="100%">
+        <stop offset="0%" style="stop-color: #00fff4; stop-opacity: 1" />
+        <stop offset="100%" style="stop-color: #37bdfe; stop-opacity: 1" />
+      </linearGradient>
+    </defs>
+    <text
+      x="0"
+      y="24"
+      fill="url(#smoke-text)"
+      :style="{ fontSize: '24px', letterSpacing: spacing || '2px' }"
+    >
+      {{ text | numberFilter }}
+    </text>
+  </svg>
+</template>
+
+<script>
+export default {
+  name: "GradientText",
+  components: {},
+  props: {
+    text: {
+      type: String,
+      default: "Test",
+    },
+    spacing: {
+      type: String,
+      default: "1px",
+    },
+  },
+  filters: {
+    numberFilter(value) {
+      if (value != null && !isNaN(parseInt(value))) {
+        return parseInt(value).toLocaleString();
+      } else {
+        return value;
+      }
+    },
+  },
+  data() {
+    return {};
+  },
+};
+</script>
+
+<style scoped lang="scss"></style>
diff --git a/src/views/copilot/components/select.vue b/src/views/copilot/components/select.vue
index 4ecf30f..58e9814 100644
--- a/src/views/copilot/components/select.vue
+++ b/src/views/copilot/components/select.vue
@@ -33,9 +33,17 @@ export default {
   },
   data() {
     return {
-      currentActive: '',
+      currentActive: this.options[0],
     };
   },
+  watch: {
+    currentActive: {
+      handler(val) {
+        this.$emit("update:active", val);
+      },
+      immediate: true,
+    },
+  },
   computed: {},
   methods: {},
 };
@@ -55,7 +63,7 @@ button {
   padding: 8px 12px;
   cursor: pointer;
   position: relative;
-  transition: all .3s;
+  transition: all 0.3s;
 }
 
 button.active,
diff --git a/src/views/copilot/yield/index.vue b/src/views/copilot/yield/index.vue
index 2bc0134..9a08a72 100644
--- a/src/views/copilot/yield/index.vue
+++ b/src/views/copilot/yield/index.vue
@@ -9,7 +9,7 @@
   <div class="yield-copilot">
     <section class="top flex">
       <db-container class="std-yield" title="标准组件产出" icon="std">
-        <std-output />
+        <std-output :period="period" />
       </db-container>
       <db-container class="chip-yield" title="芯片产出" icon="chip2">
         <chip-output />
@@ -19,7 +19,9 @@
       </db-container>
     </section>
     <section class="bottom flex">
-      <db-container class="fto-involve" title="FTO投入"></db-container>
+      <db-container class="fto-involve" title="FTO投入">
+        <fto-invest :period="period" />
+      </db-container>
       <db-container
         class="chip-involve"
         title="芯片投入"
@@ -33,7 +35,7 @@
 import Container from "../components/Container.vue";
 import StdOutputVue from "../components/charts/StdOutput.vue";
 import ChipOutputVue from "../components/charts/ChipOutput.vue";
-
+import FtoInvestVue from "../components/charts/FtoInvest.vue";
 import BipvOutputVue from "../components/charts/BipvOutput.vue";
 
 export default {
@@ -43,13 +45,31 @@ export default {
     StdOutput: StdOutputVue,
     ChipOutput: ChipOutputVue,
     BipvOutput: BipvOutputVue,
+    FtoInvest: FtoInvestVue
+  },
+  props: {
+    period: {
+      type: String,
+      default: "日",
+    },
   },
-  props: {},
   data() {
     return {};
   },
   computed: {},
-  methods: {},
+  watch: {
+    period: {
+      handler(val) {
+        val && this.fetchData(val);
+      },
+      immediate: true,
+    },
+  },
+  methods: {
+    fetchData(period = "日") {
+      this.$store.dispatch("copilot/initCopilot", { period });
+    },
+  },
 };
 </script>
 
-- 
2.45.2


From bb399835e7a37d78d8b8425f7834d8bdf001c6c7 Mon Sep 17 00:00:00 2001
From: "DESKTOP-FUDKNA8\\znjsz" <tonystark@starkindustries.mil>
Date: Thu, 25 Apr 2024 14:55:23 +0800
Subject: [PATCH 2/7] =?UTF-8?q?update=20=E4=BA=A7=E9=87=8F=E9=A9=BE?=
 =?UTF-8?q?=E9=A9=B6=E8=88=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../copilot/components/charts/BipvOutput.vue  |  11 +-
 .../copilot/components/charts/ChipInvest.vue  | 121 +++++++++++++++++
 .../copilot/components/charts/ChipOutput.vue  |  11 +-
 .../components/charts/base/CityData.vue       |  19 ++-
 .../components/charts/base/CityItem.vue       |  41 ++----
 .../components/charts/base/CityName.vue       |  55 ++++++++
 .../components/charts/base/CityValue.vue      | 127 ++++++++++++++++++
 .../components/charts/base/GradientText.vue   |  14 +-
 .../copilot/components/charts/base/icon.png   | Bin 0 -> 5165 bytes
 src/views/copilot/container.vue               |   8 ++
 src/views/copilot/yield/index.vue             |  16 +--
 11 files changed, 371 insertions(+), 52 deletions(-)
 create mode 100644 src/views/copilot/components/charts/ChipInvest.vue
 create mode 100644 src/views/copilot/components/charts/base/CityName.vue
 create mode 100644 src/views/copilot/components/charts/base/CityValue.vue
 create mode 100644 src/views/copilot/components/charts/base/icon.png

diff --git a/src/views/copilot/components/charts/BipvOutput.vue b/src/views/copilot/components/charts/BipvOutput.vue
index 174c704..fd40bef 100644
--- a/src/views/copilot/components/charts/BipvOutput.vue
+++ b/src/views/copilot/components/charts/BipvOutput.vue
@@ -6,7 +6,7 @@
 -->
 
 <template>
-  <DoubleRingWrapperVue />
+  <DoubleRingWrapperVue :data-source="dataBundle" :period="period" />
 </template>
 
 <script>
@@ -15,9 +15,14 @@ import DoubleRingWrapperVue from "./base/DoubleRingWrapper.vue";
 export default {
   name: "BipvOutput",
   components: { DoubleRingWrapperVue },
-  props: {},
+  props: {
+    period: {
+      type: String,
+      default: "日",
+    },
+  },
   data() {
-    return {};
+    return { dataBundle: null };
   },
 };
 </script>
diff --git a/src/views/copilot/components/charts/ChipInvest.vue b/src/views/copilot/components/charts/ChipInvest.vue
new file mode 100644
index 0000000..f6ede7d
--- /dev/null
+++ b/src/views/copilot/components/charts/ChipInvest.vue
@@ -0,0 +1,121 @@
+<!-- 
+    filename: FtoInvest.vue
+    author: liubin
+    date: 2024-04-10 08:59:28
+    description: 
+-->
+
+<template>
+  <bar-chart-base
+    :legend="legend"
+    :series="series"
+    :xAxis="xAxis"
+    class="fto-chart"
+  />
+</template>
+
+<script>
+import BarChartBase from "./base/BarChartBase.vue";
+
+export default {
+  name: "ChipInvest",
+  components: { BarChartBase },
+  data() {
+    // 城市数组的顺序必须是固定的
+    const cities = ["瑞昌", "邯郸", "株洲", "佳木斯", "成都", "凯盛", "蚌埠"];
+    return {
+      xAxis: cities,
+    };
+  },
+  props: {
+    period: {
+      type: String,
+      default: "日",
+    },
+  },
+  computed: {
+    legend() {
+      switch (this.period) {
+        case "日":
+          return [{ label: "昨日", color: "#12f7f1" }];
+        case "周":
+          return [{ label: "本周", color: "#12f7f1" }];
+        case "月": {
+          const year = new Date().getFullYear();
+          const month = new Date().getMonth() + 1;
+          return [
+            { label: `${year}年${month}月`, color: "#12f7f1" },
+            { label: `${year - 1}年${month}月`, color: "#58adfa" },
+          ];
+        }
+        case "年": {
+          const year = new Date().getFullYear();
+          return [
+            { label: `${year - 1}年`, color: "#12f7f1" },
+            { label: `${year}年`, color: "#58adfa" },
+          ];
+        }
+        default:
+          return [
+            { label: `${year - 1}年`, color: "#12f7f1" },
+            { label: `${year}年`, color: "#58adfa" },
+          ];
+      }
+    },
+    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)
+            ),
+          },
+        ];
+      }
+
+      return [
+        {
+          name: `${new Date().getFullYear() - 1}年`,
+          data: ftoInvest.previous,
+        },
+        {
+          name: `${new Date().getFullYear()}年`,
+          data: ftoInvest.current,
+        },
+      ];
+    },
+  },
+};
+</script>
diff --git a/src/views/copilot/components/charts/ChipOutput.vue b/src/views/copilot/components/charts/ChipOutput.vue
index 539720b..498c72e 100644
--- a/src/views/copilot/components/charts/ChipOutput.vue
+++ b/src/views/copilot/components/charts/ChipOutput.vue
@@ -6,7 +6,7 @@
 -->
 
 <template>
-  <DoubleRingWrapperVue />
+  <DoubleRingWrapperVue :data-source="dataBundle" :period="period" />
 </template>
 
 <script>
@@ -15,9 +15,14 @@ import DoubleRingWrapperVue from "./base/DoubleRingWrapper.vue";
 export default {
   name: "ChipOutput",
   components: { DoubleRingWrapperVue },
-  props: {},
+  props: {
+    period: {
+      type: String,
+      default: "日",
+    },
+  },
   data() {
-    return {};
+    return { dataBundle: null };
   },
 };
 </script>
diff --git a/src/views/copilot/components/charts/base/CityData.vue b/src/views/copilot/components/charts/base/CityData.vue
index 502388c..f285aae 100644
--- a/src/views/copilot/components/charts/base/CityData.vue
+++ b/src/views/copilot/components/charts/base/CityData.vue
@@ -9,7 +9,10 @@
   <div class="city-data">
     <div class="headquarter">
       <div class="inner-shadow w-1"></div>
-      <div class="inner-shadow flex-1">凯盛光伏</div>
+      <div class="inner-shadow flex-1 flex">
+        <CityName value="凯盛光伏" />
+        <CityValue value="32212" horizontal :period="period" />
+      </div>
       <div class="inner-shadow w-1"></div>
     </div>
 
@@ -27,9 +30,16 @@
 
 <script>
 import CityItemVue from "./CityItem.vue";
+import CityNameVue from "./CityName.vue";
+import CityValueVue from "./CityValue.vue";
+
 export default {
   name: "CityData",
-  components: { CityItem: CityItemVue },
+  components: {
+    CityItem: CityItemVue,
+    CityName: CityNameVue,
+    CityValue: CityValueVue,
+  },
   props: {
     dataSource: {
       type: Object,
@@ -77,6 +87,10 @@ export default {
   width: 70px;
 }
 
+.flex {
+  display: flex;
+}
+
 .flex-1 {
   flex: 1;
 }
@@ -90,7 +104,6 @@ export default {
   flex: 3;
   display: grid;
   grid-template-columns: repeat(2, 1fr);
-  background: #ccc3;
   gap: 8px;
 }
 </style>
diff --git a/src/views/copilot/components/charts/base/CityItem.vue b/src/views/copilot/components/charts/base/CityItem.vue
index 6978a48..2dbaf02 100644
--- a/src/views/copilot/components/charts/base/CityItem.vue
+++ b/src/views/copilot/components/charts/base/CityItem.vue
@@ -7,44 +7,22 @@
 
 <template>
   <div class="city-item inner-shadow">
-    <div class="item-location">
-      <img src="#" alt="" />
-      <span>{{ location }}</span>
-    </div>
-    <div class="item-value" style="position: relative; flex: 1">
-      <div
-        class=""
-        style="
-          width: 100%;
-          position: absolute;
-          top: 12%;
-          left: 50%;
-          transform: translateX(-25%);
-          overflow: hidden;
-        "
-      >
-        <GradientTextVue :text="'' + value" />
-      </div>
-      <span
-        style="
-          width: 100%;
-          font-size: 14px;
-          line-height: 16px;
-          position: absolute;
-          top: 56%;
-          left: 24%;
-        "
-        >{{ period == "日" ? "今日产出" : "本周产出" }}</span
-      >
-    </div>
+    <CityName :value="location" />
+    <CityValue :value="value+''" :period="period" />
   </div>
 </template>
 
 <script>
+import CityNameVue from "./CityName.vue";
+import CityValueVue from "./CityValue.vue";
 import GradientTextVue from "./GradientText.vue";
 export default {
   name: "CityItem",
-  components: { GradientTextVue },
+  components: {
+    GradientTextVue,
+    CityName: CityNameVue,
+    CityValue: CityValueVue,
+  },
   props: {
     location: {
       type: String,
@@ -71,7 +49,6 @@ export default {
 <style scoped lang="scss">
 .city-item {
   display: flex;
-  gap: 8px;
 }
 
 .inner-shadow {
diff --git a/src/views/copilot/components/charts/base/CityName.vue b/src/views/copilot/components/charts/base/CityName.vue
new file mode 100644
index 0000000..d6fda61
--- /dev/null
+++ b/src/views/copilot/components/charts/base/CityName.vue
@@ -0,0 +1,55 @@
+<!-- 
+    filename: CityName.vue
+    author: liubin
+    date: 2024-04-10 08:59:28
+    description: 
+-->
+
+<template>
+  <div class="city-name">
+    <img :src="Icon" alt="city icon" />
+    <span>{{ value }}</span>
+  </div>
+</template>
+
+<script>
+import Icon from "./icon.png";
+
+export default {
+  name: "CityName",
+  props: {
+    value: {
+      type: String,
+      default: "",
+    },
+  },
+  data() {
+    return { Icon };
+  },
+};
+</script>
+
+<style scoped>
+.city-name {
+  min-width: 80px;
+  margin: auto;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  padding: 0 8px;
+  flex: 1;
+}
+
+img {
+  /* width: 32px; */
+  width: 1.543vw;
+}
+
+span {
+  /* font-size: 12px;   */
+  font-size: 0.77vw;
+  letter-spacing: 2px;
+  text-align: center;
+}
+</style>
diff --git a/src/views/copilot/components/charts/base/CityValue.vue b/src/views/copilot/components/charts/base/CityValue.vue
new file mode 100644
index 0000000..9c42ab7
--- /dev/null
+++ b/src/views/copilot/components/charts/base/CityValue.vue
@@ -0,0 +1,127 @@
+<!-- 
+    filename: CityValue.vue
+    author: liubin
+    date: 2024-04-10 08:59:28
+    description: 
+-->
+
+<template>
+  <div class="city-value" :class="[horizontal ? 'horizontal' : '']">
+    <span class="hint" :class="[horizontal ? 'horizontal' : '']">{{
+      period == "周" ? "本周产出" : "今日产出"
+    }}</span>
+    <span class="value" :class="[horizontal ? 'horizontal' : '']">{{
+      value | numberFilter
+    }}</span>
+    <!-- <GradientTextVue :text="value" :size="horizontal ? 32 : 26" /> -->
+  </div>
+</template>
+
+<script>
+import GradientTextVue from "./GradientText.vue";
+
+export default {
+  name: "CityValue",
+  components: { GradientTextVue },
+  props: {
+    period: {
+      type: String,
+      default: "日",
+    },
+    value: {
+      type: String,
+      default: "",
+    },
+    horizontal: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  filters: {
+    numberFilter(value) {
+      if (value != null && !isNaN(parseInt(value))) {
+        return parseInt(value).toLocaleString();
+      } else {
+        return value;
+      }
+    },
+  },
+  data() {
+    return {};
+  },
+};
+</script>
+
+<style scoped>
+.city-value {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  padding: 0 8px;
+  flex: 2;
+  position: relative;
+}
+
+.city-value.horizontal {
+  flex-direction: row;
+}
+
+.city-value::after {
+  content: "";
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 1px;
+  height: 100%;
+  background: linear-gradient(
+    to bottom,
+    transparent 20%,
+    #fff 50%,
+    transparent 80%
+  );
+}
+
+span.hint {
+  margin: 0 0.77vw;
+  font-size: 0.77vw;
+  order: 2;
+  /* margin: 0 12px;
+  width: 32px;
+  font-size: 12px; */
+}
+
+span.hint.horizontal {
+  margin: 0 1.235vw;
+  width: 1.543vw;
+  order: 1;
+  font-size: 0.77vw;
+  /* margin: 0 12px;
+  width: 32px;
+  font-size: 12px; */
+}
+
+.value {
+  color: #4dd2fe;
+  text-align: center;
+  font-size: 1.132vw;
+  order: 1;
+}
+.value.horizontal {
+  text-align: left;
+  flex: 1;
+  font-size: 1.543vw;
+  order: 2;
+}
+
+svg,
+.value {
+  width: 100px;
+  order: 1;
+}
+
+.value.horizontal,
+svg.horizontal {
+  order: 2;
+}
+</style>
diff --git a/src/views/copilot/components/charts/base/GradientText.vue b/src/views/copilot/components/charts/base/GradientText.vue
index 111cda9..bb45881 100644
--- a/src/views/copilot/components/charts/base/GradientText.vue
+++ b/src/views/copilot/components/charts/base/GradientText.vue
@@ -6,7 +6,7 @@
 -->
 
 <template>
-  <svg height="32" width="100%">
+  <svg :height="size + 8" width="100%">
     <defs>
       <linearGradient id="smoke-text" x1="0%" y1="0%" x2="0%" y2="100%">
         <stop offset="0%" style="stop-color: #00fff4; stop-opacity: 1" />
@@ -15,9 +15,13 @@
     </defs>
     <text
       x="0"
-      y="24"
+      :y="size"
       fill="url(#smoke-text)"
-      :style="{ fontSize: '24px', letterSpacing: spacing || '2px' }"
+      :style="{
+        fontSize: `${size}px`,
+        letterSpacing: spacing || '2px',
+        fontFamily: 'Calibri, Verdana, sans-serif',
+      }"
     >
       {{ text | numberFilter }}
     </text>
@@ -37,6 +41,10 @@ export default {
       type: String,
       default: "1px",
     },
+    size: {
+      type: Number,
+      default: 24,
+    },
   },
   filters: {
     numberFilter(value) {
diff --git a/src/views/copilot/components/charts/base/icon.png b/src/views/copilot/components/charts/base/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..03c1a4cdea4f91a7d1cf0b62a3d8e06a0a97b81e
GIT binary patch
literal 5165
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
W*R65rJI{afH+5xgr7{JJu>S!L;;Q`s

literal 0
HcmV?d00001

diff --git a/src/views/copilot/container.vue b/src/views/copilot/container.vue
index 97d3803..2bb12b8 100644
--- a/src/views/copilot/container.vue
+++ b/src/views/copilot/container.vue
@@ -42,6 +42,14 @@ export default {
       period: "日",
     };
   },
+  // mounted() {
+  //   document.body.style.minHeight = "1024px";
+  //   document.body.style.minWidth = "1550px";
+  // },
+  // destroyed() {
+  //   document.body.style.minHeight = "1024px";
+  //   document.body.style.minWidth = "1550px";
+  // },
 };
 </script>
 
diff --git a/src/views/copilot/yield/index.vue b/src/views/copilot/yield/index.vue
index 9a08a72..40ad7b8 100644
--- a/src/views/copilot/yield/index.vue
+++ b/src/views/copilot/yield/index.vue
@@ -12,21 +12,19 @@
         <std-output :period="period" />
       </db-container>
       <db-container class="chip-yield" title="芯片产出" icon="chip2">
-        <chip-output />
+        <chip-output :period="period" />
       </db-container>
       <db-container class="bipv-yield" title="BIPV产出" icon="bipv">
-        <bipv-output />
+        <bipv-output :period="period" />
       </db-container>
     </section>
     <section class="bottom flex">
       <db-container class="fto-involve" title="FTO投入">
         <fto-invest :period="period" />
       </db-container>
-      <db-container
-        class="chip-involve"
-        title="芯片投入"
-        icon="chip"
-      ></db-container>
+      <db-container class="chip-involve" title="芯片投入" icon="chip">
+        <chip-invest :period="period" />
+      </db-container>
     </section>
   </div>
 </template>
@@ -37,6 +35,7 @@ import StdOutputVue from "../components/charts/StdOutput.vue";
 import ChipOutputVue from "../components/charts/ChipOutput.vue";
 import FtoInvestVue from "../components/charts/FtoInvest.vue";
 import BipvOutputVue from "../components/charts/BipvOutput.vue";
+import ChipInvestVue from "../components/charts/ChipInvest.vue";
 
 export default {
   name: "YieldCopilot",
@@ -45,7 +44,8 @@ export default {
     StdOutput: StdOutputVue,
     ChipOutput: ChipOutputVue,
     BipvOutput: BipvOutputVue,
-    FtoInvest: FtoInvestVue
+    FtoInvest: FtoInvestVue,
+    ChipInvest: ChipInvestVue,
   },
   props: {
     period: {
-- 
2.45.2


From 752df8417d6171c719221f4cdedf7ac8f4b1c2e6 Mon Sep 17 00:00:00 2001
From: "DESKTOP-FUDKNA8\\znjsz" <tonystark@starkindustries.mil>
Date: Thu, 25 Apr 2024 17:07:44 +0800
Subject: [PATCH 3/7] =?UTF-8?q?update=20=E9=A9=BE=E9=A9=B6=E8=88=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |   1 +
 src/store/modules/home.js                     | 408 +++++++++---------
 .../copilot/components/charts/StdOutput.vue   |   4 +-
 .../components/charts/base/CityData.vue       |  67 ++-
 .../charts/base/DoubleRingWrapper.vue         |   6 +-
 src/views/copilot/yield/index.vue             |   4 +-
 6 files changed, 255 insertions(+), 235 deletions(-)

diff --git a/package.json b/package.json
index 0a67be3..d920609 100644
--- a/package.json
+++ b/package.json
@@ -54,6 +54,7 @@
     "highlight.js": "^11.9.0",
     "js-beautify": "^1.15.1",
     "jsencrypt": "3.3.1",
+    "lodash": "^4.17.21",
     "mockjs": "^1.1.0",
     "moment": "^2.30.1",
     "nprogress": "0.2.0",
diff --git a/src/store/modules/home.js b/src/store/modules/home.js
index c9342ba..ea4d46a 100644
--- a/src/store/modules/home.js
+++ b/src/store/modules/home.js
@@ -1,4 +1,172 @@
 import axios from "@/utils/request";
+import { deepClone } from "../../utils";
+
+/* 状态 */
+const state = {
+  copilot: {
+    /* 产量驾驶舱 */
+    yield: {
+      ftoInvest: null,
+      chipInvest: null,
+      chipOutput: null,
+      stdOutput: null,
+      bipvOutput: null,
+    },
+    /* 能源驾驶舱 */
+    energy: {},
+    /* 效率驾驶舱 */
+    efficiency: {},
+  },
+  home: {
+    ftoInvest: null,
+    chipInvest: null,
+    chipOutput: null,
+    stdOutput: null,
+    bipvOutput: null,
+  },
+};
+
+const mutations = {
+  SET_HOME_INFO: (state, payload) => {
+    state.home.ftoInvest = payload.ftoInvest;
+    state.home.chipInvest = payload.chipInvest;
+    state.home.chipOutput = payload.chipOutput;
+    state.home.stdOutput = payload.stdOutput;
+    state.home.bipvOutput = payload.bipvOutput;
+  },
+  SET_COPILOT_INFO: (state, { type, payload }) => {
+    switch (type) {
+      case "yield":
+        state.copilot.yield.ftoInvest = payload.ftoInvest;
+        state.copilot.yield.chipInvest = payload.chipInvest;
+        state.copilot.yield.chipOutput = payload.chipOutput;
+        state.copilot.yield.stdOutput = payload.stdOutput;
+        state.copilot.yield.bipvOutput = payload.bipvOutput;
+        break;
+      case "energy":
+        state.copilot.energy = payload.data;
+        break;
+      case "efficiency":
+        state.copilot.efficiency = payload.data;
+        break;
+    }
+  },
+};
+
+const actions = {
+  /** 初始化首页数据 */
+  async initHome({ commit }) {
+    const dataArr = await getHomeInfo();
+    const targetArr = await getHomeTarget();
+    const payload = splitCurrentAndPrevious(dataArr, targetArr);
+    commit("SET_HOME_INFO", payload);
+  },
+  /** 初始化驾驶舱数据 */
+  async initCopilot({ commit }, { period, source }) {
+    const fetcher = {
+      yield: getCopilotYield,
+      energy: null,
+      efficiency: null,
+    }[source];
+    let { data: factoryList, type } = await fetcher(period);
+
+    const payload = splitCurrentAndPrevious(factoryList);
+    commit("SET_COPILOT_INFO", { type, payload });
+  },
+};
+
+export default {
+  namespaced: true,
+  state,
+  mutations,
+  actions,
+};
+
+// utils function
+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) {
+        const { chipYield, componentYield, bipvProductOutput } =
+          getFactoryTargetValue(targetListResponse, fId);
+        chipOutput.target[fId] = chipYield;
+        stdOutput.target[fId] = componentYield;
+        bipvOutput.target[fId] = bipvProductOutput;
+      }
+      // 芯片投入
+      chipInvest.current[fId] = factory.inputNumber;
+      chipInvest.previous[fId] = factory.previousYearInputNumber;
+      // FTO投入
+      ftoInvest.current[fId] = factory.chipInput;
+      ftoInvest.previous[fId] = factory.previousYearChipInput;
+      // 产出数据, 0 - （玻璃）芯片产出， 1 - 标准组件产出， 2 - BIPV产出
+      const _t = [chipOutput, stdOutput, bipvOutput][factory.glassType];
+      _t.current[fId] = factory.outputNumber;
+      _t.previous[fId] = factory.previousYearOutputNumber;
+    }
+
+    return {
+      chipInvest,
+      ftoInvest,
+      chipOutput,
+      stdOutput,
+      bipvOutput,
+    };
+  }
+}
+
+function getFactoryId(factory) {
+  return factory.factory;
+}
+
+function getFactoryTargetValue(targetList, factoryId) {
+  const target = targetList.find((item) => item.factory === factoryId);
+  if (target) {
+    return {
+      // 自带模拟数据了.... random_default
+      chipYield: target.chipYield ?? random_default(),
+      componentYield: target.componentYield ?? random_default(),
+      bipvProductOutput: target.bipvProductOutput ?? random_default(),
+    };
+  }
+  return {
+    chipYield: random_default(),
+    componentYield: random_default(),
+    bipvProductOutput: random_default(),
+  };
+}
+
+function init() {
+  const t_ = {
+    current: Array(7).fill(0),
+    previous: Array(7).fill(0),
+  };
+  // 芯片投入
+  const chipInvest = deepClone(t_);
+  // FTO投入
+  const ftoInvest = deepClone(t_);
+  // 芯片产出
+  const chipOutput = {
+    ...deepClone(t_),
+    target: Array(7).fill(0),
+  };
+  // 标准组件产出
+  const stdOutput = deepClone(chipOutput);
+  // BIPV产出
+  const bipvOutput = deepClone(chipOutput);
+
+  return {
+    chipInvest,
+    ftoInvest,
+    chipOutput,
+    stdOutput,
+    bipvOutput,
+  };
+}
 
 function random_default() {
   return 0;
@@ -34,7 +202,7 @@ async function getHomeTarget() {
   return null;
 }
 
-async function getCopilotYield(params) {
+async function fetcher(params) {
   const { code, data } = await axios.post("/ip/prod-output/query-by-date", {
     ...params,
   });
@@ -45,218 +213,30 @@ async function getCopilotYield(params) {
   return null;
 }
 
-/* 状态 */
-const state = {
-  copilot: {
-    /* 产量驾驶舱 */
-    yield: {},
-    /* 能源驾驶舱 */
-    energy: {},
-    /* 效率驾驶舱 */
-    efficiency: {},
-  },
-  home: {
-    ftoInvest: null,
-    chipInvest: null,
-    chipOutput: null,
-    stdOutput: null,
-    bipvOutput: null,
-  },
-};
+async function getCopilotYield(period) {
+  // 请求参数，直接一次性获取所有工厂
+  let queryParams = {
+    factorys: [],
+    date: 4,
+  };
 
-const mutations = {
-  SET_HOME_INFO: (state, payload) => {
-    state.home.ftoInvest = payload.ftoInvest;
-    state.home.chipInvest = payload.chipInvest;
-    state.home.chipOutput = payload.chipOutput;
-    state.home.stdOutput = payload.stdOutput;
-    state.home.bipvOutput = payload.bipvOutput;
-  },
-  SET_COPILOT_INFO: (state, payload) => {
-    switch (payload.type) {
-      case "yield":
-        state.copilot.yield = payload.data;
-        break;
-      case "energy":
-        state.copilot.energy = payload.data;
-        break;
-      case "efficiency":
-        state.copilot.efficiency = payload.data;
-        break;
-    }
-  },
-};
+  switch (period) {
+    case "日":
+      queryParams.date = 1;
+      break;
+    case "周":
+      queryParams.date = 2;
+      break;
+    case "月":
+      queryParams.date = 3;
+      break;
+    case "年":
+      queryParams.date = 4;
+      break;
+    default:
+      queryParams.date = 1;
+      break;
+  }
 
-const actions = {
-  /** 初始化首页数据 */
-  async initHome({ commit }) {
-    const dataArr = await getHomeInfo();
-    const targetArr = await getHomeTarget();
-
-    const chipInvest = {
-      current: Array(7).fill(0),
-      previous: Array(7).fill(0),
-    }; // 芯片投入
-    const ftoInvest = {
-      current: Array(7).fill(0),
-      previous: Array(7).fill(0),
-    }; // FTO投入
-    const chipOutput = {
-      current: Array(7).fill(0),
-      previous: Array(7).fill(0),
-      target: Array(7).fill(0),
-    }; // 芯片产出
-    const stdOutput = {
-      current: Array(7).fill(0),
-      previous: Array(7).fill(0),
-      target: Array(7).fill(0),
-    }; // 标准组件产出
-    const bipvOutput = {
-      current: Array(7).fill(0),
-      previous: Array(7).fill(0),
-      target: Array(7).fill(0),
-    }; // BIPV产出
-
-    if (dataArr) {
-      for (const factory of dataArr) {
-        /* 工厂索引 */
-        const factoryId = factory.factory;
-        /* 收集目标数据 */
-        if (targetArr) {
-          const target = targetArr.find((item) => item.factory === factoryId);
-          if (target) {
-            chipOutput.target.splice(factoryId, 1, target.chipYield ?? 0);
-            stdOutput.target.splice(factoryId, 1, target.componentYield ?? 0);
-            bipvOutput.target.splice(
-              factoryId,
-              1,
-              target.bipvProductOutput ?? 0
-            );
-          }
-        }
-        /* 收集芯片投入数据 */
-        chipInvest.current.splice(
-          factoryId,
-          1,
-          factory.inputNumber ?? random_default()
-        );
-        chipInvest.previous.splice(
-          factoryId,
-          1,
-          factory.previousYearInputNumber ?? random_default()
-        );
-        /* 收集FTO投入数据 */
-        ftoInvest.current.splice(
-          factoryId,
-          1,
-          factory.chipInput ?? random_default()
-        );
-        ftoInvest.previous.splice(
-          factoryId,
-          1,
-          factory.previousYearChipInput ?? random_default()
-        );
-        /* 收集产出数据 */
-        switch (factory.glassType) {
-          case 0:
-            // 玻璃芯片 产出
-            chipOutput.current.splice(
-              factoryId,
-              1,
-              factory.outputNumber ?? random_default()
-            );
-            chipOutput.previous.splice(
-              factoryId,
-              1,
-              factory.previousYearOutputNumber ?? random_default()
-            );
-            break;
-          case 1:
-            // 标准组件 产出
-            stdOutput.current.splice(
-              factoryId,
-              1,
-              factory.outputNumber ?? random_default()
-            );
-            stdOutput.previous.splice(
-              factoryId,
-              1,
-              factory.previousYearOutputNumber ?? random_default()
-            );
-            break;
-          case 2:
-            // BIPV 产出
-            bipvOutput.current.splice(
-              factoryId,
-              1,
-              factory.outputNumber ?? random_default()
-            );
-            bipvOutput.previous.splice(
-              factoryId,
-              1,
-              factory.previousYearOutputNumber ?? random_default()
-            );
-            break;
-        }
-      }
-
-      /* 更新 state */
-      commit("SET_HOME_INFO", {
-        ftoInvest,
-        chipInvest,
-        chipOutput,
-        stdOutput,
-        bipvOutput,
-      });
-    }
-  },
-  /** 初始化驾驶舱数据 */
-  async initCopilot({ commit }, payload) {
-    const { period } = payload;
-    let dummyData = null;
-    let type = null;
-    // 请求参数，直接一次性获取所有工厂
-    let queryParams = {
-      factorys: [],
-      date: 4,
-    };
-
-    switch (period) {
-      case "日":
-        queryParams.date = 1;
-        break;
-      case "周":
-        queryParams.date = 2;
-        break;
-      case "月":
-        queryParams.date = 3;
-        break;
-      case "年":
-        queryParams.date = 4;
-        break;
-      default:
-        queryParams.date = 1;
-        break;
-    }
-
-    const data = await getCopilotYield(queryParams);
-    if (data) {
-      dummyData = data;
-      type = "yield";
-    }
-
-    console.log("[copilot yield data]: ", dummyData, type);
-    // commit
-    // commit('SET_COPILOT_INFO', {
-    //   type,
-    //   data: dummyData
-    // })
-  },
-};
-
-export default {
-  namespaced: true,
-  state,
-  mutations,
-  actions,
-};
+  return { data: await fetcher(queryParams), type: "yield" };
+}
diff --git a/src/views/copilot/components/charts/StdOutput.vue b/src/views/copilot/components/charts/StdOutput.vue
index 97c787b..9ff5e7d 100644
--- a/src/views/copilot/components/charts/StdOutput.vue
+++ b/src/views/copilot/components/charts/StdOutput.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>
diff --git a/src/views/copilot/components/charts/base/CityData.vue b/src/views/copilot/components/charts/base/CityData.vue
index f285aae..47e0dc9 100644
--- a/src/views/copilot/components/charts/base/CityData.vue
+++ b/src/views/copilot/components/charts/base/CityData.vue
@@ -11,7 +11,7 @@
       <div class="inner-shadow w-1"></div>
       <div class="inner-shadow flex-1 flex">
         <CityName value="凯盛光伏" />
-        <CityValue value="32212" horizontal :period="period" />
+        <CityValue :value="headquarterValue" horizontal :period="period" />
       </div>
       <div class="inner-shadow w-1"></div>
     </div>
@@ -42,8 +42,8 @@ export default {
   },
   props: {
     dataSource: {
-      type: Object,
-      default: () => ({}),
+      type: String,
+      default: null,
     },
     period: {
       type: String,
@@ -51,18 +51,57 @@ export default {
     },
   },
   data() {
-    return {
-      cities: [
-        { name: "蚌埠兴科", value: 93111 },
-        { name: "成都", value: 32212 },
-        { name: "邯郸", value: 7732 },
-        { name: "株洲", value: 71732 },
-        { name: "瑞昌", value: 23421 },
-        { name: "佳木斯", value: 340 },
-      ],
-    };
+    return {};
+  },
+  computed: {
+    headquarterValue() {
+      let getterName = "";
+      switch (this.dataSource) {
+        case "标准组件输出":
+          getterName = "stdOutput";
+          break;
+        case "芯片输出":
+          getterName = "chipOutput";
+          break;
+        case "BIPV输出":
+          getterName = "bipvOutput";
+          break;
+      }
+      return (
+        "" + (this.$store.getters.copilot.yield[getterName]?.current?.[5] ?? 0)
+      );
+    },
+    cities() {
+      let getterName = "";
+      switch (this.dataSource) {
+        case "标准组件输出":
+          getterName = "stdOutput";
+          break;
+        case "芯片输出":
+          getterName = "chipOutput";
+          break;
+        case "BIPV输出":
+          getterName = "bipvOutput";
+          break;
+      }
+      const _cities = [
+        { name: "瑞昌", value: 0 },
+        { name: "邯郸", value: 0 },
+        { name: "株洲", value: 0 },
+        { name: "佳木斯", value: 0 },
+        { name: "成都", value: 0 },
+        { name: "凯盛光伏", value: 0 },
+        { name: "蚌埠兴科", value: 0 },
+      ];
+      this.$store.getters.copilot.yield[getterName]?.current?.forEach(
+        (v, idx) => {
+          _cities[idx].value = v ?? 0;
+        }
+      );
+      _cities.splice(4, 1);
+      return _cities;
+    },
   },
-  computed: {},
   mounted() {},
   methods: {},
 };
diff --git a/src/views/copilot/components/charts/base/DoubleRingWrapper.vue b/src/views/copilot/components/charts/base/DoubleRingWrapper.vue
index 10d3fc7..be95762 100644
--- a/src/views/copilot/components/charts/base/DoubleRingWrapper.vue
+++ b/src/views/copilot/components/charts/base/DoubleRingWrapper.vue
@@ -26,15 +26,15 @@
 import CopilotSelect from "../../select.vue";
 import fetcher from "./fetcherDoubleRing";
 import DoubleRingChartVue from "./DoubleRingChart.vue";
-import CityData from './CityData.vue';
+import CityData from "./CityData.vue";
 
 export default {
   name: "DoubleRingWrapper",
   components: { CopilotSelect, DoubleRingChartVue, CityData },
   props: {
     dataSource: {
-      type: Object,
-      default: () => ({}),
+      type: String,
+      default: null,
     },
     period: {
       type: String,
diff --git a/src/views/copilot/yield/index.vue b/src/views/copilot/yield/index.vue
index 40ad7b8..b35ed84 100644
--- a/src/views/copilot/yield/index.vue
+++ b/src/views/copilot/yield/index.vue
@@ -56,7 +56,6 @@ export default {
   data() {
     return {};
   },
-  computed: {},
   watch: {
     period: {
       handler(val) {
@@ -67,7 +66,8 @@ export default {
   },
   methods: {
     fetchData(period = "日") {
-      this.$store.dispatch("copilot/initCopilot", { period });
+      console.log(`产量驾驶舱，获取${period}数据`);
+      this.$store.dispatch("copilot/initCopilot", { period, source: "yield" });
     },
   },
 };
-- 
2.45.2


From e8cc80495f66ce4b92d38b66b174b7cc087c86fa Mon Sep 17 00:00:00 2001
From: "DESKTOP-FUDKNA8\\znjsz" <tonystark@starkindustries.mil>
Date: Fri, 26 Apr 2024 11:23:40 +0800
Subject: [PATCH 4/7] =?UTF-8?q?update=20=E4=BA=A7=E9=87=8Ffto=E6=8A=95?=
 =?UTF-8?q?=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/modules/home.js                     |  1 -
 .../copilot/components/charts/BipvOutput.vue  |  4 +-
 .../copilot/components/charts/ChipOutput.vue  |  4 +-
 .../copilot/components/charts/FtoInvest.vue   | 90 ++++++++-----------
 .../copilot/components/charts/StdOutput.vue   |  2 +-
 .../components/charts/base/BarChartBase.vue   |  4 +-
 .../components/charts/base/CityData.vue       | 12 +--
 7 files changed, 51 insertions(+), 66 deletions(-)

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 @@
 -->
 
 <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>
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 @@
 -->
 
 <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>
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 [
-        {
-          name: `${new Date().getFullYear() - 1}年`,
-          data: ftoInvest.previous,
-        },
-        {
-          name: `${new Date().getFullYear()}年`,
-          data: 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: period == "日" ? "昨天" : "本周",
+          data: dataList ?? [],
+        },
+      ]
+    : [
+        {
+          name: period == "年" ? `${year - 1}年` : `${year - 1}年${month}月`,
+          data: dataList ? dataList[0] : [],
+        },
+        {
+          name: period == "年" ? `${year}年` : `${year}年${month}月`,
+          data: dataList ? dataList[1] : [],
+          // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
+        },
+      ];
+}
 </script>
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 @@
 -->
 
 <template>
-  <DoubleRingWrapperVue data-source="标准组件输出" :period="period" />
+  <DoubleRingWrapperVue data-source="标准组件产出" :period="period" />
 </template>
 
 <script>
diff --git a/src/views/copilot/components/charts/base/BarChartBase.vue b/src/views/copilot/components/charts/base/BarChartBase.vue
index 77d693e..18d188a 100644
--- a/src/views/copilot/components/charts/base/BarChartBase.vue
+++ b/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);
     },
diff --git a/src/views/copilot/components/charts/base/CityData.vue b/src/views/copilot/components/charts/base/CityData.vue
index 47e0dc9..2f539f9 100644
--- a/src/views/copilot/components/charts/base/CityData.vue
+++ b/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;
       }
-- 
2.45.2


From 517874ffc2a944cd442876e34b7397e261f3a28e Mon Sep 17 00:00:00 2001
From: "DESKTOP-FUDKNA8\\znjsz" <tonystark@starkindustries.mil>
Date: Fri, 26 Apr 2024 15:44:04 +0800
Subject: [PATCH 5/7] update

---
 .env.dev                                      |  3 +-
 src/store/modules/home.js                     |  3 +
 .../copilot/components/charts/ChipInvest.vue  | 93 ++++++++-----------
 .../copilot/components/charts/FtoInvest.vue   |  3 +-
 .../components/charts/base/BarChartBase.vue   |  8 +-
 5 files changed, 53 insertions(+), 57 deletions(-)

diff --git a/.env.dev b/.env.dev
index 2cefa71..f62007f 100644
--- a/.env.dev
+++ b/.env.dev
@@ -5,7 +5,8 @@ ENV = 'development'
 VUE_APP_TITLE = 芋道管理系统
 
 # 芋道管理系统/开发环境
-VUE_APP_BASE_API = 'http://192.168.1.61:48080'
+# VUE_APP_BASE_API = 'http://192.168.1.61:48080'
+VUE_APP_BASE_API = 'http://glass.kszny.picaiba.com'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
diff --git a/src/store/modules/home.js b/src/store/modules/home.js
index 669f429..c0a68a8 100644
--- a/src/store/modules/home.js
+++ b/src/store/modules/home.js
@@ -103,9 +103,12 @@ function splitCurrentAndPrevious(factoryListResponse, targetListResponse) {
       ftoInvest.current[fId] = factory.chipInput;
       ftoInvest.previous[fId] = factory.previousYearChipInput;
       // 产出数据, 0 - （玻璃）芯片产出， 1 - 标准组件产出， 2 - BIPV产出
+      // 因为后端写的垃圾数据，所以这里要做一下判断
+      if (!([0, 1, 2].includes(factory.glassType))) continue;
       const _t = [chipOutput, stdOutput, bipvOutput][factory.glassType];
       _t.current[fId] = factory.outputNumber;
       _t.previous[fId] = factory.previousYearOutputNumber;
+      // debugger;
     }
 
     return {
diff --git a/src/views/copilot/components/charts/ChipInvest.vue b/src/views/copilot/components/charts/ChipInvest.vue
index f6ede7d..18af8e5 100644
--- a/src/views/copilot/components/charts/ChipInvest.vue
+++ b/src/views/copilot/components/charts/ChipInvest.vue
@@ -10,7 +10,8 @@
     :legend="legend"
     :series="series"
     :xAxis="xAxis"
-    class="fto-chart"
+    in="ChipInvest"
+    class="chip-invest-chart"
   />
 </template>
 
@@ -44,8 +45,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 +64,43 @@ 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 { chipInvest } = this.$store.getters.copilot.yield;
+      let dataList = null;
+      switch (this.period) {
+        case "日":
+        case "周":
+          dataList = chipInvest?.current;
+          break;
+        default:
+          dataList = [];
+          dataList[0] = chipInvest?.pervious;
+          dataList[1] = chipInvest?.current;
       }
-
-      return [
-        {
-          name: `${new Date().getFullYear() - 1}年`,
-          data: ftoInvest.previous,
-        },
-        {
-          name: `${new Date().getFullYear()}年`,
-          data: 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: period == "日" ? "昨日" : "本周",
+          data: dataList ?? [],
+        },
+      ]
+    : [
+        {
+          name: period == "年" ? `${year - 1}年` : `${year - 1}年${month}月`,
+          data: dataList ? dataList[0] : [],
+        },
+        {
+          name: period == "年" ? `${year}年` : `${year}年${month}月`,
+          data: dataList ? dataList[1] : [],
+          // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
+        },
+      ];
+}
 </script>
diff --git a/src/views/copilot/components/charts/FtoInvest.vue b/src/views/copilot/components/charts/FtoInvest.vue
index 7971edc..a825691 100644
--- a/src/views/copilot/components/charts/FtoInvest.vue
+++ b/src/views/copilot/components/charts/FtoInvest.vue
@@ -10,6 +10,7 @@
     :legend="legend"
     :series="series"
     :xAxis="xAxis"
+    in="ftoInvest"
     class="fto-chart"
   />
 </template>
@@ -88,7 +89,7 @@ function getTemplate(period, dataList) {
   return period == "日" || period == "周"
     ? [
         {
-          name: period == "日" ? "昨天" : "本周",
+          name: period == "日" ? "昨日" : "本周",
           data: dataList ?? [],
         },
       ]
diff --git a/src/views/copilot/components/charts/base/BarChartBase.vue b/src/views/copilot/components/charts/base/BarChartBase.vue
index 18d188a..f136dd3 100644
--- a/src/views/copilot/components/charts/base/BarChartBase.vue
+++ b/src/views/copilot/components/charts/base/BarChartBase.vue
@@ -52,6 +52,10 @@ export default {
       type: Array,
       required: true,
     },
+    in: {
+      type: String,
+      default: ""
+    }
   },
   data() {
     return {
@@ -190,6 +194,8 @@ export default {
       this.initOptions(this.actualOptions);
     },
     series(val) {
+      debugger;
+      console.log(`[BarChartBase] [${this.in}] should update component`, val);
       if (!val) {
         this.initOptions(this.options);
         return;
@@ -198,7 +204,7 @@ export default {
       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].name = val?.[1]?.name || "";
       this.actualOptions = actualOptions;
       this.initOptions(actualOptions);
     },
-- 
2.45.2


From 08c9cf8dd66bcf9f36978045c28c48f124fdbfb1 Mon Sep 17 00:00:00 2001
From: "DESKTOP-FUDKNA8\\znjsz" <tonystark@starkindustries.mil>
Date: Fri, 26 Apr 2024 17:05:26 +0800
Subject: [PATCH 6/7] =?UTF-8?q?update=20=E6=A0=87=E5=87=86=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E4=BA=A7=E5=87=BA=20=E7=8E=AF=E5=BD=A2=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/modules/home.js                     | 40 ++++++++++++----
 .../components/charts/base/BarChartBase.vue   |  6 +--
 .../charts/base/DoubleRingChart.vue           | 32 ++++++++++---
 .../charts/base/DoubleRingWrapper.vue         | 13 ++----
 .../charts/base/double-ring-chart-options.js  | 46 ++++++++++++-------
 src/views/copilot/components/select.vue       | 13 +++++-
 6 files changed, 103 insertions(+), 47 deletions(-)

diff --git a/src/store/modules/home.js b/src/store/modules/home.js
index c0a68a8..bfab628 100644
--- a/src/store/modules/home.js
+++ b/src/store/modules/home.js
@@ -68,9 +68,15 @@ const actions = {
       energy: null,
       efficiency: null,
     }[source];
+    // 获取产量数据
     let { data: factoryList, type } = await fetcher(period);
-
-    const payload = splitCurrentAndPrevious(factoryList);
+    let targetList = null;
+    if (source === "yield") {
+      // 获取目标数据
+      let { data } = await fetcher(period, true);
+      targetList = data;
+    }
+    const payload = splitCurrentAndPrevious(factoryList, targetList);
     commit("SET_COPILOT_INFO", { type, payload });
   },
 };
@@ -104,7 +110,7 @@ function splitCurrentAndPrevious(factoryListResponse, targetListResponse) {
       ftoInvest.previous[fId] = factory.previousYearChipInput;
       // 产出数据, 0 - （玻璃）芯片产出， 1 - 标准组件产出， 2 - BIPV产出
       // 因为后端写的垃圾数据，所以这里要做一下判断
-      if (!([0, 1, 2].includes(factory.glassType))) continue;
+      if (![0, 1, 2].includes(factory.glassType)) continue;
       const _t = [chipOutput, stdOutput, bipvOutput][factory.glassType];
       _t.current[fId] = factory.outputNumber;
       _t.previous[fId] = factory.previousYearOutputNumber;
@@ -204,10 +210,17 @@ async function getHomeTarget() {
   return null;
 }
 
-async function fetcher(params) {
-  const { code, data } = await axios.post("/ip/prod-output/query-by-date", {
-    ...params,
-  });
+async function fetcher(type = "yield", params) {
+  const { code, data } = await axios.post(
+    type == "yield"
+      ? // 产量 数据
+        "/ip/prod-output/query-by-date"
+      : // 目标数据
+        "/ip/prod-target/query-by-date",
+    {
+      ...params,
+    }
+  );
   if (code == 0) {
     return data;
   }
@@ -215,7 +228,13 @@ async function fetcher(params) {
   return null;
 }
 
-async function getCopilotYield(period) {
+/**
+ *
+ * @param {*} period 周期： 日周月年
+ * @param {*} target 是否获取目标数据：默认 否
+ * @returns
+ */
+async function getCopilotYield(period, target = false) {
   // 请求参数，直接一次性获取所有工厂
   let queryParams = {
     factorys: [],
@@ -240,5 +259,8 @@ async function getCopilotYield(period) {
       break;
   }
 
-  return { data: await fetcher(queryParams), type: "yield" };
+  return {
+    data: await fetcher(target ? "target" : "yield", queryParams),
+    type: "yield",
+  };
 }
diff --git a/src/views/copilot/components/charts/base/BarChartBase.vue b/src/views/copilot/components/charts/base/BarChartBase.vue
index f136dd3..54768a9 100644
--- a/src/views/copilot/components/charts/base/BarChartBase.vue
+++ b/src/views/copilot/components/charts/base/BarChartBase.vue
@@ -54,8 +54,8 @@ export default {
     },
     in: {
       type: String,
-      default: ""
-    }
+      default: "",
+    },
   },
   data() {
     return {
@@ -194,8 +194,6 @@ export default {
       this.initOptions(this.actualOptions);
     },
     series(val) {
-      debugger;
-      console.log(`[BarChartBase] [${this.in}] should update component`, val);
       if (!val) {
         this.initOptions(this.options);
         return;
diff --git a/src/views/copilot/components/charts/base/DoubleRingChart.vue b/src/views/copilot/components/charts/base/DoubleRingChart.vue
index be15fca..d61cebe 100644
--- a/src/views/copilot/components/charts/base/DoubleRingChart.vue
+++ b/src/views/copilot/components/charts/base/DoubleRingChart.vue
@@ -23,7 +23,7 @@
 <script>
 import chartMixin from "@/mixins/chart.js";
 import fullscreenMixin from "@/mixins/fullscreen.js";
-import options from "./double-ring-chart-options";
+import getOptions from "./double-ring-chart-options";
 
 export default {
   name: "DoubleRingChart",
@@ -37,6 +37,10 @@ export default {
       type: String,
       default: "日",
     },
+    dataSource: {
+      type: String,
+      default: null,
+    },
   },
   data() {
     return {};
@@ -45,9 +49,25 @@ export default {
     legendItems() {
       return calculateItems(this.period);
     },
+    options() {
+      // TODO: 此处更新数据
+      let titleValue = "10%",
+        subtitle = "测试子标题",
+        previousSum = 10,
+        currentSum = 0,
+        targetSum = 100;
+
+      return getOptions({
+        titleValue,
+        subtitle,
+        previousSum,
+        currentSum,
+        targetSum,
+      });
+    },
   },
   mounted() {
-    this.initOptions(options);
+    this.initOptions(this.options);
   },
   methods: {
     // fullscreen mixin 需要的回调
@@ -136,17 +156,17 @@ function calculateItems(period) {
 }
 
 .legend-item:nth-child(1) .legend-item__label::before {
-  background: #0f65ff;
+  background: #12fff5;
 }
 .legend-item:nth-child(1) .legend-item__value {
-  color: #0f65ff;
+  color: #12fff5;
 }
 
 .legend-item:nth-child(2) .legend-item__label::before {
-  background: #12fff5;
+  background: #0f65ff;
 }
 .legend-item:nth-child(2) .legend-item__value {
-  color: #12fff5;
+  color: #0f65ff;
 }
 
 .legend-item:nth-child(3) .legend-item__label::before {
diff --git a/src/views/copilot/components/charts/base/DoubleRingWrapper.vue b/src/views/copilot/components/charts/base/DoubleRingWrapper.vue
index be95762..6b8b2be 100644
--- a/src/views/copilot/components/charts/base/DoubleRingWrapper.vue
+++ b/src/views/copilot/components/charts/base/DoubleRingWrapper.vue
@@ -13,7 +13,7 @@
         :options="cityOptions"
       />
       <div class="flex-1 stretch">
-        <DoubleRingChartVue :period="period" />
+        <DoubleRingChartVue :data-source="dataSource" :period="period" />
       </div>
     </template>
     <template v-else>
@@ -24,7 +24,6 @@
 
 <script>
 import CopilotSelect from "../../select.vue";
-import fetcher from "./fetcherDoubleRing";
 import DoubleRingChartVue from "./DoubleRingChart.vue";
 import CityData from "./CityData.vue";
 
@@ -54,15 +53,9 @@ export default {
       ],
     };
   },
-  computed: {},
-  mounted() {
-    fetcher.getData().then((res) => {
-      console.log("getData--->", res);
-    });
-  },
   methods: {
-    handleActiveUpdate(val) {
-      console.log("handleActiveUpdate--->", val);
+    handleActiveUpdate(index) {
+      console.log("handleActiveUpdate--->", index);
     },
   },
 };
diff --git a/src/views/copilot/components/charts/base/double-ring-chart-options.js b/src/views/copilot/components/charts/base/double-ring-chart-options.js
index b41cd15..11ef152 100644
--- a/src/views/copilot/components/charts/base/double-ring-chart-options.js
+++ b/src/views/copilot/components/charts/base/double-ring-chart-options.js
@@ -1,4 +1,10 @@
-export default {
+export default ({
+  titleValue,
+  subtitle,
+  previousSum,
+  currentSum,
+  targetSum,
+}) => ({
   grid: {
     left: 0,
     right: 0,
@@ -8,16 +14,16 @@ export default {
   },
   tooltip: {},
   title: {
-    text: "78%",
-    left: "50%",
-    top: "40%",
+    text: titleValue,
+    left: "49%",
+    top: "39%",
     textAlign: "center",
     textStyle: {
       fontWeight: 600,
       fontSize: 32,
       color: "#fffd",
     },
-    subtext: "\u200224年累计产出\u2002",
+    subtext: `\u2002${subtitle}\u2002`,
     subtextStyle: {
       fontSize: 14,
       fontWeight: 100,
@@ -26,17 +32,17 @@ export default {
     },
   },
   series: [
-    // 背景 series - 2024计划
+    // 背景 series
     {
       type: "pie",
-      name: "2024目标",
+      name: "当前目标",
       radius: ["70%", "85%"],
       center: ["50%", "52%"],
       emptyCircleStyle: {
         color: "#042c5f33",
       },
     },
-    // 数据 series - 2024累计
+    // 数据 series
     {
       type: "pie",
       radius: ["70%", "85%"],
@@ -44,15 +50,14 @@ export default {
       avoidLabelOvervlap: false,
       label: {
         show: false,
-        // position: "center",
       },
       labelLine: {
         show: false,
       },
       data: [
         {
-          value: 90,
-          name: "2024累计产出",
+          value: currentSum,
+          name: "当前累计产出",
           selected: false,
           itemStyle: {
             borderJoin: "round",
@@ -73,8 +78,15 @@ export default {
           },
         },
         {
-          value: 20,
-          name: "-",
+          value:
+            targetSum > currentSum
+              ? targetSum - currentSum
+              : targetSum == currentSum
+              ? currentSum == 0
+                ? 1
+                : 0
+              : 0,
+          name: "未达成累计",
           itemStyle: { color: "transparent" },
           label: { show: false },
         },
@@ -94,8 +106,8 @@ export default {
       },
       data: [
         {
-          value: 90,
-          name: "2023累计产出",
+          value: previousSum,
+          name: "上期累计产出",
           selected: false,
           itemStyle: {
             borderJoin: "round",
@@ -116,7 +128,7 @@ export default {
           },
         },
         {
-          value: 20,
+          value: targetSum > previousSum ? targetSum - previousSum : 0,
           name: "-",
           itemStyle: { color: "transparent" },
           label: { show: false },
@@ -124,4 +136,4 @@ export default {
       ],
     },
   ],
-};
+});
diff --git a/src/views/copilot/components/select.vue b/src/views/copilot/components/select.vue
index 58e9814..ae818f3 100644
--- a/src/views/copilot/components/select.vue
+++ b/src/views/copilot/components/select.vue
@@ -39,7 +39,18 @@ export default {
   watch: {
     currentActive: {
       handler(val) {
-        this.$emit("update:active", val);
+        this.$emit(
+          "update:active",
+          [
+            "瑞昌",
+            "邯郸",
+            "株洲",
+            "佳木斯",
+            "成都",
+            "凯盛光伏",
+            "蚌埠兴科",
+          ].indexOf(val)
+        );
       },
       immediate: true,
     },
-- 
2.45.2


From 622a8b4a3153663dc4372f8f837936f708bcd259 Mon Sep 17 00:00:00 2001
From: "DESKTOP-FUDKNA8\\znjsz" <tonystark@starkindustries.mil>
Date: Sun, 28 Apr 2024 10:59:05 +0800
Subject: [PATCH 7/7] =?UTF-8?q?update=20=E4=BA=A7=E9=87=8F=E9=A9=BE?=
 =?UTF-8?q?=E9=A9=B6=E8=88=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../charts/base/DoubleRingChart.vue           | 97 ++++++++++++++-----
 .../charts/base/DoubleRingWrapper.vue         |  9 +-
 .../charts/base/double-ring-chart-options.js  | 10 +-
 3 files changed, 86 insertions(+), 30 deletions(-)

diff --git a/src/views/copilot/components/charts/base/DoubleRingChart.vue b/src/views/copilot/components/charts/base/DoubleRingChart.vue
index d61cebe..76be992 100644
--- a/src/views/copilot/components/charts/base/DoubleRingChart.vue
+++ b/src/views/copilot/components/charts/base/DoubleRingChart.vue
@@ -12,9 +12,7 @@
     <div class="double-ring-chart__legend">
       <div v-for="item in legendItems" :key="item.label" class="legend-item">
         <span class="legend-item__label">{{ item.label }}</span>
-        <span class="legend-item__value">{{
-          item.value.toLocaleString()
-        }}</span>
+        <span class="legend-item__value">{{ item.value | numberFilter }}</span>
       </div>
     </div>
   </div>
@@ -33,6 +31,10 @@ export default {
       type: Number,
       default: 24,
     },
+    factoryId: {
+      type: Number,
+      required: true,
+    },
     period: {
       type: String,
       default: "日",
@@ -45,26 +47,69 @@ export default {
   data() {
     return {};
   },
-  computed: {
-    legendItems() {
-      return calculateItems(this.period);
+  filters: {
+    numberFilter(val) {
+      if (!isNaN(val)) {
+        return (+val).toLocaleString();
+      }
+      return 0;
     },
+  },
+  computed: {
+    dataSourceField() {
+      switch (this.dataSource) {
+        case "标准组件产出":
+          return "stdOutput";
+        case "芯片产出":
+          return "chipOutput";
+        case "BIPV产出":
+          return "bipvOutput";
+      }
+    },
+    valueTuple() {
+      // [previousValue, currentValue, sumValue?]
+      const getter = this.$store.getters.copilot.yield[this.dataSourceField];
+      if (this.period === "日" || this.period === "周") {
+        return [
+          getter.previous[this.factoryId],
+          getter.current[this.factoryId],
+        ];
+      }
+      return [
+        getter.previous[this.factoryId],
+        getter.current[this.factoryId],
+        getter.target[this.factoryId],
+      ];
+    },
+
     options() {
-      // TODO: 此处更新数据
-      let titleValue = "10%",
-        subtitle = "测试子标题",
-        previousSum = 10,
-        currentSum = 0,
-        targetSum = 100;
+      const year = new Date().getFullYear();
+      const month = new Date().getMonth() + 1;
+      const vt = this.valueTuple;
+      let titleValue =
+          vt[0] != null && vt[2] != null && vt[2] !== 0
+            ? `${vt[1] / vt[2]}%`
+            : "0%",
+        subtitle =
+          this.period == "月" ? `${month}月累计产出` : `${year}年累计产出`;
 
       return getOptions({
         titleValue,
         subtitle,
-        previousSum,
-        currentSum,
-        targetSum,
+        previousSum: this.valueTuple[0],
+        currentSum: this.valueTuple[1],
+        targetSum: this.valueTuple[2],
       });
     },
+
+    legendItems() {
+      return calculateItems(this.period, this.valueTuple);
+    },
+  },
+  watch: {
+    legendItems() {
+      this.initOptions(this.options);
+    },
   },
   mounted() {
     this.initOptions(this.options);
@@ -77,7 +122,7 @@ export default {
   },
 };
 
-function calculateItems(period) {
+function calculateItems(period, valueTuple) {
   let items = [];
   const today = new Date().getDate();
   const month = new Date().getMonth() + 1;
@@ -85,28 +130,28 @@ function calculateItems(period) {
   switch (period) {
     case "日":
       items = [
-        { label: `${month}月${today}日累计`, value: 24 },
-        { label: `去年${month}月${today}日累计`, value: 33 },
+        { label: `${month}月${today}日累计`, value: valueTuple[1] },
+        { label: `去年${month}月${today}日累计`, value: valueTuple[0] },
       ];
       break;
     case "周":
       items = [
-        { label: `本周累计`, value: 32 },
-        { label: `去年本周累计`, value: 12 },
+        { label: `本周累计`, value: valueTuple[1] },
+        { label: `去年本周累计`, value: valueTuple[0] },
       ];
       break;
     case "月":
       items = [
-        { label: `${month}月累计`, value: 24 },
-        { label: `去年${month}月累计`, value: 33 },
-        { label: `${month}月目标`, value: 12334 },
+        { label: `${month}月累计`, value: valueTuple[1] },
+        { label: `去年${month}月累计`, value: valueTuple[0] },
+        { label: `${month}月目标`, value: valueTuple[2] },
       ];
       break;
     case "年":
       items = [
-        { label: `${year - 1}年累计`, value: 23234 },
-        { label: `${year}年累计`, value: 4324 },
-        { label: `${year}年目标`, value: 12334 },
+        { label: `${year}年累计`, value: valueTuple[1] },
+        { label: `${year - 1}年累计`, value: valueTuple[0] },
+        { label: `${year}年目标`, value: valueTuple[2] },
       ];
       break;
   }
diff --git a/src/views/copilot/components/charts/base/DoubleRingWrapper.vue b/src/views/copilot/components/charts/base/DoubleRingWrapper.vue
index 6b8b2be..621d5e7 100644
--- a/src/views/copilot/components/charts/base/DoubleRingWrapper.vue
+++ b/src/views/copilot/components/charts/base/DoubleRingWrapper.vue
@@ -13,7 +13,11 @@
         :options="cityOptions"
       />
       <div class="flex-1 stretch">
-        <DoubleRingChartVue :data-source="dataSource" :period="period" />
+        <DoubleRingChartVue
+          :data-source="dataSource"
+          :period="period"
+          :factoryId="factoryId"
+        />
       </div>
     </template>
     <template v-else>
@@ -42,6 +46,7 @@ export default {
   },
   data() {
     return {
+      factoryId: 4, // 默认成都
       cityOptions: [
         "成都",
         "邯郸",
@@ -55,7 +60,7 @@ export default {
   },
   methods: {
     handleActiveUpdate(index) {
-      console.log("handleActiveUpdate--->", index);
+      this.factoryId = index;
     },
   },
 };
diff --git a/src/views/copilot/components/charts/base/double-ring-chart-options.js b/src/views/copilot/components/charts/base/double-ring-chart-options.js
index 11ef152..743f820 100644
--- a/src/views/copilot/components/charts/base/double-ring-chart-options.js
+++ b/src/views/copilot/components/charts/base/double-ring-chart-options.js
@@ -81,11 +81,12 @@ export default ({
           value:
             targetSum > currentSum
               ? targetSum - currentSum
-              : targetSum == currentSum
+              : targetSum == 0
               ? currentSum == 0
                 ? 1
                 : 0
               : 0,
+
           name: "未达成累计",
           itemStyle: { color: "transparent" },
           label: { show: false },
@@ -128,7 +129,12 @@ export default ({
           },
         },
         {
-          value: targetSum > previousSum ? targetSum - previousSum : 0,
+          value:
+            targetSum > previousSum
+              ? targetSum - previousSum
+              : previousSum == 0
+              ? 1
+              : 0,
           name: "-",
           itemStyle: { color: "transparent" },
           label: { show: false },
-- 
2.45.2