From 5ed4eed5de3346e320076966370a3483be6e42fc Mon Sep 17 00:00:00 2001
From: "DESKTOP-FUDKNA8\\znjsz" <tonystark@starkindustries.mil>
Date: Mon, 29 Apr 2024 13:26:38 +0800
Subject: [PATCH 1/7] update efficiency

---
 src/views/copilot/{yield => }/assets/icon.png | Bin
 .../copilot/efficiency/components/ChipOee.vue |  25 ++++++
 .../efficiency/components/ChipRate.vue        |  27 ++++++
 .../copilot/efficiency/components/StdRate.vue |  65 ++++++++++++++
 .../efficiency/components/TransformRate.vue   |  25 ++++++
 .../efficiency/components/sub/CityName.vue    |  68 +++++++++++++++
 .../efficiency/components/sub/ProgressBar.vue |  82 ++++++++++++++++++
 .../efficiency/components/sub/StdRateItem.vue |  65 ++++++++++++++
 src/views/copilot/efficiency/index.vue        |  34 ++++++--
 .../yield/components/sub/city/CityName.vue    |   2 +-
 10 files changed, 386 insertions(+), 7 deletions(-)
 rename src/views/copilot/{yield => }/assets/icon.png (100%)
 create mode 100644 src/views/copilot/efficiency/components/ChipOee.vue
 create mode 100644 src/views/copilot/efficiency/components/ChipRate.vue
 create mode 100644 src/views/copilot/efficiency/components/StdRate.vue
 create mode 100644 src/views/copilot/efficiency/components/TransformRate.vue
 create mode 100644 src/views/copilot/efficiency/components/sub/CityName.vue
 create mode 100644 src/views/copilot/efficiency/components/sub/ProgressBar.vue
 create mode 100644 src/views/copilot/efficiency/components/sub/StdRateItem.vue

diff --git a/src/views/copilot/yield/assets/icon.png b/src/views/copilot/assets/icon.png
similarity index 100%
rename from src/views/copilot/yield/assets/icon.png
rename to src/views/copilot/assets/icon.png
diff --git a/src/views/copilot/efficiency/components/ChipOee.vue b/src/views/copilot/efficiency/components/ChipOee.vue
new file mode 100644
index 0000000..5eb554e
--- /dev/null
+++ b/src/views/copilot/efficiency/components/ChipOee.vue
@@ -0,0 +1,25 @@
+<!-- 
+    filename: ChipOee.vue
+    author: liubin
+    date: 2024-04-29 08:51:04
+    description: 芯片OEE
+-->
+
+<template></template>
+
+<script>
+export default {
+    name: "ChipOEE",
+    components: {},
+    props: {},
+    data() {
+        return {}
+    },
+    computed: {},
+    methods: {},
+}
+</script>
+
+<style scoped lang="scss">
+
+</style>
diff --git a/src/views/copilot/efficiency/components/ChipRate.vue b/src/views/copilot/efficiency/components/ChipRate.vue
new file mode 100644
index 0000000..d1fed9e
--- /dev/null
+++ b/src/views/copilot/efficiency/components/ChipRate.vue
@@ -0,0 +1,27 @@
+<!-- 
+    filename: ChipRate.vue
+    author: liubin
+    date: 2024-04-29 08:50:54
+    description: 芯片良率
+-->
+
+<template>
+
+</template>
+
+<script>
+export default {
+    name: "ChipRate",
+    components: {},
+    props: {},
+    data() {
+        return {}
+    },
+    computed: {},
+    methods: {},
+}
+</script>
+
+<style scoped lang="scss">
+
+</style>
diff --git a/src/views/copilot/efficiency/components/StdRate.vue b/src/views/copilot/efficiency/components/StdRate.vue
new file mode 100644
index 0000000..7563fdc
--- /dev/null
+++ b/src/views/copilot/efficiency/components/StdRate.vue
@@ -0,0 +1,65 @@
+<!-- 
+    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].name"
+        :target="cities[5].target"
+        :total="cities[5].total"
+      />
+    </div>
+    <div
+      v-for="item in cities.filter((val, index) => index != 5)"
+      :key="item.name"
+    >
+      <StdRateItem
+        :city="item.name"
+        :target="item.target"
+        :total="item.total"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+import StdRateItem from "./sub/StdRateItem.vue";
+export default {
+  name: "StdRate",
+  components: { StdRateItem },
+  props: {},
+  data() {
+    return {
+      cities: [
+        { name: "A", target: 100, total: 200 },
+        { name: "B", target: 200, total: 300 },
+        { name: "C", target: 300, total: 400 },
+        { name: "D", target: 400, total: 500 },
+        { name: "E", target: 500, total: 600 },
+        { name: "F", target: 400, total: 500 },
+        { name: "G", target: 500, total: 600 },
+      ],
+    };
+  },
+  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>
diff --git a/src/views/copilot/efficiency/components/TransformRate.vue b/src/views/copilot/efficiency/components/TransformRate.vue
new file mode 100644
index 0000000..e68597b
--- /dev/null
+++ b/src/views/copilot/efficiency/components/TransformRate.vue
@@ -0,0 +1,25 @@
+<!-- 
+    filename: TransformRate.vue
+    author: liubin
+    date: 2024-04-29 08:50:34
+    description: 转化效率
+-->
+
+<template></template>
+
+<script>
+export default {
+    name: "TransformRate",
+    components: {},
+    props: {},
+    data() {
+        return {}
+    },
+    computed: {},
+    methods: {},
+}
+</script>
+
+<style scoped lang="scss">
+
+</style>
diff --git a/src/views/copilot/efficiency/components/sub/CityName.vue b/src/views/copilot/efficiency/components/sub/CityName.vue
new file mode 100644
index 0000000..6483fce
--- /dev/null
+++ b/src/views/copilot/efficiency/components/sub/CityName.vue
@@ -0,0 +1,68 @@
+<!-- 
+    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: 0;
+  height: 0;
+  border-top: 8px solid transparent;
+  border-bottom: 8px solid transparent;
+  border-left: 8px solid #002f6b;
+  transform: translateY(-50%);
+}
+
+img {
+  /* width: 32px; */
+  width: 1.543vw;
+}
+
+span {
+  /* font-size: 12px;   */
+  font-size: 0.77vw;
+  letter-spacing: 2px;
+  text-align: center;
+}
+</style>
diff --git a/src/views/copilot/efficiency/components/sub/ProgressBar.vue b/src/views/copilot/efficiency/components/sub/ProgressBar.vue
new file mode 100644
index 0000000..b0c16be
--- /dev/null
+++ b/src/views/copilot/efficiency/components/sub/ProgressBar.vue
@@ -0,0 +1,82 @@
+<!-- 
+    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 ? "-" : `${parseInt(this.value / this.total)}%`;
+    },
+  },
+  methods: {},
+};
+</script>
+
+<style scoped lang="scss">
+.progress-bar {
+  height: 8px;
+  background-color: #002f6b;
+  border-radius: 4px;
+  margin-bottom: 20px;
+  position: relative;
+
+  &:before {
+    content: attr(data-title);
+    display: inline-block;
+    color: #fff;
+    position: absolute;
+    bottom: -18px;
+    font-size: 12px;
+  }
+
+  &:after {
+    content: attr(data-rate);
+    display: inline-block;
+    color: #fff;
+    position: absolute;
+    bottom: -18px;
+    right: 0;
+    font-size: 12px;
+  }
+
+  .progress-bar__rate {
+    display: inline-block;
+    height: 100%;
+    width: 0;
+    background-color: #11e8e2;
+    border-radius: 4px;
+  }
+}
+</style>
diff --git a/src/views/copilot/efficiency/components/sub/StdRateItem.vue b/src/views/copilot/efficiency/components/sub/StdRateItem.vue
new file mode 100644
index 0000000..6b3ed7c
--- /dev/null
+++ b/src/views/copilot/efficiency/components/sub/StdRateItem.vue
@@ -0,0 +1,65 @@
+<!-- 
+    filename: StdRateItem.vue
+    author: liubin
+    date: 2024-04-29 08:59:33
+    description: 
+-->
+
+<template>
+  <div class="std-rate-item">
+    <CityName :value="city" />
+    <div class="std-rate-item__value">
+      <ProgressBar title="24年目标" :total="100" :value="10" />
+      <ProgressBar title="24年目标" :total="100" :value="10" />
+    </div>
+  </div>
+</template>
+
+<script>
+import CityName from "./CityName.vue";
+import ProgressBar from "./ProgressBar.vue";
+
+export default {
+  name: "StdRateItem",
+  components: { CityName, ProgressBar },
+  props: {
+    city: {
+      type: String,
+      default: "",
+    },
+    target: {
+      type: Number,
+      default: 0,
+    },
+    total: {
+      type: Number,
+      default: 0,
+    },
+  },
+  data() {
+    return {};
+  },
+  computed: {},
+  methods: {},
+};
+</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: 2px;
+  flex-direction: column;
+  justify-content: center;
+}
+</style>
diff --git a/src/views/copilot/efficiency/index.vue b/src/views/copilot/efficiency/index.vue
index 7ea9aab..5303c81 100644
--- a/src/views/copilot/efficiency/index.vue
+++ b/src/views/copilot/efficiency/index.vue
@@ -7,18 +7,37 @@
 
 <template>
   <div class="efficiency-copilot">
-    <Container title="芯片良率" icon="chip2"></Container>
-    <Container title="标准组件良率" icon="std"></Container>
-    <Container title="芯片OEE" icon="chip"></Container>
-    <Container title="转化效率" icon="cube"></Container>
+    <Container title="芯片良率" icon="chip2">
+      <ChipRate />
+    </Container>
+    <Container title="标准组件良率" icon="std">
+      <StdRate />
+    </Container>
+    <Container title="芯片OEE" icon="chip">
+      <ChipOee />
+    </Container>
+    <Container title="转化效率" icon="cube">
+      <TransformRate />
+    </Container>
   </div>
 </template>
 
 <script>
 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: { Container },
+  components: {
+    Container,
+    ChipOee: ChipOeeVue,
+    ChipRate: ChipRateVue,
+    StdRate: StdRateVue,
+    TransformRate: TransformRateVue,
+  },
   props: {
     period: {
       type: String,
@@ -39,7 +58,10 @@ export default {
   methods: {
     fetchData(period = "日") {
       console.log(`效率驾驶舱，获取${period}数据`);
-      this.$store.dispatch("copilot/initCopilot", { period, source: "efficiency" });
+      this.$store.dispatch("copilot/initCopilot", {
+        period,
+        source: "efficiency",
+      });
     },
   },
 };
diff --git a/src/views/copilot/yield/components/sub/city/CityName.vue b/src/views/copilot/yield/components/sub/city/CityName.vue
index bf3ffd1..44371e2 100644
--- a/src/views/copilot/yield/components/sub/city/CityName.vue
+++ b/src/views/copilot/yield/components/sub/city/CityName.vue
@@ -13,7 +13,7 @@
 </template>
 
 <script>
-import Icon from "../../../assets/icon.png";
+import Icon from "@/views/copilot/assets/icon.png";
 
 export default {
   name: "CityName",

From b6820fd61fcc9ed3344ff0acc38390fa666cac58 Mon Sep 17 00:00:00 2001
From: "DESKTOP-FUDKNA8\\znjsz" <tonystark@starkindustries.mil>
Date: Mon, 29 Apr 2024 14:18:52 +0800
Subject: [PATCH 2/7] =?UTF-8?q?update=20=E6=A0=87=E5=87=86=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E8=89=AF=E7=8E=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../copilot/efficiency/components/StdRate.vue | 26 ++++-------
 .../efficiency/components/sub/CityName.vue    |  8 ++--
 .../efficiency/components/sub/ProgressBar.vue | 43 ++++++++++++++++---
 .../efficiency/components/sub/StdRateItem.vue | 27 +++++-------
 4 files changed, 60 insertions(+), 44 deletions(-)

diff --git a/src/views/copilot/efficiency/components/StdRate.vue b/src/views/copilot/efficiency/components/StdRate.vue
index 7563fdc..42aaa3f 100644
--- a/src/views/copilot/efficiency/components/StdRate.vue
+++ b/src/views/copilot/efficiency/components/StdRate.vue
@@ -8,21 +8,13 @@
 <template>
   <div class="std-rate">
     <div class="span-2">
-      <StdRateItem
-        :city="cities[5].name"
-        :target="cities[5].target"
-        :total="cities[5].total"
-      />
+      <StdRateItem :city="cities[5]" />
     </div>
     <div
       v-for="item in cities.filter((val, index) => index != 5)"
       :key="item.name"
     >
-      <StdRateItem
-        :city="item.name"
-        :target="item.target"
-        :total="item.total"
-      />
+      <StdRateItem :city="item" />
     </div>
   </div>
 </template>
@@ -36,13 +28,13 @@ export default {
   data() {
     return {
       cities: [
-        { name: "A", target: 100, total: 200 },
-        { name: "B", target: 200, total: 300 },
-        { name: "C", target: 300, total: 400 },
-        { name: "D", target: 400, total: 500 },
-        { name: "E", target: 500, total: 600 },
-        { name: "F", target: 400, total: 500 },
-        { name: "G", target: 500, total: 600 },
+        { 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 },
       ],
     };
   },
diff --git a/src/views/copilot/efficiency/components/sub/CityName.vue b/src/views/copilot/efficiency/components/sub/CityName.vue
index 6483fce..f157336 100644
--- a/src/views/copilot/efficiency/components/sub/CityName.vue
+++ b/src/views/copilot/efficiency/components/sub/CityName.vue
@@ -46,11 +46,9 @@ export default {
   position: absolute;
   top: 50%;
   right: 0;
-  width: 0;
-  height: 0;
-  border-top: 8px solid transparent;
-  border-bottom: 8px solid transparent;
-  border-left: 8px solid #002f6b;
+  width: 2px;
+  background: linear-gradient(to top, transparent, #0b5be1ee, transparent);
+  height: 100%;
   transform: translateY(-50%);
 }
 
diff --git a/src/views/copilot/efficiency/components/sub/ProgressBar.vue b/src/views/copilot/efficiency/components/sub/ProgressBar.vue
index b0c16be..4ae66f0 100644
--- a/src/views/copilot/efficiency/components/sub/ProgressBar.vue
+++ b/src/views/copilot/efficiency/components/sub/ProgressBar.vue
@@ -37,7 +37,9 @@ export default {
   },
   computed: {
     dataRate() {
-      return this.total == 0 ? "-" : `${parseInt(this.value / this.total)}%`;
+      return this.total == 0
+        ? "-"
+        : `${(parseFloat(this.value / this.total) * 100).toFixed(0)}%`;
     },
   },
   methods: {},
@@ -46,10 +48,10 @@ export default {
 
 <style scoped lang="scss">
 .progress-bar {
-  height: 8px;
+  height: 10px;
   background-color: #002f6b;
   border-radius: 4px;
-  margin-bottom: 20px;
+  margin-bottom: 12px;
   position: relative;
 
   &:before {
@@ -57,7 +59,7 @@ export default {
     display: inline-block;
     color: #fff;
     position: absolute;
-    bottom: -18px;
+    bottom: -200%;
     font-size: 12px;
   }
 
@@ -66,17 +68,46 @@ export default {
     display: inline-block;
     color: #fff;
     position: absolute;
-    bottom: -18px;
+    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;
-    background-color: #11e8e2;
     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>
diff --git a/src/views/copilot/efficiency/components/sub/StdRateItem.vue b/src/views/copilot/efficiency/components/sub/StdRateItem.vue
index 6b3ed7c..e9422c1 100644
--- a/src/views/copilot/efficiency/components/sub/StdRateItem.vue
+++ b/src/views/copilot/efficiency/components/sub/StdRateItem.vue
@@ -7,10 +7,14 @@
 
 <template>
   <div class="std-rate-item">
-    <CityName :value="city" />
+    <CityName :value="city.name" />
     <div class="std-rate-item__value">
-      <ProgressBar title="24年目标" :total="100" :value="10" />
-      <ProgressBar title="24年目标" :total="100" :value="10" />
+      <ProgressBar title="24年目标" :total="city.target" :value="city.target" />
+      <ProgressBar
+        title="24年累计"
+        :total="city.target"
+        :value="city.thisYear"
+      />
     </div>
   </div>
 </template>
@@ -24,23 +28,13 @@ export default {
   components: { CityName, ProgressBar },
   props: {
     city: {
-      type: String,
-      default: "",
-    },
-    target: {
-      type: Number,
-      default: 0,
-    },
-    total: {
-      type: Number,
-      default: 0,
+      type: Object,
+      required: true,
     },
   },
   data() {
     return {};
   },
-  computed: {},
-  methods: {},
 };
 </script>
 
@@ -58,7 +52,8 @@ export default {
   flex: 1;
   margin: 6px;
   display: flex;
-  gap: 2px;
+  gap: 12px;
+  height: 60px;
   flex-direction: column;
   justify-content: center;
 }

From e066a7c4c7f29ecce63afa058b3f7b762f51532e Mon Sep 17 00:00:00 2001
From: "DESKTOP-FUDKNA8\\znjsz" <tonystark@starkindustries.mil>
Date: Mon, 29 Apr 2024 16:00:07 +0800
Subject: [PATCH 3/7] =?UTF-8?q?update=20=E8=8A=AF=E7=89=87=E8=89=AF?=
 =?UTF-8?q?=E7=8E=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../efficiency/components/ChipRate.vue        |  40 +++--
 .../copilot/efficiency/components/StdRate.vue |   2 +-
 .../components/sub/chip/ChipRateItem.vue      | 139 ++++++++++++++++
 .../components/sub/{ => std}/CityName.vue     |   0
 .../components/sub/{ => std}/ProgressBar.vue  |   0
 .../components/sub/{ => std}/StdRateItem.vue  |   0
 .../copilot/efficiency/options/chipOptions.js | 156 ++++++++++++++++++
 7 files changed, 326 insertions(+), 11 deletions(-)
 create mode 100644 src/views/copilot/efficiency/components/sub/chip/ChipRateItem.vue
 rename src/views/copilot/efficiency/components/sub/{ => std}/CityName.vue (100%)
 rename src/views/copilot/efficiency/components/sub/{ => std}/ProgressBar.vue (100%)
 rename src/views/copilot/efficiency/components/sub/{ => std}/StdRateItem.vue (100%)
 create mode 100644 src/views/copilot/efficiency/options/chipOptions.js

diff --git a/src/views/copilot/efficiency/components/ChipRate.vue b/src/views/copilot/efficiency/components/ChipRate.vue
index d1fed9e..8d71f73 100644
--- a/src/views/copilot/efficiency/components/ChipRate.vue
+++ b/src/views/copilot/efficiency/components/ChipRate.vue
@@ -6,22 +6,42 @@
 -->
 
 <template>
-
+  <div class="chip-rate">
+    <ChipRateItem :cities="['成都', '邯郸', '株洲', '瑞昌']" :color="1" />
+    <ChipRateItem :cities="['佳木斯', '凯盛光伏', '蚌埠兴科']" :color="2" />
+  </div>
 </template>
 
 <script>
+import ChipRateItemVue from "./sub/chip/ChipRateItem.vue";
 export default {
-    name: "ChipRate",
-    components: {},
-    props: {},
-    data() {
-        return {}
-    },
-    computed: {},
-    methods: {},
-}
+  name: "ChipRate",
+  components: { ChipRateItem: ChipRateItemVue },
+  props: {},
+  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>
diff --git a/src/views/copilot/efficiency/components/StdRate.vue b/src/views/copilot/efficiency/components/StdRate.vue
index 42aaa3f..42d7d26 100644
--- a/src/views/copilot/efficiency/components/StdRate.vue
+++ b/src/views/copilot/efficiency/components/StdRate.vue
@@ -20,7 +20,7 @@
 </template>
 
 <script>
-import StdRateItem from "./sub/StdRateItem.vue";
+import StdRateItem from "./sub/std/StdRateItem.vue";
 export default {
   name: "StdRate",
   components: { StdRateItem },
diff --git a/src/views/copilot/efficiency/components/sub/chip/ChipRateItem.vue b/src/views/copilot/efficiency/components/sub/chip/ChipRateItem.vue
new file mode 100644
index 0000000..f3bc1d1
--- /dev/null
+++ b/src/views/copilot/efficiency/components/sub/chip/ChipRateItem.vue
@@ -0,0 +1,139 @@
+<!-- 
+    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="1">
+      <div class="legend-item">
+        <span class="legend-item__value">20%</span>
+        <span class="legend-item__label">2023年累计</span>
+      </div>
+      <div class="legend-item">
+        <span class="legend-item__value">20%</span>
+        <span class="legend-item__label">2024年累计</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";
+
+export default {
+  name: "ChipRateItem",
+  components: { CopilotButtons },
+  mixins: [chartMixin, fullscreenMixin],
+  props: {
+    cities: {
+      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">
+.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
diff --git a/src/views/copilot/efficiency/components/sub/CityName.vue b/src/views/copilot/efficiency/components/sub/std/CityName.vue
similarity index 100%
rename from src/views/copilot/efficiency/components/sub/CityName.vue
rename to src/views/copilot/efficiency/components/sub/std/CityName.vue
diff --git a/src/views/copilot/efficiency/components/sub/ProgressBar.vue b/src/views/copilot/efficiency/components/sub/std/ProgressBar.vue
similarity index 100%
rename from src/views/copilot/efficiency/components/sub/ProgressBar.vue
rename to src/views/copilot/efficiency/components/sub/std/ProgressBar.vue
diff --git a/src/views/copilot/efficiency/components/sub/StdRateItem.vue b/src/views/copilot/efficiency/components/sub/std/StdRateItem.vue
similarity index 100%
rename from src/views/copilot/efficiency/components/sub/StdRateItem.vue
rename to src/views/copilot/efficiency/components/sub/std/StdRateItem.vue
diff --git a/src/views/copilot/efficiency/options/chipOptions.js b/src/views/copilot/efficiency/options/chipOptions.js
new file mode 100644
index 0000000..bb27d43
--- /dev/null
+++ b/src/views/copilot/efficiency/options/chipOptions.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 },
+              },
+            ],
+          },
+    ],
+  };
+}

From bc3a68a9a730817e66c557492a16d18e503777cd Mon Sep 17 00:00:00 2001
From: "DESKTOP-FUDKNA8\\znjsz" <tonystark@starkindustries.mil>
Date: Mon, 29 Apr 2024 16:06:59 +0800
Subject: [PATCH 4/7] =?UTF-8?q?update=20=E8=8A=AF=E7=89=87OEE=E5=92=8C?=
 =?UTF-8?q?=E8=BD=AC=E5=8C=96=E6=95=88=E7=8E=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/copilot/components/BarChartBase.vue | 257 ++++++++++++++++++
 .../copilot/efficiency/components/ChipOee.vue | 107 +++++++-
 .../efficiency/components/TransformRate.vue   | 107 +++++++-
 src/views/copilot/efficiency/index.vue        |   4 +-
 .../copilot/yield/components/FtoInvest.vue    |   2 +-
 5 files changed, 452 insertions(+), 25 deletions(-)
 create mode 100644 src/views/copilot/components/BarChartBase.vue

diff --git a/src/views/copilot/components/BarChartBase.vue b/src/views/copilot/components/BarChartBase.vue
new file mode 100644
index 0000000..ea5cfdf
--- /dev/null
+++ b/src/views/copilot/components/BarChartBase.vue
@@ -0,0 +1,257 @@
+<!-- 
+    filename: BarChartBase.vue
+    author: liubin
+    date: 2024-04-10 08:59:28
+    description: 
+-->
+
+<template>
+  <chart-container class="bar-chart-base">
+    <div class="legend">
+      <span
+        v-for="item in legend"
+        :key="item.label"
+        class="legend-item"
+        :style="{ fontSize: isFullscreen ? '0.58vw' : '0.54vw' }"
+        >{{ item.label }}</span
+      >
+    </div>
+    <div
+      ref="chart"
+      style="max-width: 50vw"
+      :style="{ height: vHeight + 'vh' }"
+    ></div>
+  </chart-container>
+</template>
+
+<script>
+import screenfull from "screenfull";
+import ChartContainer from "./ChartContainer.vue";
+import chartMixin from "@/mixins/chart.js";
+
+export default {
+  name: "BarChartBase",
+  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">
+.bar-chart-base {
+  // position: relative;
+
+  .legend {
+    position: absolute;
+    top: 5.2vh;
+    right: 1vw;
+  }
+
+  .legend-item {
+    position: relative;
+    // font-size: 12px;
+    margin-right: 0.67vw;
+
+    &::before {
+      content: "";
+      display: inline-block;
+      width: 0.531vw;
+      height: 0.531vw;
+      background-color: #ccc;
+      border-radius: 2px;
+      margin-right: 0.22vw;
+    }
+  }
+
+  .legend-item:nth-child(1):before {
+    background-color: #12f7f1;
+  }
+
+  .legend-item:nth-child(2):before {
+    background-color: #58adfa;
+  }
+}
+</style>
diff --git a/src/views/copilot/efficiency/components/ChipOee.vue b/src/views/copilot/efficiency/components/ChipOee.vue
index 5eb554e..5bc43db 100644
--- a/src/views/copilot/efficiency/components/ChipOee.vue
+++ b/src/views/copilot/efficiency/components/ChipOee.vue
@@ -5,21 +5,106 @@
     description: 芯片OEE
 -->
 
-<template></template>
+<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: {},
-    props: {},
-    data() {
-        return {}
+  name: "ChipOEE",
+  components: { BarChartBase },
+  props: {
+    period: {
+      type: String,
+      default: "日",
     },
-    computed: {},
-    methods: {},
+  },
+  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>
+<style scoped lang="scss"></style>
diff --git a/src/views/copilot/efficiency/components/TransformRate.vue b/src/views/copilot/efficiency/components/TransformRate.vue
index e68597b..73ccb90 100644
--- a/src/views/copilot/efficiency/components/TransformRate.vue
+++ b/src/views/copilot/efficiency/components/TransformRate.vue
@@ -5,21 +5,106 @@
     description: 转化效率
 -->
 
-<template></template>
+<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: {},
-    props: {},
-    data() {
-        return {}
+  name: "TransformRate",
+  components: { BarChartBase },
+  props: {
+    period: {
+      type: String,
+      default: "日",
     },
-    computed: {},
-    methods: {},
+  },
+  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>
+<style scoped lang="scss"></style>
diff --git a/src/views/copilot/efficiency/index.vue b/src/views/copilot/efficiency/index.vue
index 5303c81..c07ffbd 100644
--- a/src/views/copilot/efficiency/index.vue
+++ b/src/views/copilot/efficiency/index.vue
@@ -14,10 +14,10 @@
       <StdRate />
     </Container>
     <Container title="芯片OEE" icon="chip">
-      <ChipOee />
+      <ChipOee :period="period" />
     </Container>
     <Container title="转化效率" icon="cube">
-      <TransformRate />
+      <TransformRate :period="period" />
     </Container>
   </div>
 </template>
diff --git a/src/views/copilot/yield/components/FtoInvest.vue b/src/views/copilot/yield/components/FtoInvest.vue
index b41bd1b..c56adce 100644
--- a/src/views/copilot/yield/components/FtoInvest.vue
+++ b/src/views/copilot/yield/components/FtoInvest.vue
@@ -16,7 +16,7 @@
 </template>
 
 <script>
-import BarChartBase from "./sub/bar/BarChartBase.vue";
+import BarChartBase from "@/views/copilot/components/BarChartBase.vue";
 
 export default {
   name: "FtoInvest",

From 646eb9c27063ba57a56df95d48cb6455bcef99c1 Mon Sep 17 00:00:00 2001
From: "DESKTOP-FUDKNA8\\znjsz" <tonystark@starkindustries.mil>
Date: Mon, 29 Apr 2024 17:00:53 +0800
Subject: [PATCH 5/7] =?UTF-8?q?update=20=E7=BB=BC=E5=90=88=E9=A9=BE?=
 =?UTF-8?q?=E9=A9=B6=E8=88=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/modules/home.js                     |   4 +-
 .../copilot/components/CopilotHeader.vue      |   2 +-
 src/views/copilot/container.vue               |   2 +-
 .../copilot/energy/components/ElecCost.vue    |  30 ++
 .../copilot/energy/components/NatGas.vue      |  30 ++
 .../energy/components/StockMonitor.vue        |  30 ++
 .../copilot/energy/components/WaterCost.vue   |  30 ++
 src/views/copilot/energy/index.vue            |  71 ++++-
 .../copilot/yield/components/ChipInvest.vue   |   2 +-
 .../yield/components/sub/bar/BarChartBase.vue | 257 ------------------
 10 files changed, 190 insertions(+), 268 deletions(-)
 create mode 100644 src/views/copilot/energy/components/ElecCost.vue
 create mode 100644 src/views/copilot/energy/components/NatGas.vue
 create mode 100644 src/views/copilot/energy/components/StockMonitor.vue
 create mode 100644 src/views/copilot/energy/components/WaterCost.vue
 delete mode 100644 src/views/copilot/yield/components/sub/bar/BarChartBase.vue

diff --git a/src/store/modules/home.js b/src/store/modules/home.js
index ca92d85..fc0d0bf 100644
--- a/src/store/modules/home.js
+++ b/src/store/modules/home.js
@@ -64,9 +64,11 @@ const actions = {
   },
   /** 初始化驾驶舱数据 */
   async initCopilot({ commit }, { period, source }) {
+    if (source == 'comprehensive') return;
+    
     const fetcher = {
       yield: getCopilotYield,
-      energy: getCopilotEnergy,
+      comprehensive: getCopilotEnergy,
       efficiency: getCopilotEfficiency,
     }[source];
     // 获取产量数据
diff --git a/src/views/copilot/components/CopilotHeader.vue b/src/views/copilot/components/CopilotHeader.vue
index 8ee26cf..40ced8d 100644
--- a/src/views/copilot/components/CopilotHeader.vue
+++ b/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"
diff --git a/src/views/copilot/container.vue b/src/views/copilot/container.vue
index 2bb12b8..4dd3478 100644
--- a/src/views/copilot/container.vue
+++ b/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>
diff --git a/src/views/copilot/energy/components/ElecCost.vue b/src/views/copilot/energy/components/ElecCost.vue
new file mode 100644
index 0000000..9e4152a
--- /dev/null
+++ b/src/views/copilot/energy/components/ElecCost.vue
@@ -0,0 +1,30 @@
+<!-- 
+    filename: ElecCost.vue
+    author: liubin
+    date: 2024-04-29 16:37:01
+    description: 电能耗
+-->
+
+<template>
+  <div class="elec-cost">elec cost</div>
+</template>
+
+<script>
+export default {
+  name: "ElecCost",
+  components: {},
+  props: {},
+  data() {
+    return {};
+  },
+  computed: {},
+  methods: {},
+};
+</script>
+
+<style scoped lang="scss">
+.elec-cost {
+  background: #cc03;
+  flex: 1;
+}
+</style>
diff --git a/src/views/copilot/energy/components/NatGas.vue b/src/views/copilot/energy/components/NatGas.vue
new file mode 100644
index 0000000..2c0ff1d
--- /dev/null
+++ b/src/views/copilot/energy/components/NatGas.vue
@@ -0,0 +1,30 @@
+<!-- 
+    filename: NatGas.vue
+    author: liubin
+    date: 2024-04-29 16:36:27
+    description: 天然气能耗
+-->
+
+<template>
+  <div class="nat-gas">nat-gas</div>
+</template>
+
+<script>
+export default {
+  name: "NatGas",
+  components: {},
+  props: {},
+  data() {
+    return {};
+  },
+  computed: {},
+  methods: {},
+};
+</script>
+
+<style scoped lang="scss">
+.nat-gas {
+  background: #31f2;
+  flex: 1;
+}
+</style>
diff --git a/src/views/copilot/energy/components/StockMonitor.vue b/src/views/copilot/energy/components/StockMonitor.vue
new file mode 100644
index 0000000..ea4ce6c
--- /dev/null
+++ b/src/views/copilot/energy/components/StockMonitor.vue
@@ -0,0 +1,30 @@
+<!-- 
+    filename: StockMonitor.vue
+    author: liubin
+    date: 2024-04-29 16:35:40
+    description: 仓库监控·当前
+-->
+
+<template>
+  <div class="stock-monitor">仓库监控</div>
+</template>
+
+<script>
+export default {
+  name: "StockMonitor",
+  components: {},
+  props: {},
+  data() {
+    return {};
+  },
+  computed: {},
+  methods: {},
+};
+</script>
+
+<style scoped lang="scss">
+.stock-monitor {
+  background: #fff2;
+  flex: 1;
+}
+</style>
diff --git a/src/views/copilot/energy/components/WaterCost.vue b/src/views/copilot/energy/components/WaterCost.vue
new file mode 100644
index 0000000..dab648f
--- /dev/null
+++ b/src/views/copilot/energy/components/WaterCost.vue
@@ -0,0 +1,30 @@
+<!-- 
+    filename: WaterCost.vue
+    author: liubin
+    date: 2024-04-29 16:37:34
+    description: 水能耗
+-->
+
+<template>
+  <div class="water-cost">water cost</div>
+</template>
+
+<script>
+export default {
+  name: "WaterCost",
+  components: {},
+  props: {},
+  data() {
+    return {};
+  },
+  computed: {},
+  methods: {},
+};
+</script>
+
+<style scoped lang="scss">
+.water-cost {
+  background: #f002;
+  flex: 1;
+}
+</style>
diff --git a/src/views/copilot/energy/index.vue b/src/views/copilot/energy/index.vue
index 5e4ae78..21bc61f 100644
--- a/src/views/copilot/energy/index.vue
+++ b/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 />
+    </Container>
+    <Container title="天然气能耗" icon="std">
+      <NatGasVue />
+    </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>
diff --git a/src/views/copilot/yield/components/ChipInvest.vue b/src/views/copilot/yield/components/ChipInvest.vue
index 9fea832..52e8938 100644
--- a/src/views/copilot/yield/components/ChipInvest.vue
+++ b/src/views/copilot/yield/components/ChipInvest.vue
@@ -16,7 +16,7 @@
 </template>
 
 <script>
-import BarChartBase from "./sub/bar/BarChartBase.vue";
+import BarChartBase from "@/views/copilot/components/BarChartBase.vue";
 
 export default {
   name: "ChipInvest",
diff --git a/src/views/copilot/yield/components/sub/bar/BarChartBase.vue b/src/views/copilot/yield/components/sub/bar/BarChartBase.vue
deleted file mode 100644
index 5369183..0000000
--- a/src/views/copilot/yield/components/sub/bar/BarChartBase.vue
+++ /dev/null
@@ -1,257 +0,0 @@
-<!-- 
-    filename: BarChartBase.vue
-    author: liubin
-    date: 2024-04-10 08:59:28
-    description: 
--->
-
-<template>
-  <chart-container class="bar-chart-base">
-    <div class="legend">
-      <span
-        v-for="item in legend"
-        :key="item.label"
-        class="legend-item"
-        :style="{ fontSize: isFullscreen ? '0.58vw' : '0.54vw' }"
-        >{{ item.label }}</span
-      >
-    </div>
-    <div
-      ref="chart"
-      style="max-width: 50vw"
-      :style="{ height: vHeight + 'vh' }"
-    ></div>
-  </chart-container>
-</template>
-
-<script>
-import screenfull from "screenfull";
-import ChartContainer from "../../../../components/ChartContainer.vue";
-import chartMixin from "@/mixins/chart.js";
-
-export default {
-  name: "BarChartBase",
-  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">
-.bar-chart-base {
-  // position: relative;
-
-  .legend {
-    position: absolute;
-    top: 5.2vh;
-    right: 1vw;
-  }
-
-  .legend-item {
-    position: relative;
-    // font-size: 12px;
-    margin-right: 0.67vw;
-
-    &::before {
-      content: "";
-      display: inline-block;
-      width: 0.531vw;
-      height: 0.531vw;
-      background-color: #ccc;
-      border-radius: 2px;
-      margin-right: 0.22vw;
-    }
-  }
-
-  .legend-item:nth-child(1):before {
-    background-color: #12f7f1;
-  }
-
-  .legend-item:nth-child(2):before {
-    background-color: #58adfa;
-  }
-}
-</style>

From ea63cb5730f3188974f7556b3b3835a780ac3146 Mon Sep 17 00:00:00 2001
From: "DESKTOP-FUDKNA8\\znjsz" <tonystark@starkindustries.mil>
Date: Tue, 30 Apr 2024 09:35:44 +0800
Subject: [PATCH 6/7] =?UTF-8?q?update=20=E7=BB=BC=E5=90=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/copilot/components/Container.vue    |   8 +-
 .../copilot/components/LineChartBase.vue      | 296 ++++++++++++++++++
 .../copilot/energy/components/ElecCost.vue    | 112 ++++++-
 .../copilot/energy/components/NatGas.vue      | 101 +++++-
 .../energy/components/StockMonitor.vue        |  41 ++-
 .../copilot/energy/components/WaterCost.vue   | 112 ++++++-
 .../components/sub/monitor/MonitorItem.vue    | 139 ++++++++
 src/views/copilot/energy/index.vue            |   4 +-
 .../copilot/energy/options/monitorOptions.js  | 156 +++++++++
 9 files changed, 940 insertions(+), 29 deletions(-)
 create mode 100644 src/views/copilot/components/LineChartBase.vue
 create mode 100644 src/views/copilot/energy/components/sub/monitor/MonitorItem.vue
 create mode 100644 src/views/copilot/energy/options/monitorOptions.js

diff --git a/src/views/copilot/components/Container.vue b/src/views/copilot/components/Container.vue
index 1e59c2c..58af7bc 100644
--- a/src/views/copilot/components/Container.vue
+++ b/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;
   }
 
diff --git a/src/views/copilot/components/LineChartBase.vue b/src/views/copilot/components/LineChartBase.vue
new file mode 100644
index 0000000..c4eca81
--- /dev/null
+++ b/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>
diff --git a/src/views/copilot/energy/components/ElecCost.vue b/src/views/copilot/energy/components/ElecCost.vue
index 9e4152a..b6c7a17 100644
--- a/src/views/copilot/energy/components/ElecCost.vue
+++ b/src/views/copilot/energy/components/ElecCost.vue
@@ -6,25 +6,123 @@
 -->
 
 <template>
-  <div class="elec-cost">elec cost</div>
+  <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: {},
-  props: {},
-  data() {
-    return {};
+  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);
+    },
   },
-  computed: {},
   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 {
-  background: #cc03;
   flex: 1;
 }
 </style>
diff --git a/src/views/copilot/energy/components/NatGas.vue b/src/views/copilot/energy/components/NatGas.vue
index 2c0ff1d..eb9febd 100644
--- a/src/views/copilot/energy/components/NatGas.vue
+++ b/src/views/copilot/energy/components/NatGas.vue
@@ -6,25 +6,110 @@
 -->
 
 <template>
-  <div class="nat-gas">nat-gas</div>
+  <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: "NatGas",
-  components: {},
-  props: {},
-  data() {
-    return {};
+  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);
+    },
   },
-  computed: {},
   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 {
-  background: #31f2;
   flex: 1;
 }
 </style>
diff --git a/src/views/copilot/energy/components/StockMonitor.vue b/src/views/copilot/energy/components/StockMonitor.vue
index ea4ce6c..d5ada52 100644
--- a/src/views/copilot/energy/components/StockMonitor.vue
+++ b/src/views/copilot/energy/components/StockMonitor.vue
@@ -6,16 +6,36 @@
 -->
 
 <template>
-  <div class="stock-monitor">仓库监控</div>
+  <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: {},
+  components: { MonitorItem: MonitorItemVue },
   props: {},
   data() {
-    return {};
+    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: {},
@@ -24,7 +44,20 @@ export default {
 
 <style scoped lang="scss">
 .stock-monitor {
-  background: #fff2;
   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>
diff --git a/src/views/copilot/energy/components/WaterCost.vue b/src/views/copilot/energy/components/WaterCost.vue
index dab648f..0adfd9d 100644
--- a/src/views/copilot/energy/components/WaterCost.vue
+++ b/src/views/copilot/energy/components/WaterCost.vue
@@ -6,25 +6,123 @@
 -->
 
 <template>
-  <div class="water-cost">water cost</div>
+  <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: {},
-  props: {},
-  data() {
-    return {};
+  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);
+    },
   },
-  computed: {},
   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 {
-  background: #f002;
   flex: 1;
 }
 </style>
diff --git a/src/views/copilot/energy/components/sub/monitor/MonitorItem.vue b/src/views/copilot/energy/components/sub/monitor/MonitorItem.vue
new file mode 100644
index 0000000..10df11b
--- /dev/null
+++ b/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
diff --git a/src/views/copilot/energy/index.vue b/src/views/copilot/energy/index.vue
index 21bc61f..e92d39b 100644
--- a/src/views/copilot/energy/index.vue
+++ b/src/views/copilot/energy/index.vue
@@ -8,10 +8,10 @@
 <template>
   <div class="energy-copilot">
     <Container title="仓库监控·当前" icon="chip2">
-      <StockMonitorVue />
+      <StockMonitorVue :period="period" />
     </Container>
     <Container title="天然气能耗" icon="std">
-      <NatGasVue />
+      <NatGasVue :period="period" />
     </Container>
     <Container title="电能耗" icon="chip">
       <ElecCostVue :period="period" />
diff --git a/src/views/copilot/energy/options/monitorOptions.js b/src/views/copilot/energy/options/monitorOptions.js
new file mode 100644
index 0000000..a503461
--- /dev/null
+++ b/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 },
+              },
+            ],
+          },
+    ],
+  };
+}

From fdf71145e85334f16a7f730861d005d2a2c35ef7 Mon Sep 17 00:00:00 2001
From: "DESKTOP-FUDKNA8\\znjsz" <tonystark@starkindustries.mil>
Date: Tue, 30 Apr 2024 16:22:15 +0800
Subject: [PATCH 7/7] 1

---
 src/store/modules/home.js                     | 196 ++++++++++++++++--
 .../efficiency/components/ChipRate.vue        |  19 +-
 .../components/sub/chip/ChipRateItem.vue      | 105 +++++++---
 src/views/copilot/efficiency/index.vue        |   4 +-
 .../copilot/efficiency/options/chipOptions.js |  17 +-
 5 files changed, 291 insertions(+), 50 deletions(-)

diff --git a/src/store/modules/home.js b/src/store/modules/home.js
index fc0d0bf..ad7a7bd 100644
--- a/src/store/modules/home.js
+++ b/src/store/modules/home.js
@@ -15,7 +15,25 @@ const state = {
     /* 能源驾驶舱 */
     energy: {},
     /* 效率驾驶舱 */
-    efficiency: {},
+    efficiency: {
+      chipOee: {
+        current: [],
+        previous: [],
+      },
+      transformRate: {
+        current: [],
+        previous: [],
+      },
+      chipRate: {
+        target: [],
+        current: [],
+        previous: [],
+      },
+      stdRate: {
+        target: [],
+        current: [],
+      },
+    },
   },
   home: {
     /** 主页状态 */
@@ -48,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;
     }
   },
@@ -64,13 +85,18 @@ const actions = {
   },
   /** 初始化驾驶舱数据 */
   async initCopilot({ commit }, { period, source }) {
-    if (source == 'comprehensive') return;
-    
+    if (source == "comprehensive") return;
+
     const fetcher = {
       yield: getCopilotYield,
       comprehensive: getCopilotEnergy,
       efficiency: getCopilotEfficiency,
     }[source];
+    const handler = {
+      yield: splitCurrentAndPrevious,
+      comprehensive: () => null,
+      efficiency: splitCurrentAndPreviousA,
+    }[source];
     // 获取产量数据
     let { data: factoryList, type } = await fetcher(period);
     let targetList = null;
@@ -79,7 +105,7 @@ const actions = {
       let { data } = await fetcher(period, true);
       targetList = data;
     }
-    const payload = splitCurrentAndPrevious(factoryList, targetList);
+    const payload = handler(factoryList, targetList);
     commit("SET_COPILOT_INFO", { type, payload });
   },
 };
@@ -91,8 +117,99 @@ export default {
   actions,
 };
 
+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) {
@@ -152,8 +269,57 @@ function getFactoryTargetValue(targetList, factoryId) {
 }
 
 /**
- * 
- * @returns 初始化状态值
+ * 获取 芯片良率目标值 和 标准组件良率目标值
+ * @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_ = {
@@ -183,11 +349,11 @@ function init() {
   };
 }
 
-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;
 }
@@ -256,10 +422,10 @@ async function doFetch(copilot_module = "yield", fetch_target, params) {
 }
 
 /**
- * 
+ *
  * @param {*} period 日周月年1,2,3,4
  * @param {*} target 是否获取目标数据
- * @returns 
+ * @returns
  */
 function getCopilotYield(period, target = false) {
   return getCopilotData("yield", period, target);
diff --git a/src/views/copilot/efficiency/components/ChipRate.vue b/src/views/copilot/efficiency/components/ChipRate.vue
index 8d71f73..425ea68 100644
--- a/src/views/copilot/efficiency/components/ChipRate.vue
+++ b/src/views/copilot/efficiency/components/ChipRate.vue
@@ -7,8 +7,16 @@
 
 <template>
   <div class="chip-rate">
-    <ChipRateItem :cities="['成都', '邯郸', '株洲', '瑞昌']" :color="1" />
-    <ChipRateItem :cities="['佳木斯', '凯盛光伏', '蚌埠兴科']" :color="2" />
+    <ChipRateItem
+      :period="period"
+      :cities="['成都', '邯郸', '株洲', '瑞昌']"
+      :color="1"
+    />
+    <ChipRateItem
+      :period="period"
+      :cities="['佳木斯', '凯盛光伏', '蚌埠兴科']"
+      :color="2"
+    />
   </div>
 </template>
 
@@ -17,7 +25,12 @@ import ChipRateItemVue from "./sub/chip/ChipRateItem.vue";
 export default {
   name: "ChipRate",
   components: { ChipRateItem: ChipRateItemVue },
-  props: {},
+  props: {
+    period: {
+      type: String,
+      default: "日",
+    },
+  },
   data() {
     return {};
   },
diff --git a/src/views/copilot/efficiency/components/sub/chip/ChipRateItem.vue b/src/views/copilot/efficiency/components/sub/chip/ChipRateItem.vue
index f3bc1d1..69df63e 100644
--- a/src/views/copilot/efficiency/components/sub/chip/ChipRateItem.vue
+++ b/src/views/copilot/efficiency/components/sub/chip/ChipRateItem.vue
@@ -11,14 +11,10 @@
       <CopilotButtons :options="cities" @update:active="handleCityUpdate" />
     </div>
     <div class="chart" ref="chart"></div>
-    <div class="legend" v-if="1">
-      <div class="legend-item">
-        <span class="legend-item__value">20%</span>
-        <span class="legend-item__label">2023年累计</span>
-      </div>
-      <div class="legend-item">
-        <span class="legend-item__value">20%</span>
-        <span class="legend-item__label">2024年累计</span>
+    <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>
@@ -29,6 +25,7 @@ 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",
@@ -43,44 +40,102 @@ export default {
       type: Number,
       default: 1,
     },
+    period: {
+      type: String,
+      default: "日",
+    },
   },
   data() {
     return {
-      period: "月",
-      valueTuple: [100, 100, 200],
+      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 =
-          vt[0] != null && vt[2] != null && vt[2] !== 0
-            ? `${((vt[1] / vt[2]) * 100).toFixed(0)}%`
-            : "0%",
-        subtitle =
-          this.period == "月" ? `${month}月累计产出` : `${year}年累计产出`;
+      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];
 
-      return getOptions({
-        single: true,
+      const t = getOptions({
+        single,
         color: this.color == 1 ? "#4CF0E8" : "#1065ff",
         titleValue,
         subtitle,
-        previousSum: this.valueTuple[0],
-        currentSum: this.valueTuple[1],
-        targetSum: this.valueTuple[2],
+        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);
   },
-  methods: {
-    handleCityUpdate() {},
-    fullscreenCallback(isFullscreen) {
-      console.log("isFullscreen--->", isFullscreen);
+  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>
diff --git a/src/views/copilot/efficiency/index.vue b/src/views/copilot/efficiency/index.vue
index c07ffbd..a87fd3c 100644
--- a/src/views/copilot/efficiency/index.vue
+++ b/src/views/copilot/efficiency/index.vue
@@ -8,10 +8,10 @@
 <template>
   <div class="efficiency-copilot">
     <Container title="芯片良率" icon="chip2">
-      <ChipRate />
+      <ChipRate :period="period" />
     </Container>
     <Container title="标准组件良率" icon="std">
-      <StdRate />
+      <StdRate :period="period" />
     </Container>
     <Container title="芯片OEE" icon="chip">
       <ChipOee :period="period" />
diff --git a/src/views/copilot/efficiency/options/chipOptions.js b/src/views/copilot/efficiency/options/chipOptions.js
index bb27d43..2c11b26 100644
--- a/src/views/copilot/efficiency/options/chipOptions.js
+++ b/src/views/copilot/efficiency/options/chipOptions.js
@@ -15,7 +15,11 @@ export default function ({
       top: 0,
       containLabel: true,
     },
-    tooltip: {},
+    tooltip: {
+      // formatter(params) {
+      //   return `${params.name}: ${(params.value * 100).toFixed(0)}%`;
+      // }
+    },
     title: {
       text: titleValue,
       left: "49%",
@@ -60,7 +64,7 @@ export default function ({
         data: [
           {
             value: currentSum,
-            name: "当前累计产出",
+            name: "当前良率",
             selected: false,
             itemStyle: {
               borderJoin: "round",
@@ -93,9 +97,9 @@ export default function ({
                 ? currentSum == 0
                   ? 1
                   : 0
-                : 0,
+                : targetSum,
 
-            name: "未达成累计",
+            name: "未达成",
             itemStyle: { color: "transparent" },
             label: { show: false },
           },
@@ -118,7 +122,7 @@ export default function ({
             data: [
               {
                 value: previousSum,
-                name: "上期累计产出",
+                name: "上期良率",
                 selected: false,
                 itemStyle: {
                   borderJoin: "round",
@@ -146,6 +150,9 @@ export default function ({
                     ? 1
                     : 0,
                 name: "-",
+                formatter: {
+                  show: false
+                },
                 itemStyle: { color: "transparent" },
                 label: { show: false },
               },