src/store/modules/home.js

@@ -289,7 +289,7 @@ function splitCurrentAndPreviousB(factoryListResponse) {
 }
 
 function splitCurrentAndPreviousA(factoryListResponse, targetListResponse, prodOutputFtoListRes,preData,preFtoData) {
-  console.log('工厂',preData);
+  console.log('工厂',targetListResponse);
 
   // 初始数据
   const { chipOeeRate, transformRate, chipRate, stdRate } = initA();
@@ -343,24 +343,17 @@ function splitCurrentAndPreviousA(factoryListResponse, targetListResponse, prodO
   //     componentYieldRate: 0.73,
   //   },
   // ];
-  if (preData) {
+  if (preData && preData[0] != null) {
     for (const factory of preData) {
-      const fId = getPreFactoryId(factory)
+      const fId = getPreFactoryId(factory);
-      console.log('factory',factory.previousYearOee);
         //  chipInvest.previous[fId] = factory.previousYearInputNumber;
       // chipOeeRate.current[fId] = factory.oee;
-      if (factory.previousGlassType === 0) {
+      chipOeeRate.previous[fId] = factory.previousYearOee;
-         chipOeeRate.previous[fId] = factory.previousYearOee;
-      }
-      // chipOeeRate.previous[fId] = factory.previousYearOee;
       // 转化效率
-        if (factory.previousGlassType === 1) {
+      transformRate.previous[fId] =factory.previousYearComponentConversionEfficiency ;
-        transformRate.previous[fId] = factory.previousYearComponentConversionEfficiency;
-      }
-      // transformRate.previous[fId] =factory.previousYearComponentConversionEfficiency ;
       // 芯片良率 与 标准组件良率
-      if (![0, 1].includes(factory.previousGlassType)) continue;
+      if (![0, 1].includes(factory.glassType)) continue;
-      const _t = [chipRate, stdRate][factory.previousGlassType]
+      const _t = [chipRate, stdRate][factory.glassType]
       // _t.current[fId] = factory.yieldRate ;
       _t.previous[fId] = factory.previousYearYieldRate ;
       // }
@@ -400,7 +393,6 @@ function splitCurrentAndPreviousA(factoryListResponse, targetListResponse, prodO
       _t.current[fId] = factory.yieldRate ;
       // _t.previous[fId] = factory.previousYearYieldRate ;
     }
-    console.log('chipOeeRate',stdRate);
     // console.log('chipOeeRate',chipOeeRate);
     return {
       chipOeeRate,

src/views/copilot/components/FactoryDataHeader.vue

@@ -63,22 +63,14 @@ export default {
   computed: {},
   methods: {
     handleExport() {
-      if (this.period != 1) {
+      exportFactoryDataExcel({
-        exportFactoryDataExcel({
+        factoryId: this.companyId,
-          factoryId: this.companyId,
+        timeSelection: this.period === 1 ? 0 : this.period === 2 ? 1 : this.period === 3 ? 2 : 3,
-          timeSelection: this.period === 1 ? 0 : this.period === 2 ? 1 : this.period === 3 ? 2 : 3,
+        compare: this.than === '同比' ? 1 : 2
-          compare: this.than === '同比' ? 1 : 2
+      }).then(response => {
-        }).then(response => {
+        this.$download.excel(response, `${this.companyName}生产数据.xls`);
-          this.$download.excel(response, `${this.companyName}生产数据.xls`);
+      // this.exportLoading = false;
-          // this.exportLoading = false;
+    }).catch(() => { });
-        }).catch(() => { });
-      } else {
-        this.$message({
-          type: 'warning',
-          message: '为日的情况下没有导出功能',
-        })
-      }
-
     },
     toggleFullScreen() {
       this.isFullscreen = !this.isFullscreen;

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

@@ -65,26 +65,21 @@ export default {
         items = [
           { label: `${year - 1}年${yesterday}日`, color: "#12f7f1" },
           { label: `${yesterday}日`, color: "#58adfa" },
-          { label: `${yesterday}日目标`, color: "#58adfa" },
         ];
       } else if (this.period === '日' && this.than === '环比') {
         items = [
           { label: `${dayBeYes}日`, color: "#12f7f1" },
           { label: `${yesterday}日`, color: "#58adfa" },
-          { label: `${yesterday}日目标`, color: "#58adfa" },
         ];
       } else if (this.period === '周' && this.than === '同比') {
         items = [
           { label: `${year-1}年本周`, color: "#12f7f1" },
           { label: `本周`, color: "#58adfa" },
-          { label: `本周目标`, color: "#58adfa" },
-
         ];
       } else if (this.period === '周' && this.than === '环比') {
         items = [
           { label: `上周`, color: "#12f7f1" },
           { label: `本周`, color: "#58adfa" },
-          { label: `本周目标`, color: "#58adfa" },
         ];
       } else if (this.period === '月' && this.than === '同比') {
         items = [
@@ -146,6 +141,14 @@ export default {
       // console.log('chipOee', chipOeeRate)
       let dataList = null
       switch (this.period) {
+        case "日":
+          dataList = [];
+          dataList[0] = chipOeeRate?.previous;
+          dataList[1] = chipOeeRate?.current;
+        case "周":
+          dataList = [];
+          dataList[0] = chipOeeRate?.previous;
+          dataList[1] = chipOeeRate?.current;
           default:
           dataList = [];
           dataList[0] = chipOeeRate?.previous;
@@ -188,11 +191,6 @@ function getTemplate(period, dataList, than) {
         data: dataList ? dataList[1] : [],
         // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
       },
-      {
-        name: `${yesterday}日目标`,
-        data: dataList ? dataList[2] : [],
-        // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
-      },
     ];
   } else if (period === '日' && than === '环比') {
     items = [
@@ -205,11 +203,6 @@ function getTemplate(period, dataList, than) {
         data: dataList ? dataList[1] : [],
         // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
       },
-      {
-        name: `${yesterday}日目标`,
-        data: dataList ? dataList[2] : [],
-        // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
-      },
     ];
   } else if (period === '周' && than === '同比') {
     items = [
@@ -222,11 +215,6 @@ function getTemplate(period, dataList, than) {
         data: dataList ? dataList[1] : [],
         // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
       },
-      {
-        name: `本周目标`,
-        data: dataList ? dataList[2] : [],
-        // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
-      },
     ];
   } else if (period === '周' && than === '环比') {
     items = [
@@ -239,11 +227,6 @@ function getTemplate(period, dataList, than) {
         data: dataList ? dataList[1] : [],
         // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
       },
-      {
-        name: `本周目标`,
-        data: dataList ? dataList[2] : [],
-        // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
-      },
     ];
   } else if (period === '月' && than === '同比') {
     items = [

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

@@ -65,26 +65,21 @@ export default {
         items = [
           { label: `${year - 1}年${yesterday}日`, color: "#12f7f1" },
           { label: `${yesterday}日`, color: "#58adfa" },
-          { label: `${yesterday}日目标`, color: "#58adfa" },
-
         ];
       } else if (this.period === '日' && this.than === '环比') {
         items = [
           { label: `${dayBeYes}日`, color: "#12f7f1" },
           { label: `${yesterday}日`, color: "#58adfa" },
-          { label: `${yesterday}日目标`, color: "#58adfa" },
         ];
       } else if (this.period === '周' && this.than === '同比') {
         items = [
           { label: `${year-1}年本周`, color: "#12f7f1" },
           { label: `本周`, color: "#58adfa" },
-          { label: `本周目标`, color: "#58adfa" },
         ];
       } else if (this.period === '周' && this.than === '环比') {
         items = [
           { label: `上周`, color: "#12f7f1" },
           { label: `本周`, color: "#58adfa" },
-          { label: `本周目标`, color: "#58adfa" },
         ];
       } else if (this.period === '月' && this.than === '同比') {
         items = [
@@ -117,9 +112,17 @@ export default {
     series() {
       // console.log('aaaaaaaa', this.$store.getters.copilot.efficiency.chipOee);
       const transformRate = this.transformRate
-      console.log('chipOee', transformRate)
+      // console.log('chipOee', chipOeeRate)
       let dataList = null;
       switch (this.period) {
+        case "日":
+          dataList = [];
+          dataList[0] = transformRate.previous;
+          dataList[1] = transformRate.current;
+        case "周":
+          dataList = [];
+          dataList[0] = transformRate.previous;
+          dataList[1] = transformRate.current;
         default:
           dataList = [];
           dataList[0] = transformRate.previous;
@@ -179,11 +182,6 @@ function getTemplate(period, dataList,than) {
         data: dataList ? dataList[1] : [],
         // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
       },
-      {
-        name: `${yesterday}日目标`,
-        data: dataList ? dataList[2] : [],
-        // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
-      },
     ];
   } else if (period === '日' && than === '环比') {
     items = [
@@ -196,11 +194,6 @@ function getTemplate(period, dataList,than) {
         data: dataList ? dataList[1] : [],
         // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
       },
-      {
-        name: `${yesterday}日目标`,
-        data: dataList ? dataList[2] : [],
-        // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
-      },
     ];
   } else if (period === '周' && than === '同比') {
     items = [
@@ -213,11 +206,6 @@ function getTemplate(period, dataList,than) {
         data: dataList ? dataList[1] : [],
         // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
       },
-      {
-        name: `本周目标`,
-        data: dataList ? dataList[2] : [],
-        // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
-      },
     ];
   } else if (period === '周' && than === '环比') {
     items = [
@@ -230,11 +218,6 @@ function getTemplate(period, dataList,than) {
         data: dataList ? dataList[1] : [],
         // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
       },
-      {
-        name: `本周目标`,
-        data: dataList ? dataList[2] : [],
-        // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
-      },
     ];
   } else if (period === '月' && than === '同比') {
     items = [

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

@@ -65,13 +65,13 @@ export default {
     valueTuple() {
       const getter = this.chipRate;
       // console.log(getter)
-      // if (this.period === "日" || this.period === "周") {
+      if (this.period === "日" || this.period === "周") {
-      //   return [
+        return [
-      //     getter.previous[this.factoryId],
+          getter.previous[this.factoryId],
-      //     getter.current[this.factoryId],
+          getter.current[this.factoryId],
-      //     0,
+          0,
-      //   ];
+        ];
-      // }
+      }
       // [100, 200, 200]
       return [
         getter.previous[this.factoryId],
@@ -105,25 +105,21 @@ export default {
         items = [
           { label: `${yesterday}日良率`, },
           { label: `${year - 1}年${yesterday}日良率` },
-          { label: `${yesterday}日目标` },
         ];
       } else if (this.period === '日' && this.than === '环比') {
         items = [
           { label: `${yesterday}日良率` },
           { label: `${dayBeYes}日良率` },
-          { label: `${yesterday}日目标` },
         ];
       } else if (this.period === '周' && this.than === '同比') {
         items = [
           { label: `本周良率`, },
-          { label: `${year - 1}年本周良率` },
+          { label: `${year-1}年本周良率` },
-          { label: `本周目标`, },
         ];
       } else if (this.period === '周' && this.than === '环比') {
         items = [
           { label: `本周良率`, },
           { label: `上周良率`, },
-          { label: `本周目标`, },
         ];
       } else if (this.period === '月' && this.than === '同比') {
         items = [
@@ -151,13 +147,12 @@ export default {
           月: `${month}月良率`,
           年: `${year}良率`,
         }[this.period];
-      console.log(vt[0]);
+      console.log(vt[1]);
       const t = getOptions({
         // single,
         color: this.color == 1 ? "#4CF0E8" : "#1065ff",
         titleValue,
         subtitle,
-        yesterday,
         currentName: items[0].label,
         preName: items[1].label,
         previousSum: vt[0],
@@ -187,25 +182,22 @@ export default {
         items = [
           { label: `${year - 1}年${yesterday}日良率`, value: isNaN(this.valueTuple[0]) || this.valueTuple[0] == null ? 0 + "%" : (this.formatNumber(this.valueTuple[0]) ) + "%" },
           { label: `${yesterday}日良率`, value: isNaN(this.valueTuple[1]) || this.valueTuple[1] == null ? 0 + "%" : (this.formatNumber(this.valueTuple[1])) + "%" },
-          { label: `${yesterday}日目标`, value: isNaN(this.valueTuple[2]) || this.valueTuple[2] == null ? 0 + "%" : (this.formatNumber(this.valueTuple[2])) + "%" },
         ];
       } else if (this.period === '日' && this.than === '环比') {
         items = [
           { label: `${dayBeYes}日良率`, value: isNaN(this.valueTuple[0]) || this.valueTuple[0] == null ? 0 + "%" : (this.formatNumber(this.valueTuple[0])) + "%" },
           { label: `${yesterday}日良率`, value: isNaN(this.valueTuple[1]) || this.valueTuple[1] == null ? 0 + "%" : (this.formatNumber(this.valueTuple[1])) + "%" },
-          { label: `${yesterday}日目标`, value: isNaN(this.valueTuple[2]) || this.valueTuple[2] == null ? 0 + "%" : (this.formatNumber(this.valueTuple[2])) + "%" },
         ];
       } else if (this.period === '周' && this.than === '同比') {
         items = [
           { label: `${year-1}年本周良率`, 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])) + "%" },
-          { label: `本周目标`, value: isNaN(this.valueTuple[2]) || this.valueTuple[2] == null ? 0 + "%" : (this.formatNumber(this.valueTuple[2])) + "%" },
+
         ];
       } else if (this.period === '周' && this.than === '环比') {
         items = [
           { 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])) + "%" },
-          { label: `本周目标`, value: isNaN(this.valueTuple[2]) || this.valueTuple[2] == null ? 0 + "%" : (this.formatNumber(this.valueTuple[2])) + "%" },
         ];
       } else if (this.period === '月' && this.than === '同比') {
         items = [

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

@@ -47,12 +47,12 @@ export default {
   computed: {
     dataRate() {
       // if (this.current != 0 && this.target != 0) {
-        console.log( '1111111111', this.current, this.target,this.previous);
+        console.log( '1111111111', this.current, this.target);
       return this.current == 0 && this.target == 0
           ? 0
         : this.current != 0 && this.target != 0
           ? `${((this.current / this.target) * 100).toFixed(2)}%`
-          : this.current != 0 && this.target == 0 && this.current >= 100 ? 100 + '%' : this.current != 0 && this.target == 0 && this.current < 100 ? this.current + '%' : 0 + '%'
+          : this.current != 0 && this.target == 0 && this.current >= 100 ? 100 + '%' : this.current != 0 && this.target == 0 && this.current < 100 ? this.current + '%' : this.previous >=100 ? 100 + '%' : this.previous + '%';
       // } else if(this.previous != 0) {
       //   return this.previous + '%'
       // }

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

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-05-07 10:25:10
- * @LastEditTime: 2024-06-27 09:13:38
+ * @LastEditTime: 2024-06-14 09:58:01
  * @LastEditors: zhp
  * @Description:
 -->
@@ -11,21 +11,21 @@
     <CityName :value="city.name" />
     <div class="std-rate-item__value">
       <ProgressBar :period="period" :title="title" :target="city.target" :current="city.current" />
-      <preProgressBar :period="period" :title="titlePre" :previous="city.previous" />
+      <ProgressBar :period="period" :title="titlePre" :previous="city.previous" />
     </div>
   </div>
   <div v-else-if="period == '周'" class="std-rate-item">
     <CityName :value="city.name" />
     <div class="std-rate-item__value">
       <ProgressBar :period="period" :title="title" :target="city.target" :current="city.current" />
-      <preProgressBar :period="period" :title="titlePre" :previous="city.previous" />
+      <ProgressBar :period="period" :title="titlePre" :previous="city.previous" />
     </div>
   </div>
   <div v-else-if="period == '月'" class="std-rate-item">
     <CityName :value="city.name" />
     <div class="std-rate-item__value">
       <ProgressBar :period="period" :title="titleTarget" :target="city.target" :current="city.current" />
-      <preProgressBar :period="period" :title="titlePre" :previous="city.previous" />
+      <ProgressBar :period="period" :title="titlePre" :previous="city.previous" />
       <!-- <ProgressBar :period="period" :title="title" :value="city.current" /> -->
     </div>
   </div>
@@ -33,7 +33,7 @@
     <CityName :value="city.name" />
     <div class="std-rate-item__value">
       <ProgressBar :period="period" :title="titleTarget" :target="city.target" :current="city.current" />
-      <preProgressBar :period="period" :title="titlePre" :previous="city.previous" />
+      <ProgressBar :period="period" :title="titlePre" :previous="city.previous" />
       <!-- <ProgressBar :period="period" :title="title" :value="city.current" /> -->
     </div>
   </div>
@@ -42,12 +42,10 @@
 <script>
 import CityName from "./CityName.vue";
 import ProgressBar from "./ProgressBar.vue";
-import preProgressBar from "./preProgressBar.vue";
-
 
 export default {
   name: "StdRateItem",
-  components: { CityName, ProgressBar, preProgressBar },
+  components: { CityName, ProgressBar },
   props: {
     city: {
       type: Object,

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

@@ -1,130 +0,0 @@
-<!--
- * @Author: zhp
- * @Date: 2024-06-27 09:12:54
- * @LastEditTime: 2024-06-27 09:14:21
- * @LastEditors: zhp
- * @Description:
--->
-
-<template>
-  <div class="progress-bar" :data-title="title" :data-rate="previous + '%'">
-    <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,
-    },
-    target: {
-      type: Number,
-      default: 0,
-    },
-    previous: {
-      type: Number,
-      default: 0,
-    },
-    current: {
-      type: Number,
-      default: 0,
-    },
-    // total: {
-    //   type: Number,
-    //   default: 0,
-    // },
-    title: {
-      type: String,
-      default: "",
-    },
-  },
-  data() {
-    return {};
-  },
-  computed: {
-    dataRate() {
-      // if (this.current != 0 && this.target != 0) {
-        // console.log( '1111111111', this.current, this.target,this.previous);
-      return this.previous >=100 ? 100 + '%' : this.previous + '%';
-      // } else if(this.previous != 0) {
-      //   return this.previous + '%'
-      // }
-    },
-  },
-  methods: {},
-};
-</script>
-
-<style scoped lang="scss">
-.progress-bar {
-  height: 10px;
-  background-color: #002f6b;
-  border-radius: 4px;
-  margin-bottom: 12px;
-  position: relative;
-
-  &:before {
-    content: attr(data-title);
-    display: inline-block;
-    color: #fff;
-    position: absolute;
-    bottom: -200%;
-    font-size: 12px;
-  }
-
-  &:after {
-    content: attr(data-rate);
-    display: inline-block;
-    color: #fff;
-    position: absolute;
-    bottom: -200%;
-    right: 0;
-    font-size: 12px;
-  }
-
-  &:first-child {
-    &:after {
-      color: #11eae3;
-    }
-  }
-
-  &:nth-child(2) {
-    &:after {
-      color: #0e65fd;
-    }
-  }
-
-  .progress-bar__rate {
-    position: absolute;
-    display: inline-block;
-    height: 100%;
-    width: 0;
-    border-radius: 4px;
-     background: linear-gradient(to right,
-          #004c5e11 10%,
-          #004c5e,
-          #0ac0c0,
-          #11eae3);
-  }
-
-  &:first-child {
-    .progress-bar__rate {
-      background: linear-gradient(to right,
-          #004c5e11 10%,
-          #004c5e,
-          #0ac0c0,
-          #11eae3);
-    }
-  }
-
-  &:nth-child(2) {
-    .progress-bar__rate {
-      background: linear-gradient(to right, #0048a811, #0048a8, #0e65fd);
-    }
-  }
-}
-</style>

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

@@ -6,7 +6,6 @@ export default ({
   targetSum,
   currentName,
   preName,
-  yesterday,
 }) => ({
   grid: {
     left: 300,
@@ -26,7 +25,7 @@ export default ({
       fontSize: 26,
       color: "#fffd",
     },
-    subtext: `\u2002${yesterday + '日良率'}\u2002`,
+    subtext: `\u2002${subtitle}\u2002`,
     subtextStyle: {
       fontSize: 14,
       fontWeight: 100,
@@ -110,9 +109,6 @@ export default ({
         {
           value: previousSum,
           name: preName,
-           tooltip: {
-            formatter: `${preName} : ${previousSum}`
-          },
           selected: false,
           itemStyle: {
             borderJoin: "round",
@@ -133,11 +129,10 @@ export default ({
           },
         },
         {
-          value:previousSum === 0 ? 1 : 0,
+          value:previousSum == 0
-          name: preName,
+              ? 1
-          tooltip: {
+              : 0,
-            formatter: `${preName} : ${previousSum}`
+          name: "-",
-          },
           itemStyle: { color: "transparent" },
           label: { show: false },
         },

src/views/copilot/yield/options/double-ring-chart-options.js

@@ -17,7 +17,7 @@ export default ({
   tooltip: {},
   title: {
     text: titleValue,
-    left: "48%",
+    left: "44%",
     top: "37%",
     textAlign: "center",
     textStyle: {
@@ -39,7 +39,7 @@ export default ({
       type: "pie",
       name: "当前目标",
      radius: ["80%", "90%"],
-      center: ["50%", "52%"],
+      center: ["45%", "52%"],
       emptyCircleStyle: {
         color: "#042c5f33",
       },
@@ -48,7 +48,7 @@ export default ({
     {
       type: "pie",
       radius: ["80%", "90%"],
-      center: ["50%", "52%"],
+      center: ["45%", "52%"],
       avoidLabelOvervlap: false,
       label: {
         show: false,
@@ -97,7 +97,7 @@ export default ({
     {
       type: "pie",
       radius: ["70%", "80%"],
-      center: ["50%", "52%"],
+      center: ["45%", "52%"],
       avoidLabelOvervlap: false,
       label: {
         show: false,

src/views/produce/data/add-or-updata.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-11-06 15:15:30
- * @LastEditTime: 2024-06-26 13:39:22
+ * @LastEditTime: 2024-06-25 08:59:33
  * @LastEditors: DY
  * @Description:
 -->
@@ -116,8 +116,6 @@
             <p class="title">标准组件平均功率(W)</p>
             <p class="text">{{ dataForm.componentAveragePower }}</p>
           </el-col>
-        </el-row>
-        <el-row :gutter="24">
           <el-col :span="6">
             <p class="title">标准组件转化效率</p>
             <p class="text">{{ dataForm.componentTransRate }}</p>

src/views/produce/data/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-04-15 10:49:13
- * @LastEditTime: 2024-06-27 14:56:20
+ * @LastEditTime: 2024-06-24 14:38:17
  * @LastEditors: DY
  * @Description:
 -->
@@ -210,7 +210,7 @@ export default {
         {
           prop: 'factory',
           label: '工厂名称',
-          filter: (val) =>  factoryList[val],
+          filter: (val) => factoryList[val],
           minWidth: 180,
           showOverflowtooltip: true
         },
@@ -244,7 +244,7 @@ export default {
       colorList: ['#7164FF',  '#63BDFF', '#8EF0AB', '#FFCE6A']
 			// proLineList: [],
 			// all: {}
-		};
+		}; 
   },
   // computed: {
   //   weekNum() {
@@ -381,7 +381,7 @@ export default {
       this.seriesList = []
       // x轴数据
       xAxisData = Object.keys(data)
-
+      
       // y轴数据
       this.factoryArray.forEach(fac => {
         let i =  0

src/views/produce/workOrder/add-or-updata.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-11-06 15:15:30
- * @LastEditTime: 2024-06-27 14:50:21
+ * @LastEditTime: 2024-06-17 17:03:17
  * @LastEditors: DY
  * @Description:
 -->
@@ -76,44 +76,15 @@
           <p class="text">{{ dataForm.endDate?.length > 0 ? dataForm.endDate[0] + '-' + dataForm.endDate[1] + '-' + dataForm.endDate[2] : '' }}</p>
         </el-col>
       </el-row>
-      <div style="width: 100%; padding: 0 32px"><el-divider style="margin: 0"></el-divider></div>
+      <el-divider></el-divider>
-      <el-row :gutter="0" style="margin: 20px 32px">
+      <div class="chartDiv">
-        <el-col :span="8">
+        <div ref="bar" :style="{ height: '30vh', width: '40vw' }" />
-          <div>
+        <div ref="pie" :style="{ height: '30vh', width: '40vw' }" />
-            <small-title slot="title" :no-padding="true">
+      </div>
-              产品良率
+      <div class="chartDiv">
-            </small-title>
+        <div ref="equipmentLine" :style="{ height: '30vh', width: '40vw' }" />
-            <div ref="pie" :style="{ height: '40vh', width: '100%' }" />
+        <div ref="line" v-show="dataForm.orderStatus === 2" :style="{ height: '30vh', width: '40vw' }" />
-          </div>
+      </div>
-        </el-col>
-        <el-col :span="16">
-          <div style="border-left: 1px solid #d1d3d8; width: 100%; padding-left: 32px">
-            <small-title slot="title" :no-padding="true">
-              历史趋势
-            </small-title>
-            <div ref="line" v-show="dataForm.orderStatus === 2" :style="{ height: '40vh', width: '50vw' }" />
-          </div>
-        </el-col>
-      </el-row>
-      <div style="width: 100%; padding: 0 32px"><el-divider style="margin: 0"></el-divider></div>
-      <el-row :gutter="0" style="margin: 20px 32px">
-        <el-col :span="8">
-          <div>
-            <small-title slot="title" :no-padding="true">
-              生产明细
-            </small-title>
-            <div ref="bar" :style="{ height: '40vh', width: '100%' }" />
-          </div>
-        </el-col>
-        <el-col :span="16">
-          <div style="border-left: 1px solid #d1d3d8; width: 100%; padding-left: 32px">
-            <small-title slot="title" :no-padding="true">
-              待制品分布
-            </small-title>
-            <div ref="equipmentLine" :style="{ height: '40vh', width: '50vw' }" />
-          </div>
-        </el-col>
-      </el-row>
     </div>
   </el-drawer>
 
@@ -147,8 +118,7 @@ export default {
       barChart: null,
       equipmentLineChart: null,
       visible: false,
-      dataForm: {},
+      dataForm: {}
-      colorList: ['#3E8EF7', '#69E6D8', '#F7C739'] // pie颜色
     }
   },
   beforeDestroy() {
@@ -257,47 +227,38 @@ export default {
     initChart(barData) {
       this.barChart = echarts.init(this.$refs['bar'])
       this.barChart.setOption({
-        // title: {
+        title: {
-        //   text: '生产明细',
+          text: '生产明细',
-        //   left: 'center'
+          left: 'center'
-        //   // subtext: 'Fake Data'
+          // subtext: 'Fake Data'
-        // },
+        },
-        color: ['#3E8EF7'],
         tooltip: {
           trigger: 'axis'
         },
         grid: { top: 100, right: 90, bottom: 10, left: 10, containLabel: true },
         calculable: true,
         grid: {
-          top: '15%',
+          top: '20%',
-          left: 0,
+          left: "1%",
-          right: '10%',
+          right: "3%",
-          bottom: 0,
+          bottom: "1%",
           containLabel: true
         },
         xAxis: {
           type: 'category',
           data: ['目标产量', '计划投入量', '实际投入', '实际产出', '废品数量', '待再加工数量'],
           axisLabel: {
-            rotate: 25
+            rotate:45
           }
         },
         yAxis: {
-          type: 'value',
+          type: 'value'
-          name: '单位/片',
-          axisLine: {
-            show: true
-          }
         },
         series: [
           {
             data: barData,
             type: 'bar',
-            barWidth: '40%',
+            barWidth: '40%'
-            label: {
-              show: true,
-              position: 'top'
-            }
           }
         ]
       }, true)
@@ -305,9 +266,8 @@ export default {
     initPieChart(pieData) {
       this.pieChart = echarts.init(this.$refs['pie'])
       this.pieChart.setOption({
-        color: ['#3E8EF7', '#69E6D8', '#F7C739'],
         title: {
-          // text: !isNaN((pieData[0].value / (pieData[0].value + pieData[1].value)).toFixed(4) * 100) ? ( '产品良率 ' + (pieData[0].value / (pieData[0].value + pieData[1].value)).toFixed(4) * 100 + '%') : '产品良率 -',
+          text: !isNaN((pieData[0].value / (pieData[0].value + pieData[1].value)).toFixed(4) * 100) ? ( '产品良率 ' + (pieData[0].value / (pieData[0].value + pieData[1].value)).toFixed(4) * 100 + '%') : '产品良率 -',
           left: 'center'
           // subtext: 'Fake Data'
         },
@@ -315,31 +275,31 @@ export default {
           trigger: 'item'
         },
         legend: {
-          bottom: 0,
+          top: '5%',
-          left: 'center'
+          left: 'right',
+          orient: 'vertical'
         },
         series: [
           {
             // name: 'Access From',
             type: 'pie',
-            radius: ['50%', '70%'],
+            radius: ['40%', '70%'],
             avoidLabelOverlap: false,
-            data: pieData,
             label: {
-              show: true,
+              show: false,
-              position: 'outside',
+              position: 'center'
-              formatter: '{d|{d}%} \n {b|{b}}',
+            },
-              rich: {
+            emphasis: {
-                d: {
+              label: {
-                  color: 'inherit', // 系列色
+                show: false,
-                  verticalAlign: 'top'
+                fontSize: 40,
-                },
+                fontWeight: 'bold'
-                b: {
-                  color: '#8C8C8C',
-                  verticalAlign: 'top'
-                }
               }
-            }
+            },
+            labelLine: {
+              show: false
+            },
+            data: pieData
           }
         ]
       }, true)
@@ -347,48 +307,39 @@ export default {
     initEqLineChart(xAxisList, yAxisList) {
       this.equipmentLineChart = echarts.init(this.$refs['equipmentLine'])
       this.equipmentLineChart.setOption({
-        // title: {
+        title: {
-        //   text: '待制品分布',
+          text: '待制品分布',
-        //   left: 'center'
+          left: 'center'
-        //   // subtext: 'Fake Data'
+          // subtext: 'Fake Data'
-        // },
+        },
-        color: ['#3E8EF7'],
         tooltip: {
           trigger: 'axis'
         },
         grid: { top: 100, right: 90, bottom: 10, left: 10, containLabel: true },
         calculable: true,
         grid: {
-          top: '15%',
+          top: '20%',
-          left: 0,
+          left: "1%",
-          right: 0,
+          right: "3%",
-          bottom: 0,
+          bottom: "1%",
           containLabel: true
         },
         xAxis: {
           type: 'category',
           data: xAxisList,
           axisLabel: {
-            rotate: 25
+            rotate:45,
             // width: '10%'
           }
         },
         yAxis: {
-          type: 'value',
+          type: 'value'
-          name: '单位/片',
-          axisLine: {
-            show: true
-          }
         },
         series: [
           {
             data: yAxisList,
             type: 'bar',
-            barWidth: '50%',
+            barWidth: '50%'
-            label: {
-              show: true,
-              position: 'top'
-            }
           }
         ]
       }, true)
@@ -396,39 +347,27 @@ export default {
     initLineChart(xAxisList, seriesList) {
       this.lineChart = echarts.init(this.$refs['line'])
       this.lineChart.setOption({
-        color: ['#3E8EF7'],
+        title: {
+          text: '历史趋势',
+          left: 'center' // 设置标题居中
+        },
         tooltip: {
           trigger: 'item'
         },
-        grid: {
-          top: '15%',
-          left: 0,
-          right: 0,
-          bottom: 0,
-          containLabel: true
-        },
         xAxis: {
           type: 'category',
           data: xAxisList,
           axisLabel: {
-            rotate: 25
+            rotate:45
           }
         },
         yAxis: {
-          type: 'value',
+          type: 'value'
-          name: '单位/片',
-          axisLine: {
-            show: true
-          }
         },
         series: [
           {
             data: seriesList,
-            type: 'line',
+            type: 'line'
-            label: {
-              show: true,
-              position: 'top'
-            }
           }
         ]
       }, true)
@@ -442,8 +381,14 @@ export default {
   },
 };
 </script>
-
 <style scoped>
+.chartDiv {
+  display: flex;
+  justify-content: space-between;
+  width: 100%;
+  padding: 5px;
+  padding-left: 30px;
+}
   .drawer >>> .el-drawer {
   border-radius: 8px 0 0 8px;
 }
@@ -460,8 +405,7 @@ export default {
 }
 .detailBox p {
   margin: 0;
-  padding-left: 32px;
+  padding: 0 32px;
-  /* padding: 0 32px; */
 }
 .detailBox .title {
   /* width: 56px; */
@@ -483,8 +427,6 @@ export default {
 }
 .detailBox {
   padding-top: 30px;
-  overflow-x: hidden;
+  width: 99%;
-  overflow-y: auto;
-  /* width: 99%; */
 }
 </style>

src/views/report/components/produceLineBar.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-06-19 15:28:34
- * @LastEditTime: 2024-06-27 10:40:57
+ * @LastEditTime: 2024-06-24 08:46:34
  * @LastEditors: zhp
  * @Description:
 -->
@@ -9,9 +9,9 @@
   <div>
     <!-- 暂无数据 -->
     <div class="no-data-bg" style="position: relative; left: 50%; transform: translateX(-50%)"
-      v-show="this.chartMsg.series[0].data.length === 0"></div>
+      v-show="this.chartMsg.series.length === 0"></div>
     <!-- 图例 -->
-    <div v-show="this.chartMsg.series[0].data.length > 0 ">
+    <div v-show="this.chartMsg.series.length > 0">
       <div class="legendData" v-if="show">
         <span class="itemData" v-for="item in legendList" :key="item.id">
           <span v-if="item.type === 1" class="block" :style="{ backgroundColor: item.color }"></span>
@@ -63,7 +63,7 @@ export default {
                 : params[i].seriesName === "转化效率"
                     ? (params[i].value ? params[i].value.toFixed(2) : 0.0) + "%"
                   : params[i].seriesName.search('总功率') != -1
-                      ? (params[i].value ? params[i].value : 0) + "MW"
+                      ? (params[i].value ? params[i] : 0) + "MW"
                     : (params[i].value ? params[i].value : 0) + "片"
                 }</span>`;
             }
@@ -83,36 +83,15 @@ export default {
         dataZoom: [//滚动条
           {
             // 设置滚动条的隐藏与显示
-            show: true,
+            show: false,
             // 设置滚动条类型
             type: "slider",
             // 设置背景颜色
-            backgroundColor: "#F7F7F7",
+            backgroundColor: "rgb(19, 63, 100)",
-            // handleStyle: {
-            //   color: '#D6D6D6'
-            // },
-            handleStyle: {
-              borderColor: '#EBEBEB',
-              color: '#EBEBEB'
-            },
-            moveHandleStyle: {
-              borderColor: '#EBEBEB',
-              color: '#EBEBEB'
-            },
-            emphasis: {
-              handleStyle: {
-                borderColor: '#D6D6D6',
-                color: '#D6D6D6'
-              },
-              moveHandleStyle: {
-                borderColor: '#D6D6D6',
-                color: '#D6D6D6'
-              }
-            },
             // 设置选中范围的填充颜色
-            fillerColor: "#F7F7F7",
+            fillerColor: "rgb(16, 171, 198)",
             // 设置边框颜色
-            borderColor: "#F7F7F7",
+            borderColor: "rgb(19, 63, 100)",
             // 是否显示detail，即拖拽时候显示详细数值信息
             showDetail: false,
             // 数据窗口范围的起始数值
@@ -123,9 +102,9 @@ export default {
             // 即不会影响其他轴的数据范围
             filterMode: "empty",
             // 设置滚动条宽度，相对于盒子宽度
-            width: "100%",
+            width: "50%",
             // 设置滚动条高度
-            height: 3,
+            height: 8,
             // 设置滚动条显示位置
             left: "center",
             // 是否锁定选择区域（或叫做数据窗口）的大小
@@ -133,7 +112,7 @@ export default {
             // 控制手柄的尺寸
             handleSize: 0,
             // dataZoom-slider组件离容器下侧的距离
-            bottom: 14,
+            bottom: 3,
           },
           {
             // 没有下面这块的话，只能拖动滚动条，
@@ -145,6 +124,7 @@ export default {
             moveOnMouseMove: true,
             moveOnMouseWheel: true,
           },
+
         ],
         yAxis:undefined,
         series: [],
@@ -210,7 +190,6 @@ export default {
       }, 500)();
     },
     getMes() {
-      console.log('222222', this.chartMsg.series);
       if (this.myChart) {
         this.myChart.dispose();
       }

src/views/report/components/produceLineBarTarget.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-06-20 16:13:36
- * @LastEditTime: 2024-06-27 09:51:43
+ * @LastEditTime: 2024-06-24 08:46:42
  * @LastEditors: zhp
  * @Description:
 -->
@@ -36,9 +36,9 @@ export default {
         color: [],
         // color: ["#8EF0AB", "#63BDFF", "#288AFF"],
         grid: {
-          left: 20,
+          left: -30,
           right: 0,
-          bottom: 31,
+          bottom: 30,
           top: 30,
           containLabel:true,
         },
@@ -51,7 +51,7 @@ export default {
             },
           },
           formatter: function (params) {
-            console.log('params', params.data)
+            // console.log('params', params);
             var res = `<span style='color:rgba(0,0,0,0.8)'>${params[0].axisValueLabel}</span>`;
             for (var i = 0, l = params.length; i < l; i++) {
               res +=
@@ -59,12 +59,12 @@ export default {
                 `<span style='display:inline-block;margin-right:4px;border-radius:10px;width:10px;height:10px;background-color:${params[i].color}'></span>` +
                 `<span style='display:inline-block;width:150px;color:rgba(0,0,0,0.8);font-size:14px;'>${params[i].seriesName}</span>` +
               `<span style='color:rgba(0,0,0,0.48);font-size:14px;'>${params[i].seriesName === "综合良率"
-                ? (params[i].data.titleValue ? params[i].data.titleValue.toFixed(2) : 0.0) + "%"
+                  ? (params[i].value ? params[i].value.toFixed(2) : 0.0) + "%"
                 : params[i].seriesName === "转化效率"
-                  ? (params[i].data.titleValue ? params[i].data.titleValue.toFixed(2) : 0.0) + "%"
+                    ? (params[i].value ? params[i].value.toFixed(2) : 0.0) + "%"
                   : params[i].seriesName.search('总功率') != -1
-                    ? (params[i].data.titleValue ? params[i].data.titleValue : 0) + "MW"
+                    ? (params[i].value ? params[i] : 0) + "MW"
-                    : (params[i].data.titleValue ? params[i].data.titleValue : 0) + "片"
+                    : (params[i].value ? params[i].value : 0) + "片"
                 }</span>`;
             }
             return res;
@@ -80,52 +80,52 @@ export default {
             type: "shadow",
           },
         },
-        // dataZoom: [//滚动条
+        dataZoom: [//滚动条
-        //   {
+          {
-        //     // 设置滚动条的隐藏与显示
+            // 设置滚动条的隐藏与显示
-        //     show: true,
+            show: false,
-        //     // 设置滚动条类型
+            // 设置滚动条类型
-        //     type: "slider",
+            type: "slider",
-        //     // 设置背景颜色
+            // 设置背景颜色
-        //     backgroundColor: "rgb(19, 63, 100)",
+            backgroundColor: "rgb(19, 63, 100)",
-        //     // 设置选中范围的填充颜色
+            // 设置选中范围的填充颜色
-        //     fillerColor: "rgb(16, 171, 198)",
+            fillerColor: "rgb(16, 171, 198)",
-        //     // 设置边框颜色
+            // 设置边框颜色
-        //     borderColor: "rgb(19, 63, 100)",
+            borderColor: "rgb(19, 63, 100)",
-        //     // 是否显示detail，即拖拽时候显示详细数值信息
+            // 是否显示detail，即拖拽时候显示详细数值信息
-        //     showDetail: false,
+            showDetail: false,
-        //     // 数据窗口范围的起始数值
+            // 数据窗口范围的起始数值
-        //     startValue: 0,
+            startValue: 0,
-        //     // 数据窗口范围的结束数值（一页显示多少条数据）
+            // 数据窗口范围的结束数值（一页显示多少条数据）
-        //     endValue: 5,
+            endValue: 5,
-        //     // empty：当前数据窗口外的数据，被设置为空。
+            // empty：当前数据窗口外的数据，被设置为空。
-        //     // 即不会影响其他轴的数据范围
+            // 即不会影响其他轴的数据范围
-        //     filterMode: "empty",
+            filterMode: "empty",
-        //     // 设置滚动条宽度，相对于盒子宽度
+            // 设置滚动条宽度，相对于盒子宽度
-        //     width: "50%",
+            width: "50%",
-        //     // 设置滚动条高度
+            // 设置滚动条高度
-        //     height: 8,
+            height: 8,
-        //     // 设置滚动条显示位置
+            // 设置滚动条显示位置
-        //     left: "center",
+            left: "center",
-        //     // 是否锁定选择区域（或叫做数据窗口）的大小
+            // 是否锁定选择区域（或叫做数据窗口）的大小
-        //     zoomLoxk: true,
+            zoomLoxk: true,
-        //     // 控制手柄的尺寸
+            // 控制手柄的尺寸
-        //     handleSize: 0,
+            handleSize: 0,
-        //     // dataZoom-slider组件离容器下侧的距离
+            // dataZoom-slider组件离容器下侧的距离
-        //     bottom: 3,
+            bottom: 3,
-        //   },
+          },
-        //   {
+          {
-        //     // 没有下面这块的话，只能拖动滚动条，
+            // 没有下面这块的话，只能拖动滚动条，
-        //     // 鼠标滚轮在区域内不能控制外部滚动条
+            // 鼠标滚轮在区域内不能控制外部滚动条
-        //     type: "inside",
+            type: "inside",
-        //     // 滚轮是否触发缩放
+            // 滚轮是否触发缩放
-        //     zoomOnMouseWheel: false,
+            zoomOnMouseWheel: false,
-        //     // 鼠标滚轮触发滚动
+            // 鼠标滚轮触发滚动
-        //     moveOnMouseMove: true,
+            moveOnMouseMove: true,
-        //     moveOnMouseWheel: true,
+            moveOnMouseWheel: true,
-        //   },
+          },
 
-        // ],
+        ],
         yAxis:undefined,
         series: [],
       },
@@ -136,10 +136,6 @@ export default {
       type: Number,
       default: 300,
     },
-    gridLeft: {
-      type: Boolean,
-      default: true,
-    },
     type: {
       type: Number,
       default: 2,
@@ -170,12 +166,7 @@ export default {
       handler(newVal) {
         this.chartHeight = newVal;
       },
-
     },
-    // gridLeft(val) {
-    //   console.log(val)
-
-    // },
     type() {
       this.canvasReset();
     },
@@ -199,20 +190,13 @@ export default {
       }, 500)();
     },
     getMes() {
-      console.log(this.gridLeft)
-      if (this.gridLeft === false) {
-        this.option.grid.left = 20
-      } else {
-        this.option.grid.left = -80
-      }
-      // console.log('222222', this.chartMsg);
       if (this.myChart) {
         this.myChart.dispose();
       }
       var chartDom = document.getElementById(this.chartId);
       this.myChart = echarts.init(chartDom);
       this.option.color = this.chartMsg.color;
-      this.option.xAxis.data = this.chartMsg.xData
+      this.option.xAxis.data = this.chartMsg.xData;
       // this.option.yAxis.name = this.chartMsg.yName;
 
       // this.option.yAxis.axisLabel = this.chartMsg.yAxisLabel;

src/views/report/components/produceLineBarYearTarget.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-06-20 16:13:52
- * @LastEditTime: 2024-06-27 09:55:02
+ * @LastEditTime: 2024-06-24 08:46:46
  * @LastEditors: zhp
  * @Description:
 -->
@@ -9,9 +9,9 @@
   <div>
     <!-- 暂无数据 -->
     <div class="no-data-bg" style="position: relative; left: 50%; transform: translateX(-50%)"
-      v-show="this.chartMsg.series[0].data.length === 0"></div>
+      v-show="this.chartMsg.series.length === 0"></div>
     <!-- 图例 -->
-    <div v-show="this.chartMsg.series[0].data.length > 0">
+    <div v-show="this.chartMsg.series.length > 0">
       <div class="legendData" v-if="show">
         <span class="itemData" v-for="item in legendList" :key="item.id">
           <span v-if="item.type === 1" class="block" :style="{ backgroundColor: item.color }"></span>
@@ -36,7 +36,7 @@ export default {
         color: [],
         // color: ["#8EF0AB", "#63BDFF", "#288AFF"],
         grid: {
-          left: 60,
+          left: 30,
           right: 0,
           bottom: 30,
           top: 30,
@@ -80,52 +80,52 @@ export default {
             type: "shadow",
           },
         },
-        // dataZoom: [//滚动条
+        dataZoom: [//滚动条
-        //   {
+          {
-        //     // 设置滚动条的隐藏与显示
+            // 设置滚动条的隐藏与显示
-        //     show: true,
+            show: false,
-        //     // 设置滚动条类型
+            // 设置滚动条类型
-        //     type: "slider",
+            type: "slider",
-        //     // 设置背景颜色
+            // 设置背景颜色
-        //     backgroundColor: "rgb(19, 63, 100)",
+            backgroundColor: "rgb(19, 63, 100)",
-        //     // 设置选中范围的填充颜色
+            // 设置选中范围的填充颜色
-        //     fillerColor: "rgb(16, 171, 198)",
+            fillerColor: "rgb(16, 171, 198)",
-        //     // 设置边框颜色
+            // 设置边框颜色
-        //     borderColor: "rgb(19, 63, 100)",
+            borderColor: "rgb(19, 63, 100)",
-        //     // 是否显示detail，即拖拽时候显示详细数值信息
+            // 是否显示detail，即拖拽时候显示详细数值信息
-        //     showDetail: false,
+            showDetail: false,
-        //     // 数据窗口范围的起始数值
+            // 数据窗口范围的起始数值
-        //     startValue: 0,
+            startValue: 0,
-        //     // 数据窗口范围的结束数值（一页显示多少条数据）
+            // 数据窗口范围的结束数值（一页显示多少条数据）
-        //     endValue: 5,
+            endValue: 5,
-        //     // empty：当前数据窗口外的数据，被设置为空。
+            // empty：当前数据窗口外的数据，被设置为空。
-        //     // 即不会影响其他轴的数据范围
+            // 即不会影响其他轴的数据范围
-        //     filterMode: "empty",
+            filterMode: "empty",
-        //     // 设置滚动条宽度，相对于盒子宽度
+            // 设置滚动条宽度，相对于盒子宽度
-        //     width: "50%",
+            width: "50%",
-        //     // 设置滚动条高度
+            // 设置滚动条高度
-        //     height: 8,
+            height: 8,
-        //     // 设置滚动条显示位置
+            // 设置滚动条显示位置
-        //     left: "center",
+            left: "center",
-        //     // 是否锁定选择区域（或叫做数据窗口）的大小
+            // 是否锁定选择区域（或叫做数据窗口）的大小
-        //     zoomLoxk: true,
+            zoomLoxk: true,
-        //     // 控制手柄的尺寸
+            // 控制手柄的尺寸
-        //     handleSize: 0,
+            handleSize: 0,
-        //     // dataZoom-slider组件离容器下侧的距离
+            // dataZoom-slider组件离容器下侧的距离
-        //     bottom: 3,
+            bottom: 3,
-        //   },
+          },
-        //   {
+          {
-        //     // 没有下面这块的话，只能拖动滚动条，
+            // 没有下面这块的话，只能拖动滚动条，
-        //     // 鼠标滚轮在区域内不能控制外部滚动条
+            // 鼠标滚轮在区域内不能控制外部滚动条
-        //     type: "inside",
+            type: "inside",
-        //     // 滚轮是否触发缩放
+            // 滚轮是否触发缩放
-        //     zoomOnMouseWheel: false,
+            zoomOnMouseWheel: false,
-        //     // 鼠标滚轮触发滚动
+            // 鼠标滚轮触发滚动
-        //     moveOnMouseMove: true,
+            moveOnMouseMove: true,
-        //     moveOnMouseWheel: true,
+            moveOnMouseWheel: true,
-        //   },
+          },
 
-        // ],
+        ],
         yAxis:undefined,
         series: [],
       },

src/views/report/components/produceLineYieldBarTarget.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-06-21 09:05:14
- * @LastEditTime: 2024-06-27 10:59:40
+ * @LastEditTime: 2024-06-24 08:46:49
  * @LastEditors: zhp
  * @Description:
 -->
@@ -9,9 +9,9 @@
   <div>
     <!-- 暂无数据 -->
     <div class="no-data-bg" style="position: relative; left: 50%; transform: translateX(-50%)"
-      v-show="this.chartMsg.series[0].data.length === 0"></div>
+      v-show="this.chartMsg.series.length === 0"></div>
     <!-- 图例 -->
-    <div v-show="this.chartMsg.series[0].data.length > 0">
+    <div v-show="this.chartMsg.series.length > 0">
       <div class="legendData" v-if="show">
         <span class="itemData" v-for="item in legendList" :key="item.id">
           <span v-if="item.type === 1" class="block" :style="{ backgroundColor: item.color }"></span>
@@ -36,7 +36,7 @@ export default {
         color: [],
         // color: ["#8EF0AB", "#63BDFF", "#288AFF"],
         grid: {
-          left: 60,
+          left: -30,
           right: 0,
           bottom: 30,
           top: 30,
@@ -51,7 +51,7 @@ export default {
             },
           },
           formatter: function (params) {
-            // console.log('params', params)
+            console.log('params', params)
             let arr = []
             var res = ``;
             // for (var i = 0, l = params.length; i < l; i++) {
@@ -66,7 +66,7 @@ export default {
                 : params[0].name === "转化效率"
                     ? (params[0].value ? params[0].value.toFixed(2) : 0.0) + "%"
                   : params[i].seriesName.search('总功率') != -1
-                    ? (params[i].value ? params[i].value : 0) + "MW"
+                    ? (params[i].value ? params[i] : 0) + "MW"
                     : (params[i].value ? params[i].value : 0) + "片"
                 }</span>`;
               // }
@@ -81,7 +81,7 @@ export default {
                 : params[1].name === "转化效率"
                   ? (params[1].value ? params[1].value.toFixed(2) : 0.0) + "%"
                   : params[i].seriesName.search('总功率') != -1
-                    ? (params[i].value ? params[i].value : 0) + "MW"
+                    ? (params[i].value ? params[i] : 0) + "MW"
                     : (params[i].value ? params[i].value : 0) + "片"
                 }</span>`;
             }
@@ -98,51 +98,52 @@ export default {
             type: "shadow",
           },
         },
-        // dataZoom: [//滚动条
+        dataZoom: [//滚动条
-        //   {
+          {
-        //     // 设置滚动条的隐藏与显示
+            // 设置滚动条的隐藏与显示
-        //     show: true,
+            show: false,
-        //     // 设置滚动条类型
+            // 设置滚动条类型
-        //     type: "slider",
+            type: "slider",
-        //     // 设置背景颜色
+            // 设置背景颜色
-        //     backgroundColor: "#F7F7F7",
+            backgroundColor: "rgb(19, 63, 100)",
-        //     // 设置选中范围的填充颜色
+            // 设置选中范围的填充颜色
-        //     fillerColor: "#EBEBEB",
+            fillerColor: "rgb(16, 171, 198)",
-        //     // 设置边框颜色
+            // 设置边框颜色
-        //     borderColor: "#F7F7F7",
+            borderColor: "rgb(19, 63, 100)",
-        //     // 是否显示detail，即拖拽时候显示详细数值信息
+            // 是否显示detail，即拖拽时候显示详细数值信息
-        //     showDetail: false,
+            showDetail: false,
-        //     // 数据窗口范围的起始数值
+            // 数据窗口范围的起始数值
-        //     startValue: 0,
+            startValue: 0,
-        //     // 数据窗口范围的结束数值（一页显示多少条数据）
+            // 数据窗口范围的结束数值（一页显示多少条数据）
-        //     endValue: 5,
+            endValue: 5,
-        //     // empty：当前数据窗口外的数据，被设置为空。
+            // empty：当前数据窗口外的数据，被设置为空。
-        //     // 即不会影响其他轴的数据范围
+            // 即不会影响其他轴的数据范围
-        //     filterMode: "empty",
+            filterMode: "empty",
-        //     // 设置滚动条宽度，相对于盒子宽度
+            // 设置滚动条宽度，相对于盒子宽度
-        //     width: "100%",
+            width: "50%",
-        //     // 设置滚动条高度
+            // 设置滚动条高度
-        //     height: 8,
+            height: 8,
-        //     // 设置滚动条显示位置
+            // 设置滚动条显示位置
-        //     left: "center",
+            left: "center",
-        //     // 是否锁定选择区域（或叫做数据窗口）的大小
+            // 是否锁定选择区域（或叫做数据窗口）的大小
-        //     zoomLoxk: true,
+            zoomLoxk: true,
-        //     // 控制手柄的尺寸
+            // 控制手柄的尺寸
-        //     handleSize: 0,
+            handleSize: 0,
-        //     // dataZoom-slider组件离容器下侧的距离
+            // dataZoom-slider组件离容器下侧的距离
-        //     bottom: 3,
+            bottom: 3,
-        //   },
+          },
-        //   {
+          {
-        //     // 没有下面这块的话，只能拖动滚动条，
+            // 没有下面这块的话，只能拖动滚动条，
-        //     // 鼠标滚轮在区域内不能控制外部滚动条
+            // 鼠标滚轮在区域内不能控制外部滚动条
-        //     type: "inside",
+            type: "inside",
-        //     // 滚轮是否触发缩放
+            // 滚轮是否触发缩放
-        //     zoomOnMouseWheel: false,
+            zoomOnMouseWheel: false,
-        //     // 鼠标滚轮触发滚动
+            // 鼠标滚轮触发滚动
-        //     moveOnMouseMove: true,
+            moveOnMouseMove: true,
-        //     moveOnMouseWheel: true,
+            moveOnMouseWheel: true,
-        //   },
+          },
-        // ],
+
+        ],
         yAxis:undefined,
         series: [],
       },

src/views/report/comprehensiveData.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-04-15 10:49:13
- * @LastEditTime: 2024-06-25 08:39:48
+ * @LastEditTime: 2024-06-24 09:39:27
  * @LastEditors: zhp
  * @Description:
 -->
@@ -155,11 +155,6 @@ export default {
       // all: {}
     };
   },
-  watch: {
-    currentMenu() {
-      this.getDataList()
-    },
-  },
   computed: {
     weekNum() {
       return Math.round((this.end - this.start) / (24 * 60 * 60 * 1000 * 7)) + 1
@@ -319,12 +314,9 @@ export default {
       }
     },
     async getDataList() {
-      if (!this.listQuery.startDate && !this.listQuery.endDate) {
-        return this.$message('请选择起止时间')
-      }
       this.otherProps = []
       let arr  = []
-      this.currentMenu === '邯郸' ? arr.push(1) : arr.push(0)
+      this.currentMenu === '邯郸' ? arr.push(1) : arr.push(2)
       this.listQuery.factory = arr
       const res = await getComprehensiveDataPage(this.listQuery)
       // this.tableData = res.data.list

src/views/report/produceConversion.vue

@@ -84,7 +84,7 @@
             :chartMsg="chartMsgYearTarget" :chartId=" 'yearData'" :chartNum="chartNum" />
         </el-col> -->
       </el-row>
-      <base-table :key="showTable" :table-props="tableProps" :page="listQuery.current"
+      <base-table :key="showTable" :span-method="objectSpanMethod" :table-props="tableProps" :page="listQuery.current"
         :limit="listQuery.size" :table-data="tableData" :max-height="tableH" />
     </div>
     <!-- <div class="containerBottom">
@@ -174,15 +174,7 @@ export default {
         yAxis: [
           {
             type: "value",
-            name: "单位/MW",
+            name: "单位/片",
-            // splitNumber: 5,
-            // min: function (value) {//取最小值向下取整为最小刻度
-            //   return 0
-            // },
-            // max: function (value) {//取最大值向上取整为最大刻度
-            //   return Math.ceil(value.max)
-            // },
-            alignTicks: true,
             nameTextStyle: {
               fontSize: 12,
               align: "right",
@@ -191,13 +183,7 @@ export default {
           },
           {
             type: 'value',
-            alignTicks: true,
-            // min: 0,
-            // max: 100,
-            // scale: true,
-            // interval: 25,//间隔
             // inverse: true,
-            // splitNumber: 5,
             name: "单位/%",
             nameTextStyle: {
               fontSize: 12,
@@ -218,7 +204,7 @@ export default {
               position: [-18, -16],
               color: "#68C483",
               formatter: function (params) {
-                return params.value
+                return params.value + "MW";
               },
             },
           },
@@ -233,7 +219,7 @@ export default {
               position: [-18, -16],
               color: "#68C483",
               formatter: function (params) {
-                return params.value
+                return params.value + "%";
               },
             },
             yAxisIndex: 1
@@ -247,16 +233,7 @@ export default {
         yAxis: [
           {
             type: "value",
-            name: "单位/片",
+          name: "单位/片",
-            // min: function (value) {//取最小值向下取整为最小刻度
-            //   return 0
-            // },
-            // max: function (value) {//取最大值向上取整为最大刻度
-            //   return Math.ceil(value.max)
-            // },
-            alignTicks: true,
-            // splitNumber: 5,
-            // scale: true,
             nameTextStyle: {
               fontSize: 12,
               align: "right",
@@ -264,16 +241,8 @@ export default {
             axisLabel: {},
           },
           {
-            type: 'value',
+            type: "value",
-            // inverse: true,
             name: "单位/%",
-            scale: true,
-            alignTicks: true,
-            // min: 0,
-            // max: 100,
-            // scale: true,
-            // interval: 25,//间隔
-            // splitNumber: 5,
             nameTextStyle: {
               fontSize: 12,
               align: "right",
@@ -290,10 +259,10 @@ export default {
             barWidth: 20,
             label: {
               show: true,
-              position: [-50, -16],
+              position: [-18, -16],
               color: "#68C483",
               formatter: function (params) {
-                return params.value.toFixed(2)
+                return params.value.toFixed(2) + "MW";
               },
             },
           },
@@ -305,10 +274,10 @@ export default {
             barWidth: 20,
             label: {
               show: true,
-              position: [10, -16],
+              position: [0, -16],
               color: "#288AFF",
               formatter: function (params) {
-                return params.value.toFixed(2)
+                return params.value.toFixed(2) + "MW";
               },
             },
           },
@@ -325,7 +294,7 @@ export default {
               show: true,
               color: "#FFAE17",
               formatter: function (params) {
-                return params.value.toFixed(2)
+                return params.value.toFixed(2) + "%";
               },
             },
           },
@@ -344,6 +313,13 @@ export default {
   computed: {
     tableProps() {
       return [
+        {
+          prop: "factory",
+          label: "工厂名称",
+          // filter: (val) => factoryList[val],
+          minWidth: 200,
+          showOverflowtooltip: true,
+        },
         {
           prop: "item",
           label: "科目",
@@ -369,9 +345,6 @@ export default {
   },
   watch: {
     // 监听左侧菜单栏是否展开
-    currentMenu() {
-      this.getDataList()
-    },
     isOpen(val) {
       if (this.$route.name === "produceConversion") {
         this.chartNum++;
@@ -521,10 +494,7 @@ export default {
       this.chartMsg.series[2].data = []
       this.chartMsgYearTarget.series[0].data = []
       this.chartMsgYearTarget.series[1].data = []
-      this.title = ''
+
-      if (!this.listQuery.beginTime && !this.listQuery.endTime) {
-        return this.$message('请选择起止时间')
-      }
       console.log(this.listQuery);
       if (this.listQuery.type == 3) {
         this.listQuery.beginTime = this.listQuery.reportTime[0]
@@ -590,6 +560,9 @@ export default {
             dataArr[0]['' + m + ''] = item.chipTotalPowers
             dataArr[1]['' + m + ''] = item.scTotalPowers
             dataArr[2]['' + m + ''] = item.conversionEfficiency
+            dataArr[0].factory = ele.factory === 1 ? '邯郸' : '瑞昌'
+            dataArr[1].factory = ele.factory === 1 ? '邯郸' : '瑞昌'
+            dataArr[2].factory = ele.factory === 1 ? '邯郸' : '瑞昌'
 
             // dataArr[3]['' + m + ''] = ele.comprehensiveYieldRate
             // })
@@ -600,7 +573,7 @@ export default {
             // })
           })
         })
-        this.title = res.data[0].yearTarget.targetTime ? res.data[0].yearTarget.targetTime + '目标值' : ''
+        this.title = res.data[0].yearTarget.targetTime + '目标值'
         this.chartMsgYearTarget.series[0].data = [
           {
             value: res.data[0].yearTarget.chipTotalPower,
@@ -645,7 +618,7 @@ export default {
           if (i.search('value') === 0) {
             this.chartMsg.series[0].data.push({
               name: dataArr[0]['item'],
-              value: dataArr[0][i] === 0 ? null : dataArr[0][i]
+              value: dataArr[0][i]
             })
           }
         }
@@ -654,7 +627,7 @@ export default {
           if (i.search('value') === 0) {
             this.chartMsg.series[1].data.push({
               name: dataArr[1]['item'],
-              value: dataArr[1][i] === 0 ? null : dataArr[1][i]
+              value: dataArr[1][i]
             })
           }
         }
@@ -663,7 +636,7 @@ export default {
           if (i.search('value') === 0) {
             this.chartMsg.series[2].data.push({
               name: dataArr[2]['item'],
-              value: dataArr[2][i] === 0 ? null : dataArr[2][i]
+              value: dataArr[2][i]
             })
           }
         }

src/views/report/productionSituationMW.vue

@@ -64,7 +64,7 @@
         </el-col>
         <el-col :span="6" style="margin-top: 30px">
           <bm-line-bar-target :type="listQuery.type" :chartHeight="chartHeight" :legendList="legendList"
-            :chartMsg="chartMsgTarget" :gridLeft="gridLeft" :chartId="'chartTarget'" :chartNum="chartNum" />
+            :chartMsg="chartMsgTarget" :chartId="'chartTarget'" :chartNum="chartNum" />
         </el-col>
         <el-col :span="6">
           <div class="blueTip">
@@ -84,7 +84,7 @@
         </el-col>
         <el-col :span="6" style="margin-top: 30px">
           <bm-line-bar-target :type="listQuery.type" :chartHeight="chartHeight" :legendList="legendList"
-            :chartMsg="chartMsgTarget" :gridLeft="gridLeft" :chartId="'chartDayTarget'" :chartNum="chartNum" />
+            :chartMsg="chartMsgTarget" :chartId="'chartDayTarget'" :chartNum="chartNum" />
         </el-col>
         <!-- <el-col :span="6">
           <div class="blueTip">
@@ -103,8 +103,8 @@
           :chartId="chartId" :chartNum="chartNum" />
         <!-- </el-col> -->
       </el-row>
-      <base-table :key="showTable" :table-props="tableProps" :page="listQuery.current" :limit="listQuery.size"
+      <base-table :key="showTable" :span-method="objectSpanMethod" :table-props="tableProps" :page="listQuery.current"
-        :table-data="tableData" :max-height="tableH" />
+        :limit="listQuery.size" :table-data="tableData" :max-height="tableH" />
     </div>
     <!-- <div class="containerBottom">
 
@@ -130,7 +130,6 @@ export default {
       currentMenu: '邯郸',
       end: undefined,
       title: '',
-      gridLeft:true,
       listQuery: {
         pageNo: 1,
         pageSize: 999,
@@ -223,10 +222,9 @@ export default {
         xData: [],
         yName: "单位/MW",
         yAxis: {
-          show: true,
           type: "value",
           name: "单位/MW",
-          // splitNumber: 4,
+          show: false,
           nameTextStyle: {
             fontSize: 12,
             align: "right",
@@ -241,10 +239,10 @@ export default {
         color: ["#8EF0AB", "#288AFF"],
         xData: [],
         yName: "单位/MW",
-        yAxis:{
+        yAxis:
+        {
           type: "value",
           name: "单位/MW",
-          // splitNumber: 4,
           nameTextStyle: {
             fontSize: 12,
             align: "right",
@@ -254,12 +252,13 @@ export default {
         series: [
           {
             name: "芯片总功率",
-            data: [],
+            data: [
+            ],
             type: "bar",
             barWidth: 20,
             label: {
               show: true,
-              position: [-30, -16],
+              position: [10, -16],
               color: "#68C483",
               formatter: function (params) {
                 return params.value
@@ -311,6 +310,13 @@ export default {
     },
     tableProps() {
       return [
+        {
+          prop: "factory",
+          label: "工厂名称",
+          // filter: (val) => factoryList[val],
+          minWidth: 200,
+          showOverflowtooltip: true,
+        },
         {
           prop: "item",
           label: "科目",
@@ -336,9 +342,6 @@ export default {
   },
   watch: {
     // 监听左侧菜单栏是否展开
-    currentMenu() {
-      this.getDataList()
-    },
     isOpen(val) {
       if (this.$route.name === "productionSituationMW") {
         this.chartNum++;
@@ -491,66 +494,36 @@ export default {
       this.chartMsgYearTarget.series[0].data = []
       this.chartMsgYearTarget.series[1].data = []
       console.log(this.listQuery);
-      if (!this.listQuery.startDate && !this.listQuery.endDate) {
-        return this.$message('请选择起止时间')
-      }
       let arr = []
       this.currentMenu === '邯郸' ? arr.push(1) : arr.push(0)
       this.listQuery.factory = arr
       const res = await getProductionSituationMWData(this.listQuery)
-      let maxData = []
-      res.data.list.forEach((ele, index) => {
-        let i = index + 1
-        // this.chartMsg.xData.push(ele.titleValue.replace(/[^\d]/g, " "))
-        this.otherProps.push({
-          label: ele.titleValue,
-          prop: 'value' + i
-        })
-      })
-      res.data.list.forEach((ele, index) => {
-        let i = index + 1
-        let m = 'value' + i
-        ele.productionSituationPowerDataVOList.forEach((item) => {
-          maxData.push(item.chipTotalPower, item.componentTotalPower)
-          this.dataArr[0]['' + m + ''] = item.chipTotalPower
-          // this.dataArr[3].factory = item.factory == 1 ? '邯郸' : '瑞昌'
-          this.dataArr[1]['' + m + ''] = item.componentTotalPower
-          // this.dataArr[3]['' + m + ''] = item.bipvProductOutput
-        })
-        // ele.titleValue
-        // .push({
-        //   label: ele.titleValue,
-        //   props: 'value' + index + 1,
-        // })
-      })
-      this.chartMsg.yAxis.max = Math.ceil(Math.max(...maxData) / 100) * 100
-      this.chartMsgTarget.yAxis.max = Math.ceil(Math.max(...maxData) / 100) * 100
-      this.chartMsg.yAxis.min = Math.ceil(Math.min(...maxData) / 100) * 100
-      this.chartMsgTarget.yAxis.min = Math.ceil(Math.min(...maxData) / 100) * 100
-      this.chartMsg.yAxis.interval = (this.chartMsg.yAxis.max - this.chartMsg.yAxis.min) / 4
-      this.chartMsgTarget.yAxis.interval = (this.chartMsgTarget.yAxis.max - this.chartMsgTarget.yAxis.min) / 4
       if (this.listQuery.type === 2) {
-        if (res.data.list.length === 3) {
+        console.log(res.data.list.slice(res.data.list.length - 2, res.data.list.length));
-          this.gridLeft = false
+        res.data.list.forEach((ele, index) => {
-        } else {
+          let i = index + 1
-          this.gridLeft = true
+          // this.chartMsg.xData.push(ele.titleValue.replace(/[^\d]/g, " "))
-        }
+          this.otherProps.push({
+            label: ele.titleValue,
+            prop: 'value' + i
+          })
+        })
         // res.data.list.forEach((ele) => {
-        res.data.list.slice(0, res.data.list.length - 3).forEach((ele, index) => {
+        res.data.list.slice(0, res.data.list.length - 2).forEach((ele, index) => {
           // let i = index + 1
-          this.chartMsg.xData.push(ele.titleValue.slice(0, ele.titleValue.length - 3))
+          this.chartMsg.xData.push(ele.titleValue.replace(/[^\d]/g, " "))
           ele.productionSituationPowerDataVOList.forEach((item) => {
             this.chartMsg.series[0].data.push({
               name: ele.titleValue,
-              value: item.chipTotalPower === 0 ? null : item.chipTotalPower
+              value: item.chipTotalPower
             })
             this.chartMsg.series[1].data.push({
               name: ele.titleValue,
-              value: item.componentTotalPower === 0 ? null : item.componentTotalPower
+              value: item.componentTotalPower
             })
           })
         })
-        this.chartMsgTarget.xData.push(res.data.list[res.data.list.length - 2].titleValue)
+        this.chartMsgTarget.xData.push(res.data.list[res.data.list.length - 2].titleValue.replace(/[^\d]/g, " "))
         // this.chartMsgTarget.series = [{
         //   name: "FTO投入",
         //   data: [
@@ -574,19 +547,98 @@ export default {
         let arr = []
         let chip = []
         let std = []
-        let obj = {}
-        let targetObj = {}
         res.data.list.slice(res.data.list.length - 3, res.data.list.length - 1).forEach((ele, index) => {
           console.log(ele.titleValue.search('目标'));
           // let i = index + 1
           // this.chartMsgTarget.xData.push(ele.titleValue)
           ele.productionSituationPowerDataVOList.forEach((item) => {
             if (ele.titleValue.search('目标') != -1) {
-              targetObj.chipTotalPower = item.chipTotalPower === 0 ? null : item.chipTotalPower
+              chip.push({
-              targetObj.componentTotalPower = item.componentTotalPower === 0 ? null : item.componentTotalPower
+                name: "芯片总功率目标值",
+                // barGap: '-100%',
+                stack: 'a',
+                data: [
+                  { name: "芯片总功率目标值", value: item.componentTotalPower },
+                  // { name: '芯片总功率目标值', value: 22 },
+                  // { name: "%", value: 21.66 },
+                  // { name: "%", value: 18.4 },
+                ],
+                type: "bar",
+                barWidth: 20,
+                // barGap: '-100%',
+                label: {
+                  show: true,
+                  position: [-18, -16],
+                  color: "rgba(104,196,131,.5)",
+                  formatter: function (params) {
+                    return params.value
+                  },
+                },
+              },)
+              std.push({
+                name: "标准组件总功率目标值",
+                stack: 'b',
+                data: [
+                  { name: "标准组件总功率目标值", value: item.componentYield },
+                  // { name: '标准组件总功率目标值', value: 23 },
+
+                  // { name: "%", value: 7.02 },
+                  // { name: "%", value: 80.2 },
+                ],
+                type: "bar",
+                barWidth: 20,
+                label: {
+                  show: true,
+                  position: [0, -16],
+                  color: "rgba(40,138,255,.5)",
+                  formatter: function (params) {
+                    return params.value
+                  },
+                },
+              })
             } else {
-              obj.chipTotalPower = item.chipTotalPower === 0 ? null : item.chipTotalPower
+              chip.unshift({
-              obj.componentTotalPower = item.componentTotalPower === 0 ? null : item.componentTotalPower
+                name: "芯片总功率完成值",
+                // barGap: '-100%',
+                stack: 'a',
+                data: [
+                  { name: "芯片总功率完成值", value: item.componentTotalPower },
+                  // { name: '芯片总功率完成值', value: 55 },
+                  // { name: "%", value: 21.66 },
+                  // { name: "%", value: 18.4 },
+                ],
+                type: "bar",
+                barWidth: 20,
+                // barGap: '-100%',
+                label: {
+                  show: true,
+                  position: [-18, -16],
+                  color: "rgba(104,196,131)",
+                  formatter: function (params) {
+                    return params.value
+                  },
+                },
+              },)
+              std.unshift({
+                name: "标准组件总功率完成值",
+                stack: 'b',
+                data: [
+                  { name: "标准组件总功率完成值", value: item.componentYield },
+                  // { name: '标准组件总功率完成值', value: 23 },
+                  // { name: "%", value: 7.02 },
+                  // { name: "%", value: 80.2 },
+                ],
+                type: "bar",
+                barWidth: 20,
+                label: {
+                  show: true,
+                  position: [0, -16],
+                  color: "rgba(40,138,255)",
+                  formatter: function (params) {
+                    return params.value
+                  },
+                },
+              })
             }
 
             // this.chartMsgTarget.series[1].data.push()
@@ -594,89 +646,7 @@ export default {
             // this.chartMsgTarget.series[3].data.push()
           })
         })
-        chip.push({
+        console.log('arr', arr)
-          name: "芯片总功率完成值",
-          // barGap: '-100%',
-          stack: 'a',
-          data: [
-            { name: "芯片总功率完成值", value: obj.chipTotalPower, titleValue: obj.chipTotalPower },
-            // { name: '芯片总功率完成值', value: 55 },
-            // { name: "%", value: 21.66 },
-            // { name: "%", value: 18.4 },
-          ],
-          type: "bar",
-          barWidth: 20,
-          // barGap: '-100%',
-          label: {
-            show: true,
-            position: [-18, -16],
-            color: "rgba(104,196,131)",
-            formatter: function (params) {
-              return params.value
-            },
-          },
-        }, {
-          name: "芯片总功率目标值",
-          // barGap: '-100%',
-          stack: 'a',
-          data: [
-            { name: "芯片总功率目标值", value: (targetObj.chipTotalPower - obj.chipTotalPower) > 0 ? (targetObj.chipTotalPower - obj.chipTotalPower) : null, titleValue: targetObj.chipTotalPower },
-            // { name: '芯片总功率目标值', value: 22 },
-            // { name: "%", value: 21.66 },
-            // { name: "%", value: 18.4 },
-          ],
-          type: "bar",
-          // barGap: '-100%',
-          label: {
-            show: true,
-            position: [-18, -16],
-            color: "rgba(104,196,131,.5)",
-            formatter: function (params) {
-              return params.value
-            },
-          },
-        })
-        std.push({
-          name: "标准组件总功率完成值",
-          stack: 'b',
-          data: [
-            { name: "标准组件总功率完成值", value: obj.componentTotalPower,titleValue:obj.componentTotalPower },
-            // { name: '标准组件总功率完成值', value: 23 },
-            // { name: "%", value: 7.02 },
-            // { name: "%", value: 80.2 },
-          ],
-          type: "bar",
-          barWidth: 20,
-          label: {
-            show: true,
-            position: [0, -16],
-            color: "rgba(40,138,255)",
-            formatter: function (params) {
-              return params.value
-            },
-          },
-        }, {
-          name: "标准组件总功率目标值",
-          stack: 'b',
-          data: [
-            { name: "标准组件总功率目标值", value: (targetObj.componentTotalPower - obj.componentTotalPower) > 0 ? (targetObj.componentTotalPower - obj.componentTotalPower) : null, titleValue: targetObj.componentTotalPower },
-            // { name: '标准组件总功率目标值', value: 23 },
-
-            // { name: "%", value: 7.02 },
-            // { name: "%", value: 80.2 },
-          ],
-          type: "bar",
-          barWidth: 20,
-          label: {
-            show: true,
-            position: [0, -16],
-            color: "rgba(40,138,255,.5)",
-            formatter: function (params) {
-              return params.value
-            },
-          },
-        })
-        console.log('arr', chip,std)
         this.chartMsgTarget.series = [...chip, ...std]
         // arr.forEach((ele) => {
 
@@ -688,33 +658,55 @@ export default {
           ele.productionSituationPowerDataVOList.forEach((item) => {
             this.chartMsgYearTarget.series[0].data.push({
               name: ele.titleValue,
-              value: item.chipTotalPower === 0 ? null : item.chipTotalPower
+              value: item.chipTotalPower
             })
             this.chartMsgYearTarget.series[1].data.push({
               name: ele.titleValue,
-              value: item.componentTotalPower === 0 ? null : item.componentTotalPower
+              value: item.componentTotalPower
             })
           })
         })
         // })
+        console.log(this.chartMsg.xData)
+        res.data.list.forEach((ele, index) => {
+          let i = index + 1
+          let m = 'value' + i
+          ele.productionSituationPowerDataVOList.forEach((item) => {
+            this.dataArr[0]['' + m + ''] = item.chipTotalPower
+            this.dataArr[0].factory = item.factory == 1 ? '邯郸' : '瑞昌'
+            this.dataArr[1].factory = item.factory == 1 ? '邯郸' : '瑞昌'
+            // this.dataArr[3].factory = item.factory == 1 ? '邯郸' : '瑞昌'
+            this.dataArr[1]['' + m + ''] = item.componentTotalPower
+            // this.dataArr[3]['' + m + ''] = item.bipvProductOutput
+          })
+          // ele.titleValue
+          // .push({
+          //   label: ele.titleValue,
+          //   props: 'value' + index + 1,
+          // })
+        })
       } else if (this.listQuery.type === 1 || this.listQuery.type === 0) {
-        if (res.data.list.length === 2) {
+        console.log(res.data.list.slice(res.data.list.length - 2, res.data.list.length));
-          this.gridLeft = false
+        res.data.list.forEach((ele, index) => {
-        } else {
+          let i = index + 1
-          this.gridLeft = true
+          // this.chartMsg.xData.push(ele.titleValue.replace(/[^\d]/g, " "))
-        }
+          this.otherProps.push({
+            label: ele.titleValue,
+            prop: 'value' + i
+          })
+        })
         // res.data.list.forEach((ele) => {
-        res.data.list.slice(0, res.data.list.length - 2).forEach((ele, index) => {
+        res.data.list.slice(0, res.data.list.length - 1).forEach((ele, index) => {
           // let i = index + 1
-          this.chartMsg.xData.push(ele.titleValue.slice(0, ele.titleValue.length - 3))
+          this.chartMsg.xData.push(ele.titleValue.replace(/[^\d]/g, " "))
           ele.productionSituationPowerDataVOList.forEach((item) => {
             this.chartMsg.series[0].data.push({
               name: ele.titleValue,
-              value: item.chipTotalPower === 0 ? null : item.chipTotalPower
+              value: item.chipTotalPower
             })
             this.chartMsg.series[1].data.push({
               name: ele.titleValue,
-              value: item.componentTotalPower === 0 ? null : item.componentTotalPower
+              value: item.componentTotalPower
             })
           })
         })
@@ -742,19 +734,98 @@ export default {
         let arr = []
         let chip = []
         let std = []
-        let obj = {}
+        res.data.list.slice(res.data.list.length - 1, res.data.list.length).forEach((ele, index) => {
-        let targetObj = {}
-        res.data.list.slice(res.data.list.length - 2, res.data.list.length).forEach((ele, index) => {
           console.log(ele.titleValue.search('目标'));
           // let i = index + 1
           // this.chartMsgTarget.xData.push(ele.titleValue)
           ele.productionSituationPowerDataVOList.forEach((item) => {
             if (ele.titleValue.search('目标') != -1) {
-              targetObj.chipTotalPower = item.chipTotalPower === 0 ? null : item.chipTotalPower
+              chip.push({
-              targetObj.componentTotalPower = item.componentTotalPower === 0 ? null : item.componentTotalPower
+                name: "芯片总功率目标值",
+                // barGap: '-100%',
+                stack: 'a',
+                data: [
+                  { name: "芯片总功率目标值", value: item.componentTotalPower },
+                  // { name: '芯片总功率目标值', value: 22 },
+                  // { name: "%", value: 21.66 },
+                  // { name: "%", value: 18.4 },
+                ],
+                type: "bar",
+                barWidth: 20,
+                // barGap: '-100%',
+                label: {
+                  show: true,
+                  position: [-18, -16],
+                  color: "rgba(104,196,131,.5)",
+                  formatter: function (params) {
+                    return params.value
+                  },
+                },
+              },)
+              std.push({
+                name: "标准组件总功率目标值",
+                stack: 'b',
+                data: [
+                  { name: "标准组件总功率目标值", value: item.componentYield },
+                  // { name: '标准组件总功率目标值', value: 23 },
+
+                  // { name: "%", value: 7.02 },
+                  // { name: "%", value: 80.2 },
+                ],
+                type: "bar",
+                barWidth: 20,
+                label: {
+                  show: true,
+                  position: [0, -16],
+                  color: "rgba(40,138,255,.5)",
+                  formatter: function (params) {
+                    return params.value
+                  },
+                },
+              })
             } else {
-              obj.chipTotalPower = item.chipTotalPower === 0 ? null : item.chipTotalPower
+              chip.unshift({
-              obj.componentTotalPower = item.componentTotalPower === 0 ? null : item.componentTotalPower
+                name: "芯片总功率完成值",
+                // barGap: '-100%',
+                stack: 'a',
+                data: [
+                  { name: "芯片总功率完成值", value: item.componentTotalPower },
+                  // { name: '芯片总功率完成值', value: 55 },
+                  // { name: "%", value: 21.66 },
+                  // { name: "%", value: 18.4 },
+                ],
+                type: "bar",
+                barWidth: 20,
+                // barGap: '-100%',
+                label: {
+                  show: true,
+                  position: [-18, -16],
+                  color: "rgba(104,196,131)",
+                  formatter: function (params) {
+                    return params.value
+                  },
+                },
+              },)
+              std.unshift({
+                name: "标准组件总功率完成值",
+                stack: 'b',
+                data: [
+                  { name: "标准组件总功率完成值", value: item.componentYield },
+                  // { name: '标准组件总功率完成值', value: 23 },
+                  // { name: "%", value: 7.02 },
+                  // { name: "%", value: 80.2 },
+                ],
+                type: "bar",
+                barWidth: 20,
+                label: {
+                  show: true,
+                  position: [0, -16],
+                  color: "rgba(40,138,255)",
+                  formatter: function (params) {
+                    return params.value
+                  },
+                },
+              })
             }
 
             // this.chartMsgTarget.series[1].data.push()
@@ -762,101 +833,57 @@ export default {
             // this.chartMsgTarget.series[3].data.push()
           })
         })
-        chip.push({
+        console.log('arr', arr)
-          name: "芯片总功率完成值",
+        this.chartMsgTarget.series = [...chip,...std]
-          // barGap: '-100%',
+        console.log(this.chartMsg.xData)
-          stack: 'a',
-          data: [
-            { name: "芯片总功率完成值", value: obj.chipTotalPower, titleValue: obj.chipTotalPower },
-            // { name: '芯片总功率完成值', value: 55 },
-            // { name: "%", value: 21.66 },
-            // { name: "%", value: 18.4 },
-          ],
-          type: "bar",
-          barWidth: 20,
-          // barGap: '-100%',
-          label: {
-            show: true,
-            position: [-18, -16],
-            color: "rgba(104,196,131)",
-            formatter: function (params) {
-              return params.value
-            },
-          },
-        }, {
-          name: "芯片总功率目标值",
-          // barGap: '-100%',
-          stack: 'a',
-          data: [
-            { name: "芯片总功率目标值", value: (targetObj.chipTotalPower - obj.chipTotalPower) > 0 ? (targetObj.chipTotalPower - obj.chipTotalPower) : null, titleValue: targetObj.chipTotalPower },
-            // { name: '芯片总功率目标值', value: 22 },
-            // { name: "%", value: 21.66 },
-            // { name: "%", value: 18.4 },
-          ],
-          type: "bar",
-          // barGap: '-100%',
-          label: {
-            show: true,
-            position: [-18, -16],
-            color: "rgba(104,196,131,.5)",
-            formatter: function (params) {
-              return params.value
-            },
-          },
-        })
-        std.push({
-          name: "标准组件总功率完成值",
-          stack: 'b',
-          data: [
-            { name: "标准组件总功率完成值", value: obj.componentTotalPower, titleValue: obj.componentTotalPower },
-            // { name: '标准组件总功率完成值', value: 23 },
-            // { name: "%", value: 7.02 },
-            // { name: "%", value: 80.2 },
-          ],
-          type: "bar",
-          barWidth: 20,
-          label: {
-            show: true,
-            position: [0, -16],
-            color: "rgba(40,138,255)",
-            formatter: function (params) {
-              return params.value
-            },
-          },
-        }, {
-          name: "标准组件总功率目标值",
-          stack: 'b',
-          data: [
-            { name: "标准组件总功率目标值", value: (targetObj.componentTotalPower - obj.componentTotalPower) > 0 ? (targetObj.componentTotalPower - obj.componentTotalPower) : null, titleValue: targetObj.componentTotalPower },
-            // { name: '标准组件总功率目标值', value: 23 },
-
-            // { name: "%", value: 7.02 },
-            // { name: "%", value: 80.2 },
-          ],
-          type: "bar",
-          barWidth: 20,
-          label: {
-            show: true,
-            position: [0, -16],
-            color: "rgba(40,138,255,.5)",
-            formatter: function (params) {
-              return params.value
-            },
-          },
-        })
-        console.log('arr', chip, std)
-        this.chartMsgTarget.series = [...chip, ...std]
-      } else {
         res.data.list.forEach((ele, index) => {
+          let i = index + 1
+          let m = 'value' + i
+          ele.productionSituationPowerDataVOList.forEach((item) => {
+            this.dataArr[0]['' + m + ''] = item.chipTotalPower
+            this.dataArr[0].factory = item.factory == 1 ? '邯郸' : '瑞昌'
+            this.dataArr[1].factory = item.factory == 1 ? '邯郸' : '瑞昌'
+            // this.dataArr[3].factory = item.factory == 1 ? '邯郸' : '瑞昌'
+            this.dataArr[1]['' + m + ''] = item.componentTotalPower
+          })
+          // ele.titleValue
+          // .push({
+          //   label: ele.titleValue,
+          //   props: 'value' + index + 1,
+          // })
+        })
+      } else {
+        // if (this.currentMenu !== '瑞昌') {
+        res.data.list.forEach((ele, index) => {
+          let i = index + 1
           this.chartMsg.xData.push(ele.titleValue)
+          this.otherProps.push({
+            label: ele.titleValue,
+            prop: 'value' + i
+          })
+        })
+        console.log(this.otherProps)
+        res.data.list.forEach((ele, index) => {
+          let i = index + 1
+          let m = 'value' + i
+          ele.productionSituationPowerDataVOList.forEach((item) => {
+            this.dataArr[0]['' + m + ''] = item.chipTotalPower
+            this.dataArr[0].factory = item.factory == 1 ? '邯郸' : '瑞昌'
+            this.dataArr[1].factory = item.factory == 1 ? '邯郸' : '瑞昌'
+            this.dataArr[1]['' + m + ''] = item.componentTotalPower
+          })
+          // ele.titleValue
+          // .push({
+          //   label: ele.titleValue,
+          //   props: 'value' + index + 1,
+          // })
         })
         for (let i in this.dataArr[0]) {
-          console.log(this.dataArr[0]['item']);
           this.chartMsg.series[0].name = this.dataArr[0]['item']
           if (i.search('value') === 0) {
             this.chartMsg.series[0].data.push({
               name: this.dataArr[0]['item'],
-              value: this.dataArr[0][i] === 0 ? null : this.dataArr[0][i]
+              value: this.dataArr[0][i]
             })
           }
         }
@@ -865,7 +892,7 @@ export default {
           if (i.search('value') === 0) {
             this.chartMsg.series[1].data.push({
               name: this.dataArr[1]['item'],
-              value: this.dataArr[1][i] === 0 ? null : this.dataArr[1][i]
+              value: this.dataArr[1][i]
             })
           }
         }

src/views/report/productionYield.vue

@@ -84,7 +84,7 @@
             :chartMsg="chartMsgYearTarget" :chartId=" 'yearData'" :chartNum="chartNum" />
         </el-col> -->
       </el-row>
-      <base-table :key="showTable" :table-props="tableProps" :page="listQuery.current"
+      <base-table :key="showTable" :span-method="objectSpanMethod" :table-props="tableProps" :page="listQuery.current"
         :limit="listQuery.size" :table-data="tableData" :max-height="tableH" />
     </div>
     <!-- <div class="containerBottom">
@@ -173,14 +173,6 @@ export default {
           {
             type: "value",
             name: "单位/片",
-            splitNumber: 4,
-            // min: function (value) {//取最小值向下取整为最小刻度
-            //   return Math.floor(value.min)
-            // },
-            // max: function (value) {//取最大值向上取整为最大刻度
-            //   return Math.ceil(value.max)
-            // },
-            alignTicks: true,
             nameTextStyle: {
               fontSize: 12,
               align: "right",
@@ -190,12 +182,6 @@ export default {
           {
             type: 'value',
             // inverse: true,
-            alignTicks: true,
-            // min: 0,
-            // max: 100,
-            // scale: true,
-            // interval: 25,//间隔
-            splitNumber: 4,
             name: "单位/%",
             nameTextStyle: {
               fontSize: 12,
@@ -246,15 +232,6 @@ export default {
           {
             type: "value",
             name: "单位/片",
-            // min: function (value) {//取最小值向下取整为最小刻度
-            //   return Math.floor(value.min)
-            // },
-            // max: function (value) {//取最大值向上取整为最大刻度
-            //   return Math.ceil(value.max)
-            // },
-            alignTicks:true,
-            // splitNumber: 4,
-            // scale: true,
             nameTextStyle: {
               fontSize: 12,
               align: "right",
@@ -265,12 +242,6 @@ export default {
             type: 'value',
             // inverse: true,
             name: "单位/%",
-            alignTicks: true,
-            // min: 0,
-            // max:100,
-            // scale: true,
-            // interval: 25,//间隔
-            splitNumber: 4,
             nameTextStyle: {
               fontSize: 12,
               align: "right",
@@ -285,13 +256,12 @@ export default {
             data: [],
             type: "bar",
             barWidth: 20,
-            yAxisIndex: 0,
             label: {
               show: true,
               position: [-18, -16],
               color: "#68C483",
               formatter: function (params) {
-                return params.value
+                return params.value + "片";
               },
             },
           },
@@ -299,7 +269,6 @@ export default {
             name: "",
             // yAxisIndex: 0,
             data: [],
-            yAxisIndex: 0,
             type: "bar",
             barWidth: 20,
             label: {
@@ -307,7 +276,7 @@ export default {
               position: [0, -16],
               color: "#288AFF",
               formatter: function (params) {
-                return params.value
+                return params.value + "片";
               },
             },
           },
@@ -316,14 +285,13 @@ export default {
               // yAxisIndex: 0,
             data: [],
             type: "bar",
-            yAxisIndex: 0,
             barWidth: 20,
             label: {
               show: true,
               position: [0, -16],
               color: "#64BDFF",
               formatter: function (params) {
-                return params.value
+                return params.value+ "片";
               },
             },
           },
@@ -339,7 +307,7 @@ export default {
               show: true,
               color: "#FFAE17",
               formatter: function (params) {
-                return params.value.toFixed(2)
+                return params.value.toFixed(2) + "%";
               },
             },
           },
@@ -358,6 +326,13 @@ export default {
   computed: {
     tableProps() {
       return [
+        {
+          prop: "factory",
+          label: "工厂名称",
+          // filter: (val) => factoryList[val],
+          minWidth: 200,
+          showOverflowtooltip: true,
+        },
         {
           prop: "item",
           label: "科目",
@@ -388,9 +363,6 @@ export default {
     // 监听左侧菜单栏是否展开
     type(val) {
 
-    },
-    currentMenu() {
-      this.getDataList()
     },
     isOpen(val) {
       if (this.$route.name === "productionYield") {
@@ -540,12 +512,8 @@ export default {
       this.chartMsg.series[1].data = []
       this.chartMsg.series[2].data = []
       this.chartMsg.series[3].data = []
-      this.chartMsgYearTarget.xData = []
       this.chartMsgYearTarget.series[0].data = []
       this.chartMsgYearTarget.series[1].data = []
-      if (!this.listQuery.startDate && !this.listQuery.endDate) {
-        return this.$message('请选择起止时间')
-      }
       let arr = []
       this.currentMenu === '邯郸' ? arr.push(1) : arr.push(0)
       this.listQuery.factory = arr
@@ -653,6 +621,10 @@ export default {
           let m = 'value' + i
           ele.productYieldDataVOList.forEach((item) => {
             dataArr[0]['' + m + ''] = item.ftoInput
+            dataArr[0].factory = item.factory == 1 ? '邯郸' : '瑞昌'
+            dataArr[1].factory = item.factory == 1 ? '邯郸' : '瑞昌'
+            dataArr[2].factory = item.factory == 1 ? '邯郸' : '瑞昌'
+            dataArr[3].factory = item.factory == 1 ? '邯郸' : '瑞昌'
             dataArr[1]['' + m + ''] = item.chipYield
             dataArr[2]['' + m + ''] = item.componentYield
             dataArr[3]['' + m + ''] = item.comprehensiveYieldRate
@@ -663,7 +635,7 @@ export default {
           if (i.search('value') === 0) {
             this.chartMsg.series[0].data.push({
               name: dataArr[0]['item'],
-              value: dataArr[0][i] === 0 ? null : dataArr[0][i]
+              value: dataArr[0][i]
             })
           }
         }
@@ -672,7 +644,7 @@ export default {
           if (i.search('value') === 0) {
             this.chartMsg.series[1].data.push({
               name: dataArr[1]['item'],
-              value: dataArr[1][i] === 0 ? null : dataArr[1][i]
+              value: dataArr[1][i]
             })
           }
         }
@@ -681,7 +653,7 @@ export default {
           if (i.search('value') === 0) {
             this.chartMsg.series[2].data.push({
               name: dataArr[2]['item'],
-              value: dataArr[2][i] === 0 ? null : dataArr[2][i]
+              value: dataArr[2][i]
             })
           }
         }
@@ -690,7 +662,7 @@ export default {
           if (i.search('value') === 0) {
             this.chartMsg.series[3].data.push({
               name: dataArr[3]['item'],
-              value: dataArr[3][i] === 0 ? null : dataArr[3][i]
+              value: dataArr[3][i]
             })
           }
         }
@@ -723,7 +695,7 @@ export default {
           if (i.search('value') === 0) {
             this.chartMsg.series[0].data.push({
               name: dataArr[0]['item'],
-              value: dataArr[0][i] === 0 ? null : dataArr[0][i]
+              value: dataArr[0][i]
             })
           }
         }
@@ -732,7 +704,7 @@ export default {
           if (i.search('value') === 0) {
             this.chartMsg.series[1].data.push({
               name: dataArr[1]['item'],
-              value: dataArr[1][i] === 0 ? null : dataArr[1][i]
+              value: dataArr[1][i]
             })
           }
         }
@@ -741,7 +713,7 @@ export default {
           if (i.search('value') === 0) {
             this.chartMsg.series[2].data.push({
               name: dataArr[2]['item'],
-              value: dataArr[2][i] === 0 ? null : dataArr[2][i]
+              value: dataArr[2][i]
             })
           }
         }
@@ -750,7 +722,7 @@ export default {
           if (i.search('value') === 0) {
             this.chartMsg.series[3].data.push({
               name: dataArr[3]['item'],
-              value: dataArr[3][i] === 0 ? null : dataArr[3][i]
+              value: dataArr[3][i]
             })
           }
         }