修改

2024-06-03 08:23:40 +08:00
parent 91fd1b09d5
commit 38665c38bd
39 changed files with 541 additions and 406 deletions
--- a/src/views/copilot/components/CopilotHeader.vue
+++ b/src/views/copilot/components/CopilotHeader.vue
@@ -19,7 +19,7 @@
      <CopilotButton v-for="i in ['日', '周', '月', '年']" :key="i" :label="i" :active="i === period"
        @click="() => $emit('update:period', i)" />
      <div class="btn-group">
-        <button type="button" class="export-btn" />
+        <!-- <button type="button" class="export-btn" @click="handleExport" /> -->
        <button type="button" class="fullscreen-btn" :class="[isFullscreen ? 'exit-fullscreen' : '']"
          @click="toggleFullScreen" />
        <!-- <button class="times-btn"> {{ times }} </button> -->
@@ -31,6 +31,7 @@
 <script>
 import CopilotButton from "./button.vue";
 import screenfull from "screenfull";
+import { exportFactoryDataExcel } from "@/api/produceData";

 export default {
  name: "CopilotHeader",
@@ -58,6 +59,15 @@ export default {
  },
  computed: {},
  methods: {
+    handleExport() {
+      exportFactoryDataExcel({
+        // factoryId: this.companyId,
+        timeSelection: this.period === 1 ? 0 : this.period === 2 ? 1 : this.period === 3 ? 2 : 3,
+      }).then(response => {
+        this.$download.excel(response, `生产数据.xls`);
+        // this.exportLoading = false;
+      }).catch(() => { });
+    },
    getTimes() {
      setInterval(this.getTimesInterval, 60000);
    },
--- a/src/views/copilot/components/FactoryDataHeader.vue
+++ b/src/views/copilot/components/FactoryDataHeader.vue
@@ -7,7 +7,7 @@
      <CopilotButton v-for="i in ['同比', '环比']" :key="i" :label="i" :active="i === than"
        @click="() => $emit('update:than', i)" />
      <div class="btn-group">
-        <button type="button" class="export-btn" />
+        <button type="button" class="export-btn" @click="handleExport" />
        <button type="button" class="fullscreen-btn" :class="[isFullscreen ? 'exit-fullscreen' : '']"
          @click="toggleFullScreen" />
      </div>
@@ -25,6 +25,8 @@
 import FactorySelect from "./FactorySelect.vue";
 import screenfull from "screenfull";
 import CopilotButton from "./button.vue";
+import { exportFactoryDataExcel } from "@/api/produceData";
+
 export default {
  name: "FactoryDataHeader",
  components: { CopilotButton, FactorySelect },
@@ -55,6 +57,15 @@ export default {
  },
  computed: {},
  methods: {
+    handleExport() {
+      exportFactoryDataExcel({
+        factoryId: this.companyId,
+        timeSelection: this.period === 1 ? 0 : this.period === 2 ? 1 : this.period === 3 ? 2 : 3,
+      }).then(response => {
+        this.$download.excel(response, `${this.companyName}生产数据.xls`);
+      // this.exportLoading = false;
+    }).catch(() => { });
+    },
    toggleFullScreen() {
      this.isFullscreen = !this.isFullscreen;

--- a/src/views/copilot/components/button.vue
+++ b/src/views/copilot/components/button.vue
@@ -1,8 +1,15 @@
-<!-- 
+<!--
+ * @Author: zhp
+ * @Date: 2024-04-28 13:42:51
+ * @LastEditTime: 2024-05-31 13:26:32
+ * @LastEditors: zhp
+ * @Description:
+-->
+<!--
    filename: button.vue
    author: liubin
    date: 2024-04-16 15:02:34
-    description: 
+    description:
 -->

 <template>
@@ -50,7 +57,7 @@ button {
  padding: 12px;
  padding-left: 20px;
  color: #fff;
-  font-size: 22px;
+  font-size: 18px;
  letter-spacing: 10px;
  cursor: pointer;
 }
--- a/src/views/copilot/components/ftoBarChartBase.vue
+++ b/src/views/copilot/components/ftoBarChartBase.vue
@@ -1,16 +1,10 @@
 <!--
 * @Author: zhp
 * @Date: 2024-05-23 15:49:14
- * @LastEditTime: 2024-05-29 10:56:21
+ * @LastEditTime: 2024-05-31 16:06:50
 * @LastEditors: zhp
 * @Description:
 -->
-<!--
-    filename: BarChartBase.vue
-    author: liubin
-    date: 2024-04-10 08:59:28
-    description:
-->

 <template>
  <chart-container class="bar-chart-base">
--- a/src/views/copilot/container.vue
+++ b/src/views/copilot/container.vue
@@ -35,7 +35,7 @@ export default {
  data() {
    return {
      page: "产量",
-      period: "日",
+      period: "月",
      than:'同比',
      currentsStyles: '',
    };
--- a/src/views/copilot/efficiency/components/ChipOee.vue
+++ b/src/views/copilot/efficiency/components/ChipOee.vue
@@ -36,7 +36,9 @@ export default {
  },
  data() {
    // 城市数组的顺序必须是固定的
-    const cities = ["瑞昌", "邯郸", "株洲", "佳木斯", "成都", "凯盛", "蚌埠"];
+    const cities = ["瑞昌", "邯郸",
+      // "株洲", "佳木斯", "成都", "凯盛", "蚌埠"
+    ];
    return {
      xAxis: cities,
    };
--- a/src/views/copilot/efficiency/components/ChipRate.vue
+++ b/src/views/copilot/efficiency/components/ChipRate.vue
@@ -1,15 +1,15 @@
 <!--
 * @Author: zhp
 * @Date: 2024-05-10 11:10:54
- * @LastEditTime: 2024-05-30 13:23:03
+ * @LastEditTime: 2024-05-31 16:19:45
 * @LastEditors: zhp
 * @Description:
 -->

 <template>
  <div class="chip-rate">
-    <ChipRateItem :period="period" :than="than" :cities="['成都', '邯郸', '株洲', '瑞昌']" :color="1" />
-    <ChipRateItem :period="period" :than="than" :cities="['佳木斯', '凯盛光伏', '蚌埠兴科']" :color="2" />
+    <ChipRateItem :period="period" :than="than" :cities="['邯郸', '瑞昌']" :color="1" />
+    <!-- <ChipRateItem :period="period" :than="than" :cities="['佳木斯', '凯盛光伏', '蚌埠兴科']" :color="2" /> -->
  </div>
 </template>

@@ -43,15 +43,15 @@ export default {
  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);
-  }
+  // &:after {
+  //   content: "";
+  //   position: absolute;
+  //   left: 50%;
+  //   top: 0;
+  //   width: 3px;
+  //   height: 100%;
+  //   transform: translateX(-50%);
+  //   background: linear-gradient(to bottom, transparent, #00f2ff, transparent);
+  // }
 }
 </style>
--- a/src/views/copilot/efficiency/components/StdRate.vue
+++ b/src/views/copilot/efficiency/components/StdRate.vue
@@ -1,21 +1,21 @@
 <!--
 * @Author: zhp
 * @Date: 2024-05-07 10:25:10
- * @LastEditTime: 2024-05-30 11:19:51
+ * @LastEditTime: 2024-05-31 16:38:29
 * @LastEditors: zhp
 * @Description:
 -->

 <template>
  <!-- <div class="order"> -->
-    <div class="std-rate" style="width: 100%; overflow: hidden scroll; height: 400px">
-      <div class="span-2">
+  <div class="std-rate" style="width: 100%; overflow: hidden scroll; height: 400px">
+    <!-- <div class="span-2">
        <StdRateItem :period="period" :city="cities[5]" />
-      </div>
-      <div class="flex-item" v-for="item in cities.filter((val, index) => index != 5)" :key="item.name">
-        <StdRateItem :period="period" :than="than" :city="item" />
-      </div>
+      </div> -->
+    <div class="span-2" v-for="item in cities.filter((val, index) => index != 5)" :key="item.name">
+      <StdRateItem :period="period" :than="than" :city="item" />
    </div>
+  </div>
 </template>

 <script>
@@ -49,8 +49,8 @@ export default {
      //     break;
      // }
      const _cities = [
-        { name: "瑞昌", target: 0, total: 0, current: 0, componentYield: 0, goodNumber:0,},
-        { name: "邯郸", target: 0, total: 0, current: 0, componentYield: 0, goodNumber: 0, },
+        { name: "瑞昌", target: 0, previous: 0, current: 0, componentYield: 0, goodNumber: 0, },
+        { name: "邯郸",target: 0, previous: 0, current: 0, componentYield: 0, goodNumber: 0, },
        { name: "株洲", target: 0, previous: 0, current: 0, componentYield: 0, goodNumber: 0, },
        { name: "佳木斯", target: 0, previous: 0, current: 0, componentYield: 0, goodNumber: 0, },
        { name: "成都", target: 0, previous: 0, current: 0, componentYield: 0, goodNumber: 0, },
@@ -80,7 +80,10 @@ export default {
      }
      // 删掉凯盛光伏
      // _cities.splice(4, 1);
-      return _cities;
+      let arr = []
+      arr.push(_cities[0])
+      arr.push(_cities[1])
+      return arr;
    },
  },
  data() {
--- a/src/views/copilot/efficiency/components/TransformRate.vue
+++ b/src/views/copilot/efficiency/components/TransformRate.vue
@@ -36,7 +36,9 @@ export default {
  },
  data() {
    // 城市数组的顺序必须是固定的
-    const cities = ["瑞昌", "邯郸", "株洲", "佳木斯", "成都", "凯盛", "蚌埠"];
+    const cities = ["瑞昌", "邯郸",
+      // "株洲", "佳木斯", "成都", "凯盛", "蚌埠"
+    ];
    return {
      xAxis: cities,
    };
--- a/src/views/copilot/efficiency/components/sub/bar/BarChartChipOEE.vue
+++ b/src/views/copilot/efficiency/components/sub/bar/BarChartChipOEE.vue
@@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2024-05-07 13:22:43
- * @LastEditTime: 2024-05-29 14:09:08
+ * @LastEditTime: 2024-05-31 15:55:00
 * @LastEditors: zhp
 * @Description:
 -->
@@ -11,7 +11,7 @@
      <span v-for="(item,index) in legend" :key="index" class="legend-item"
        :style="{ fontSize: isFullscreen ? '0.58vw' : '0.54vw' }">{{ item.label }}</span>
    </div>
-    <div ref="oeeChart" style="height:96%;width:100%"></div>
+    <div ref="oeeChart" style="height:100%;width:100%"></div>
  </chart-container>
 </template>

@@ -220,30 +220,30 @@ export default {
      this.canvasReset()
    },
    /** 全屏状态切换时，对柱子粗细和字体大小进行相应调整 */
-    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;
-      // if (val === false && this.isOpen === true) {
-      //   console.log(val)
-      //   this.width = 97 + '%'
-      //   this.canvasReset()
-      // } else if (val === false && this.isOpen === false) {
-      //   this.width = 100 + '%'
-      //   this.canvasReset()
-      // }
-      // 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.initChart(this.actualOptions)
-      this.canvasReset()
-    },
+    // 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;
+    //   // if (val === false && this.isOpen === true) {
+    //   //   console.log(val)
+    //   //   this.width = 97 + '%'
+    //   //   this.canvasReset()
+    //   // } else if (val === false && this.isOpen === false) {
+    //   //   this.width = 100 + '%'
+    //   //   this.canvasReset()
+    //   // }
+    //   // 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.initChart(this.actualOptions)
+    //   this.canvasReset()
+    // },
    series(val) {
      if (!val) {
        this.initChart(this.options);
--- a/src/views/copilot/efficiency/components/sub/bar/BarChartChipTrans.vue
+++ b/src/views/copilot/efficiency/components/sub/bar/BarChartChipTrans.vue
@@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2024-05-23 15:50:44
- * @LastEditTime: 2024-05-29 14:25:10
+ * @LastEditTime: 2024-05-31 15:54:41
 * @LastEditors: zhp
 * @Description:
 -->
@@ -11,7 +11,7 @@
      <span v-for="(item,index) in legend" :key="index" class="legend-item"
        :style="{ fontSize: isFullscreen ? '0.58vw' : '0.54vw' }">{{ item.label }}</span>
    </div>
-    <div ref="oeeChart" style="height:96%;width:100%"></div>
+    <div ref="oeeChart" style="height:100%;width:100%"></div>
  </chart-container>
 </template>

@@ -241,7 +241,7 @@ export default {
      // 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.initChart(this.actualOptions)
+      // this.initChart(this.actualOptions)
      // this.canvasReset()
    },
    series(val) {
--- a/src/views/copilot/efficiency/components/sub/chip/ChipRateItem.vue
+++ b/src/views/copilot/efficiency/components/sub/chip/ChipRateItem.vue
@@ -79,15 +79,64 @@ export default {
      ];
    },
    options() {
-      const single = this.period === "日" || this.period === "周";
+      // const single = this.period === "日" || this.period === "周";
+      const today = new Date().getDate();
      const year = new Date().getFullYear();
      const month = new Date().getMonth() + 1;
      const vt = this.valueTuple;
-      let titleValue = single
-          ? (vt[1] != null && `${vt[1] * 100}%`) || "0%"
-          : vt[0] != null && vt[2] != null && vt[2] !== 0
-          ? `${((vt[1] / vt[2]) * 100).toFixed(0)}%`
-          : "0%",
+      let items = [];
+      var day1 = new Date();
+      day1.setTime(day1.getTime() - 24 * 60 * 60 * 1000);
+      var yesterday = (day1.getMonth() + 1) + "月" + day1.getDate()
+      //今天的时间
+      // var day2 = new Date();
+      // day2.setTime(day2.getTime());
+      // var s2 = (day2.getMonth() + 1) + "月" + day2.getDate() + '日';
+      // const today = new Date().getDate();
+      // let yesterday = new Date().getDate() -1;
+      // const month = new Date().getMonth() + 1;
+      const lastMonth = new Date().getMonth() + 1 === 12 ? 1 : new Date().getMonth() + 1 - 1;
+      // const year = new Date().getFullYear();
+      if (this.period === '日' && this.than === '同比') {
+        items = [
+          { label: `${month}月${today}日良率`, },
+          { label: `去年${month}月${today}日良率` },
+        ];
+      } else if (this.period === '日' && this.than === '环比') {
+        items = [
+          { label: `${month}月${today}日良率` },
+          { label: `${yesterday}日良率` },
+        ];
+      } else if (this.period === '周' && this.than === '同比') {
+        items = [
+          { label: `本周良率`, },
+          { label: `去年本周良率` },
+        ];
+      } else if (this.period === '周' && this.than === '环比') {
+        items = [
+          { label: `本周良率`, },
+          { label: `上周良率`, },
+        ];
+      } else if (this.period === '月' && this.than === '同比') {
+        items = [
+          { label: `${month}月良率`, },
+          { label: `去年${month}月良率`, },
+          { label: `${month}月目标良率`, },
+        ];
+      } else if (this.period === '月' && this.than === '环比') {
+        items = [
+          { label: `${month}月良率`, },
+          { label: `${lastMonth}月良率`, },
+          { label: `${month}月目标良率`, },
+        ];
+      } else {
+        items = [
+          { label: `${year}年良率`, },
+          { label: `${year - 1}年良率` },
+          { label: `${year}年目标良率` },
+        ];
+      }
+      let titleValue = vt[1] === null ? 0 + '%' : this.formatNumber(vt[1]) + '%',
        subtitle = {
          日: "本日良率",
          周: "本周良率",
@@ -96,10 +145,12 @@ export default {
        }[this.period];

      const t = getOptions({
-        single,
+        // single,
        color: this.color == 1 ? "#4CF0E8" : "#1065ff",
        titleValue,
        subtitle,
+        currentName: items[0].label,
+        preName: items[1].label,
        previousSum: vt[0],
        currentSum: vt[1],
        targetSum: vt[2],
@@ -122,41 +173,45 @@ export default {
      const year = new Date().getFullYear();
      if (this.period === '日' && this.than === '同比') {
        items = [
-          { label: `${month}月${today}日良率`, value: isNaN(this.valueTuple[1]) || this.valueTuple[1] == null ? 0 + "%" : (this.valueTuple[1]) + "%" },
-          { label: `去年${month}月${today}日良率`, value: isNaN(this.valueTuple[0]) || this.valueTuple[0] == null ? 0 + "%" : (this.valueTuple[0]) + "%" },
+          { label: `去年${month}月${today}日良率`, value: isNaN(this.valueTuple[0]) || this.valueTuple[0] == null ? 0 + "%" : (this.formatNumber(this.valueTuple[0]) ) + "%" },
+          { label: `${month}月${today}日良率`, value: isNaN(this.valueTuple[1]) || this.valueTuple[1] == null ? 0 + "%" : (this.formatNumber(this.valueTuple[1])) + "%" },
        ];
      } else if (this.period === '日' && this.than === '环比') {
        items = [
-          { label: `${month}月${today}日良率`, value: isNaN(this.valueTuple[1]) || this.valueTuple[1] == null ? 0 + "%" : (this.valueTuple[1]) + "%" },
-          { label: `${yesterday}日良率`, value: isNaN(this.valueTuple[0]) || this.valueTuple[0] == null ? 0 + "%" : (this.valueTuple[0]) + "%" },
+          { label: `${yesterday}日良率`, value: isNaN(this.valueTuple[0]) || this.valueTuple[0] == null ? 0 + "%" : (this.formatNumber(this.valueTuple[0])) + "%" },
+          { label: `${month}月${today}日良率`, value: isNaN(this.valueTuple[1]) || this.valueTuple[1] == null ? 0 + "%" : (this.formatNumber(this.valueTuple[1])) + "%" },
        ];
      } else if (this.period === '周' && this.than === '同比') {
        items = [
-          { label: `本周良率`, value: isNaN(this.valueTuple[1]) || this.valueTuple[1] == null ? 0 + "%" : (this.valueTuple[1]) + "%" },
-          { label: `去年本周良率`, value: isNaN(this.valueTuple[0]) || this.valueTuple[0] == null ? 0 + "%" : (this.valueTuple[0]) + "%" },
+          { label: `去年本周良率`, value: isNaN(this.valueTuple[0]) || this.valueTuple[0] == null ? 0 + "%" : (this.formatNumber(this.valueTuple[0])) + "%" },
+          { label: `本周良率`, value: isNaN(this.valueTuple[1]) || this.valueTuple[1] == null ? 0 + "%" : (this.formatNumber(this.valueTuple[1])) + "%" },
+
        ];
      } else if (this.period === '周' && this.than === '环比') {
        items = [
-          { label: `本周良率`, value: isNaN(this.valueTuple[1]) || this.valueTuple[1] == null ? 0 + "%" : (this.valueTuple[1]) + "%" },
-          { label: `上周良率`, value: isNaN(this.valueTuple[0]) || this.valueTuple[0] == null ? 0 + "%" : (this.valueTuple[0]) + "%" },
+          { label: `上周良率`, value: isNaN(this.valueTuple[0]) || this.valueTuple[0] == null ? 0 + "%" : (this.formatNumber(this.valueTuple[0])) + "%" },
+          { label: `本周良率`, value: isNaN(this.valueTuple[1]) || this.valueTuple[1] == null ? 0 + "%" : (this.formatNumber(this.valueTuple[1])) + "%" },
        ];
      } else if (this.period === '月' && this.than === '同比') {
        items = [
-          { label: `${month}月良率`, value: isNaN(this.valueTuple[1]) || this.valueTuple[1] == null ? 0 + "%" : (this.valueTuple[1]) + "%" },
-          { label: `去年${month}月良率`, value: isNaN(this.valueTuple[0]) || this.valueTuple[0] == null ? 0 + "%" : (this.valueTuple[0]) + "%" },
-          { label: `${month}月目标良率`, value: isNaN(this.valueTuple[2]) || this.valueTuple[2] == null ? 0 + "%" : (this.valueTuple[2]) + "%" },
+          { label: `去年${month}月良率`, value: isNaN(this.valueTuple[0]) || this.valueTuple[0] == null ? 0 + "%" : (this.formatNumber(this.valueTuple[0])) + "%" },
+          { label: `${month}月良率`, value: isNaN(this.valueTuple[1]) || this.valueTuple[1] == null ? 0 + "%" : (this.formatNumber(this.valueTuple[1])) + "%" },
+
+          { label: `${month}月目标良率`, value: isNaN(this.valueTuple[2]) || this.valueTuple[2] == null ? 0 + "%" : (this.formatNumber(this.valueTuple[2])) + "%" },
        ];
      } else if (this.period === '月' && this.than === '环比') {
        items = [
-          { label: `${month}月良率`, value: isNaN(this.valueTuple[1]) || this.valueTuple[1] == null ? 0 + "%" : (this.valueTuple[1]) + "%" },
-          { label: `${lastMonth}月良率`, value: isNaN(this.valueTuple[0]) || this.valueTuple[0] == null ? 0 + "%" : (this.valueTuple[0]) + "%" },
-          { label: `${month}月目标良率`, value: isNaN(this.valueTuple[2]) || this.valueTuple[2] == null ? 0 + "%" : (this.valueTuple[2]) + "%" },
+          { label: `${lastMonth}月良率`, value: isNaN(this.valueTuple[0]) || this.valueTuple[0] == null ? 0 + "%" : (this.formatNumber(this.valueTuple[0])) + "%" },
+          { label: `${month}月良率`, value: isNaN(this.valueTuple[1]) || this.valueTuple[1] == null ? 0 + "%" : (this.formatNumber(this.valueTuple[1])) + "%" },
+
+          { label: `${month}月目标良率`, value: isNaN(this.valueTuple[2]) || this.valueTuple[2] == null ? 0 + "%" : (this.formatNumber(this.valueTuple[2])) + "%" },
        ];
      } else {
        items = [
-          { label: `${year}年良率`, value: isNaN(this.valueTuple[1]) || this.valueTuple[1] == null ? 0 + "%" : (this.valueTuple[1]) + "%" },
-          { label: `${year - 1}年良率`, value: isNaN(this.valueTuple[0]) || this.valueTuple[0] == null  ? 0 + "%" : (this.valueTuple[0]) + "%" },
-          { label: `${year}年目标良率`, value: isNaN(this.valueTuple[2]) || this.valueTuple[2] == null ? 0 + "%" : (this.valueTuple[2]) + "%" },
+          { label: `${year - 1}年良率`, value: isNaN(this.valueTuple[0]) || this.valueTuple[0] == null ? 0 + "%" : (this.formatNumber(this.valueTuple[1])) + "%" },
+          { label: `${year}年良率`, value: isNaN(this.valueTuple[1]) || this.valueTuple[1] == null ? 0 + "%" : (this.formatNumber(this.valueTuple[1])) + "%" },
+
+          { label: `${year}年目标良率`, value: isNaN(this.valueTuple[2]) || this.valueTuple[2] == null ? 0 + "%" : (this.formatNumber(this.valueTuple[2])) + "%" },
        ];
      }
      return items
@@ -191,6 +246,15 @@ export default {
    },
  },
  methods: {
+    formatNumber(num) {
+      // 判断是否为整数
+      if (Number.isInteger(num)) {
+        return num; // 如果是整数，直接转换为字符串
+      } else {
+        // 如果不是整数，保留两位小数并转换为字符串
+        return num.toFixed(2);
+      }
+    },
    handleCityUpdate(id) {
      this.factoryId = id;
    },
@@ -216,14 +280,11 @@ export default {
    .chart {
      // margin-left: 5%;
      // width: 290px;
-      align-self: stretch;
-      // flex: 1 1 auto;
-    // align-items: center;
-      // margin:0 auto;
-      // padding: 0 10%;;
+      flex: 1 1 auto;
+      padding: 0 15%;
      /* margin: 10%; */
      /* min-width: 300px; */
-      height: 200px;
+      align-self: stretch;
    }
  .legend {
    height: 80px;
--- a/src/views/copilot/efficiency/components/sub/ring/DoubleRingChart.vue
+++ b/src/views/copilot/efficiency/components/sub/ring/DoubleRingChart.vue
@@ -1,8 +1,8 @@
-<!-- 
+<!--
    filename: DoubleRingChart.vue
    author: liubin
    date: 2024-04-17 11:01:55
-    description: 
+    description:
 -->

 <template>
--- a/src/views/copilot/efficiency/index.vue
+++ b/src/views/copilot/efficiency/index.vue
@@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2024-05-07 10:04:53
- * @LastEditTime: 2024-05-30 11:13:01
+ * @LastEditTime: 2024-05-31 13:19:34
 * @LastEditors: zhp
 * @Description:
 -->
--- a/src/views/copilot/efficiency/options/chipOptions.js
+++ b/src/views/copilot/efficiency/options/chipOptions.js
@@ -1,163 +1,138 @@
-export default function ({
-  single = false,
-  color,
+export default ({
  titleValue,
  subtitle,
  previousSum,
  currentSum,
  targetSum,
-}) {
-  return {
-    grid: {
-      left: 0,
-      right: 0,
-      bottom: 0,
-      top: 0,
-      containLabel: true,
+  currentName,
+  preName,
+}) => ({
+  grid: {
+    left: 0,
+    right: 0,
+    bottom: 0,
+    top: 0,
+    containLabel: true,
+  },
+  tooltip: {},
+  title: {
+    text: titleValue,
+    left: "44%",
+    top: "37%",
+    textAlign: "center",
+    textStyle: {
+      fontWeight: 600,
+      fontSize: 32,
+      color: "#fffd",
    },
-    tooltip: {
-      // formatter(params) {
-      //   return `${params.name}: ${(params.value * 100).toFixed(0)}%`;
-      // }
+    subtext: `\u2002${subtitle}\u2002`,
+    subtextStyle: {
+      fontSize: 14,
+      fontWeight: 100,
+      color: "#fffd",
+      align: "right",
    },
-    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: ["45%", "52%"],
+      emptyCircleStyle: {
+        color: "#042c5f33",
      },
    },
-    series: [
-      // 背景 series
-      {
-        type: "pie",
-        name: "当前目标",
-        radius: ["70%", "85%"],
-        center: ["50%", "52%"],
-        emptyCircleStyle: {
-          color: "#040c5f45",
-        },
+    // 数据 series
+    {
+      type: "pie",
+      radius: ["70%", "85%"],
+      center: ["45%", "52%"],
+      avoidLabelOvervlap: false,
+      label: {
+        show: false,
      },
-      // 数据 series
-      {
-        type: "pie",
-        radius: ["70%", "85%"],
-        center: ["50%", "52%"],
-        avoidLabelOvervlap: false,
-        label: {
-          show: false,
-        },
-        labelLine: {
-          show: false,
-        },
-        data: [
-          {
-            value: currentSum,
-            name: "当前良率",
-            selected: false,
-            itemStyle: {
-              borderJoin: "round",
-              borderCap: "round",
-              borderWidth: 12,
-              borderRadius: "50%",
-              color: {
-                type: "linear",
-                x: 1,
-                y: 0,
-                x2: 0,
-                y2: 1,
-                colorStops: single
-                  ? [
-                      { offset: 0, color: `${color}11` },
-                      { offset: 1, color: `${color}` },
-                    ]
-                  : [
-                      { offset: 0, color: "#4CF0E811" },
-                      { offset: 1, color: "#4CF0E8" },
-                    ],
-              },
-            },
-          },
-          {
-            value:
-              targetSum > currentSum
-                ? targetSum - currentSum
-                : targetSum == 0
-                ? currentSum == 0
-                  ? 1
-                  : 0
-                : targetSum,
-
-            name: "未达成",
-            itemStyle: { color: "transparent" },
-            label: { show: false },
-          },
-        ],
+      labelLine: {
+        show: false,
      },
-      // 数据 series2 - 2023累计
-      single
-        ? null
-        : {
-            type: "pie",
-            radius: ["55%", "70%"],
-            center: ["50%", "52%"],
-            avoidLabelOvervlap: false,
-            label: {
-              show: false,
+      data: [
+        {
+          value: currentSum,
+          name: currentName,
+          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: "#4CF0E811" },
+                { offset: 1, color: "#4CF0E8" },
+              ],
            },
-            labelLine: {
-              show: false,
-            },
-            data: [
-              {
-                value: previousSum,
-                name: "上期良率",
-                selected: false,
-                itemStyle: {
-                  borderJoin: "round",
-                  borderCap: "round",
-                  borderWidth: 12,
-                  borderRadius: "50%",
-                  color: {
-                    type: "linear",
-                    x: 1,
-                    y: 0,
-                    x2: 0,
-                    y2: 1,
-                    colorStops: [
-                      { offset: 0, color: "#1065ff66" },
-                      { offset: 1, color: "#1065ff" },
-                    ],
-                  },
-                },
-              },
-              {
-                value:
-                  targetSum > previousSum
-                    ? targetSum - previousSum
-                    : previousSum == 0
-                    ? 1
-                    : 0,
-                name: "-",
-                formatter: {
-                  show: false
-                },
-                itemStyle: { color: "transparent" },
-                label: { show: false },
-              },
-            ],
          },
-    ],
-  };
-}
+        },
+        {
+            value:currentSum == 0
+              ? 1
+              : 0,
+          name: "未达成良率",
+          itemStyle: { color: "transparent" },
+          label: { show: false },
+        },
+      ],
+    },
+    // 数据 series2 - 2023累计
+    {
+      type: "pie",
+      radius: ["55%", "70%"],
+      center: ["45%", "52%"],
+      avoidLabelOvervlap: false,
+      label: {
+        show: false,
+      },
+      labelLine: {
+        show: false,
+      },
+      data: [
+        {
+          value: previousSum,
+          name: preName,
+          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:previousSum == 0
+              ? 1
+              : 0,
+          name: "-",
+          itemStyle: { color: "transparent" },
+          label: { show: false },
+        },
+      ],
+    },
+  ],
+});
--- a/src/views/copilot/efficiencyContainer.vue
+++ b/src/views/copilot/efficiencyContainer.vue
@@ -1,13 +1,13 @@
 <!--
 * @Author: zhp
 * @Date: 2024-05-20 16:04:18
- * @LastEditTime: 2024-05-30 11:14:17
+ * @LastEditTime: 2024-05-31 13:16:26
 * @LastEditors: zhp
 * @Description:
 -->
 <template>
  <!-- <div class="copilot-layout" ref="copilot-layout"> -->
-  <div class="copilot-layout other" ref="copilot-layout">
+  <div class="copilot-layout" ref="copilot-layout">
    <CopilotHeaderVue :than="than" :active="page" :period="period" @update:active="updateActive"
      @update:period="period = $event" @update:than="updateThan" />

@@ -34,7 +34,7 @@ export default {
    return {
      than:'同比',
      page: "效率",
-      period: "日",
+      period: "月",
      currentsStyles: '',
    };
  },
@@ -101,7 +101,7 @@ export default {
  position: absolute;
  left: -16px;
  /* top: -8px; */
-  /* height: calc(100% + 38px); */
+  height: calc(100% + 240px);
  width: calc(100% + 30px);
  z-index: 1001;
  color: #fff;
@@ -114,7 +114,7 @@ export default {
  height: calc(100% + 38px);
 }
 .other {
-  height: calc(100% + 240px);
+  /* height: calc(100% + 240px); */
 }
 .copilot-footer {
  /** position: absolute;
--- a/src/views/copilot/factoryData/components/BarChartChipOEE.vue
+++ b/src/views/copilot/factoryData/components/BarChartChipOEE.vue
@@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2024-05-30 08:58:39
- * @LastEditTime: 2024-05-30 10:38:32
+ * @LastEditTime: 2024-05-31 15:52:28
 * @LastEditors: zhp
 * @Description:
 -->
@@ -11,7 +11,7 @@
      <span v-for="(item,index) in legend" :key="index" class="legend-item"
        :style="{ fontSize: isFullscreen ? '0.58vw' : '0.54vw' }">{{ item.label }}</span>
    </div>
-    <div ref="oeeChart" style="height:96%;width:100%"></div>
+    <div ref="oeeChart" style="height:100%"></div>
  </chart-container>
 </template>

@@ -79,7 +79,7 @@ export default {
          data: this.xAxis,
        },
        yAxis: {
-          name: "单位/%",
+          name: "单位/片",
          nameTextStyle: {
            color: "#fff",
            fontSize: 12,
--- a/src/views/copilot/factoryData/components/Order.vue
+++ b/src/views/copilot/factoryData/components/Order.vue
@@ -5,7 +5,7 @@
    </div>
    <div class="chart">
      <div class="chart-title">
-        <span class="title">生产情况</span>
+        <span class="title">工单情况</span>
        <span class="line"></span>
      </div>
      <barChartBase :energyCockpits="prodOrder" ref="barChart" style="height: 0;flex:1"></barChartBase>
--- a/src/views/copilot/yield/components/ChipInvest.vue
+++ b/src/views/copilot/yield/components/ChipInvest.vue
@@ -23,7 +23,10 @@ export default {
  components: { BarChartBase },
  data() {
    // 城市数组的顺序必须是固定的
-    const cities = ["瑞昌", "邯郸", "株洲", "佳木斯", "成都", "凯盛", "蚌埠"];
+    const cities = ["瑞昌", "邯郸",
+      // "株洲", "佳木斯", "成都", "凯盛", "蚌埠"
+
+    ];
    return {
      xAxis: cities,
    };
--- a/src/views/copilot/yield/components/FtoInvest.vue
+++ b/src/views/copilot/yield/components/FtoInvest.vue
@@ -23,7 +23,10 @@ export default {
  components: { BarChartBase },
  data() {
    // 城市数组的顺序必须是固定的
-    const cities = ["瑞昌", "邯郸", "株洲", "佳木斯", "成都", "凯盛", "蚌埠"];
+    const cities = ["瑞昌", "邯郸",
+      // "株洲", "佳木斯", "成都", "凯盛", "蚌埠"
+
+    ];
    return {
      xAxis: cities,
    };
--- a/src/views/copilot/yield/components/sub/ring/DoubleRingChart.vue
+++ b/src/views/copilot/yield/components/sub/ring/DoubleRingChart.vue
@@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2024-05-20 13:32:59
- * @LastEditTime: 2024-05-30 13:35:00
+ * @LastEditTime: 2024-05-31 15:05:20
 * @LastEditors: zhp
 * @Description:
 -->
@@ -151,9 +151,10 @@ export default {
        ];
      }
      let titleValue =
-          vt[0] != null && vt[2] != null && vt[2] !== 0
-            ? `${vt[1] / vt[2]}%`
-            : "0%",
+           vt[1] != null && vt[2] !== 0
+          ? this.formatNumber((vt[1] / vt[2] * 100)) + '%'
+          : (vt[1] != 0 && vt[1] != null) && vt[2] == 0
+            ? "100%" : '0%',
        subtitle =
      this.period == "日" ? `${month}月${today}日累计` : this.period == "周" ? `本周` : this.period == "月" ? `${month}月累计产出` : `${year}年累计产出`;
      console.log(this.valueTuple[0], this.valueTuple[1], this.valueTuple[2],)
@@ -196,6 +197,15 @@ export default {
    }
  },
  methods: {
+    formatNumber(num) {
+      // 判断是否为整数
+      if (Number.isInteger(num)) {
+        return num; // 如果是整数，直接转换为字符串
+      } else {
+        // 如果不是整数，保留两位小数并转换为字符串
+        return num.toFixed(2);
+      }
+    }
    // fullscreen mixin 需要的回调
    // fullscreenCallback(isFullscreen) {
    //   console.log("isFullscreen--->", isFullscreen);
@@ -219,40 +229,40 @@ function calculateItems(period, valueTuple,than) {
  const year = new Date().getFullYear();
  if (period === '日' && than === '同比') {
    items = [
-      { label: `${month}月${today}日累计`, value: valueTuple[1] },
      { label: `去年${month}月${today}日累计`, value: valueTuple[0] },
+      { label: `${month}月${today}日累计`, value: valueTuple[1] },
    ];
  } else if (period === '日' && than === '环比') {
    items = [
-      { label: `${month}月${today}日累计`, value: valueTuple[1] },
      { label: `${yesterday}日累计`, value: valueTuple[0] },
+      { label: `${month}月${today}日累计`, value: valueTuple[1] },
    ];
  } else if (period === '周' && than === '同比') {
    items = [
-      { label: `本周累计`, value: valueTuple[1] },
      { label: `去年本周累计`, value: valueTuple[0] },
+      { label: `本周累计`, value: valueTuple[1] },
    ];
  } else if (period === '周' && than === '环比') {
    items = [
-      { label: `本周累计`, value: valueTuple[1] },
      { label: `上周累计`, value: valueTuple[0] },
+      { label: `本周累计`, value: valueTuple[1] },
    ];
  } else if (period === '月' && than === '同比') {
    items = [
-      { label: `${month}月累计`, value: valueTuple[1] },
      { label: `去年${month}月累计`, value: valueTuple[0] },
+      { label: `${month}月累计`, value: valueTuple[1] },
      { label: `${month}月目标`, value: valueTuple[2] },
    ];
  } else if (period === '月' && than === '环比') {
    items = [
-      { label: `${month}月累计`, value: valueTuple[1] },
      { label: `${lastMonth}月累计`, value: valueTuple[0] },
+      { label: `${month}月累计`, value: valueTuple[1] },
      { label: `${month}月目标`, value: valueTuple[2] },
    ];
  } else {
    items = [
-      { label: `${year}年累计`, value: valueTuple[1] },
      { label: `${year - 1}年累计`, value: valueTuple[0] },
+      { label: `${year}年累计`, value: valueTuple[1] },
      { label: `${year}年目标`, value: valueTuple[2] },
    ];
  }
@@ -314,17 +324,17 @@ function calculateItems(period, valueTuple,than) {
  left: -18px;
 }

-.legend-item:nth-child(1) .legend-item__label::before {
+.legend-item:nth-child(2) .legend-item__label::before {
  background: #12fff5;
 }
-.legend-item:nth-child(1) .legend-item__value {
+.legend-item:nth-child(2) .legend-item__value {
  color: #12fff5;
 }

-.legend-item:nth-child(2) .legend-item__label::before {
+.legend-item:nth-child(1) .legend-item__label::before {
  background: #0f65ff;
 }
-.legend-item:nth-child(2) .legend-item__value {
+.legend-item:nth-child(1) .legend-item__value {
  color: #0f65ff;
 }

--- a/src/views/copilot/yield/components/sub/ring/DoubleRingWrapper.vue
+++ b/src/views/copilot/yield/components/sub/ring/DoubleRingWrapper.vue
@@ -1,3 +1,10 @@
+<!--
+ * @Author: zhp
+ * @Date: 2024-05-30 16:00:50
+ * @LastEditTime: 2024-05-31 16:15:51
+ * @LastEditors: zhp
+ * @Description:
+-->
 <!--
    filename: DoubleRingWrapper.vue
    author: liubin
@@ -42,13 +49,13 @@ export default {
    return {
      factoryId: 4, // 默认成都
      cityOptions: [
-        "成都",
+        // "成都",
        "邯郸",
-        "株洲",
+        // "株洲",
        "瑞昌",
-        "佳木斯",
-        "凯盛光伏",
-        "蚌埠兴科",
+        // "佳木斯",
+        // "凯盛光伏",
+        // "蚌埠兴科",
      ],
    };
  },
--- a/src/views/copilot/yield/components/sub/ring/noDoubleRingWrapper.vue
+++ b/src/views/copilot/yield/components/sub/ring/noDoubleRingWrapper.vue
@@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2024-05-24 15:15:00
- * @LastEditTime: 2024-05-28 08:42:36
+ * @LastEditTime: 2024-05-31 16:16:16
 * @LastEditors: zhp
 * @Description:
 -->
@@ -54,12 +54,12 @@ export default {
    return {
      factoryId: 4, // 默认成都
      cityOptions: [
-        "成都",
+        // "成都",
        "邯郸",
-        "株洲",
-        "佳木斯",
-        "凯盛光伏",
-        "蚌埠兴科",
+        // "株洲",
+        // "佳木斯",
+        // "凯盛光伏",
+        // "蚌埠兴科",
      ],
    };
  },
--- a/src/views/copilot/yield/options/double-ring-chart-options.js
+++ b/src/views/copilot/yield/options/double-ring-chart-options.js
@@ -80,15 +80,9 @@ export default ({
          },
        },
        {
-          value:
-            targetSum > currentSum
-              ? targetSum - currentSum
-              : targetSum == 0
-              ? currentSum == 0
-                ? 1
-                : 0
+            value:currentSum == 0
+              ? 1
              : 0,
-
          name: "未达成累计",
          itemStyle: { color: "transparent" },
          label: { show: false },
@@ -131,10 +125,7 @@ export default ({
          },
        },
        {
-          value:
-            targetSum > previousSum
-              ? targetSum - previousSum
-              : previousSum == 0
+          value:previousSum == 0
              ? 1
              : 0,
          name: "-",