package.json

@@ -54,7 +54,6 @@
     "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",

src/store/modules/home.js

@@ -1,172 +1,4 @@
 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;
@@ -202,7 +34,7 @@ async function getHomeTarget() {
   return null;
 }
 
-async function fetcher(params) {
+async function getCopilotYield(params) {
   const { code, data } = await axios.post("/ip/prod-output/query-by-date", {
     ...params,
   });
@@ -213,30 +45,218 @@ async function fetcher(params) {
   return null;
 }
 
-async function getCopilotYield(period) {
+/* 状态 */
-  // 请求参数，直接一次性获取所有工厂
+const state = {
-  let queryParams = {
+  copilot: {
-    factorys: [],
+    /* 产量驾驶舱 */
-    date: 4,
+    yield: {},
-  };
+    /* 能源驾驶舱 */
+    energy: {},
+    /* 效率驾驶舱 */
+    efficiency: {},
+  },
+  home: {
+    ftoInvest: null,
+    chipInvest: null,
+    chipOutput: null,
+    stdOutput: null,
+    bipvOutput: null,
+  },
+};
 
-  switch (period) {
+const mutations = {
-    case "日":
+  SET_HOME_INFO: (state, payload) => {
-      queryParams.date = 1;
+    state.home.ftoInvest = payload.ftoInvest;
-      break;
+    state.home.chipInvest = payload.chipInvest;
-    case "周":
+    state.home.chipOutput = payload.chipOutput;
-      queryParams.date = 2;
+    state.home.stdOutput = payload.stdOutput;
-      break;
+    state.home.bipvOutput = payload.bipvOutput;
-    case "月":
+  },
-      queryParams.date = 3;
+  SET_COPILOT_INFO: (state, payload) => {
-      break;
+    switch (payload.type) {
-    case "年":
+      case "yield":
-      queryParams.date = 4;
+        state.copilot.yield = payload.data;
-      break;
+        break;
-    default:
+      case "energy":
-      queryParams.date = 1;
+        state.copilot.energy = payload.data;
-      break;
+        break;
-  }
+      case "efficiency":
+        state.copilot.efficiency = payload.data;
+        break;
+    }
+  },
+};
 
-  return { data: await fetcher(queryParams), type: "yield" };
+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,
+};

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

@@ -6,7 +6,7 @@
 -->
 
 <template>
-  <DoubleRingWrapperVue :data-source="dataBundle" :period="period" />
+  <DoubleRingWrapperVue />
 </template>
 
 <script>
@@ -15,14 +15,9 @@ import DoubleRingWrapperVue from "./base/DoubleRingWrapper.vue";
 export default {
   name: "BipvOutput",
   components: { DoubleRingWrapperVue },
-  props: {
+  props: {},
-    period: {
-      type: String,
-      default: "日",
-    },
-  },
   data() {
-    return { dataBundle: null };
+    return {};
   },
 };
 </script>

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

@@ -1,121 +0,0 @@
-<!-- 
-    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>

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

@@ -6,7 +6,7 @@
 -->
 
 <template>
-  <DoubleRingWrapperVue :data-source="dataBundle" :period="period" />
+  <DoubleRingWrapperVue />
 </template>
 
 <script>
@@ -15,14 +15,9 @@ import DoubleRingWrapperVue from "./base/DoubleRingWrapper.vue";
 export default {
   name: "ChipOutput",
   components: { DoubleRingWrapperVue },
-  props: {
+  props: {},
-    period: {
-      type: String,
-      default: "日",
-    },
-  },
   data() {
-    return { dataBundle: null };
+    return {};
   },
 };
 </script>

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

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

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

@@ -9,10 +9,7 @@
   <div class="city-data">
     <div class="headquarter">
       <div class="inner-shadow w-1"></div>
-      <div class="inner-shadow flex-1 flex">
+      <div class="inner-shadow flex-1">凯盛光伏</div>
-        <CityName value="凯盛光伏" />
-        <CityValue :value="headquarterValue" horizontal :period="period" />
-      </div>
       <div class="inner-shadow w-1"></div>
     </div>
 
@@ -30,20 +27,13 @@
 
 <script>
 import CityItemVue from "./CityItem.vue";
-import CityNameVue from "./CityName.vue";
-import CityValueVue from "./CityValue.vue";
-
 export default {
   name: "CityData",
-  components: {
+  components: { CityItem: CityItemVue },
-    CityItem: CityItemVue,
-    CityName: CityNameVue,
-    CityValue: CityValueVue,
-  },
   props: {
     dataSource: {
-      type: String,
+      type: Object,
-      default: null,
+      default: () => ({}),
     },
     period: {
       type: String,
@@ -51,57 +41,18 @@ export default {
     },
   },
   data() {
-    return {};
+    return {
-  },
+      cities: [
-  computed: {
+        { name: "蚌埠兴科", value: 93111 },
-    headquarterValue() {
+        { name: "成都", value: 32212 },
-      let getterName = "";
+        { name: "邯郸", value: 7732 },
-      switch (this.dataSource) {
+        { name: "株洲", value: 71732 },
-        case "标准组件输出":
+        { name: "瑞昌", value: 23421 },
-          getterName = "stdOutput";
+        { name: "佳木斯", value: 340 },
-          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: {},
 };
@@ -126,10 +77,6 @@ export default {
   width: 70px;
 }
 
-.flex {
-  display: flex;
-}
-
 .flex-1 {
   flex: 1;
 }
@@ -143,6 +90,7 @@ export default {
   flex: 3;
   display: grid;
   grid-template-columns: repeat(2, 1fr);
+  background: #ccc3;
   gap: 8px;
 }
 </style>

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

@@ -7,22 +7,44 @@
 
 <template>
   <div class="city-item inner-shadow">
-    <CityName :value="location" />
+    <div class="item-location">
-    <CityValue :value="value+''" :period="period" />
+      <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 CityNameVue from "./CityName.vue";
-import CityValueVue from "./CityValue.vue";
 import GradientTextVue from "./GradientText.vue";
 export default {
   name: "CityItem",
-  components: {
+  components: { GradientTextVue },
-    GradientTextVue,
-    CityName: CityNameVue,
-    CityValue: CityValueVue,
-  },
   props: {
     location: {
       type: String,
@@ -49,6 +71,7 @@ export default {
 <style scoped lang="scss">
 .city-item {
   display: flex;
+  gap: 8px;
 }
 
 .inner-shadow {

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

@@ -1,55 +0,0 @@
-<!-- 
-    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>

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

@@ -1,127 +0,0 @@
-<!-- 
-    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>

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: String,
+      type: Object,
-      default: null,
+      default: () => ({}),
     },
     period: {
       type: String,

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

@@ -6,7 +6,7 @@
 -->
 
 <template>
-  <svg :height="size + 8" width="100%">
+  <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" />
@@ -15,13 +15,9 @@
     </defs>
     <text
       x="0"
-      :y="size"
+      y="24"
       fill="url(#smoke-text)"
-      :style="{
+      :style="{ fontSize: '24px', letterSpacing: spacing || '2px' }"
-        fontSize: `${size}px`,
-        letterSpacing: spacing || '2px',
-        fontFamily: 'Calibri, Verdana, sans-serif',
-      }"
     >
       {{ text | numberFilter }}
     </text>
@@ -41,10 +37,6 @@ export default {
       type: String,
       default: "1px",
     },
-    size: {
-      type: Number,
-      default: 24,
-    },
   },
   filters: {
     numberFilter(value) {

src/views/copilot/container.vue

@@ -42,14 +42,6 @@ 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>
 

src/views/copilot/yield/index.vue

@@ -12,19 +12,21 @@
         <std-output :period="period" />
       </db-container>
       <db-container class="chip-yield" title="芯片产出" icon="chip2">
-        <chip-output :period="period" />
+        <chip-output />
       </db-container>
       <db-container class="bipv-yield" title="BIPV产出" icon="bipv">
-        <bipv-output :period="period" />
+        <bipv-output />
       </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
-        <chip-invest :period="period" />
+        class="chip-involve"
-      </db-container>
+        title="芯片投入"
+        icon="chip"
+      ></db-container>
     </section>
   </div>
 </template>
@@ -35,7 +37,6 @@ 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",
@@ -44,8 +45,7 @@ export default {
     StdOutput: StdOutputVue,
     ChipOutput: ChipOutputVue,
     BipvOutput: BipvOutputVue,
-    FtoInvest: FtoInvestVue,
+    FtoInvest: FtoInvestVue
-    ChipInvest: ChipInvestVue,
   },
   props: {
     period: {
@@ -56,6 +56,7 @@ export default {
   data() {
     return {};
   },
+  computed: {},
   watch: {
     period: {
       handler(val) {
@@ -66,8 +67,7 @@ export default {
   },
   methods: {
     fetchData(period = "日") {
-      console.log(`产量驾驶舱，获取${period}数据`);
+      this.$store.dispatch("copilot/initCopilot", { period });
-      this.$store.dispatch("copilot/initCopilot", { period, source: "yield" });
     },
   },
 };