1

Reviewed-on: #10

.dockerignore

@@ -1,3 +1,3 @@
 .dockerignore
-dist
+#dist
 node_modules

.drone.yml

@@ -0,0 +1,58 @@
+---
+kind: pipeline
+type: docker
+name: default
+
+steps:
+- name: build
+  image: node:16-alpine
+  pull: if_not_exists
+  environment:
+    NODE_ENV: ""
+  commands:
+  - yarn install --frozen-lockfile
+  - env ${NODE_ENV} yarn build:prod 
+
+- name: publish
+  image: docker:dind
+  pull: if_not_exists
+  volumes:
+  - name: dockersock
+    path: /var/run/docker.sock
+  - name: dockerconfig
+    path: /root/.docker
+  commands:
+  - docker build -t hub.kszny.picaiba.com/kszny/glass-ui ./
+  - docker push hub.kszny.picaiba.com/kszny/glass-ui
+  depends_on:
+  - build
+
+- name: deploy
+  image: appleboy/drone-ssh
+  pull: if-not-exists
+  settings:
+    host:
+      - 172.24.145.74
+    username: root
+    password: Root@123
+    port: 22
+    command_timeout: 2m
+    script:
+    - docker pull hub.kszny.picaiba.com/kszny/glass-ui
+    - docker run --rm -v /data/www/ksznpt:/tmp hub.kszny.picaiba.com/kszny/glass-ui sh -c "rm -rf /tmp/* && mv -f /html /tmp"
+  depends_on:
+  - publish
+
+volumes:
+- name: dockersock
+  host:
+    path: /var/run/docker.sock
+- name: dockerconfig
+  host:
+    path: /root/.docker
+
+trigger:
+  branch:
+  - projects/mescc/develop
+  event:
+  - push

.env.dev

@@ -6,6 +6,7 @@ VUE_APP_TITLE = 芋道管理系统
 
 # 芋道管理系统/开发环境
 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

.env.prod

@@ -2,15 +2,15 @@
 NODE_ENV = 'production'
 
 # 页面标题
-VUE_APP_TITLE = 芋道管理系统
+VUE_APP_TITLE = 玻璃控股信息平台
 
 # 芋道管理系统/生产环境
-VUE_APP_BASE_API = '/prod-api'
+VUE_APP_BASE_API = ''
 
 # 根据服务器或域名修改
-PUBLIC_PATH = 'http://my-pi.com:8888/yudao-admin/'
+PUBLIC_PATH = ''
 # 二级部署路径
-VUE_APP_APP_NAME ='yudao-admin'
+# VUE_APP_APP_NAME ='yudao-admin'
 
 # 多租户的开关
 VUE_APP_TENANT_ENABLE = true

Dockerfile

@@ -1,21 +1,3 @@
-FROM node:16-alpine as build-stage
-
-WORKDIR /admim
-
-COPY .npmrc package.json yarn.lock ./
-RUN --mount=type=cache,id=yarn-store,target=/root/.yarn-store \
-    yarn install --frozen-lockfile
-
-COPY . .
-ARG NODE_ENV=""
-RUN env ${NODE_ENV} yarn build:prod
-
-## -- stage: dist => nginx --
-FROM nginx:alpine
-
-ENV TZ=Asia/Shanghai
-
-COPY ./nginx.conf /etc/nginx/conf.d/default.conf
-COPY --from=build-stage /admim/dist /usr/share/nginx/html
-
-EXPOSE 80
+FROM busybox 
+LABEL maintainer thomas.hairong@gmail.com
+COPY dist /html/

src/store/modules/home.js

@@ -15,9 +15,28 @@ const state = {
     /* 能源驾驶舱 */
     energy: {},
     /* 效率驾驶舱 */
-    efficiency: {},
+    efficiency: {
+      chipOee: {
+        current: [],
+        previous: [],
+      },
+      transformRate: {
+        current: [],
+        previous: [],
+      },
+      chipRate: {
+        target: [],
+        current: [],
+        previous: [],
+      },
+      stdRate: {
+        target: [],
+        current: [],
+      },
+    },
   },
   home: {
+    /** 主页状态 */
     ftoInvest: null,
     chipInvest: null,
     chipOutput: null,
@@ -47,7 +66,10 @@ const mutations = {
         state.copilot.energy = payload.data;
         break;
       case "efficiency":
-        state.copilot.efficiency = payload.data;
+        state.copilot.efficiency.chipOee = payload.chipOee;
+        state.copilot.efficiency.transformRate = payload.transformRate;
+        state.copilot.efficiency.chipRate = payload.chipRate;
+        state.copilot.efficiency.stdRate = payload.stdRate;
         break;
     }
   },
@@ -63,14 +85,27 @@ const actions = {
   },
   /** 初始化驾驶舱数据 */
   async initCopilot({ commit }, { period, source }) {
+    if (source == "comprehensive") return;
+
     const fetcher = {
       yield: getCopilotYield,
-      energy: null,
-      efficiency: null,
+      comprehensive: getCopilotEnergy,
+      efficiency: getCopilotEfficiency,
     }[source];
+    const handler = {
+      yield: splitCurrentAndPrevious,
+      comprehensive: () => null,
+      efficiency: splitCurrentAndPreviousA,
+    }[source];
+    // 获取产量数据
     let { data: factoryList, type } = await fetcher(period);
-
-    const payload = splitCurrentAndPrevious(factoryList);
+    let targetList = null;
+    if (source === "yield" || source === "efficiency") {
+      // 获取目标数据
+      let { data } = await fetcher(period, true);
+      targetList = data;
+    }
+    const payload = handler(factoryList, targetList);
     commit("SET_COPILOT_INFO", { type, payload });
   },
 };
@@ -82,12 +117,102 @@ export default {
   actions,
 };
 
-// utils function
+function splitCurrentAndPreviousA(factoryListResponse, targetListResponse) {
+  // 初始数据
+  const { chipOee, transformRate, chipRate, stdRate } = initA();
+  factoryListResponse = [
+    {
+      factory: 0,
+      oee: 0.8,
+      previousYearOee: 0.7,
+      componentConversionEfficiency: 0.8,
+      previousYearComponentConversionEfficiency: 0.7,
+      glassType: 0,
+      yieldRate: 0.8,
+      previousYearYieldRate: 0.7,
+      chipYieldRate: 0.38,
+      componentYieldRate: 0.73,
+    },
+    {
+      factory: 1,
+      oee: 0.8,
+      previousYearOee: 0.7,
+      componentConversionEfficiency: 0.8,
+      previousYearComponentConversionEfficiency: 0.7,
+      glassType: 1,
+      yieldRate: 0.8,
+      previousYearYieldRate: 0.7,
+      chipYieldRate: 0.38,
+      componentYieldRate: 0.73,
+    },
+    {
+      factory: 2,
+      oee: 0.8,
+      previousYearOee: 0.7,
+      componentConversionEfficiency: 0.8,
+      previousYearComponentConversionEfficiency: 0.7,
+      glassType: 1,
+      yieldRate: 0.8,
+      previousYearYieldRate: 0.7,
+      chipYieldRate: 0.38,
+      componentYieldRate: 0.73,
+    },
+    {
+      factory: 3,
+      oee: 0.8,
+      previousYearOee: 0.7,
+      componentConversionEfficiency: 0.8,
+      previousYearComponentConversionEfficiency: 0.7,
+      glassType: 0,
+      yieldRate: 0.8,
+      previousYearYieldRate: 0.7,
+      chipYieldRate: 0.38,
+      componentYieldRate: 0.73,
+    },
+  ];
+  if (factoryListResponse) {
+    for (const factory of factoryListResponse) {
+      const fId = getFactoryId(factory);
+      // 获取目标值
+      if (targetListResponse) {
+        const {
+          chipYieldRate,
+          componentYieldRate,
+          chipOee,
+          componentConversionEfficiency,
+        } = getFactoryTargetValueA(targetListResponse, fId);
+        stdRate.target[fId] = chipYieldRate;
+        chipRate.target[fId] = componentYieldRate;
+      }
+      // 芯片OEE
+      chipOee.current[fId] = factory.oee || random_default();
+      chipOee.previous[fId] = factory.previousYearOee || random_default();
+      // 转化效率
+      transformRate.current[fId] =
+        factory.componentConversionEfficiency || random_default();
+      transformRate.previous[fId] =
+        factory.previousYearComponentConversionEfficiency || random_default();
+      // 芯片良率 与 标准组件良率
+      if (![0, 1].includes(factory.glassType)) continue;
+      const _t = [chipRate, stdRate][factory.glassType];
+      _t.current[fId] = factory.yieldRate || random_default();
+      _t.previous[fId] = factory.previousYearYieldRate || random_default();
+    }
+
+    return {
+      chipOee,
+      transformRate,
+      chipRate,
+      stdRate,
+    };
+  }
+}
+
 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) {
@@ -104,9 +229,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 {
@@ -140,6 +268,59 @@ function getFactoryTargetValue(targetList, factoryId) {
   };
 }
 
+/**
+ * 获取 芯片良率目标值 和 标准组件良率目标值
+ * @param {*} targetList 目标值列表
+ * @param {*} factoryId 工厂ID
+ * @returns
+ */
+function getFactoryTargetValueA(targetList, factoryId) {
+  const target = targetList.find((item) => item.factory === factoryId);
+  if (target) {
+    return {
+      chipYieldRate: target.chipYieldRate ?? random_default(),
+      componentYieldRate: target.componentYieldRate ?? random_default(),
+    };
+  }
+  return {
+    chipYieldRate: random_default(),
+    componentYieldRate: random_default(),
+  };
+}
+
+/**
+ *
+ * @returns 初始化 效率模块里 初始状态值
+ */
+function initA() {
+  const t_ = {
+    current: Array(7).fill(0),
+    previous: Array(7).fill(0),
+  };
+  // 芯片OEE
+  const chipOee = deepClone(t_);
+  // 转化效率
+  const transformRate = deepClone(t_);
+  // 标准组件良率
+  const stdRate = {
+    ...deepClone(t_),
+    target: Array(7).fill(0),
+  };
+  // 芯片良率
+  const chipRate = deepClone(stdRate);
+
+  return {
+    chipOee,
+    transformRate,
+    chipRate,
+    stdRate,
+  };
+}
+
+/**
+ *
+ * @returns 初始化 产量模块里 初始状态值
+ */
 function init() {
   const t_ = {
     current: Array(7).fill(0),
@@ -160,19 +341,19 @@ function init() {
   const bipvOutput = deepClone(chipOutput);
 
   return {
-    chipInvest,
-    ftoInvest,
-    chipOutput,
-    stdOutput,
-    bipvOutput,
+    chipInvest, // 芯片投入
+    ftoInvest, // FTO投入
+    chipOutput, // 芯片产出
+    stdOutput, // 标准组件产出
+    bipvOutput, // BIPV产出
   };
 }
 
-function random_default() {
-  return 0;
-  let a = Math.floor(Math.random() * 1000);
-  while (a < 600) {
-    a = Math.floor(Math.random() * 1000);
+function random_default(min = 0, max = 1) {
+  // return 0;
+  let a = Math.floor(Math.random() * max);
+  while (a < min) {
+    a = Math.floor(Math.random() * max);
   }
   return a;
 }
@@ -202,18 +383,70 @@ async function getHomeTarget() {
   return null;
 }
 
-async function fetcher(params) {
-  const { code, data } = await axios.post("/ip/prod-output/query-by-date", {
-    ...params,
-  });
+function getUrl(copilot_module) {
+  let url = {
+    // 对比数据的 URL
+    comparison: "",
+    // 目标数据的 URL
+    target: "",
+  };
+  switch (copilot_module) {
+    case "yield":
+      url.comparison = "/ip/prod-output/query-by-date";
+      url.target = "/ip/prod-target/query-by-date";
+      break;
+    case "energy":
+      break;
+    case "efficiency":
+      url.comparison = "/ip/prod-output/query-Rate-List";
+      url.target = "/ip/prod-target/query-rate-target";
+      break;
+  }
+
+  return url;
+}
+
+async function doFetch(copilot_module = "yield", fetch_target, params) {
+  const url = getUrl(copilot_module);
+  const { code, data } = await axios.post(
+    fetch_target ? url.target : url.comparison,
+    {
+      ...params,
+    }
+  );
   if (code == 0) {
     return data;
   }
-  console.warn("getCopilotYield failed, code: ", code);
+  console.warn("[doFetch] failed, code: ", code);
   return null;
 }
 
-async function getCopilotYield(period) {
+/**
+ *
+ * @param {*} period 日周月年1,2,3,4
+ * @param {*} target 是否获取目标数据
+ * @returns
+ */
+function getCopilotYield(period, target = false) {
+  return getCopilotData("yield", period, target);
+}
+
+function getCopilotEnergy(period, target = false) {
+  return getCopilotData("energy", period, target);
+}
+
+function getCopilotEfficiency(period, target = false) {
+  return getCopilotData("efficiency", period, target);
+}
+
+/**
+ *
+ * @param {*} period 周期： 日周月年
+ * @param {*} target 是否获取目标数据：默认 否
+ * @returns
+ */
+async function getCopilotData(copilot_module, period, target = false) {
+  if (!copilot_module) copilot_module = "yield";
   // 请求参数，直接一次性获取所有工厂
   let queryParams = {
     factorys: [],
@@ -238,5 +471,8 @@ async function getCopilotYield(period) {
       break;
   }
 
-  return { data: await fetcher(queryParams), type: "yield" };
+  return {
+    data: await doFetch(copilot_module, target ? true : false, queryParams),
+    type: copilot_module,
+  };
 }

src/views/copilot/components/BarChartBase.vue

@@ -26,13 +26,13 @@
 
 <script>
 import screenfull from "screenfull";
-import ChartContainerVue from "../../../../components/ChartContainer.vue";
+import ChartContainer from "./ChartContainer.vue";
 import chartMixin from "@/mixins/chart.js";
 
 export default {
   name: "BarChartBase",
   components: {
-    ChartContainer: ChartContainerVue,
+    ChartContainer,
   },
   mixins: [chartMixin],
   props: {
@@ -52,6 +52,10 @@ export default {
       type: Array,
       required: true,
     },
+    in: {
+      type: String,
+      default: "",
+    },
   },
   data() {
     return {
@@ -197,8 +201,8 @@ export default {
       const actualOptions = JSON.parse(JSON.stringify(this.options));
       actualOptions.series[0].data = val[0].data;
       actualOptions.series[0].name = val[0].name;
-      actualOptions.series[1].data = val[1].data;
-      actualOptions.series[1].name = val[1].name;
+      actualOptions.series[1].data = val?.[1]?.data || [];
+      actualOptions.series[1].name = val?.[1]?.name || "";
       this.actualOptions = actualOptions;
       this.initOptions(actualOptions);
     },

src/views/copilot/components/ChartContainer.vue

@@ -0,0 +1,69 @@
+<!-- 
+    filename: ChartContainer.vue
+    author: liubin
+    date: 2024-04-10 08:54:33
+    description: 
+    todo: 驾驶舱和首页的 ChartContainer, 实现滑动条 和动态宽高
+-->
+
+<template>
+  <div class="chart-container" :class="{ 'no-scroll': noScroll }">
+    <slot />
+  </div>
+</template>
+
+<script>
+export default {
+  name: "ChartContainer",
+  components: {},
+  props: {
+    noScroll: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  data() {
+    return {};
+  },
+  computed: {},
+  methods: {},
+};
+</script>
+
+<style scoped lang="scss">
+.chart-container {
+  height: 0;
+  flex: 1;
+  overflow-x: scroll;
+}
+
+.no-scroll::-webkit-scrollbar {
+  width: 0;
+  height: 0;
+}
+
+::-webkit-scrollbar {
+  width: 8px;
+  height: 8px;
+}
+
+::-webkit-scrollbar-button {
+  width: 0;
+  height: 0;
+  //   width: 10px;
+  //   height: 10px;
+  //   background: #14305f;
+}
+
+::-webkit-scrollbar-track {
+  background: #14305f;
+  border: 0 none;
+  border-radius: 0;
+}
+
+::-webkit-scrollbar-thumb {
+  background: #004798;
+  border: 0 none;
+  border-radius: 6px;
+}
+</style>

src/views/copilot/components/Container.vue

@@ -9,6 +9,7 @@
   <div class="copilot-container">
     <!-- refresh btn  -->
     <button
+      v-if="0"
       style="
         appearance: none;
         outline: none;
@@ -109,7 +110,12 @@ export default {
     border-radius: 2px;
     top: 0%;
     left: 0;
-    background: radial-gradient(circle at center , #024798 2%, #024798 30%, transparent);
+    background: radial-gradient(
+      circle at center,
+      #024798 2%,
+      #024798 30%,
+      transparent
+    );
     z-index: 1;
   }
 

src/views/copilot/components/CopilotHeader.vue

@@ -9,7 +9,7 @@
   <div class="copilot-header">
     <section class="menu">
       <CopilotButton
-        v-for="i in ['产量', '效率', '能源']"
+        v-for="i in ['产量', '效率', '综合']"
         :key="i"
         :label="i"
         :active="i === active"

src/views/copilot/components/LineChartBase.vue

@@ -0,0 +1,296 @@
+<!-- 
+    filename: LineChartBase.vue
+    author: liubin
+    date: 2024-04-30 08:59:28
+    description: 
+-->
+
+<template>
+  <chart-container class="line-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 ChartContainer from "./ChartContainer.vue";
+import chartMixin from "@/mixins/chart.js";
+
+export default {
+  name: "LineChartBase",
+  components: {
+    ChartContainer,
+  },
+  mixins: [chartMixin],
+  props: {
+    vHeight: {
+      type: Number,
+      default: 34,
+    },
+    legend: {
+      type: Array,
+      required: true,
+    },
+    xAxis: {
+      type: Array,
+      required: true,
+    },
+    series: {
+      type: Array,
+      required: true,
+    },
+    in: {
+      type: String,
+      default: "",
+    },
+  },
+  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">
+.line-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.432vw;
+      height: 0.432vw;
+      border-radius: 100%;
+      margin-right: 0.4vw;
+    }
+
+    &::after {
+      content: "";
+      display: inline-block;
+      width: 1vw;
+      height: 0.125vw;
+      position: absolute;
+      top: 54%;
+      left: -15%;
+      transform: translateY(-50%);
+      border-radius: 100;
+      margin-right: 0.22vw;
+    }
+  }
+
+  .legend-item:nth-child(1):after,
+  .legend-item:nth-child(1):before {
+    background-color: #fad162;
+  }
+
+  .legend-item:nth-child(2):after,
+  .legend-item:nth-child(2):before {
+    background-color: #2160f3;
+  }
+
+  .legend-item:nth-child(3):after,
+  .legend-item:nth-child(3):before {
+    background-color: #13dbf3;
+  }
+
+  .legend-item:nth-child(4):after,
+  .legend-item:nth-child(4):before {
+    background-color: #88ca67;
+  }
+
+  .legend-item:nth-child(5):after,
+  .legend-item:nth-child(5):before {
+    background-color: #5c97fc;
+  }
+
+  .legend-item:nth-child(6):after,
+  .legend-item:nth-child(6):before {
+    background-color: #f48900;
+  }
+
+  .legend-item:nth-child(7):after,
+  .legend-item:nth-child(7):before {
+    background-color: #776bf0;
+  }
+}
+</style>

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/FtoInvest.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: "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>

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

@@ -1,155 +0,0 @@
-<!-- 
-    filename: DoubleRingChart.vue
-    author: liubin
-    date: 2024-04-17 11:01:55
-    description: 
--->
-
-<template>
-  <div class="double-ring-chart">
-    <div ref="chart" class="double-ring-chart__container"></div>
-    <!--   :style="{ height: vHeight + 'vh' }" -->
-    <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>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import chartMixin from "@/mixins/chart.js";
-import fullscreenMixin from "@/mixins/fullscreen.js";
-import options from "./double-ring-chart-options";
-
-export default {
-  name: "DoubleRingChart",
-  mixins: [chartMixin, fullscreenMixin],
-  props: {
-    vHeight: {
-      type: Number,
-      default: 24,
-    },
-    period: {
-      type: String,
-      default: "日",
-    },
-  },
-  data() {
-    return {};
-  },
-  computed: {
-    legendItems() {
-      return calculateItems(this.period);
-    },
-  },
-  mounted() {
-    this.initOptions(options);
-  },
-  methods: {
-    // fullscreen mixin 需要的回调
-    fullscreenCallback(isFullscreen) {
-      console.log("isFullscreen--->", isFullscreen);
-    },
-  },
-};
-
-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>
-.double-ring-chart {
-  height: 100%;
-  display: flex;
-  flex-direction: column;
-}
-
-.double-ring-chart__container {
-  flex: 1;
-  height: 0;
-}
-
-.double-ring-chart__legend {
-  padding: 12px;
-  color: #fff;
-  display: flex;
-  justify-content: center;
-  gap: 32px;
-}
-
-.legend-item {
-  display: flex;
-  flex-direction: column;
-  align-items: flex-start;
-}
-
-.legend-item__label {
-  position: relative;
-}
-
-.legend-item__label::before {
-  content: "";
-  position: absolute;
-  width: 12px;
-  height: 12px;
-  background: #ccc;
-  border-radius: 2px;
-  top: 6px;
-  left: -18px;
-}
-
-.legend-item:nth-child(1) .legend-item__label::before {
-  background: #0f65ff;
-}
-.legend-item:nth-child(1) .legend-item__value {
-  color: #0f65ff;
-}
-
-.legend-item:nth-child(2) .legend-item__label::before {
-  background: #12fff5;
-}
-.legend-item:nth-child(2) .legend-item__value {
-  color: #12fff5;
-}
-
-.legend-item:nth-child(3) .legend-item__label::before {
-  background: #003982;
-}
-</style>

src/views/copilot/components/charts/base/fetcherDoubleRing.js

@@ -1,10 +0,0 @@
-export default {
-  getData: async function (url) {
-    //
-    return await new Promise((resolve, reject) => {
-      setTimeout(() => {
-        resolve([90119, 40801, 44028]);
-      }, 1200);
-    });
-  },
-};

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,
     },

src/views/copilot/container.vue

@@ -15,7 +15,7 @@
     />
 
     <YieldCopilot v-if="page == '产量'" :period="period" />
-    <EnergyCopilot v-if="page == '能源'" :period="period" />
+    <EnergyCopilot v-if="page == '综合'" :period="period" />
     <EfficiencyCopilot v-if="page == '效率'" :period="period" />
 
     <div class="copilot-footer">© 中建材智能自动化研究院有限公司</div>

src/views/copilot/efficiency/components/ChipOee.vue

@@ -0,0 +1,110 @@
+<!-- 
+    filename: ChipOee.vue
+    author: liubin
+    date: 2024-04-29 08:51:04
+    description: 芯片OEE
+-->
+
+<template>
+  <BarChartBase
+    :legend="legend"
+    :series="series"
+    :xAxis="xAxis"
+    in="chipOEE"
+    class="chip-oee"
+  />
+</template>
+
+<script>
+import BarChartBase from "@/views/copilot/components/BarChartBase.vue";
+export default {
+  name: "ChipOEE",
+  components: { BarChartBase },
+  props: {
+    period: {
+      type: String,
+      default: "日",
+    },
+  },
+  data() {
+    // 城市数组的顺序必须是固定的
+    const cities = ["瑞昌", "邯郸", "株洲", "佳木斯", "成都", "凯盛", "蚌埠"];
+    return {
+      xAxis: cities,
+    };
+  },
+  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 - 1}年${month}月`, color: "#12f7f1" },
+            { label: `${year}年${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 { ftoInvest } = this.$store.getters.copilot.yield;
+      let dataList = null;
+
+      switch (this.period) {
+        case "日":
+        case "周":
+          dataList = ftoInvest?.current;
+          break;
+        default:
+          dataList = [];
+          dataList[0] = ftoInvest?.pervious;
+          dataList[1] = ftoInvest?.current;
+      }
+
+      return getTemplate(this.period, dataList);
+    },
+  },
+  methods: {},
+};
+
+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>
+
+<style scoped lang="scss"></style>

src/views/copilot/efficiency/components/ChipRate.vue

@@ -0,0 +1,60 @@
+<!-- 
+    filename: ChipRate.vue
+    author: liubin
+    date: 2024-04-29 08:50:54
+    description: 芯片良率
+-->
+
+<template>
+  <div class="chip-rate">
+    <ChipRateItem
+      :period="period"
+      :cities="['成都', '邯郸', '株洲', '瑞昌']"
+      :color="1"
+    />
+    <ChipRateItem
+      :period="period"
+      :cities="['佳木斯', '凯盛光伏', '蚌埠兴科']"
+      :color="2"
+    />
+  </div>
+</template>
+
+<script>
+import ChipRateItemVue from "./sub/chip/ChipRateItem.vue";
+export default {
+  name: "ChipRate",
+  components: { ChipRateItem: ChipRateItemVue },
+  props: {
+    period: {
+      type: String,
+      default: "日",
+    },
+  },
+  data() {
+    return {};
+  },
+  computed: {},
+  methods: {},
+};
+</script>
+
+<style scoped lang="scss">
+.chip-rate {
+  flex: 1;
+  display: flex;
+  gap: 5px;
+  position: relative;
+
+  &:after {
+    content: "";
+    position: absolute;
+    left: 50%;
+    top: 0;
+    width: 3px;
+    height: 100%;
+    transform: translateX(-50%);
+    background: linear-gradient(to bottom, transparent, #00f2ff, transparent);
+  }
+}
+</style>

src/views/copilot/efficiency/components/StdRate.vue

@@ -0,0 +1,57 @@
+<!-- 
+    filename: StdRate.vue
+    author: liubin
+    date: 2024-04-29 08:50:43
+    description: 标准组件良率
+-->
+
+<template>
+  <div class="std-rate">
+    <div class="span-2">
+      <StdRateItem :city="cities[5]" />
+    </div>
+    <div
+      v-for="item in cities.filter((val, index) => index != 5)"
+      :key="item.name"
+    >
+      <StdRateItem :city="item" />
+    </div>
+  </div>
+</template>
+
+<script>
+import StdRateItem from "./sub/std/StdRateItem.vue";
+export default {
+  name: "StdRate",
+  components: { StdRateItem },
+  props: {},
+  data() {
+    return {
+      cities: [
+        { name: "瑞昌", target: 100, total: 200, thisYear: 20 },
+        { name: "邯郸", target: 200, total: 300, thisYear: 20 },
+        { name: "株洲", target: 300, total: 400, thisYear: 20 },
+        { name: "佳木斯", target: 400, total: 500, thisYear: 20 },
+        { name: "成都", target: 500, total: 600, thisYear: 20 },
+        { name: "凯盛光伏", target: 400, total: 500, thisYear: 20 },
+        { name: "蚌埠", target: 500, total: 600, thisYear: 20 },
+      ],
+    };
+  },
+  computed: {},
+  methods: {},
+};
+</script>
+
+<style scoped lang="scss">
+.std-rate {
+  display: grid;
+  gap: 8px;
+  grid-template-columns: repeat(2, 1fr);
+  grid-template-rows: repeat(4, 1fr);
+}
+
+.span-2 {
+  grid-column: span 2;
+}
+</style>

src/views/copilot/efficiency/components/TransformRate.vue

@@ -0,0 +1,110 @@
+<!-- 
+    filename: TransformRate.vue
+    author: liubin
+    date: 2024-04-29 08:50:34
+    description: 转化效率
+-->
+
+<template>
+  <BarChartBase
+    :legend="legend"
+    :series="series"
+    :xAxis="xAxis"
+    in="chipOEE"
+    class="chip-oee"
+  />
+</template>
+
+<script>
+import BarChartBase from "@/views/copilot/components/BarChartBase.vue";
+export default {
+  name: "TransformRate",
+  components: { BarChartBase },
+  props: {
+    period: {
+      type: String,
+      default: "日",
+    },
+  },
+  data() {
+    // 城市数组的顺序必须是固定的
+    const cities = ["瑞昌", "邯郸", "株洲", "佳木斯", "成都", "凯盛", "蚌埠"];
+    return {
+      xAxis: cities,
+    };
+  },
+  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 - 1}年${month}月`, color: "#12f7f1" },
+            { label: `${year}年${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 { ftoInvest } = this.$store.getters.copilot.yield;
+      let dataList = null;
+
+      switch (this.period) {
+        case "日":
+        case "周":
+          dataList = ftoInvest?.current;
+          break;
+        default:
+          dataList = [];
+          dataList[0] = ftoInvest?.pervious;
+          dataList[1] = ftoInvest?.current;
+      }
+
+      return getTemplate(this.period, dataList);
+    },
+  },
+  methods: {},
+};
+
+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>
+
+<style scoped lang="scss"></style>

src/views/copilot/efficiency/components/sub/chip/ChipRateItem.vue

@@ -0,0 +1,194 @@
+<!-- 
+    filename: ChipRateItem.vue
+    author: liubin
+    date: 2024-04-29 14:25:18
+    description: 
+-->
+
+<template>
+  <div class="chip-rate-item">
+    <div class="cities">
+      <CopilotButtons :options="cities" @update:active="handleCityUpdate" />
+    </div>
+    <div class="chart" ref="chart"></div>
+    <div class="legend" v-if="period == '月' || period == '年'">
+      <div class="legend-item" v-for="lgd in legend" :key="lgd.label">
+        <span class="legend-item__value">{{ lgd.value }}</span>
+        <span class="legend-item__label">{{ lgd.label }}</span>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import CopilotButtons from "@/views/copilot/components/select.vue";
+import chartMixin from "@/mixins/chart.js";
+import fullscreenMixin from "@/mixins/fullscreen.js";
+import getOptions from "../../../options/chipOptions.js";
+import { mapGetters } from "vuex";
+
+export default {
+  name: "ChipRateItem",
+  components: { CopilotButtons },
+  mixins: [chartMixin, fullscreenMixin],
+  props: {
+    cities: {
+      type: Array,
+      default: () => [],
+    },
+    color: {
+      type: Number,
+      default: 1,
+    },
+    period: {
+      type: String,
+      default: "日",
+    },
+  },
+  data() {
+    return {
+      factoryId: 0,
+      count: 1,
+    };
+  },
+  computed: {
+    chipRate() {
+      return this.$store.getters.copilot.efficiency.chipRate;
+    },
+    valueTuple() {
+      const getter = this.chipRate;
+      if (this.period === "日" || this.period === "周") {
+        return [
+          getter.previous[this.factoryId],
+          getter.current[this.factoryId],
+          0,
+        ];
+      }
+      // [100, 200, 200]
+      return [
+        getter.previous[this.factoryId],
+        getter.current[this.factoryId],
+        getter.target[this.factoryId],
+      ];
+    },
+    options() {
+      const single = this.period === "日" || this.period === "周";
+      const year = new Date().getFullYear();
+      const month = new Date().getMonth() + 1;
+      const vt = this.valueTuple;
+      let titleValue = single
+          ? (vt[1] != null && `${vt[1] * 100}%`) || "0%"
+          : vt[0] != null && vt[2] != null && vt[2] !== 0
+          ? `${((vt[1] / vt[2]) * 100).toFixed(0)}%`
+          : "0%",
+        subtitle = {
+          日: "本日良率",
+          周: "本周良率",
+          月: `${month}月良率`,
+          年: `${year}良率`,
+        }[this.period];
+
+      const t = getOptions({
+        single,
+        color: this.color == 1 ? "#4CF0E8" : "#1065ff",
+        titleValue,
+        subtitle,
+        previousSum: vt[0],
+        currentSum: vt[1],
+        targetSum: vt[2],
+      });
+      return t;
+    },
+    legend() {
+      const year = new Date().getFullYear();
+      const month = new Date().getMonth() + 1;
+      return [
+        {
+          label:
+            this.period == "月"
+              ? `${year - 1}年${month}月良率`
+              : `${year - 1}年良率`,
+          value: (this.valueTuple[0] * 100).toFixed(0) + "%",
+        },
+        {
+          label: this.period == "月" ? `${month}月良率` : `${year}年良率`,
+          value:  (this.valueTuple[1] * 100).toFixed(0) + "%",
+        },
+      ];
+    },
+  },
+  mounted() {
+    this.initOptions(this.options);
+  },
+  watch: {
+    period() {
+      this.initOptions(this.options);
+    },
+    factoryId() {
+      this.initOptions(this.options);
+    },
+    chipRate() {
+      this.initOptions(this.options);
+    },
+  },
+  methods: {
+    handleCityUpdate(id) {
+      this.factoryId = id;
+    },
+    fullscreenCallback(isFullscreen) {},
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.chip-rate-item {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  gap: 3px;
+  backdrop-filter: blur(24px);
+
+  .cities {
+    height: 40px;
+  }
+
+  .chart {
+    align-self: stretch;
+    height: 280px;
+  }
+
+  .legend {
+    height: 80px;
+    display: flex;
+    gap: 40px;
+    justify-content: space-around;
+  }
+
+  .legend-item {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    gap: 3px;
+
+    &:first-child {
+      .legend-item__value {
+        color: #0e61f5;
+      }
+    }
+
+    &:nth-child(2) {
+      .legend-item__value {
+        color: #0fd5d1;
+      }
+    }
+  }
+
+  .legend-item__value {
+    font-size: 24px;
+    font-weight: 600;
+  }
+}
+</style>
+l

src/views/copilot/efficiency/components/sub/std/CityName.vue

@@ -0,0 +1,66 @@
+<!-- 
+    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 "@/views/copilot/assets/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;
+  position: relative;
+}
+
+.city-name::after {
+  content: "";
+  position: absolute;
+  top: 50%;
+  right: 0;
+  width: 2px;
+  background: linear-gradient(to top, transparent, #0b5be1ee, transparent);
+  height: 100%;
+  transform: translateY(-50%);
+}
+
+img {
+  /* width: 32px; */
+  width: 1.543vw;
+}
+
+span {
+  /* font-size: 12px;   */
+  font-size: 0.77vw;
+  letter-spacing: 2px;
+  text-align: center;
+}
+</style>

src/views/copilot/efficiency/components/sub/std/ProgressBar.vue

@@ -0,0 +1,113 @@
+<!-- 
+    filename: ProgressBar.vue
+    author: liubin
+    date: 2024-04-29 09:18:30
+    description: 
+-->
+
+<template>
+  <div class="progress-bar" :data-title="title" :data-rate="dataRate">
+    <div
+      class="progress-bar__rate"
+      :style="{ width: dataRate == '-' ? 0 : dataRate }"
+    ></div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "ProgressBar",
+  components: {},
+  props: {
+    value: {
+      type: Number,
+      default: 0,
+    },
+    total: {
+      type: Number,
+      default: 0,
+    },
+    title: {
+      type: String,
+      default: "",
+    },
+  },
+  data() {
+    return {};
+  },
+  computed: {
+    dataRate() {
+      return this.total == 0
+        ? "-"
+        : `${(parseFloat(this.value / this.total) * 100).toFixed(0)}%`;
+    },
+  },
+  methods: {},
+};
+</script>
+
+<style scoped lang="scss">
+.progress-bar {
+  height: 10px;
+  background-color: #002f6b;
+  border-radius: 4px;
+  margin-bottom: 12px;
+  position: relative;
+
+  &:before {
+    content: attr(data-title);
+    display: inline-block;
+    color: #fff;
+    position: absolute;
+    bottom: -200%;
+    font-size: 12px;
+  }
+
+  &:after {
+    content: attr(data-rate);
+    display: inline-block;
+    color: #fff;
+    position: absolute;
+    bottom: -200%;
+    right: 0;
+    font-size: 12px;
+  }
+
+  &:first-child {
+    &:after {
+      color: #11eae3;
+    }
+  }
+  &:nth-child(2) {
+    &:after {
+      color: #0e65fd;
+    }
+  }
+
+  .progress-bar__rate {
+    position: absolute;
+    display: inline-block;
+    height: 100%;
+    width: 0;
+    border-radius: 4px;
+  }
+
+  &:first-child {
+    .progress-bar__rate {
+      background: linear-gradient(
+        to right,
+        #004c5e11 10%,
+        #004c5e,
+        #0ac0c0,
+        #11eae3
+      );
+    }
+  }
+
+  &:nth-child(2) {
+    .progress-bar__rate {
+      background: linear-gradient(to right, #0048a811, #0048a8, #0e65fd);
+    }
+  }
+}
+</style>

src/views/copilot/efficiency/components/sub/std/StdRateItem.vue

@@ -0,0 +1,60 @@
+<!-- 
+    filename: StdRateItem.vue
+    author: liubin
+    date: 2024-04-29 08:59:33
+    description: 
+-->
+
+<template>
+  <div class="std-rate-item">
+    <CityName :value="city.name" />
+    <div class="std-rate-item__value">
+      <ProgressBar title="24年目标" :total="city.target" :value="city.target" />
+      <ProgressBar
+        title="24年累计"
+        :total="city.target"
+        :value="city.thisYear"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+import CityName from "./CityName.vue";
+import ProgressBar from "./ProgressBar.vue";
+
+export default {
+  name: "StdRateItem",
+  components: { CityName, ProgressBar },
+  props: {
+    city: {
+      type: Object,
+      required: true,
+    },
+  },
+  data() {
+    return {};
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.std-rate-item {
+  box-shadow: inset 0 0 12px 2px #fff3;
+  border-radius: 4px;
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  padding: 12px;
+}
+
+.std-rate-item__value {
+  flex: 1;
+  margin: 6px;
+  display: flex;
+  gap: 12px;
+  height: 60px;
+  flex-direction: column;
+  justify-content: center;
+}
+</style>

src/views/copilot/efficiency/index.vue

@@ -7,23 +7,63 @@
 
 <template>
   <div class="efficiency-copilot">
-    <db-container title="芯片良率" icon="chip2"></db-container>
-    <db-container title="标准组件良率" icon="std"></db-container>
-    <db-container title="芯片OEE" icon="chip"></db-container>
-    <db-container title="转化效率" icon="cube"></db-container>
+    <Container title="芯片良率" icon="chip2">
+      <ChipRate :period="period" />
+    </Container>
+    <Container title="标准组件良率" icon="std">
+      <StdRate :period="period" />
+    </Container>
+    <Container title="芯片OEE" icon="chip">
+      <ChipOee :period="period" />
+    </Container>
+    <Container title="转化效率" icon="cube">
+      <TransformRate :period="period" />
+    </Container>
   </div>
 </template>
 
 <script>
-import Container from "../../dashboard/components/Container.vue";
+import Container from "@/views/copilot/components/Container.vue";
+import ChipOeeVue from "./components/ChipOee.vue";
+import ChipRateVue from "./components/ChipRate.vue";
+import StdRateVue from "./components/StdRate.vue";
+import TransformRateVue from "./components/TransformRate.vue";
+
 export default {
   name: "EfficiencyCopilot",
-  components: { DbContainer: Container },
+  components: {
+    Container,
+    ChipOee: ChipOeeVue,
+    ChipRate: ChipRateVue,
+    StdRate: StdRateVue,
+    TransformRate: TransformRateVue,
+  },
+  props: {
+    period: {
+      type: String,
+      default: "日",
+    },
+  },
   data() {
     return {};
   },
-  computed: {},
-  methods: {},
+  watch: {
+    period: {
+      handler(val) {
+        val && this.fetchData(val);
+      },
+      immediate: true,
+    },
+  },
+  methods: {
+    fetchData(period = "日") {
+      console.log(`效率驾驶舱，获取${period}数据`);
+      this.$store.dispatch("copilot/initCopilot", {
+        period,
+        source: "efficiency",
+      });
+    },
+  },
 };
 </script>
 

src/views/copilot/efficiency/options/chipOptions.js

@@ -0,0 +1,163 @@
+export default function ({
+  single = false,
+  color,
+  titleValue,
+  subtitle,
+  previousSum,
+  currentSum,
+  targetSum,
+}) {
+  return {
+    grid: {
+      left: 0,
+      right: 0,
+      bottom: 0,
+      top: 0,
+      containLabel: true,
+    },
+    tooltip: {
+      // formatter(params) {
+      //   return `${params.name}: ${(params.value * 100).toFixed(0)}%`;
+      // }
+    },
+    title: {
+      text: titleValue,
+      left: "49%",
+      top: "39%",
+      textAlign: "center",
+      textStyle: {
+        fontWeight: 600,
+        fontSize: 32,
+        color: "#fffd",
+      },
+      subtext: `\u2002${subtitle}\u2002`,
+      subtextStyle: {
+        fontSize: 14,
+        fontWeight: 100,
+        color: "#fffd",
+        align: "right",
+      },
+    },
+    series: [
+      // 背景 series
+      {
+        type: "pie",
+        name: "当前目标",
+        radius: ["70%", "85%"],
+        center: ["50%", "52%"],
+        emptyCircleStyle: {
+          color: "#040c5f45",
+        },
+      },
+      // 数据 series
+      {
+        type: "pie",
+        radius: ["70%", "85%"],
+        center: ["50%", "52%"],
+        avoidLabelOvervlap: false,
+        label: {
+          show: false,
+        },
+        labelLine: {
+          show: false,
+        },
+        data: [
+          {
+            value: currentSum,
+            name: "当前良率",
+            selected: false,
+            itemStyle: {
+              borderJoin: "round",
+              borderCap: "round",
+              borderWidth: 12,
+              borderRadius: "50%",
+              color: {
+                type: "linear",
+                x: 1,
+                y: 0,
+                x2: 0,
+                y2: 1,
+                colorStops: single
+                  ? [
+                      { offset: 0, color: `${color}11` },
+                      { offset: 1, color: `${color}` },
+                    ]
+                  : [
+                      { offset: 0, color: "#4CF0E811" },
+                      { offset: 1, color: "#4CF0E8" },
+                    ],
+              },
+            },
+          },
+          {
+            value:
+              targetSum > currentSum
+                ? targetSum - currentSum
+                : targetSum == 0
+                ? currentSum == 0
+                  ? 1
+                  : 0
+                : targetSum,
+
+            name: "未达成",
+            itemStyle: { color: "transparent" },
+            label: { show: false },
+          },
+        ],
+      },
+      // 数据 series2 - 2023累计
+      single
+        ? null
+        : {
+            type: "pie",
+            radius: ["55%", "70%"],
+            center: ["50%", "52%"],
+            avoidLabelOvervlap: false,
+            label: {
+              show: false,
+            },
+            labelLine: {
+              show: false,
+            },
+            data: [
+              {
+                value: previousSum,
+                name: "上期良率",
+                selected: false,
+                itemStyle: {
+                  borderJoin: "round",
+                  borderCap: "round",
+                  borderWidth: 12,
+                  borderRadius: "50%",
+                  color: {
+                    type: "linear",
+                    x: 1,
+                    y: 0,
+                    x2: 0,
+                    y2: 1,
+                    colorStops: [
+                      { offset: 0, color: "#1065ff66" },
+                      { offset: 1, color: "#1065ff" },
+                    ],
+                  },
+                },
+              },
+              {
+                value:
+                  targetSum > previousSum
+                    ? targetSum - previousSum
+                    : previousSum == 0
+                    ? 1
+                    : 0,
+                name: "-",
+                formatter: {
+                  show: false
+                },
+                itemStyle: { color: "transparent" },
+                label: { show: false },
+              },
+            ],
+          },
+    ],
+  };
+}

src/views/copilot/energy/components/ElecCost.vue

@@ -0,0 +1,128 @@
+<!-- 
+    filename: ElecCost.vue
+    author: liubin
+    date: 2024-04-29 16:37:01
+    description: 电能耗
+-->
+
+<template>
+  <LineChartBase
+    v-if="1"
+    :legend="legend"
+    :series="series"
+    :xAxis="xAxis"
+    in="elecCost"
+    class="elec-cost"
+  />
+  <BarChartBase
+    v-else
+    :legend="legend"
+    :series="series"
+    :xAxis="xAxis"
+    in="elecCost"
+    class="elec-cost"
+  />
+</template>
+
+<script>
+import BarChartBaseVue from "@/views/copilot/components/BarChartBase.vue";
+import LineChartBaseVue from "@/views/copilot/components/LineChartBase.vue";
+
+export default {
+  name: "ElecCost",
+  components: {
+    BarChartBase: BarChartBaseVue,
+    LineChartBase: LineChartBaseVue,
+  },
+  props: {
+    period: {
+      type: String,
+      default: "日",
+    },
+  },
+  data() {
+    // 城市数组的顺序必须是固定的
+    const cities = ["瑞昌", "邯郸", "株洲", "佳木斯", "成都", "凯盛", "蚌埠"];
+    return {
+      xAxis: cities,
+    };
+  },
+  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 - 1}年${month}月`, color: "#12f7f1" },
+            { label: `${year}年${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 { ftoInvest } = this.$store.getters.copilot.yield;
+      let dataList = null;
+
+      switch (this.period) {
+        case "日":
+        case "周":
+          dataList = ftoInvest?.current;
+          break;
+        default:
+          dataList = [];
+          dataList[0] = ftoInvest?.pervious;
+          dataList[1] = ftoInvest?.current;
+      }
+
+      return getTemplate(this.period, dataList);
+    },
+  },
+  methods: {},
+};
+
+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>
+
+<style scoped lang="scss">
+.elec-cost {
+  flex: 1;
+}
+</style>

src/views/copilot/energy/components/NatGas.vue

@@ -0,0 +1,115 @@
+<!-- 
+    filename: NatGas.vue
+    author: liubin
+    date: 2024-04-29 16:36:27
+    description: 天然气能耗
+-->
+
+<template>
+  <BarChartBase
+    :legend="legend"
+    :series="series"
+    :xAxis="xAxis"
+    in="nat-gas"
+    class="nat-gas"
+  />
+</template>
+
+<script>
+import BarChartBase from "@/views/copilot/components/BarChartBase.vue";
+
+export default {
+  name: "NatGasCost",
+  components: { BarChartBase },
+  props: {
+    period: {
+      type: String,
+      default: "日",
+    },
+  },
+  data() {
+    // 城市数组的顺序必须是固定的
+    const cities = ["瑞昌", "邯郸", "株洲", "佳木斯", "成都", "凯盛", "蚌埠"];
+    return {
+      xAxis: cities,
+    };
+  },
+  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 - 1}年${month}月`, color: "#12f7f1" },
+            { label: `${year}年${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 { ftoInvest } = this.$store.getters.copilot.yield;
+      let dataList = null;
+
+      switch (this.period) {
+        case "日":
+        case "周":
+          dataList = ftoInvest?.current;
+          break;
+        default:
+          dataList = [];
+          dataList[0] = ftoInvest?.pervious;
+          dataList[1] = ftoInvest?.current;
+      }
+
+      return getTemplate(this.period, dataList);
+    },
+  },
+  methods: {},
+};
+
+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>
+
+<style scoped lang="scss">
+.nat-gas {
+  flex: 1;
+}
+</style>

src/views/copilot/energy/components/StockMonitor.vue

@@ -0,0 +1,63 @@
+<!-- 
+    filename: StockMonitor.vue
+    author: liubin
+    date: 2024-04-29 16:35:40
+    description: 仓库监控·当前
+-->
+
+<template>
+  <div class="stock-monitor">
+    <MonitorItem
+      :cities="['成都', '邯郸', '株洲', '瑞昌', '佳木斯']"
+      :legendList="dhgList"
+    />
+    <MonitorItem :cities="['凯盛光伏', '蚌埠兴科']" :legendList="otherList" />
+  </div>
+</template>
+
+<script>
+import MonitorItemVue from "./sub/monitor/MonitorItem.vue";
+
+export default {
+  name: "StockMonitor",
+  components: { MonitorItem: MonitorItemVue },
+  props: {},
+  data() {
+    return {
+      dhgList: [
+        { name: "总库存", value: "1000" },
+        { name: "已用库存", value: "500" },
+        { name: "剩余库存", value: "500" },
+      ],
+      otherList: [
+        { name: "分类1", value: "1000" },
+        { name: "分类2", value: "1000" },
+        { name: "分类3", value: "1000" },
+        { name: "分类4", value: "1000" },
+      ],
+    };
+  },
+  computed: {},
+  methods: {},
+};
+</script>
+
+<style scoped lang="scss">
+.stock-monitor {
+  flex: 1;
+  display: flex;
+  gap: 5px;
+  position: relative;
+
+  &:after {
+    content: "";
+    position: absolute;
+    left: 50%;
+    top: 0;
+    width: 3px;
+    height: 100%;
+    transform: translateX(-50%);
+    background: linear-gradient(to bottom, transparent, #00f2ff, transparent);
+  }
+}
+</style>

src/views/copilot/energy/components/WaterCost.vue

@@ -0,0 +1,128 @@
+<!-- 
+    filename: WaterCost.vue
+    author: liubin
+    date: 2024-04-29 16:37:34
+    description: 水能耗
+-->
+
+<template>
+  <LineChartBase
+    v-if="0"
+    :legend="legend"
+    :series="series"
+    :xAxis="xAxis"
+    in="waterCost"
+    class="water-cost"
+  />
+  <BarChartBase
+    v-else
+    :legend="legend"
+    :series="series"
+    :xAxis="xAxis"
+    in="waterCost"
+    class="water-cost"
+  />
+</template>
+
+<script>
+import BarChartBaseVue from "@/views/copilot/components/BarChartBase.vue";
+import LineChartBaseVue from "@/views/copilot/components/LineChartBase.vue";
+
+export default {
+  name: "WaterCost",
+  components: {
+    BarChartBase: BarChartBaseVue,
+    LineChartBase: LineChartBaseVue,
+  },
+  props: {
+    period: {
+      type: String,
+      default: "日",
+    },
+  },
+  data() {
+    // 城市数组的顺序必须是固定的
+    const cities = ["瑞昌", "邯郸", "株洲", "佳木斯", "成都", "凯盛", "蚌埠"];
+    return {
+      xAxis: cities,
+    };
+  },
+  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 - 1}年${month}月`, color: "#12f7f1" },
+            { label: `${year}年${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 { ftoInvest } = this.$store.getters.copilot.yield;
+      let dataList = null;
+
+      switch (this.period) {
+        case "日":
+        case "周":
+          dataList = ftoInvest?.current;
+          break;
+        default:
+          dataList = [];
+          dataList[0] = ftoInvest?.pervious;
+          dataList[1] = ftoInvest?.current;
+      }
+
+      return getTemplate(this.period, dataList);
+    },
+  },
+  methods: {},
+};
+
+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>
+
+<style scoped lang="scss">
+.water-cost {
+  flex: 1;
+}
+</style>

src/views/copilot/energy/components/sub/monitor/MonitorItem.vue

@@ -0,0 +1,139 @@
+<!-- 
+    filename: ChipRateItem.vue
+    author: liubin
+    date: 2024-04-29 14:25:18
+    description: 
+-->
+
+<template>
+  <div class="monitor-item">
+    <div class="cities">
+      <CopilotButtons :options="cities" @update:active="handleCityUpdate" />
+    </div>
+    <div class="chart" ref="chart"></div>
+    <div class="legend" v-if="1">
+      <div class="legend-item" v-for="lgd in legendList" :key="lgd.name">
+        <span class="legend-item__label">{{ lgd.name }}</span>
+        <span class="legend-item__value">{{ lgd.value }}</span>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import CopilotButtons from "@/views/copilot/components/select.vue";
+import chartMixin from "@/mixins/chart.js";
+import fullscreenMixin from "@/mixins/fullscreen.js";
+import getOptions from "../../../options/monitorOptions.js";
+
+export default {
+  name: "ChipRateItem",
+  components: { CopilotButtons },
+  mixins: [chartMixin, fullscreenMixin],
+  props: {
+    cities: {
+      type: Array,
+      default: () => [],
+    },
+    legendList: {
+      type: Array,
+      default: () => [],
+    },
+    color: {
+      type: Number,
+      default: 1,
+    },
+  },
+  data() {
+    return {
+      period: "月",
+      valueTuple: [100, 100, 200],
+    };
+  },
+  computed: {
+    options() {
+      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]) * 100).toFixed(0)}%`
+            : "0%",
+        subtitle =
+          this.period == "月" ? `${month}月累计产出` : `${year}年累计产出`;
+
+      return getOptions({
+        single: true,
+        color: this.color == 1 ? "#4CF0E8" : "#1065ff",
+        titleValue,
+        subtitle,
+        previousSum: this.valueTuple[0],
+        currentSum: this.valueTuple[1],
+        targetSum: this.valueTuple[2],
+      });
+    },
+  },
+  mounted() {
+    this.initOptions(this.options);
+  },
+  methods: {
+    handleCityUpdate() {},
+    fullscreenCallback(isFullscreen) {
+      console.log("isFullscreen--->", isFullscreen);
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.monitor-item {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  gap: 3px;
+  backdrop-filter: blur(24px);
+
+  .cities {
+    height: 40px;
+  }
+
+  .chart {
+    align-self: stretch;
+    height: 280px;
+  }
+
+  .legend {
+    height: 80px;
+    display: flex;
+    gap: 40px;
+    justify-content: space-around;
+  }
+
+  .legend-item {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    gap: 3px;
+
+    &:first-child {
+      .legend-item__value {
+        color: #0e61f5;
+      }
+    }
+
+    &:nth-child(2) {
+      .legend-item__value {
+        color: #0fd5d1;
+      }
+    }
+  }
+
+  .legend-item__value {
+    font-size: 24px;
+    font-weight: 600;
+  }
+}
+</style>
+l

src/views/copilot/energy/index.vue

@@ -2,24 +2,81 @@
     filename: index.vue
     author: liubin
     date: 2024-04-16 14:40:15
-    description: 能源驾驶舱
+    description: 综合驾驶舱
 -->
 
 <template>
-  <div class="energy-copilot">能源驾驶舱</div>
+  <div class="energy-copilot">
+    <Container title="仓库监控·当前" icon="chip2">
+      <StockMonitorVue :period="period" />
+    </Container>
+    <Container title="天然气能耗" icon="std">
+      <NatGasVue :period="period" />
+    </Container>
+    <Container title="电能耗" icon="chip">
+      <ElecCostVue :period="period" />
+    </Container>
+    <Container title="水能耗" icon="cube">
+      <WaterCostVue :period="period" />
+    </Container>
+  </div>
 </template>
 
 <script>
+import Container from "@/views/copilot/components/Container.vue";
+import StockMonitorVue from "./components/StockMonitor.vue";
+import ElecCostVue from "./components/ElecCost.vue";
+import NatGasVue from "./components/NatGas.vue";
+import WaterCostVue from "./components/WaterCost.vue";
+
 export default {
   name: "EnergyCopilot",
-  components: {},
-  props: {},
+  components: {
+    Container,
+    StockMonitorVue,
+    ElecCostVue,
+    NatGasVue,
+    WaterCostVue,
+  },
+  props: {
+    period: {
+      type: String,
+      default: "日",
+    },
+  },
   data() {
     return {};
   },
-  computed: {},
-  methods: {},
+  watch: {
+    period: {
+      handler(val) {
+        val && this.fetchData(val);
+      },
+      immediate: true,
+    },
+  },
+  methods: {
+    fetchData(period = "日") {
+      console.log(`效率驾驶舱，获取${period}数据`);
+      this.$store.dispatch("copilot/initCopilot", {
+        period,
+        source: "comprehensive",
+      });
+    },
+  },
 };
 </script>
 
-<style scoped></style>
+<style scoped>
+.energy-copilot {
+  flex: 1;
+  display: grid;
+  gap: 16px;
+  grid-template-columns: 1fr 1fr;
+  grid-template-rows: 1fr 1fr;
+}
+
+.energy-copilot > div {
+  height: 100%;
+}
+</style>

src/views/copilot/energy/options/monitorOptions.js

@@ -0,0 +1,156 @@
+export default function ({
+  single = false,
+  color,
+  titleValue,
+  subtitle,
+  previousSum,
+  currentSum,
+  targetSum,
+}) {
+  return {
+    grid: {
+      left: 0,
+      right: 0,
+      bottom: 0,
+      top: 0,
+      containLabel: true,
+    },
+    tooltip: {},
+    title: {
+      text: titleValue,
+      left: "49%",
+      top: "39%",
+      textAlign: "center",
+      textStyle: {
+        fontWeight: 600,
+        fontSize: 32,
+        color: "#fffd",
+      },
+      subtext: `\u2002${subtitle}\u2002`,
+      subtextStyle: {
+        fontSize: 14,
+        fontWeight: 100,
+        color: "#fffd",
+        align: "right",
+      },
+    },
+    series: [
+      // 背景 series
+      {
+        type: "pie",
+        name: "当前目标",
+        radius: ["70%", "85%"],
+        center: ["50%", "52%"],
+        emptyCircleStyle: {
+          color: "#040c5f45",
+        },
+      },
+      // 数据 series
+      {
+        type: "pie",
+        radius: ["70%", "85%"],
+        center: ["50%", "52%"],
+        avoidLabelOvervlap: false,
+        label: {
+          show: false,
+        },
+        labelLine: {
+          show: false,
+        },
+        data: [
+          {
+            value: currentSum,
+            name: "当前累计产出",
+            selected: false,
+            itemStyle: {
+              borderJoin: "round",
+              borderCap: "round",
+              borderWidth: 12,
+              borderRadius: "50%",
+              // color: {
+              //   type: "linear",
+              //   x: 1,
+              //   y: 0,
+              //   x2: 0,
+              //   y2: 1,
+              //   colorStops: single
+              //     ? [
+              //         { offset: 0, color: `${color}11` },
+              //         { offset: 1, color: `${color}` },
+              //       ]
+              //     : [
+              //         { offset: 0, color: "#4CF0E811" },
+              //         { offset: 1, color: "#4CF0E8" },
+              //       ],
+              // },
+            },
+          },
+          {
+            value:
+              targetSum > currentSum
+                ? targetSum - currentSum
+                : targetSum == 0
+                ? currentSum == 0
+                  ? 1
+                  : 0
+                : 0,
+
+            name: "未达成累计",
+            itemStyle: { color: "transparent" },
+            label: { show: false },
+          },
+        ],
+      },
+      // 数据 series2 - 2023累计
+      single
+        ? null
+        : {
+            type: "pie",
+            radius: ["55%", "70%"],
+            center: ["50%", "52%"],
+            avoidLabelOvervlap: false,
+            label: {
+              show: false,
+            },
+            labelLine: {
+              show: false,
+            },
+            data: [
+              {
+                value: previousSum,
+                name: "上期累计产出",
+                selected: false,
+                itemStyle: {
+                  borderJoin: "round",
+                  borderCap: "round",
+                  borderWidth: 12,
+                  borderRadius: "50%",
+                  // color: {
+                  //   type: "linear",
+                  //   x: 1,
+                  //   y: 0,
+                  //   x2: 0,
+                  //   y2: 1,
+                  //   colorStops: [
+                  //     { offset: 0, color: "#1065ff66" },
+                  //     { offset: 1, color: "#1065ff" },
+                  //   ],
+                  // },
+                },
+              },
+              {
+                value:
+                  targetSum > previousSum
+                    ? targetSum - previousSum
+                    : previousSum == 0
+                    ? 1
+                    : 0,
+                name: "-",
+                itemStyle: { color: "transparent" },
+                label: { show: false },
+              },
+            ],
+          },
+    ],
+  };
+}

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

@@ -6,11 +6,11 @@
 -->
 
 <template>
-  <DoubleRingWrapperVue :data-source="dataBundle" :period="period" />
+  <DoubleRingWrapperVue data-source="BIPV产出" :period="period" />
 </template>
 
 <script>
-import DoubleRingWrapperVue from "./base/DoubleRingWrapper.vue";
+import DoubleRingWrapperVue from "./sub/ring/DoubleRingWrapper.vue";
 
 export default {
   name: "BipvOutput",
@@ -22,7 +22,7 @@ export default {
     },
   },
   data() {
-    return { dataBundle: null };
+    return {};
   },
 };
 </script>

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

@@ -0,0 +1,106 @@
+<!-- 
+    filename: FtoInvest.vue
+    author: liubin
+    date: 2024-04-10 08:59:28
+    description: 
+-->
+
+<template>
+  <BarChartBase
+    :legend="legend"
+    :series="series"
+    :xAxis="xAxis"
+    in="ChipInvest"
+    class="chip-invest-chart"
+  />
+</template>
+
+<script>
+import BarChartBase from "@/views/copilot/components/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 - 1}年${month}月`, color: "#12f7f1" },
+            { label: `${year}年${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 { 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 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>

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

@@ -6,11 +6,11 @@
 -->
 
 <template>
-  <DoubleRingWrapperVue :data-source="dataBundle" :period="period" />
+  <DoubleRingWrapperVue data-source="芯片产出" :period="period" />
 </template>
 
 <script>
-import DoubleRingWrapperVue from "./base/DoubleRingWrapper.vue";
+import DoubleRingWrapperVue from "./sub/ring/DoubleRingWrapper.vue";
 
 export default {
   name: "ChipOutput",
@@ -22,7 +22,7 @@ export default {
     },
   },
   data() {
-    return { dataBundle: null };
+    return {};
   },
 };
 </script>

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

@@ -0,0 +1,108 @@
+<!-- 
+    filename: FtoInvest.vue
+    author: liubin
+    date: 2024-04-10 08:59:28
+    description: 
+-->
+
+<template>
+  <BarChartBase
+    :legend="legend"
+    :series="series"
+    :xAxis="xAxis"
+    in="ftoInvest"
+    class="fto-chart"
+  />
+</template>
+
+<script>
+import BarChartBase from "@/views/copilot/components/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 - 1}年${month}月`, color: "#12f7f1" },
+            { label: `${year}年${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 { ftoInvest } = this.$store.getters.copilot.yield;
+      let dataList = null;
+
+      switch (this.period) {
+        case "日":
+        case "周":
+          dataList = ftoInvest?.current;
+          break;
+        default:
+          dataList = [];
+          dataList[0] = ftoInvest?.pervious;
+          dataList[1] = ftoInvest?.current;
+      }
+
+      return getTemplate(this.period, dataList);
+    },
+  },
+};
+
+function getTemplate(period, dataList) {
+  const year = new Date().getFullYear();
+  const month = new Date().getMonth() + 1;
+  return period == "日" || period == "周"
+    ? [
+        {
+          name: 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>

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

@@ -6,11 +6,11 @@
 -->
 
 <template>
-  <DoubleRingWrapperVue data-source="标准组件输出" :period="period" />
+  <DoubleRingWrapperVue data-source="标准组件产出" :period="period" />
 </template>
 
 <script>
-import DoubleRingWrapperVue from "./base/DoubleRingWrapper.vue";
+import DoubleRingWrapperVue from "./sub/ring/DoubleRingWrapper.vue";
 
 export default {
   name: "StdOutput",

src/views/copilot/yield/components/sub/city/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;
       }
@@ -98,6 +98,7 @@ export default {
           _cities[idx].value = v ?? 0;
         }
       );
+      // 删掉凯盛光伏
       _cities.splice(4, 1);
       return _cities;
     },

src/views/copilot/yield/components/sub/city/CityItem.vue

@@ -8,14 +8,15 @@
 <template>
   <div class="city-item inner-shadow">
     <CityName :value="location" />
-    <CityValue :value="value+''" :period="period" />
+    <CityValue :value="value + ''" :period="period" />
   </div>
 </template>
 
 <script>
 import CityNameVue from "./CityName.vue";
 import CityValueVue from "./CityValue.vue";
-import GradientTextVue from "./GradientText.vue";
+import GradientTextVue from "../gradient/GradientText.vue";
+
 export default {
   name: "CityItem",
   components: {

src/views/copilot/yield/components/sub/city/CityName.vue

@@ -13,7 +13,7 @@
 </template>
 
 <script>
-import Icon from "./icon.png";
+import Icon from "@/views/copilot/assets/icon.png";
 
 export default {
   name: "CityName",

src/views/copilot/yield/components/sub/city/CityValue.vue

@@ -18,7 +18,7 @@
 </template>
 
 <script>
-import GradientTextVue from "./GradientText.vue";
+import GradientTextVue from "../gradient/GradientText.vue";
 
 export default {
   name: "CityValue",

src/views/copilot/yield/components/sub/ring/DoubleRingChart.vue

@@ -0,0 +1,221 @@
+<!-- 
+    filename: DoubleRingChart.vue
+    author: liubin
+    date: 2024-04-17 11:01:55
+    description: 
+-->
+
+<template>
+  <div class="double-ring-chart">
+    <div ref="chart" class="double-ring-chart__container"></div>
+    <!-- style="{ height: vHeight + 'vh' }" -->
+    <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 | numberFilter }}</span>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import chartMixin from "@/mixins/chart.js";
+import fullscreenMixin from "@/mixins/fullscreen.js";
+import getOptions from "../../../options/double-ring-chart-options";
+
+export default {
+  name: "DoubleRingChart",
+  mixins: [chartMixin, fullscreenMixin],
+  props: {
+    vHeight: {
+      type: Number,
+      default: 24,
+    },
+    factoryId: {
+      type: Number,
+      required: true,
+    },
+    period: {
+      type: String,
+      default: "日",
+    },
+    dataSource: {
+      type: String,
+      default: null,
+    },
+  },
+  data() {
+    return {};
+  },
+  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],
+        ];
+      }
+      // [100, 200, 200]
+      return [
+        getter.previous[this.factoryId],
+        getter.current[this.factoryId],
+        getter.target[this.factoryId],
+      ];
+    },
+
+    options() {
+      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: 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);
+  },
+  methods: {
+    // fullscreen mixin 需要的回调
+    fullscreenCallback(isFullscreen) {
+      console.log("isFullscreen--->", isFullscreen);
+    },
+  },
+};
+
+function calculateItems(period, valueTuple) {
+  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: valueTuple[1] },
+        { label: `去年${month}月${today}日累计`, value: valueTuple[0] },
+      ];
+      break;
+    case "周":
+      items = [
+        { label: `本周累计`, value: valueTuple[1] },
+        { label: `去年本周累计`, value: valueTuple[0] },
+      ];
+      break;
+    case "月":
+      items = [
+        { label: `${month}月累计`, value: valueTuple[1] },
+        { label: `去年${month}月累计`, value: valueTuple[0] },
+        { label: `${month}月目标`, value: valueTuple[2] },
+      ];
+      break;
+    case "年":
+      items = [
+        { label: `${year}年累计`, value: valueTuple[1] },
+        { label: `${year - 1}年累计`, value: valueTuple[0] },
+        { label: `${year}年目标`, value: valueTuple[2] },
+      ];
+      break;
+  }
+  return items;
+}
+</script>
+
+<style scoped>
+.double-ring-chart {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+}
+
+.double-ring-chart__container {
+  flex: 1;
+  height: 0;
+}
+
+.double-ring-chart__legend {
+  padding: 12px;
+  color: #fff;
+  display: flex;
+  justify-content: center;
+  gap: 32px;
+}
+
+.legend-item {
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
+}
+
+.legend-item__label {
+  position: relative;
+}
+
+.legend-item__label::before {
+  content: "";
+  position: absolute;
+  width: 12px;
+  height: 12px;
+  background: #ccc;
+  border-radius: 2px;
+  top: 6px;
+  left: -18px;
+}
+
+.legend-item:nth-child(1) .legend-item__label::before {
+  background: #12fff5;
+}
+.legend-item:nth-child(1) .legend-item__value {
+  color: #12fff5;
+}
+
+.legend-item:nth-child(2) .legend-item__label::before {
+  background: #0f65ff;
+}
+.legend-item:nth-child(2) .legend-item__value {
+  color: #0f65ff;
+}
+
+.legend-item:nth-child(3) .legend-item__label::before {
+  background: #003982;
+}
+</style>

src/views/copilot/yield/components/sub/ring/DoubleRingWrapper.vue

@@ -13,7 +13,11 @@
         :options="cityOptions"
       />
       <div class="flex-1 stretch">
-        <DoubleRingChartVue :period="period" />
+        <DoubleRingChartVue
+          :data-source="dataSource"
+          :period="period"
+          :factoryId="factoryId"
+        />
       </div>
     </template>
     <template v-else>
@@ -23,10 +27,9 @@
 </template>
 
 <script>
-import CopilotSelect from "../../select.vue";
-import fetcher from "./fetcherDoubleRing";
+import CopilotSelect from "@/views/copilot/components/select.vue";
 import DoubleRingChartVue from "./DoubleRingChart.vue";
-import CityData from "./CityData.vue";
+import CityData from "../city/CityData.vue";
 
 export default {
   name: "DoubleRingWrapper",
@@ -43,6 +46,7 @@ export default {
   },
   data() {
     return {
+      factoryId: 4, // 默认成都
       cityOptions: [
         "成都",
         "邯郸",
@@ -54,15 +58,9 @@ export default {
       ],
     };
   },
-  computed: {},
-  mounted() {
-    fetcher.getData().then((res) => {
-      console.log("getData--->", res);
-    });
-  },
   methods: {
-    handleActiveUpdate(val) {
-      console.log("handleActiveUpdate--->", val);
+    handleActiveUpdate(index) {
+      this.factoryId = index;
     },
   },
 };

src/views/copilot/yield/index.vue

@@ -30,22 +30,22 @@
 </template>
 
 <script>
-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";
-import ChipInvestVue from "../components/charts/ChipInvest.vue";
+import Container from "@/views/copilot/components/Container.vue";
+import StdOutput from "./components/StdOutput.vue";
+import ChipOutput from "./components/ChipOutput.vue";
+import FtoInvest from "./components/FtoInvest.vue";
+import BipvOutput from "./components/BipvOutput.vue";
+import ChipInvest from "./components/ChipInvest.vue";
 
 export default {
   name: "YieldCopilot",
   components: {
     DbContainer: Container,
-    StdOutput: StdOutputVue,
-    ChipOutput: ChipOutputVue,
-    BipvOutput: BipvOutputVue,
-    FtoInvest: FtoInvestVue,
-    ChipInvest: ChipInvestVue,
+    StdOutput,
+    ChipOutput,
+    BipvOutput,
+    FtoInvest,
+    ChipInvest,
   },
   props: {
     period: {

src/views/copilot/yield/options/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,16 @@ export default {
           },
         },
         {
-          value: 20,
-          name: "-",
+          value:
+            targetSum > currentSum
+              ? targetSum - currentSum
+              : targetSum == 0
+              ? currentSum == 0
+                ? 1
+                : 0
+              : 0,
+
+          name: "未达成累计",
           itemStyle: { color: "transparent" },
           label: { show: false },
         },
@@ -94,8 +107,8 @@ export default {
       },
       data: [
         {
-          value: 90,
-          name: "2023累计产出",
+          value: previousSum,
+          name: "上期累计产出",
           selected: false,
           itemStyle: {
             borderJoin: "round",
@@ -116,7 +129,12 @@ export default {
           },
         },
         {
-          value: 20,
+          value:
+            targetSum > previousSum
+              ? targetSum - previousSum
+              : previousSum == 0
+              ? 1
+              : 0,
           name: "-",
           itemStyle: { color: "transparent" },
           label: { show: false },
@@ -124,4 +142,4 @@ export default {
       ],
     },
   ],
-};
+});

src/views/dashboard/components/CompanyInfo.vue

@@ -12,7 +12,7 @@
     <h2>{{ info.companyName }}</h2>
     <ul>
       <li v-for="item in info.items" :key="item.label">
-        {{ item.label }} {{ item.value | currency }}
+        {{ item.label }} {{ item.value | numberFilter }}
       </li>
     </ul>
   </div>
@@ -35,8 +35,12 @@ export default {
     },
   },
   filters: {
-    currency(value) {
-      return value.toLocaleString();
+    numberFilter(value) {
+      if (value != null && !isNaN(parseInt(value))) {
+        return parseInt(value).toLocaleString();
+      } else {
+        return '-';
+      }
     },
   },
   data() {