From c8bc54e04bc93ff4ca945c854e5fac55429f83d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98937886381=E2=80=99?= <‘937886381@qq.com’>
Date: Wed, 19 Jun 2024 16:25:50 +0800
Subject: [PATCH 01/12] =?UTF-8?q?=E6=8A=A5=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/report/index.js                       |  19 +-
 .../report/components/produceLineBar.vue      | 220 ++++++++++++
 src/views/report/comprehensiveData.vue        |  19 +-
 src/views/report/produceConversion.vue        | 257 ++++++++------
 src/views/report/productionSituationMW.vue    | 175 ++++-----
 .../report/productionSituationTablets.vue     | 186 ++++++----
 src/views/report/productionYield.vue          | 336 ++++++++++++------
 7 files changed, 812 insertions(+), 400 deletions(-)
 create mode 100644 src/views/report/components/produceLineBar.vue

diff --git a/src/api/report/index.js b/src/api/report/index.js
index 8571ad5..9c6ea60 100644
--- a/src/api/report/index.js
+++ b/src/api/report/index.js
@@ -1,7 +1,7 @@
 /*
  * @Author: zhp
  * @Date: 2024-06-17 09:41:03
- * @LastEditTime: 2024-06-18 13:47:36
+ * @LastEditTime: 2024-06-19 13:30:14
  * @LastEditors: zhp
  * @Description:
  */
@@ -21,3 +21,20 @@ export function getProduceTransData(data) {
     data: data
   })
 }
+
+
+export function getProduceSituationData(data) {
+   return request({
+    url: 'ip/production/situation/get/production/situation',
+    method: 'post',
+    data: data
+  })
+}
+
+export function getProductionSituationMWData(data) {
+   return request({
+    url: 'ip/production/situation/power/get/production/situation',
+    method: 'post',
+    data: data
+  })
+}
diff --git a/src/views/report/components/produceLineBar.vue b/src/views/report/components/produceLineBar.vue
new file mode 100644
index 0000000..19a58f0
--- /dev/null
+++ b/src/views/report/components/produceLineBar.vue
@@ -0,0 +1,220 @@
+<!--
+ * @Author: zhp
+ * @Date: 2024-06-19 15:28:34
+ * @LastEditTime: 2024-06-19 15:28:34
+ * @LastEditors: zhp
+ * @Description:
+-->
+<template>
+  <div>
+    <!-- 暂无数据 -->
+    <div
+      class="no-data-bg"
+      style="position: relative; left: 50%; transform: translateX(-50%)"
+      v-show="this.chartMsg.series.length === 0"
+    ></div>
+    <!-- 图例 -->
+    <div v-show="this.chartMsg.series.length > 0">
+      <div class="legend">
+        <span class="item" v-for="item in legendList" :key="item.id">
+          <span
+            v-if="item.type === 1"
+            class="block"
+            :style="{ backgroundColor: item.color }"
+          ></span>
+          <span
+            v-if="item.type === 2"
+            class="line"
+            :style="{ backgroundColor: item.color }"
+          >
+            <span
+              class="line-block"
+              :style="{ backgroundColor: item.color }"
+            ></span>
+          </span>
+          {{ item.name }}</span
+        >
+      </div>
+      <div
+        :id="chartId"
+        :style="{ width: '100%', height: chartHeight + 'px' }"
+      ></div>
+    </div>
+  </div>
+</template>
+<script>
+import * as echarts from "echarts";
+import { debounce } from "@/utils/debounce";
+export default {
+  name: "bmLineBar",
+  data() {
+    return {
+      myChart: "",
+      option: {
+        color: [],
+        // color: ["#8EF0AB", "#63BDFF", "#288AFF"],
+        grid: {
+          left: 100,
+          right: 10,
+          bottom: 30,
+          top: 30,
+        },
+        tooltip: {
+          trigger: "axis",
+          axisPointer: {
+            // type: "cross",
+            crossStyle: {
+              color: "rgba(237,237,237,0.5)",
+            },
+          },
+          formatter: function (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 +=
+                "<br/>" +
+                `<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].name === "%"
+                    ? (params[i].value ? params[i].value.toFixed(2) : 0.0) +
+                      params[i].name
+                    : params[i].value
+                }</span>`;
+            }
+            return res;
+          },
+        },
+        xAxis: {
+          type: "category",
+          data: [],
+          axisTick: {
+            show: false,
+          },
+          axisPointer: {
+            type: "shadow",
+          },
+        },
+        yAxis: {
+          type: "value",
+          name: "",
+          nameTextStyle: {
+            fontSize: 12,
+            align: "right",
+          },
+          axisLabel: {},
+        },
+        series: [],
+      },
+    };
+  },
+  props: {
+    chartHeight: {
+      type: Number,
+      default: 300,
+    },
+    legendList: {
+      type: Array,
+      default: () => [],
+    },
+    chartMsg: {
+      type: Object,
+      default: () => {},
+    },
+    chartId: {
+      type: String,
+      default: "bmChart",
+    },
+    chartNum: {
+      type: Number,
+      default: 1,
+    },
+  },
+  watch: {
+    chartHeight: {
+      handler(newVal) {
+        this.chartHeight = newVal;
+      },
+    },
+    chartNum(val) {
+      this.canvasReset();
+    },
+    chartMsg: {
+      handler(newVal) {
+        this.canvasReset();
+      },
+      deep: true,
+    },
+  },
+  mounted() {
+    this.canvasReset();
+  },
+  methods: {
+    canvasReset() {
+      debounce(() => {
+        this.getMes();
+      }, 500)();
+    },
+    getMes() {
+      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.yAxis.name = this.chartMsg.yName;
+      if (
+        this.chartMsg.series.length > 0 &&
+        this.chartMsg.series[0].data[0].name === "%"
+      ) {
+        this.option.yAxis.axisLabel = {
+          formatter: function (value) {
+            return value + ".00%";
+          },
+        };
+      } else {
+        this.option.yAxis.axisLabel = {
+          formatter: function (value) {
+            return value;
+          },
+        };
+      }
+      // this.option.yAxis.axisLabel = this.chartMsg.yAxisLabel;
+      this.option.series = this.chartMsg.series;
+      this.myChart.setOption(this.option);
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.legend {
+  text-align: right;
+  .item {
+    display: inline-block;
+    margin-right: 10px;
+    font-size: 14px;
+    color: #8c8c8c;
+    .block {
+      width: 10px;
+      height: 10px;
+      display: inline-block;
+      margin-right: 4px;
+    }
+    .line {
+      width: 10px;
+      height: 10px;
+      border-radius: 5px;
+      display: inline-block;
+      margin-right: 4px;
+      position: relative;
+      .line-block {
+        position: absolute;
+        width: 20px;
+        height: 2px;
+        left: -5px;
+        top: 4px;
+      }
+    }
+  }
+}
+</style>
diff --git a/src/views/report/comprehensiveData.vue b/src/views/report/comprehensiveData.vue
index 73a9f68..7d2b818 100644
--- a/src/views/report/comprehensiveData.vue
+++ b/src/views/report/comprehensiveData.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-04-15 10:49:13
- * @LastEditTime: 2024-06-18 13:41:03
+ * @LastEditTime: 2024-06-19 09:35:25
  * @LastEditors: zhp
  * @Description:
 -->
@@ -21,7 +21,7 @@
         </el-form-item>
         <el-form-item v-show="listQuery.type === 0 || listQuery.type === ''" label="时间范围" prop="reportTime">
           <el-date-picker size="small" clearable v-model="listQuery.reportTime" type="daterange" range-separator="至"
-            start-placeholder="开始日期" value-format="yyyy-MM-dd HH:mm:ss" @change="changeDayTime" end-placeholder="结束日期">
+            start-placeholder="开始日期" value-format="yyyy-MM-dd" @change="changeDayTime" end-placeholder="结束日期">
           </el-date-picker>
         </el-form-item>
         <el-form-item v-show="listQuery.type === 1" label="时间范围" prop="reportTime">
@@ -34,9 +34,8 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item v-show="listQuery.type === 2" label="时间值" prop="reportTime">
-          <el-date-picker size="small" v-model="listQuery.reportTime" type="monthrange"
-            value-format="yyyy-MM-DD HH:mm:ss" range-separator="至" start-placeholder="开始月份" end-placeholder="结束月份"
-            @change="changeTime">
+          <el-date-picker size="small" v-model="listQuery.reportTime" type="monthrange" value-format="yyyy-MM-DD"
+            range-separator="至" start-placeholder="开始月份" end-placeholder="结束月份" @change="changeTime">
           </el-date-picker>
         </el-form-item>
         <el-form-item v-show="listQuery.type === 3" label="时间值" prop="reportTime">
@@ -100,9 +99,11 @@ export default {
       start: undefined,
       end: undefined,
       listQuery: {
+        pageNo: 1,
+        pageSize: 999,
         // size: 10,
         // current: 1,
-        factory: null,
+        factory: undefined,
         // total: 0,
         type: 2,
         startDate: undefined,
@@ -236,7 +237,7 @@ export default {
   mounted() {
     // this.getOverView()
     const currentMonth = new Date()
-    this.listQuery.reportTime = [moment(currentMonth).format('yyyy-MM-DD HH:mm:ss'), moment(currentMonth).format('yyyy-MM-DD HH:mm:ss')]
+    this.listQuery.reportTime = [moment(currentMonth).format('yyyy-MM-DD'), moment(currentMonth).format('yyyy-MM-DD')]
     this.changeTime()
     this.getDataList()
   },
@@ -294,8 +295,8 @@ export default {
     },
     onValueChange(picker, k) { // 选中近k周后触发的操作
       if (this.start && this.end) {
-        this.date1 = moment(this.start.getTime() - 24 * 60 * 60 * 1000).format('YYYY-MM-DD HH:mm:ss')
-        this.date2 = moment(this.end.getTime() + 5 * 24 * 60 * 60 * 1000).format('YYYY-MM-DD HH:mm:ss')
+        this.date1 = moment(this.start.getTime() - 24 * 60 * 60 * 1000).format('YYYY-MM-DD')
+        this.date2 = moment(this.end.getTime() + 5 * 24 * 60 * 60 * 1000).format('YYYY-MM-DD')
         const numDays = (new Date(this.date2).getTime() - new Date(this.date1).getTime()) / (24 * 3600 * 1000);
         if (numDays > 168) {
           console.log(numDays)
diff --git a/src/views/report/produceConversion.vue b/src/views/report/produceConversion.vue
index f8e9637..1e76b70 100644
--- a/src/views/report/produceConversion.vue
+++ b/src/views/report/produceConversion.vue
@@ -7,17 +7,17 @@
     <div class="containerTop">
       <el-form :model="listQuery" :inline="true" ref="dataForm" class="blueTip">
         <el-form-item label="时间维度" prop="date">
-          <el-select size="small" clearable v-model="listQuery.date" placeholder="请选择">
+          <el-select size="small" clearable v-model="listQuery.type" placeholder="请选择">
             <el-option v-for="item in timeList" :key="item.value" :label="item.label" :value="item.value">
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item v-show="listQuery.date === 0 || listQuery.type === ''" label="时间范围" prop="reportTime">
+        <el-form-item v-show="listQuery.type === 0 || listQuery.type === ''" label="时间范围" prop="reportTime">
           <el-date-picker size="small" clearable v-model="listQuery.reportTime" type="daterange" range-separator="至"
-            start-placeholder="开始日期" value-format="yyyy-MM-dd HH:mm:ss" @change="changeDayTime" end-placeholder="结束日期">
+            start-placeholder="开始日期" value-format="yyyy-MM-dd" @change="changeDayTime" end-placeholder="结束日期">
           </el-date-picker>
         </el-form-item>
-        <el-form-item v-show="listQuery.date === 1" label="时间范围" prop="reportTime">
+        <el-form-item v-show="listQuery.type === 1" label="时间范围" prop="reportTime">
           <el-date-picker size="small" clearable v-model="start" type="week" format="yyyy 第 WW 周" placeholder="选择周"
             style="width: 180px" @change="onValueChange">
           </el-date-picker>
@@ -29,13 +29,12 @@
             {{ date1 }} 至 {{ date2 }}，共 {{ weekNum }} 周
           </span> -->
         </el-form-item>
-        <el-form-item v-show="listQuery.date === 2" label="时间值" prop="reportTime">
-          <el-date-picker size="small" v-model="listQuery.reportTime" type="monthrange"
-            value-format="yyyy-MM-DD HH:mm:ss" range-separator="至" start-placeholder="开始月份" end-placeholder="结束月份"
-            @change="changeTime">
+        <el-form-item v-show="listQuery.type === 2" label="时间值" prop="reportTime">
+          <el-date-picker size="small" v-model="listQuery.reportTime" type="monthrange" value-format="yyyy-MM-DD"
+            range-separator="至" start-placeholder="开始月份" end-placeholder="结束月份" @change="changeTime">
           </el-date-picker>
         </el-form-item>
-        <el-form-item v-show="listQuery.date === 3" label="时间值" prop="reportTime">
+        <el-form-item v-show="listQuery.type === 3" label="时间值" prop="reportTime">
           <el-date-picker size="small" clearable v-model="listQuery.reportTime[0]" value-format="yyyy" type="year"
             placeholder="开始时间">
           </el-date-picker>
@@ -79,65 +78,28 @@
 </template>
 
 <script>
+import { getProduceSituationData } from '@/api/report';
 import bmSearchBar from "./components/bmSearchBar.vue";
 import BmLineBar from "./components/bmLineBar.vue";
 import ButtonNav from '@/components/ButtonNav'
 import moment from 'moment'
-import { getProduceTransData } from '@/api/report';
-const tableProps = [
-  {
-    prop: "factory",
-    label: "玻璃类型",
-    // filter: (val) => factoryList[val],
-    minWidth: 200,
-    showOverflowtooltip: true,
-  },
-  {
-    prop: "name",
-    label: "科目",
-    minWidth: 120,
-    showOverflowtooltip: true,
-  },
-  {
-    prop: "unit",
-    label: "单位",
-    minWidth: 80,
-    showOverflowtooltip: true,
-  },
-  {
-    prop: "time1",
-    label: "时间1",
-    minWidth: 150,
-    showOverflowtooltip: true,
-  },
-  {
-    prop: "time2",
-    label: "时间2",
-    minWidth: 150,
-    showOverflowtooltip: true,
-  },
-  {
-    prop: "mubiao",
-    label: "目标值",
-    minWidth: 150,
-    showOverflowtooltip: true,
-  },
-];
 export default {
   name: "ChipYieldBM",
   data() {
     return {
-      tableProps,
+      otherProps: [],
       start: undefined,
       end: undefined,
       listQuery: {
+        pageNo: 1,
+        pageSize: 999,
         // size: 10,
         // current: 1,
-        factorys: null,
+        factory: null,
         // total: 0,
-        date: 2,
-        beginTime: undefined,
-        endTime: undefined,
+        type: 2,
+        startDate: undefined,
+        endDate: undefined,
         reportTime: []
       },
       timeList: [
@@ -158,35 +120,7 @@ export default {
           label: '年'
         }
       ],
-      tableData: [
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-      ],
+      tableData: [],
       chartHeight: this.tableHeight(137) / 2 - 111,
       tableH: this.tableHeight(137) / 2 - 70,
       legendList: [
@@ -265,6 +199,31 @@ export default {
     ButtonNav
   },
   computed: {
+    tableProps() {
+      return [
+        {
+          prop: "factory",
+          label: "工厂名称",
+          // filter: (val) => factoryList[val],
+          minWidth: 200,
+          showOverflowtooltip: true,
+        },
+        {
+          prop: "item",
+          label: "科目",
+          // filter: (val) => factoryList[val],
+          minWidth: 200,
+          showOverflowtooltip: true,
+        },
+        {
+          prop: "unit",
+          label: "单位",
+          minWidth: 120,
+          showOverflowtooltip: true,
+        },
+        ...this.otherProps
+      ]
+    },
     weekNum() {
       return Math.round((this.end - this.start) / (24 * 60 * 60 * 1000 * 7)) + 1
     },
@@ -297,7 +256,7 @@ export default {
   mounted() {
     // this.getOverView()
     const currentMonth = new Date()
-    this.listQuery.reportTime = [moment(currentMonth).format('yyyy-MM-DD HH:mm:ss'), moment(currentMonth).format('yyyy-MM-DD HH:mm:ss')]
+    this.listQuery.reportTime = [moment(currentMonth).format('yyyy-MM-DD'), moment(currentMonth).format('yyyy-MM-DD')]
     this.changeTime()
     this.getDataList()
   },
@@ -320,13 +279,13 @@ export default {
           this.start = undefined
           this.end = undefined
         } else {
-          this.listQuery.beginTime = Number(this.start)
-          this.listQuery.endTime = Number(this.end)
+          this.listQuery.startDate = Number(this.start)
+          this.listQuery.endDate = Number(this.end)
         }
       }
       if (!this.start && !this.end) {
-        this.listQuery.beginTime = undefined
-        this.listQuery.endTime = undefined
+        this.listQuery.startDate = undefined
+        this.listQuery.endDate = undefined
       }
       // console.log(e);
     },
@@ -345,18 +304,18 @@ export default {
           });
           this.listQuery.reportTime = [];
         } else {
-          this.listQuery.beginTime = this.listQuery.reportTime[0]
-          this.listQuery.endTime = this.listQuery.reportTime[1]
+          this.listQuery.startDate = this.listQuery.reportTime[0]
+          this.listQuery.endDate = this.listQuery.reportTime[1]
         }
       } else {
-        this.listQuery.beginTime = undefined
-        this.listQuery.endTime = undefined
+        this.listQuery.startDate = undefined
+        this.listQuery.endDate = undefined
       }
     },
     onValueChange(picker, k) { // 选中近k周后触发的操作
       if (this.start && this.end) {
-        this.date1 = moment(this.start.getTime() - 24 * 60 * 60 * 1000).format('YYYY-MM-DD HH:mm:ss')
-        this.date2 = moment(this.end.getTime() + 5 * 24 * 60 * 60 * 1000).format('YYYY-MM-DD HH:mm:ss')
+        this.date1 = moment(this.start.getTime() - 24 * 60 * 60 * 1000).format('YYYY-MM-DD')
+        this.date2 = moment(this.end.getTime() + 5 * 24 * 60 * 60 * 1000).format('YYYY-MM-DD')
         const numDays = (new Date(this.date2).getTime() - new Date(this.date1).getTime()) / (24 * 3600 * 1000);
         if (numDays > 168) {
           console.log(numDays)
@@ -365,15 +324,15 @@ export default {
             type: 'warning'
           });
         } else {
-          this.listQuery.beginTime = this.date1
-          this.listQuery.endTime = this.date2
-          // this.listQuery.beginTime = Number(moment(this.start.getTime()).format('YYYYWW'))
-          // this.listQuery.endTime = Number(moment(this.end.getTime()).format('YYYYWW'))
+          this.listQuery.startDate = this.date1
+          this.listQuery.endDate = this.date2
+          // this.listQuery.startDate = Number(moment(this.start.getTime()).format('YYYYWW'))
+          // this.listQuery.endDate = Number(moment(this.end.getTime()).format('YYYYWW'))
         }
       }
       if (!this.start && !this.end) {
-        this.listQuery.beginTime = undefined
-        this.listQuery.endTime = undefined
+        this.listQuery.startDate = undefined
+        this.listQuery.endDate = undefined
       }
     },
     changeDayTime() {
@@ -386,12 +345,12 @@ export default {
           });
           this.listQuery.reportTime = [];
         } else {
-          this.listQuery.beginTime = this.listQuery.reportTime[0]
-          this.listQuery.endTime = this.listQuery.reportTime[1]
+          this.listQuery.startDate = this.listQuery.reportTime[0]
+          this.listQuery.endDate = this.listQuery.reportTime[1]
         }
       } else {
-        this.listQuery.beginTime = undefined
-        this.listQuery.endTime = undefined
+        this.listQuery.startDate = undefined
+        this.listQuery.endDate = undefined
       }
     },
     getOverView() {
@@ -408,21 +367,89 @@ export default {
       });
     },
     async getDataList() {
+      this.otherProps = []
+      this.xData = []
       console.log(this.listQuery);
-      if (this.listQuery.date == 3) {
-        this.listQuery.beginTime = this.listQuery.reportTime[0] + '-01-01 00:00:00'
-        this.listQuery.endTime = this.listQuery.reportTime[1] + '-12-31 23:59:59'
+      if (this.listQuery.type == 3) {
+        this.listQuery.startDate = this.listQuery.reportTime[0]
+        this.listQuery.endDate = this.listQuery.reportTime[1]
       }
       let arr = []
-      this.currentMenu === '邯郸' ? arr.push(1) : arr.push(2)
-      this.listQuery.factorys = arr
-      const res = await getProduceTransData(this.listQuery)
-      this.tableData = res.data.list
+      this.currentMenu === '邯郸' ? arr.push(1) : arr.push(0)
+      this.listQuery.factory = arr
+      const res = await getProduceSituationData(this.listQuery)
+      let dataArr = [{
+        factory: null,
+        item: 'FTO投入',
+        unit: '片'
+      },
+      {
+        factory: null,
+        item: '芯片产量',
+        unit: '片'
+      },
+      {
+        factory: null,
+        item: '标准组件产量',
+        unit: '片'
+      },
+      {
+        factory: null,
+        item: '综合良率',
+        unit: '%'
+        },]
+      res.data.list.forEach((ele, index) => {
+        let i = index + 1
+        ele.titleValue
+        this.xData.push(ele.titleValue)
+        this.otherProps.push({
+          label: ele.titleValue,
+          props: 'value' + i
+        })
+      })
+      console.log(this.otherProps)
+      res.data.list.forEach((ele, index) => {
+        let i = index + 1
+        let m = 'value' + i
+        ele.productionSituationDataVOList.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
+        })
+        // ele.titleValue
+        // .push({
+        //   label: ele.titleValue,
+        //   props: 'value' + index + 1,
+        // })
+      })
+      // this.tableProps = otherProps
+      // res.data.list.forEach((ele) => {
+      //   console.log(ele);
+      //   ele.productionSituationDataVOList.forEach((item) => {
+      //     let obj = {
+      //       bipvProductOutput: item.bipvProductOutput,
+      //       chipYield: item.chipYield,
+      //       componentYield: item.componentYield,
+      //       factory: item.factory,
+      //       ftoInput: item.ftoInput,
+      //       titleValue:ele.titleValue
+      //     }
+      //     dataArr.push(obj)
+      //   })
+      // })
+      console.log(dataArr)
+      this.tableData = dataArr
+      // this.tableProps.push()
       this.listQuery.total = res.data.total
       if (this.listQuery.total > 0) {
         this.tableData.forEach(item => {
-          item.startTime = item.beginTime ? item.beginTime[0] + '-' + item.beginTime[1] + '-' + item.beginTime[2] : '--'
-          item.endTime = item.endTime ? item.endTime[0] + '-' + item.endTime[1] + '-' + item.endTime[2] : '--'
+          item.startTime = item.startDate ? item.startDate[0] + '-' + item.startDate[1] + '-' + item.startDate[2] : '--'
+          item.endTime = item.endDate ? item.endDate[0] + '-' + item.endDate[1] + '-' + item.endDate[2] : '--'
         })
       }
     },
@@ -452,7 +479,8 @@ export default {
   padding: 16px 16px 0 16px;
   margin-bottom: 8px;
 }
-.containerTop{
+
+.containerTop {
   height: calc((100vh - 170px));
   background-color: #fff;
   border-radius: 8px;
@@ -469,6 +497,7 @@ export default {
   margin-right: 8PX;
   margin-top: 8px;
 }
+
 .containerTop {
   margin-top: 8px;
 
diff --git a/src/views/report/productionSituationMW.vue b/src/views/report/productionSituationMW.vue
index 23906a7..b432c4f 100644
--- a/src/views/report/productionSituationMW.vue
+++ b/src/views/report/productionSituationMW.vue
@@ -14,7 +14,7 @@
         </el-form-item>
         <el-form-item v-show="listQuery.type === 0 || listQuery.type === ''" label="时间范围" prop="reportTime">
           <el-date-picker size="small" clearable v-model="listQuery.reportTime" type="daterange" range-separator="至"
-            start-placeholder="开始日期" value-format="yyyy-MM-dd HH:mm:ss" @change="changeDayTime" end-placeholder="结束日期">
+            start-placeholder="开始日期" value-format="yyyy-MM-dd" @change="changeDayTime" end-placeholder="结束日期">
           </el-date-picker>
         </el-form-item>
         <el-form-item v-show="listQuery.type === 1" label="时间范围" prop="reportTime">
@@ -30,9 +30,8 @@
           </span> -->
         </el-form-item>
         <el-form-item v-show="listQuery.type === 2" label="时间值" prop="reportTime">
-          <el-date-picker size="small" v-model="listQuery.reportTime" type="monthrange"
-            value-format="yyyy-MM-DD HH:mm:ss" range-separator="至" start-placeholder="开始月份" end-placeholder="结束月份"
-            @change="changeTime">
+          <el-date-picker size="small" v-model="listQuery.reportTime" type="monthrange" value-format="yyyy-MM-DD"
+            range-separator="至" start-placeholder="开始月份" end-placeholder="结束月份" @change="changeTime">
           </el-date-picker>
         </el-form-item>
         <el-form-item v-show="listQuery.type === 3" label="时间值" prop="reportTime">
@@ -79,57 +78,21 @@
 </template>
 
 <script>
+import { getProductionSituationMWData } from '@/api/report';
 import bmSearchBar from "./components/bmSearchBar.vue";
 import BmLineBar from "./components/bmLineBar.vue";
 import ButtonNav from '@/components/ButtonNav'
 import moment from 'moment'
-const tableProps = [
-  {
-    prop: "factory",
-    label: "玻璃类型",
-    // filter: (val) => factoryList[val],
-    minWidth: 200,
-    showOverflowtooltip: true,
-  },
-  {
-    prop: "name",
-    label: "科目",
-    minWidth: 120,
-    showOverflowtooltip: true,
-  },
-  {
-    prop: "unit",
-    label: "单位",
-    minWidth: 80,
-    showOverflowtooltip: true,
-  },
-  {
-    prop: "time1",
-    label: "时间1",
-    minWidth: 150,
-    showOverflowtooltip: true,
-  },
-  {
-    prop: "time2",
-    label: "时间2",
-    minWidth: 150,
-    showOverflowtooltip: true,
-  },
-  {
-    prop: "mubiao",
-    label: "目标值",
-    minWidth: 150,
-    showOverflowtooltip: true,
-  },
-];
 export default {
   name: "ChipYieldBM",
   data() {
     return {
-      tableProps,
+      otherProps: [],
       start: undefined,
       end: undefined,
       listQuery: {
+        pageNo: 1,
+        pageSize: 999,
         // size: 10,
         // current: 1,
         factory: null,
@@ -157,35 +120,7 @@ export default {
           label: '年'
         }
       ],
-      tableData: [
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-      ],
+      tableData: [],
       chartHeight: this.tableHeight(137) / 2 - 111,
       tableH: this.tableHeight(137) / 2 - 70,
       legendList: [
@@ -264,6 +199,31 @@ export default {
     ButtonNav
   },
   computed: {
+    tableProps() {
+      return [
+        {
+          prop: "factory",
+          label: "工厂名称",
+          // filter: (val) => factoryList[val],
+          minWidth: 200,
+          showOverflowtooltip: true,
+        },
+        {
+          prop: "item",
+          label: "科目",
+          // filter: (val) => factoryList[val],
+          minWidth: 200,
+          showOverflowtooltip: true,
+        },
+        {
+          prop: "unit",
+          label: "单位",
+          minWidth: 120,
+          showOverflowtooltip: true,
+        },
+        ...this.otherProps
+      ]
+    },
     weekNum() {
       return Math.round((this.end - this.start) / (24 * 60 * 60 * 1000 * 7)) + 1
     },
@@ -296,7 +256,7 @@ export default {
   mounted() {
     // this.getOverView()
     const currentMonth = new Date()
-    this.listQuery.reportTime = [moment(currentMonth).format('yyyy-MM-DD HH:mm:ss'), moment(currentMonth).format('yyyy-MM-DD HH:mm:ss')]
+    this.listQuery.reportTime = [moment(currentMonth).format('yyyy-MM-DD'), moment(currentMonth).format('yyyy-MM-DD')]
     this.changeTime()
     this.getDataList()
   },
@@ -354,8 +314,8 @@ export default {
     },
     onValueChange(picker, k) { // 选中近k周后触发的操作
       if (this.start && this.end) {
-        this.date1 = moment(this.start.getTime() - 24 * 60 * 60 * 1000).format('YYYY-MM-DD HH:mm:ss')
-        this.date2 = moment(this.end.getTime() + 5 * 24 * 60 * 60 * 1000).format('YYYY-MM-DD HH:mm:ss')
+        this.date1 = moment(this.start.getTime() - 24 * 60 * 60 * 1000).format('YYYY-MM-DD')
+        this.date2 = moment(this.end.getTime() + 5 * 24 * 60 * 60 * 1000).format('YYYY-MM-DD')
         const numDays = (new Date(this.date2).getTime() - new Date(this.date1).getTime()) / (24 * 3600 * 1000);
         if (numDays > 168) {
           console.log(numDays)
@@ -407,14 +367,67 @@ export default {
       });
     },
     async getDataList() {
+      this.otherProps = []
       console.log(this.listQuery);
       if (this.listQuery.type == 3) {
-        this.listQuery.startDate = this.listQuery.reportTime[0] + '-01-01 00:00:00'
-        this.listQuery.endDate = this.listQuery.reportTime[1] + '-12-31 23:59:59'
+        this.listQuery.startDate = this.listQuery.reportTime[0]
+        this.listQuery.endDate = this.listQuery.reportTime[1]
       }
-      this.listQuery.factory = this.currentMenu === '邯郸' ? 1 : 2
-      const res = await getComprehensiveDataPage(this.listQuery)
-      this.tableData = res.data.list
+      let arr = []
+      this.currentMenu === '邯郸' ? arr.push(1) : arr.push(0)
+      this.listQuery.factory = arr
+      const res = await getProductionSituationMWData(this.listQuery)
+      let dataArr = [{
+        factory: null,
+        item: '芯片总功率',
+        unit: 'MW'
+      },
+      {
+        factory: null,
+        item: '标准组件总功率',
+        unit: 'MW'
+      }]
+      res.data.list.forEach((ele, index) => {
+        let i = index + 1
+        this.otherProps.push({
+          label: ele.titleValue,
+          props: 'value' + i
+        })
+      })
+      console.log(this.otherProps)
+      res.data.list.forEach((ele, index) => {
+        let i = index + 1
+        let m = 'value' + i
+        ele.productionSituationPowerDataVOList.forEach((item) => {
+          dataArr[0]['' + m + ''] = item.chipTotalPower
+          dataArr[0].factory = item.factory === 1 ? '邯郸' : '瑞昌'
+          dataArr[1].factory = item.factory === 1 ? '邯郸' : '瑞昌'
+          dataArr[1]['' + m + ''] = item.componentTotalPower
+        })
+        // ele.titleValue
+        // .push({
+        //   label: ele.titleValue,
+        //   props: 'value' + index + 1,
+        // })
+      })
+      // this.tableProps = otherProps
+      // res.data.list.forEach((ele) => {
+      //   console.log(ele);
+      //   ele.productionSituationDataVOList.forEach((item) => {
+      //     let obj = {
+      //       bipvProductOutput: item.bipvProductOutput,
+      //       chipYield: item.chipYield,
+      //       componentYield: item.componentYield,
+      //       factory: item.factory,
+      //       ftoInput: item.ftoInput,
+      //       titleValue:ele.titleValue
+      //     }
+      //     dataArr.push(obj)
+      //   })
+      // })
+      console.log(dataArr)
+      this.tableData = dataArr
+      // this.tableProps.push()
       this.listQuery.total = res.data.total
       if (this.listQuery.total > 0) {
         this.tableData.forEach(item => {
diff --git a/src/views/report/productionSituationTablets.vue b/src/views/report/productionSituationTablets.vue
index 23906a7..42c482f 100644
--- a/src/views/report/productionSituationTablets.vue
+++ b/src/views/report/productionSituationTablets.vue
@@ -14,7 +14,7 @@
         </el-form-item>
         <el-form-item v-show="listQuery.type === 0 || listQuery.type === ''" label="时间范围" prop="reportTime">
           <el-date-picker size="small" clearable v-model="listQuery.reportTime" type="daterange" range-separator="至"
-            start-placeholder="开始日期" value-format="yyyy-MM-dd HH:mm:ss" @change="changeDayTime" end-placeholder="结束日期">
+            start-placeholder="开始日期" value-format="yyyy-MM-dd" @change="changeDayTime" end-placeholder="结束日期">
           </el-date-picker>
         </el-form-item>
         <el-form-item v-show="listQuery.type === 1" label="时间范围" prop="reportTime">
@@ -31,7 +31,7 @@
         </el-form-item>
         <el-form-item v-show="listQuery.type === 2" label="时间值" prop="reportTime">
           <el-date-picker size="small" v-model="listQuery.reportTime" type="monthrange"
-            value-format="yyyy-MM-DD HH:mm:ss" range-separator="至" start-placeholder="开始月份" end-placeholder="结束月份"
+            value-format="yyyy-MM-DD" range-separator="至" start-placeholder="开始月份" end-placeholder="结束月份"
             @change="changeTime">
           </el-date-picker>
         </el-form-item>
@@ -79,57 +79,21 @@
 </template>
 
 <script>
+import { getProduceSituationData } from '@/api/report';
 import bmSearchBar from "./components/bmSearchBar.vue";
 import BmLineBar from "./components/bmLineBar.vue";
 import ButtonNav from '@/components/ButtonNav'
 import moment from 'moment'
-const tableProps = [
-  {
-    prop: "factory",
-    label: "玻璃类型",
-    // filter: (val) => factoryList[val],
-    minWidth: 200,
-    showOverflowtooltip: true,
-  },
-  {
-    prop: "name",
-    label: "科目",
-    minWidth: 120,
-    showOverflowtooltip: true,
-  },
-  {
-    prop: "unit",
-    label: "单位",
-    minWidth: 80,
-    showOverflowtooltip: true,
-  },
-  {
-    prop: "time1",
-    label: "时间1",
-    minWidth: 150,
-    showOverflowtooltip: true,
-  },
-  {
-    prop: "time2",
-    label: "时间2",
-    minWidth: 150,
-    showOverflowtooltip: true,
-  },
-  {
-    prop: "mubiao",
-    label: "目标值",
-    minWidth: 150,
-    showOverflowtooltip: true,
-  },
-];
 export default {
   name: "ChipYieldBM",
   data() {
     return {
-      tableProps,
+      otherProps:[],
       start: undefined,
       end: undefined,
       listQuery: {
+        pageNo: 1,
+        pageSize:999,
         // size: 10,
         // current: 1,
         factory: null,
@@ -157,35 +121,7 @@ export default {
           label: '年'
         }
       ],
-      tableData: [
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-      ],
+      tableData: [],
       chartHeight: this.tableHeight(137) / 2 - 111,
       tableH: this.tableHeight(137) / 2 - 70,
       legendList: [
@@ -264,6 +200,31 @@ export default {
     ButtonNav
   },
   computed: {
+    tableProps() {
+      return [
+        {
+          prop: "factory",
+          label: "工厂名称",
+          // filter: (val) => factoryList[val],
+          minWidth: 200,
+          showOverflowtooltip: true,
+        },
+        {
+          prop: "item",
+          label: "科目",
+          // filter: (val) => factoryList[val],
+          minWidth: 200,
+          showOverflowtooltip: true,
+        },
+        {
+          prop: "unit",
+          label: "单位",
+          minWidth: 120,
+          showOverflowtooltip: true,
+        },
+        ...this.otherProps
+      ]
+    },
     weekNum() {
       return Math.round((this.end - this.start) / (24 * 60 * 60 * 1000 * 7)) + 1
     },
@@ -296,7 +257,7 @@ export default {
   mounted() {
     // this.getOverView()
     const currentMonth = new Date()
-    this.listQuery.reportTime = [moment(currentMonth).format('yyyy-MM-DD HH:mm:ss'), moment(currentMonth).format('yyyy-MM-DD HH:mm:ss')]
+    this.listQuery.reportTime = [moment(currentMonth).format('yyyy-MM-DD'), moment(currentMonth).format('yyyy-MM-DD')]
     this.changeTime()
     this.getDataList()
   },
@@ -354,8 +315,8 @@ export default {
     },
     onValueChange(picker, k) { // 选中近k周后触发的操作
       if (this.start && this.end) {
-        this.date1 = moment(this.start.getTime() - 24 * 60 * 60 * 1000).format('YYYY-MM-DD HH:mm:ss')
-        this.date2 = moment(this.end.getTime() + 5 * 24 * 60 * 60 * 1000).format('YYYY-MM-DD HH:mm:ss')
+        this.date1 = moment(this.start.getTime() - 24 * 60 * 60 * 1000).format('YYYY-MM-DD')
+        this.date2 = moment(this.end.getTime() + 5 * 24 * 60 * 60 * 1000).format('YYYY-MM-DD')
         const numDays = (new Date(this.date2).getTime() - new Date(this.date1).getTime()) / (24 * 3600 * 1000);
         if (numDays > 168) {
           console.log(numDays)
@@ -407,14 +368,81 @@ export default {
       });
     },
     async getDataList() {
+      this.otherProps = []
       console.log(this.listQuery);
       if (this.listQuery.type == 3) {
-        this.listQuery.startDate = this.listQuery.reportTime[0] + '-01-01 00:00:00'
-        this.listQuery.endDate = this.listQuery.reportTime[1] + '-12-31 23:59:59'
+        this.listQuery.startDate = this.listQuery.reportTime[0]
+        this.listQuery.endDate = this.listQuery.reportTime[1]
       }
-      this.listQuery.factory = this.currentMenu === '邯郸' ? 1 : 2
-      const res = await getComprehensiveDataPage(this.listQuery)
-      this.tableData = res.data.list
+      let arr = []
+      this.currentMenu === '邯郸' ? arr.push(1) : arr.push(0)
+      this.listQuery.factory = arr
+      const res = await getProduceSituationData(this.listQuery)
+      let dataArr = [{
+        factory: null,
+        item: 'FTO投入',
+        unit: '片'
+      },
+        {
+          factory: null,
+          item: '芯片产量',
+          unit: '片'
+        },
+        {
+          factory: null,
+          item: '标准组件产量',
+          unit: '片'
+        },
+        {
+          factory: null,
+          item: 'BIPV产量',
+          unit: 'm2'
+        },]
+      res.data.list.forEach((ele, index) => {
+        let i = index +1
+        this.otherProps.push({
+          label: ele.titleValue,
+          props: 'value' + i
+        })
+      })
+      console.log(this.otherProps)
+      res.data.list.forEach((ele, index) => {
+        let i = index + 1
+        let m = 'value' + i
+        ele.productionSituationDataVOList.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.bipvProductOutput
+        })
+        // ele.titleValue
+        // .push({
+        //   label: ele.titleValue,
+        //   props: 'value' + index + 1,
+        // })
+      })
+      // this.tableProps = otherProps
+      // res.data.list.forEach((ele) => {
+      //   console.log(ele);
+      //   ele.productionSituationDataVOList.forEach((item) => {
+      //     let obj = {
+      //       bipvProductOutput: item.bipvProductOutput,
+      //       chipYield: item.chipYield,
+      //       componentYield: item.componentYield,
+      //       factory: item.factory,
+      //       ftoInput: item.ftoInput,
+      //       titleValue:ele.titleValue
+      //     }
+      //     dataArr.push(obj)
+      //   })
+      // })
+      console.log(dataArr)
+      this.tableData = dataArr
+      // this.tableProps.push()
       this.listQuery.total = res.data.total
       if (this.listQuery.total > 0) {
         this.tableData.forEach(item => {
diff --git a/src/views/report/productionYield.vue b/src/views/report/productionYield.vue
index 23906a7..d6aaf38 100644
--- a/src/views/report/productionYield.vue
+++ b/src/views/report/productionYield.vue
@@ -14,7 +14,7 @@
         </el-form-item>
         <el-form-item v-show="listQuery.type === 0 || listQuery.type === ''" label="时间范围" prop="reportTime">
           <el-date-picker size="small" clearable v-model="listQuery.reportTime" type="daterange" range-separator="至"
-            start-placeholder="开始日期" value-format="yyyy-MM-dd HH:mm:ss" @change="changeDayTime" end-placeholder="结束日期">
+            start-placeholder="开始日期" value-format="yyyy-MM-dd" @change="changeDayTime" end-placeholder="结束日期">
           </el-date-picker>
         </el-form-item>
         <el-form-item v-show="listQuery.type === 1" label="时间范围" prop="reportTime">
@@ -30,9 +30,8 @@
           </span> -->
         </el-form-item>
         <el-form-item v-show="listQuery.type === 2" label="时间值" prop="reportTime">
-          <el-date-picker size="small" v-model="listQuery.reportTime" type="monthrange"
-            value-format="yyyy-MM-DD HH:mm:ss" range-separator="至" start-placeholder="开始月份" end-placeholder="结束月份"
-            @change="changeTime">
+          <el-date-picker size="small" v-model="listQuery.reportTime" type="monthrange" value-format="yyyy-MM-DD"
+            range-separator="至" start-placeholder="开始月份" end-placeholder="结束月份" @change="changeTime">
           </el-date-picker>
         </el-form-item>
         <el-form-item v-show="listQuery.type === 3" label="时间值" prop="reportTime">
@@ -67,8 +66,14 @@
       <!-- <div class="smallTitle">产量转化效率</div> -->
 
       <!-- <bmSearchBar @getSearch="getSearch" @handleExport="handleExport" /> -->
-      <bm-line-bar :chartHeight="chartHeight" :legendList="legendList" :chartMsg="chartMsg" :chartId="chartId"
-        :chartNum="chartNum" />
+      <el-col :span="16">
+        <bm-line-bar :chartHeight="chartHeight" :legendList="legendList" :chartMsg="chartMsg" :chartId="chartId"
+          :chartNum="chartNum" />
+      </el-col>
+      <el-col :span="8">
+        <bm-line-bar :chartHeight="chartHeight" :legendList="legendList" :chartMsg="chartMsg" :chartId=" 'yearChart' "
+          :chartNum="chartNum" />
+      </el-col>
       <base-table :table-props="tableProps" :page="listQuery.current" :limit="listQuery.size" :table-data="tableData"
         :max-height="tableH" />
     </div>
@@ -79,57 +84,21 @@
 </template>
 
 <script>
-import bmSearchBar from "./components/bmSearchBar.vue";
+import { getProduceSituationData } from '@/api/report';
+import bmSearchBar from "./components/produceLineBar.vue";
 import BmLineBar from "./components/bmLineBar.vue";
 import ButtonNav from '@/components/ButtonNav'
 import moment from 'moment'
-const tableProps = [
-  {
-    prop: "factory",
-    label: "玻璃类型",
-    // filter: (val) => factoryList[val],
-    minWidth: 200,
-    showOverflowtooltip: true,
-  },
-  {
-    prop: "name",
-    label: "科目",
-    minWidth: 120,
-    showOverflowtooltip: true,
-  },
-  {
-    prop: "unit",
-    label: "单位",
-    minWidth: 80,
-    showOverflowtooltip: true,
-  },
-  {
-    prop: "time1",
-    label: "时间1",
-    minWidth: 150,
-    showOverflowtooltip: true,
-  },
-  {
-    prop: "time2",
-    label: "时间2",
-    minWidth: 150,
-    showOverflowtooltip: true,
-  },
-  {
-    prop: "mubiao",
-    label: "目标值",
-    minWidth: 150,
-    showOverflowtooltip: true,
-  },
-];
 export default {
   name: "ChipYieldBM",
   data() {
     return {
-      tableProps,
+      otherProps: [],
       start: undefined,
       end: undefined,
       listQuery: {
+        pageNo: 1,
+        pageSize: 999,
         // size: 10,
         // current: 1,
         factory: null,
@@ -157,89 +126,63 @@ export default {
           label: '年'
         }
       ],
-      tableData: [
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-        { factory: "工厂1" },
-      ],
+      tableData: [],
       chartHeight: this.tableHeight(137) / 2 - 111,
       tableH: this.tableHeight(137) / 2 - 70,
       legendList: [
-        { id: 1, name: "2024年4月目标值", type: 2, color: "#FFCE6A" },
-        { id: 2, name: "2023年4月", type: 1, color: "#8EF0AB" },
-        { id: 3, name: "2024年4月", type: 1, color: "#288AFF" },
+        {
+          id: 1, name: "综合良率", type: 2, color: "#FFCE6A" },
+        { id: 2, name: "标准组件产量", type: 1, color: "#8EF0AB" },
+        { id: 3, name: "芯片产量", type: 1, color: "#288AFF" },
+        { id: 3, name: "fto投入", type: 1, color: "#64BDFF" },
       ],
       chartMsg: {
-        color: ["#FFCE6A", "#8EF0AB", "#288AFF"],
-        xData: ["成都", "邯郸", "瑞昌"],
+        color: ['#64BDFF', "#8EF0AB", "#288AFF", "#FFCE6A",],
+        xData: [],
         yName: "单位/%",
         series: [
           {
-            name: "2024年4月目标值",
+            name: "",
             data: [
-              { name: "%", value: 85 },
-              { name: "%", value: 85 },
-              { name: "%", value: 85 },
-            ],
-            type: "line",
-            symbol: "circle",
-            symbolSize: 6,
-            label: {
-              show: true,
-              color: "#FFAE17",
-              formatter: function (params) {
-                return params.value.toFixed(2) + "%";
-              },
-            },
-          },
-          {
-            name: "2023年4月",
-            data: [
-              { name: "%", value: 57.5 },
-              { name: "%", value: 21.66 },
-              { name: "%", value: 18.4 },
+              // { name: "%", value: 57.5 },
+              // { name: "%", value: 21.66 },
+              // { name: "%", value: 18.4 },
             ],
             type: "bar",
             barWidth: 20,
             label: {
               show: true,
               position: [-18, -16],
-              color: "#68C483",
+              color: "#64BDFF",
               formatter: function (params) {
                 return params.value.toFixed(2) + "%";
               },
             },
           },
           {
-            name: "2024年4月",
+            name: "",
             data: [
-              { name: "%", value: 23.33 },
-              { name: "%", value: 7.02 },
-              { name: "%", value: 80.2 },
+              // { name: "%", value: 23.33 },
+              // { name: "%", value: 7.02 },
+              // { name: "%", value: 80.2 },
+            ],
+            type: "bar",
+            barWidth: 20,
+            label: {
+              show: true,
+              position: [0, -16],
+              color: "#8EF0AB",
+              formatter: function (params) {
+                return params.value.toFixed(2) + "%";
+              },
+            },
+          },
+          {
+            name: "",
+            data: [
+              // { name: "%", value: 23.33 },
+              // { name: "%", value: 7.02 },
+              // { name: "%", value: 80.2 },
             ],
             type: "bar",
             barWidth: 20,
@@ -252,6 +195,24 @@ export default {
               },
             },
           },
+          {
+            name: "",
+            data: [
+              // { name: "%", value: 85 },
+              // { name: "%", value: 85 },
+              // { name: "%", value: 85 },
+            ],
+            type: "line",
+            symbol: "circle",
+            symbolSize: 6,
+            label: {
+              show: true,
+              color: "#FFAE17",
+              formatter: function (params) {
+                return params.value.toFixed(2) + "%";
+              },
+            },
+          },
         ],
       },
       chartId: "chipYieldBMChart",
@@ -264,6 +225,31 @@ export default {
     ButtonNav
   },
   computed: {
+    tableProps() {
+      return [
+        {
+          prop: "factory",
+          label: "工厂名称",
+          // filter: (val) => factoryList[val],
+          minWidth: 200,
+          showOverflowtooltip: true,
+        },
+        {
+          prop: "item",
+          label: "科目",
+          // filter: (val) => factoryList[val],
+          minWidth: 200,
+          showOverflowtooltip: true,
+        },
+        {
+          prop: "unit",
+          label: "单位",
+          minWidth: 120,
+          showOverflowtooltip: true,
+        },
+        ...this.otherProps
+      ]
+    },
     weekNum() {
       return Math.round((this.end - this.start) / (24 * 60 * 60 * 1000 * 7)) + 1
     },
@@ -296,7 +282,7 @@ export default {
   mounted() {
     // this.getOverView()
     const currentMonth = new Date()
-    this.listQuery.reportTime = [moment(currentMonth).format('yyyy-MM-DD HH:mm:ss'), moment(currentMonth).format('yyyy-MM-DD HH:mm:ss')]
+    this.listQuery.reportTime = [moment(currentMonth).format('yyyy-MM-DD'), moment(currentMonth).format('yyyy-MM-DD')]
     this.changeTime()
     this.getDataList()
   },
@@ -354,8 +340,8 @@ export default {
     },
     onValueChange(picker, k) { // 选中近k周后触发的操作
       if (this.start && this.end) {
-        this.date1 = moment(this.start.getTime() - 24 * 60 * 60 * 1000).format('YYYY-MM-DD HH:mm:ss')
-        this.date2 = moment(this.end.getTime() + 5 * 24 * 60 * 60 * 1000).format('YYYY-MM-DD HH:mm:ss')
+        this.date1 = moment(this.start.getTime() - 24 * 60 * 60 * 1000).format('YYYY-MM-DD')
+        this.date2 = moment(this.end.getTime() + 5 * 24 * 60 * 60 * 1000).format('YYYY-MM-DD')
         const numDays = (new Date(this.date2).getTime() - new Date(this.date1).getTime()) / (24 * 3600 * 1000);
         if (numDays > 168) {
           console.log(numDays)
@@ -407,14 +393,132 @@ export default {
       });
     },
     async getDataList() {
+      this.otherProps = []
+      this.chartMsg.xData = []
       console.log(this.listQuery);
       if (this.listQuery.type == 3) {
-        this.listQuery.startDate = this.listQuery.reportTime[0] + '-01-01 00:00:00'
-        this.listQuery.endDate = this.listQuery.reportTime[1] + '-12-31 23:59:59'
+        this.listQuery.startDate = this.listQuery.reportTime[0]
+        this.listQuery.endDate = this.listQuery.reportTime[1]
       }
-      this.listQuery.factory = this.currentMenu === '邯郸' ? 1 : 2
-      const res = await getComprehensiveDataPage(this.listQuery)
-      this.tableData = res.data.list
+      let arr = []
+      this.currentMenu === '邯郸' ? arr.push(1) : arr.push(0)
+      this.listQuery.factory = arr
+      const res = await getProduceSituationData(this.listQuery)
+      let dataArr = [{
+        factory: null,
+        item: 'FTO投入',
+        unit: '片'
+      },
+      {
+        factory: null,
+        item: '芯片产量',
+        unit: '片'
+      },
+      {
+        factory: null,
+        item: '标准组件产量',
+        unit: '片'
+      },
+      {
+        factory: null,
+        item: '综合良率',
+        unit: '%'
+      },]
+      res.data.list.forEach((ele, index) => {
+        let i = index + 1
+        this.chartMsg.xData.push(ele.titleValue)
+        this.otherProps.push({
+          label: ele.titleValue,
+          props: 'value' + i
+        })
+      })
+      console.log(this.otherProps)
+      res.data.list.forEach((ele, index) => {
+        let i = index + 1
+        let m = 'value' + i
+        ele.productionSituationDataVOList.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
+        })
+        // ele.titleValue
+        // .push({
+        //   label: ele.titleValue,
+        //   props: 'value' + index + 1,
+        // })
+      })
+      // this.tableProps = otherProps
+      // res.data.list.forEach((ele) => {
+      //   console.log(ele);
+      //   ele.productionSituationDataVOList.forEach((item) => {
+      //     let obj = {
+      //       bipvProductOutput: item.bipvProductOutput,
+      //       chipYield: item.chipYield,
+      //       componentYield: item.componentYield,
+      //       factory: item.factory,
+      //       ftoInput: item.ftoInput,
+      //       titleValue:ele.titleValue
+      //     }
+      //     dataArr.push(obj)
+      //   })
+      // })
+      for (let i in dataArr[0]) {
+        // console.log(i.search('value'))
+        // dataArr.forEach((ele) => {
+        this.chartMsg.series[0].name = dataArr[0]['item']
+        if (i.search('value') === 0) {
+          this.chartMsg.series[0].data.push({
+            name: dataArr[0]['item'],
+            value: dataArr[0][i]
+          })
+        }
+        // })
+      }
+      for (let i in dataArr[1]) {
+        // console.log(i.search('value'))
+        // dataArr.forEach((ele) => {
+        this.chartMsg.series[1].name = dataArr[1]['item']
+        if (i.search('value') === 0) {
+          this.chartMsg.series[1].data.push({
+            name: dataArr[1]['item'],
+            value: dataArr[1][i]
+          })
+        }
+        // })
+      }
+      for (let i in dataArr[2]) {
+        // console.log(i.search('value'))
+        // dataArr.forEach((ele) => {
+        this.chartMsg.series[2].name = dataArr[2]['item']
+        if (i.search('value') === 0) {
+          this.chartMsg.series[2].data.push({
+            name: dataArr[2]['item'],
+            value: dataArr[2][i]
+          })
+        }
+        // })
+      }
+      for (let i in dataArr[3]) {
+        // console.log(i.search('value'))
+        // dataArr.forEach((ele) => {
+        this.chartMsg.series[3].name = dataArr[3]['item']
+        if (i.search('value') === 0) {
+          this.chartMsg.series[3].data.push({
+            name: dataArr[3]['item'],
+            value: dataArr[3][i]
+          })
+        }
+        // })
+      }
+      console.log(this.chartMsg.series)
+      console.log(dataArr)
+      this.tableData = dataArr
+      // this.tableProps.push()
       this.listQuery.total = res.data.total
       if (this.listQuery.total > 0) {
         this.tableData.forEach(item => {

From 0e60ba7dc8ea6dd7c4d998d86843cb158226c493 Mon Sep 17 00:00:00 2001
From: juzi <819872918@qq.com>
Date: Thu, 20 Jun 2024 17:07:57 +0800
Subject: [PATCH 02/12] 1

---
 .../report/completionStatusIntrBM/index.vue   | 41 +++++++++++--------
 1 file changed, 24 insertions(+), 17 deletions(-)

diff --git a/src/views/report/completionStatusIntrBM/index.vue b/src/views/report/completionStatusIntrBM/index.vue
index f83fcb7..bf6b3e5 100644
--- a/src/views/report/completionStatusIntrBM/index.vue
+++ b/src/views/report/completionStatusIntrBM/index.vue
@@ -249,44 +249,51 @@ export default {
     resetMsg() {
       this.tableProps = this.tableProps1;
       this.tableData = [];
-      this.chartMsg = {
-        color: ["#FFCE6A", "#8EF0AB", "#288AFF"],
+      this.chartMsg1 = {
+        color: ["#288AFF33", "#288AFF"],
         xData: [],
-        yName: "单位/片",
+        yName: "单位/MW",
         series: [
           {
             name: "1",
             data: [],
-            type: "line",
-            symbol: "circle",
-            symbolSize: 6,
-            label: {
-              show: true,
-              color: "#FFAE17",
-            },
+            type: "bar",
+            barWidth: 20,
           },
           {
             name: "2",
             data: [],
             type: "bar",
             barWidth: 20,
+            barGap: "-100%",
             label: {
               show: true,
-              // position: [-5, -16],
-              // position: [-5, -16],
-              position: [-10, -16],
-              // position: [-17, -16],
-              color: "#68C483",
+              position: "top",
+              color: "#288AFF",
             },
           },
+        ],
+      };
+      this.chartMsg2 = {
+        color: ["#288AFF33", "#288AFF"],
+        xData: [],
+        yName: "单位/㎡",
+        series: [
           {
-            name: "3",
+            name: "1",
             data: [],
             type: "bar",
             barWidth: 20,
+          },
+          {
+            name: "2",
+            data: [],
+            type: "bar",
+            barWidth: 20,
+            barGap: "-100%",
             label: {
               show: true,
-              position: [0, -16],
+              position: "top",
               color: "#288AFF",
             },
           },

From 6be1a83dd8564b46a868d4361a690a1f7c687568 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98937886381=E2=80=99?= <‘937886381@qq.com’>
Date: Thu, 20 Jun 2024 20:38:11 +0800
Subject: [PATCH 03/12] =?UTF-8?q?=E6=8A=A5=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/report/index.js                       |   61 +-
 .../report/components/produceLineBar.vue      |  151 ++-
 .../components/produceLineBarTarget.vue       |  252 ++++
 .../components/produceLineBarYearTarget.vue   |  245 ++++
 src/views/report/comprehensiveData.vue        |  284 +++--
 src/views/report/produceConversion.vue        |  450 ++++++--
 src/views/report/productionSituationMW.vue    |  819 ++++++++++---
 .../report/productionSituationTablets.vue     | 1020 +++++++++++++++--
 src/views/report/productionYield.vue          |  551 ++++++---
 9 files changed, 3165 insertions(+), 668 deletions(-)
 create mode 100644 src/views/report/components/produceLineBarTarget.vue
 create mode 100644 src/views/report/components/produceLineBarYearTarget.vue

diff --git a/src/api/report/index.js b/src/api/report/index.js
index 9c6ea60..1cde283 100644
--- a/src/api/report/index.js
+++ b/src/api/report/index.js
@@ -1,7 +1,7 @@
 /*
  * @Author: zhp
  * @Date: 2024-06-17 09:41:03
- * @LastEditTime: 2024-06-19 13:30:14
+ * @LastEditTime: 2024-06-20 15:39:21
  * @LastEditors: zhp
  * @Description:
  */
@@ -9,11 +9,21 @@ import request from '@/utils/request'
 export function getComprehensiveDataPage(data) {
   return request({
     url: 'ip/comprehensive/data/get/comprehensive/data',
-    method: 'get',
-    params: data
+    method: 'post',
+    data: data
   })
 }
 
+export function exportComprehensiveDataPage(data) {
+   return request({
+    url: 'ip/comprehensive/data/export/comprehensive/data',
+    method: 'post',
+    data: data,
+    responseType: 'blob',
+  })
+}
+
+
 export function getProduceTransData(data) {
    return request({
     url: 'ip/prod-output/queryYCEReportByDateRange',
@@ -22,6 +32,15 @@ export function getProduceTransData(data) {
   })
 }
 
+export function exportProduceTransData(data) {
+   return request({
+    url: 'ip/prod-output/queryYCEReportByDateRangeExcel',
+    method: 'post',
+    data: data,
+    responseType: 'blob',
+  })
+}
+
 
 export function getProduceSituationData(data) {
    return request({
@@ -31,6 +50,15 @@ export function getProduceSituationData(data) {
   })
 }
 
+export function exportProduceSituationData(data) {
+   return request({
+    url: 'ip/production/situation/export/production/situation',
+    method: 'post',
+     data: data,
+      responseType: 'blob',
+  })
+}
+
 export function getProductionSituationMWData(data) {
    return request({
     url: 'ip/production/situation/power/get/production/situation',
@@ -38,3 +66,30 @@ export function getProductionSituationMWData(data) {
     data: data
   })
 }
+
+export function exportProductionSituationMWData(data) {
+   return request({
+    url: 'ip/production/situation/power/export/production/situation',
+    method: 'post',
+     data: data,
+      responseType: 'blob',
+  })
+}
+
+
+export function getProductionYieldSituationMWData(data) {
+   return request({
+    url: 'ip/product/yield/get/production/situation',
+    method: 'post',
+    data: data
+  })
+}
+
+export function exportProductionYieldSituationMWData(data) {
+   return request({
+    url: 'ip/product/yield/export/production/situation',
+    method: 'post',
+    data: data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/views/report/components/produceLineBar.vue b/src/views/report/components/produceLineBar.vue
index 19a58f0..aea2cb5 100644
--- a/src/views/report/components/produceLineBar.vue
+++ b/src/views/report/components/produceLineBar.vue
@@ -1,44 +1,26 @@
 <!--
  * @Author: zhp
  * @Date: 2024-06-19 15:28:34
- * @LastEditTime: 2024-06-19 15:28:34
+ * @LastEditTime: 2024-06-20 20:30:35
  * @LastEditors: zhp
  * @Description:
 -->
 <template>
   <div>
     <!-- 暂无数据 -->
-    <div
-      class="no-data-bg"
-      style="position: relative; left: 50%; transform: translateX(-50%)"
-      v-show="this.chartMsg.series.length === 0"
-    ></div>
+    <div class="no-data-bg" style="position: relative; left: 50%; transform: translateX(-50%)"
+      v-show="this.chartMsg.series.length === 0"></div>
     <!-- 图例 -->
     <div v-show="this.chartMsg.series.length > 0">
-      <div class="legend">
-        <span class="item" v-for="item in legendList" :key="item.id">
-          <span
-            v-if="item.type === 1"
-            class="block"
-            :style="{ backgroundColor: item.color }"
-          ></span>
-          <span
-            v-if="item.type === 2"
-            class="line"
-            :style="{ backgroundColor: item.color }"
-          >
-            <span
-              class="line-block"
-              :style="{ backgroundColor: item.color }"
-            ></span>
+      <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>
+          <span v-if="item.type === 2" class="line" :style="{ backgroundColor: item.color }">
+            <span class="line-block" :style="{ backgroundColor: item.color }"></span>
           </span>
-          {{ item.name }}</span
-        >
+          {{ item.name }}</span>
       </div>
-      <div
-        :id="chartId"
-        :style="{ width: '100%', height: chartHeight + 'px' }"
-      ></div>
+      <div :id="chartId" :style="{ width: '100%', height: chartHeight + 'px' }"></div>
     </div>
   </div>
 </template>
@@ -54,10 +36,11 @@ export default {
         color: [],
         // color: ["#8EF0AB", "#63BDFF", "#288AFF"],
         grid: {
-          left: 100,
-          right: 10,
+          left: 30,
+          right: 0,
           bottom: 30,
           top: 30,
+          containLabel:true,
         },
         tooltip: {
           trigger: "axis",
@@ -68,17 +51,20 @@ export default {
             },
           },
           formatter: function (params) {
+            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 +=
                 "<br/>" +
                 `<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].name === "%"
-                    ? (params[i].value ? params[i].value.toFixed(2) : 0.0) +
-                      params[i].name
-                    : params[i].value
+                `<span style='color:rgba(0,0,0,0.48);font-size:14px;'>${params[i].name.search('率') === "综合良率"
+                  ? (params[i].value ? params[i].value.toFixed(2) : 0.0) + "%"
+                : params[i].seriesName === "转化效率"
+                    ? (params[i].value ? params[i].value.toFixed(2) : 0.0) + "%"
+                  : params[i].seriesName.search('总功率') != -1
+                      ? (params[i].value ? params[i].value.toFixed(2) : 0.0) + "MW"
+                      : params[i].value + "片"
                 }</span>`;
             }
             return res;
@@ -94,15 +80,53 @@ export default {
             type: "shadow",
           },
         },
-        yAxis: {
-          type: "value",
-          name: "",
-          nameTextStyle: {
-            fontSize: 12,
-            align: "right",
+        dataZoom: [//滚动条
+          {
+            // 设置滚动条的隐藏与显示
+            show: true,
+            // 设置滚动条类型
+            type: "slider",
+            // 设置背景颜色
+            backgroundColor: "rgb(19, 63, 100)",
+            // 设置选中范围的填充颜色
+            fillerColor: "rgb(16, 171, 198)",
+            // 设置边框颜色
+            borderColor: "rgb(19, 63, 100)",
+            // 是否显示detail，即拖拽时候显示详细数值信息
+            showDetail: false,
+            // 数据窗口范围的起始数值
+            startValue: 0,
+            // 数据窗口范围的结束数值（一页显示多少条数据）
+            endValue: 5,
+            // empty：当前数据窗口外的数据，被设置为空。
+            // 即不会影响其他轴的数据范围
+            filterMode: "empty",
+            // 设置滚动条宽度，相对于盒子宽度
+            width: "50%",
+            // 设置滚动条高度
+            height: 8,
+            // 设置滚动条显示位置
+            left: "center",
+            // 是否锁定选择区域（或叫做数据窗口）的大小
+            zoomLoxk: true,
+            // 控制手柄的尺寸
+            handleSize: 0,
+            // dataZoom-slider组件离容器下侧的距离
+            bottom: 3,
           },
-          axisLabel: {},
-        },
+          {
+            // 没有下面这块的话，只能拖动滚动条，
+            // 鼠标滚轮在区域内不能控制外部滚动条
+            type: "inside",
+            // 滚轮是否触发缩放
+            zoomOnMouseWheel: false,
+            // 鼠标滚轮触发滚动
+            moveOnMouseMove: true,
+            moveOnMouseWheel: true,
+          },
+
+        ],
+        yAxis:undefined,
         series: [],
       },
     };
@@ -112,6 +136,14 @@ export default {
       type: Number,
       default: 300,
     },
+    type: {
+      type: Number,
+      default: 2,
+    },
+    show: {
+      type: Boolean,
+      default: true,
+    },
     legendList: {
       type: Array,
       default: () => [],
@@ -135,6 +167,9 @@ export default {
         this.chartHeight = newVal;
       },
     },
+    type() {
+      this.canvasReset();
+    },
     chartNum(val) {
       this.canvasReset();
     },
@@ -162,34 +197,24 @@ export default {
       this.myChart = echarts.init(chartDom);
       this.option.color = this.chartMsg.color;
       this.option.xAxis.data = this.chartMsg.xData;
-      this.option.yAxis.name = this.chartMsg.yName;
-      if (
-        this.chartMsg.series.length > 0 &&
-        this.chartMsg.series[0].data[0].name === "%"
-      ) {
-        this.option.yAxis.axisLabel = {
-          formatter: function (value) {
-            return value + ".00%";
-          },
-        };
-      } else {
-        this.option.yAxis.axisLabel = {
-          formatter: function (value) {
-            return value;
-          },
-        };
-      }
+      // this.option.yAxis.name = this.chartMsg.yName;
+
       // this.option.yAxis.axisLabel = this.chartMsg.yAxisLabel;
       this.option.series = this.chartMsg.series;
+      this.option.yAxis = this.chartMsg.yAxis;
+
       this.myChart.setOption(this.option);
     },
   },
 };
 </script>
-<style lang="scss" scoped>
-.legend {
+<style lang="scss">
+.legendData {
   text-align: right;
-  .item {
+  position: relative;
+  // right: 30;
+  // top: 10px;
+  .itemData {
     display: inline-block;
     margin-right: 10px;
     font-size: 14px;
diff --git a/src/views/report/components/produceLineBarTarget.vue b/src/views/report/components/produceLineBarTarget.vue
new file mode 100644
index 0000000..2bea640
--- /dev/null
+++ b/src/views/report/components/produceLineBarTarget.vue
@@ -0,0 +1,252 @@
+<!--
+ * @Author: zhp
+ * @Date: 2024-06-20 16:13:36
+ * @LastEditTime: 2024-06-20 20:30:50
+ * @LastEditors: zhp
+ * @Description:
+-->
+<!--
+ * @Author: zhp
+ * @Date: 2024-06-19 15:28:34
+ * @LastEditTime: 2024-06-20 16:02:21
+ * @LastEditors: zhp
+ * @Description:
+-->
+<template>
+  <div>
+    <!-- 暂无数据 -->
+    <div class="no-data-bg" style="position: relative; left: 50%; transform: translateX(-50%)"
+      v-show="this.chartMsg.series.length === 0"></div>
+    <!-- 图例 -->
+    <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>
+          <span v-if="item.type === 2" class="line" :style="{ backgroundColor: item.color }">
+            <span class="line-block" :style="{ backgroundColor: item.color }"></span>
+          </span>
+          {{ item.name }}</span>
+      </div>
+      <div :id="chartId" :style="{ width: '100%', height: chartHeight + 'px' }"></div>
+    </div>
+  </div>
+</template>
+<script>
+import * as echarts from "echarts";
+import { debounce } from "@/utils/debounce";
+export default {
+  name: "bmLineBar",
+  data() {
+    return {
+      myChart: "",
+      option: {
+        color: [],
+        // color: ["#8EF0AB", "#63BDFF", "#288AFF"],
+        grid: {
+          left: -30,
+          right: 0,
+          bottom: 30,
+          top: 30,
+          containLabel:true,
+        },
+        tooltip: {
+          trigger: "axis",
+          axisPointer: {
+            // type: "cross",
+            crossStyle: {
+              color: "rgba(237,237,237,0.5)",
+            },
+          },
+          formatter: function (params) {
+            // 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 +=
+                "<br/>" +
+                `<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.search('率') === "综合良率"
+                  ? (params[i].value ? params[i].value.toFixed(2) : 0.0) + "%"
+                : params[i].seriesName === "转化效率"
+                    ? (params[i].value ? params[i].value.toFixed(2) : 0.0) + "%"
+                  : params[i].seriesName.search('总功率') != -1
+                      ? (params[i].value ? params[i].value.toFixed(2) : 0.0) + "MW"
+                      : params[i].value + "片"
+                }</span>`;
+            }
+            return res;
+          },
+        },
+        xAxis: {
+          type: "category",
+          data: [],
+          axisTick: {
+            show: false,
+          },
+          axisPointer: {
+            type: "shadow",
+          },
+        },
+        dataZoom: [//滚动条
+          {
+            // 设置滚动条的隐藏与显示
+            show: true,
+            // 设置滚动条类型
+            type: "slider",
+            // 设置背景颜色
+            backgroundColor: "rgb(19, 63, 100)",
+            // 设置选中范围的填充颜色
+            fillerColor: "rgb(16, 171, 198)",
+            // 设置边框颜色
+            borderColor: "rgb(19, 63, 100)",
+            // 是否显示detail，即拖拽时候显示详细数值信息
+            showDetail: false,
+            // 数据窗口范围的起始数值
+            startValue: 0,
+            // 数据窗口范围的结束数值（一页显示多少条数据）
+            endValue: 5,
+            // empty：当前数据窗口外的数据，被设置为空。
+            // 即不会影响其他轴的数据范围
+            filterMode: "empty",
+            // 设置滚动条宽度，相对于盒子宽度
+            width: "50%",
+            // 设置滚动条高度
+            height: 8,
+            // 设置滚动条显示位置
+            left: "center",
+            // 是否锁定选择区域（或叫做数据窗口）的大小
+            zoomLoxk: true,
+            // 控制手柄的尺寸
+            handleSize: 0,
+            // dataZoom-slider组件离容器下侧的距离
+            bottom: 3,
+          },
+          {
+            // 没有下面这块的话，只能拖动滚动条，
+            // 鼠标滚轮在区域内不能控制外部滚动条
+            type: "inside",
+            // 滚轮是否触发缩放
+            zoomOnMouseWheel: false,
+            // 鼠标滚轮触发滚动
+            moveOnMouseMove: true,
+            moveOnMouseWheel: true,
+          },
+
+        ],
+        yAxis:undefined,
+        series: [],
+      },
+    };
+  },
+  props: {
+    chartHeight: {
+      type: Number,
+      default: 300,
+    },
+    type: {
+      type: Number,
+      default: 2,
+    },
+    show: {
+      type: Boolean,
+      default: true,
+    },
+    legendList: {
+      type: Array,
+      default: () => [],
+    },
+    chartMsg: {
+      type: Object,
+      default: () => { },
+    },
+    chartId: {
+      type: String,
+      default: "bmChart",
+    },
+    chartNum: {
+      type: Number,
+      default: 1,
+    },
+  },
+  watch: {
+    chartHeight: {
+      handler(newVal) {
+        this.chartHeight = newVal;
+      },
+    },
+    type() {
+      this.canvasReset();
+    },
+    chartNum(val) {
+      this.canvasReset();
+    },
+    chartMsg: {
+      handler(newVal) {
+        this.canvasReset();
+      },
+      deep: true,
+    },
+  },
+  mounted() {
+    this.canvasReset();
+  },
+  methods: {
+    canvasReset() {
+      debounce(() => {
+        this.getMes();
+      }, 500)();
+    },
+    getMes() {
+      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.yAxis.name = this.chartMsg.yName;
+
+      // this.option.yAxis.axisLabel = this.chartMsg.yAxisLabel;
+      this.option.series = this.chartMsg.series;
+      this.option.yAxis = this.chartMsg.yAxis;
+
+      this.myChart.setOption(this.option);
+    },
+  },
+};
+</script>
+<style lang="scss">
+.legendData {
+  text-align: right;
+  position: relative;
+  // right: 30;
+  // top: 10px;
+  .itemData {
+    display: inline-block;
+    margin-right: 10px;
+    font-size: 14px;
+    color: #8c8c8c;
+    .block {
+      width: 10px;
+      height: 10px;
+      display: inline-block;
+      margin-right: 4px;
+    }
+    .line {
+      width: 10px;
+      height: 10px;
+      border-radius: 5px;
+      display: inline-block;
+      margin-right: 4px;
+      position: relative;
+      .line-block {
+        position: absolute;
+        width: 20px;
+        height: 2px;
+        left: -5px;
+        top: 4px;
+      }
+    }
+  }
+}
+</style>
diff --git a/src/views/report/components/produceLineBarYearTarget.vue b/src/views/report/components/produceLineBarYearTarget.vue
new file mode 100644
index 0000000..8fb9c80
--- /dev/null
+++ b/src/views/report/components/produceLineBarYearTarget.vue
@@ -0,0 +1,245 @@
+<!--
+ * @Author: zhp
+ * @Date: 2024-06-20 16:13:52
+ * @LastEditTime: 2024-06-20 20:30:53
+ * @LastEditors: zhp
+ * @Description:
+-->
+<template>
+  <div>
+    <!-- 暂无数据 -->
+    <div class="no-data-bg" style="position: relative; left: 50%; transform: translateX(-50%)"
+      v-show="this.chartMsg.series.length === 0"></div>
+    <!-- 图例 -->
+    <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>
+          <span v-if="item.type === 2" class="line" :style="{ backgroundColor: item.color }">
+            <span class="line-block" :style="{ backgroundColor: item.color }"></span>
+          </span>
+          {{ item.name }}</span>
+      </div>
+      <div :id="chartId" :style="{ width: '100%', height: chartHeight + 'px' }"></div>
+    </div>
+  </div>
+</template>
+<script>
+import * as echarts from "echarts";
+import { debounce } from "@/utils/debounce";
+export default {
+  name: "bmLineBar",
+  data() {
+    return {
+      myChart: "",
+      option: {
+        color: [],
+        // color: ["#8EF0AB", "#63BDFF", "#288AFF"],
+        grid: {
+          left: 30,
+          right: 0,
+          bottom: 30,
+          top: 30,
+          containLabel:true,
+        },
+        tooltip: {
+          trigger: "axis",
+          axisPointer: {
+            // type: "cross",
+            crossStyle: {
+              color: "rgba(237,237,237,0.5)",
+            },
+          },
+          formatter: function (params) {
+            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 +=
+                "<br/>" +
+                `<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.search('率') === "综合良率"
+                  ? (params[i].value ? params[i].value.toFixed(2) : 0.0) + "%"
+                : params[i].seriesName === "转化效率"
+                    ? params[i].value+ "%"
+                  : params[i].seriesName.search('总功率') != -1
+                      ? params[i].value + "MW"
+                      : params[i].value + "片"
+                }</span>`;
+            }
+            return res;
+          },
+        },
+        xAxis: {
+          type: "category",
+          data: [],
+          axisTick: {
+            show: false,
+          },
+          axisPointer: {
+            type: "shadow",
+          },
+        },
+        dataZoom: [//滚动条
+          {
+            // 设置滚动条的隐藏与显示
+            show: true,
+            // 设置滚动条类型
+            type: "slider",
+            // 设置背景颜色
+            backgroundColor: "rgb(19, 63, 100)",
+            // 设置选中范围的填充颜色
+            fillerColor: "rgb(16, 171, 198)",
+            // 设置边框颜色
+            borderColor: "rgb(19, 63, 100)",
+            // 是否显示detail，即拖拽时候显示详细数值信息
+            showDetail: false,
+            // 数据窗口范围的起始数值
+            startValue: 0,
+            // 数据窗口范围的结束数值（一页显示多少条数据）
+            endValue: 5,
+            // empty：当前数据窗口外的数据，被设置为空。
+            // 即不会影响其他轴的数据范围
+            filterMode: "empty",
+            // 设置滚动条宽度，相对于盒子宽度
+            width: "50%",
+            // 设置滚动条高度
+            height: 8,
+            // 设置滚动条显示位置
+            left: "center",
+            // 是否锁定选择区域（或叫做数据窗口）的大小
+            zoomLoxk: true,
+            // 控制手柄的尺寸
+            handleSize: 0,
+            // dataZoom-slider组件离容器下侧的距离
+            bottom: 3,
+          },
+          {
+            // 没有下面这块的话，只能拖动滚动条，
+            // 鼠标滚轮在区域内不能控制外部滚动条
+            type: "inside",
+            // 滚轮是否触发缩放
+            zoomOnMouseWheel: false,
+            // 鼠标滚轮触发滚动
+            moveOnMouseMove: true,
+            moveOnMouseWheel: true,
+          },
+
+        ],
+        yAxis:undefined,
+        series: [],
+      },
+    };
+  },
+  props: {
+    chartHeight: {
+      type: Number,
+      default: 300,
+    },
+    type: {
+      type: Number,
+      default: 2,
+    },
+    show: {
+      type: Boolean,
+      default: true,
+    },
+    legendList: {
+      type: Array,
+      default: () => [],
+    },
+    chartMsg: {
+      type: Object,
+      default: () => { },
+    },
+    chartId: {
+      type: String,
+      default: "bmChart",
+    },
+    chartNum: {
+      type: Number,
+      default: 1,
+    },
+  },
+  watch: {
+    chartHeight: {
+      handler(newVal) {
+        this.chartHeight = newVal;
+      },
+    },
+    type() {
+      this.canvasReset();
+    },
+    chartNum(val) {
+      this.canvasReset();
+    },
+    chartMsg: {
+      handler(newVal) {
+        this.canvasReset();
+      },
+      deep: true,
+    },
+  },
+  mounted() {
+    this.canvasReset();
+  },
+  methods: {
+    canvasReset() {
+      debounce(() => {
+        this.getMes();
+      }, 500)();
+    },
+    getMes() {
+      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.yAxis.name = this.chartMsg.yName;
+
+      // this.option.yAxis.axisLabel = this.chartMsg.yAxisLabel;
+      this.option.series = this.chartMsg.series;
+      this.option.yAxis = this.chartMsg.yAxis;
+
+      this.myChart.setOption(this.option);
+    },
+  },
+};
+</script>
+<style lang="scss">
+.legendData {
+  text-align: right;
+  position: relative;
+  // right: 30;
+  // top: 10px;
+  .itemData {
+    display: inline-block;
+    margin-right: 10px;
+    font-size: 14px;
+    color: #8c8c8c;
+    .block {
+      width: 10px;
+      height: 10px;
+      display: inline-block;
+      margin-right: 4px;
+    }
+    .line {
+      width: 10px;
+      height: 10px;
+      border-radius: 5px;
+      display: inline-block;
+      margin-right: 4px;
+      position: relative;
+      .line-block {
+        position: absolute;
+        width: 20px;
+        height: 2px;
+        left: -5px;
+        top: 4px;
+      }
+    }
+  }
+}
+</style>
diff --git a/src/views/report/comprehensiveData.vue b/src/views/report/comprehensiveData.vue
index 7d2b818..416d87c 100644
--- a/src/views/report/comprehensiveData.vue
+++ b/src/views/report/comprehensiveData.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-04-15 10:49:13
- * @LastEditTime: 2024-06-19 09:35:25
+ * @LastEditTime: 2024-06-20 15:40:06
  * @LastEditors: zhp
  * @Description:
 -->
@@ -76,7 +76,7 @@
 
 <script>
 // import { parseTime } from '../../core/mixins/code-filter';
-import { getComprehensiveDataPage } from '@/api/report';
+import { getComprehensiveDataPage, exportComprehensiveDataPage } from '@/api/report';
 // import { getWorkOrderPage, exportExcel, getOverView } from '@/components/buttonNav'
 // import inputTable from './inputTable.vue';
 // import lineChart from './lineChart';
@@ -153,68 +153,7 @@ export default {
           id: 2,
         },
       ],
-      tableProps: [
-        {
-          prop: 'factory',
-          label: '玻璃类型',
-          fixed:true,
-          // filter: (val) => factoryList[val],
-          // minWidth: 200,
-          // showOverflowtooltip: true
-        },
-        {
-          prop: 'workOrderNumber',
-          label: '科目/日期',
-          fixed: true,
-          // filter: (val) => ['玻璃芯片', '标准组件', 'BIPV', '定制组件'][val]
-        },
-        {
-          prop: 'workOrderType',
-          label: '单位',
-          fixed: true,
-          // filter: publicFormatter('workorder_status')
-          // filter: (val) => ['', '芯片工单', '组件类型', 'bipv类型'][val],
-        },
-        // {
-        //   prop: 'plannedInvestment',
-        //   label: '计划投入',
-        // },
-        // {
-        //   prop: 'actualInvestment',
-        //   label: '实际投入',
-        // },
-        // {
-        //   prop: 'targetProduction',
-        //   label: '目标产量',
-        // },
-        // {
-        //   prop: 'actualProduction',
-        //   label: '实际产量',
-        // },
-        // {
-        //   prop: 'productionProgress',
-        //   label: '生产进度',
-        //   filter: (val) => (val * 100) + '%'
-        // },
-        // {
-        //   prop: 'orderStatus',
-        //   label: '工单状态',
-        //   filter: publicFormatter('workorder_status')
-        //   // filter: (val) => ['未开始', '生产中', '已完成'][val],
-        // },
-        // {
-        //   prop: 'startTime',
-        //   label: '开始时间',
-        //   minWidth: 100,
-        //   showOverflowtooltip: true
-        // },
-        // {
-        //   prop: 'endTime',
-        //   label: '完成时间',
-        //   minWidth: 100,
-        //   showOverflowtooltip: true
-        // }
-      ],
+      otherProps:[],
       tableData: [],
       xAxis: [],
       currentMenu:null,
@@ -228,6 +167,32 @@ export default {
     weekNum() {
       return Math.round((this.end - this.start) / (24 * 60 * 60 * 1000 * 7)) + 1
     },
+    tableProps() {
+      return [
+        {
+          prop: 'type',
+          label: '玻璃类型',
+          fixed: true,
+          // filter: (val) => factoryList[val],
+          // minWidth: 200,
+          // showOverflowtooltip: true
+        },
+        {
+          prop: 'item',
+          label: '科目/日期',
+          fixed: true,
+          // filter: (val) => ['玻璃芯片', '标准组件', 'BIPV', '定制组件'][val]
+        },
+        {
+          prop: 'unit',
+          label: '单位',
+          fixed: true,
+          // filter: publicFormatter('workorder_status')
+          // filter: (val) => ['', '芯片工单', '组件类型', 'bipv类型'][val],
+        },
+        ...this.otherProps
+      ]
+    },
   },
   // created() {
   //   const currentMonth = new Date()
@@ -348,16 +313,195 @@ export default {
       });
     },
     async getDataList() {
+      this.otherProps = []
       console.log(this.listQuery);
       if (this.listQuery.type == 3) {
-        this.listQuery.startDate = this.listQuery.reportTime[0] + '-01-01 00:00:00'
-        this.listQuery.endDate = this.listQuery.reportTime[1] + '-12-31 23:59:59'
+        this.listQuery.startDate = this.listQuery.reportTime[0] + '-01-01'
+        this.listQuery.endDate = this.listQuery.reportTime[1] + '-12-31'
       }
       let arr  = []
       this.currentMenu === '邯郸' ? arr.push(1) : arr.push(2)
       this.listQuery.factory = arr
       const res = await getComprehensiveDataPage(this.listQuery)
       this.tableData = res.data.list
+      let dataArr = [{
+        type: '芯片',
+        item: 'FTO投入',
+        unit: '片'
+      },
+      {
+        type: '芯片',
+        item: '芯片产量',
+        unit: '片'
+        }, {
+        type: '芯片',
+          item: '芯片平均功率',
+          unit: 'W'
+        },
+        {
+          type: '芯片',
+          item: '芯片良率',
+          unit: '%'
+        }, {
+          type: '芯片',
+          item: '芯片产量',
+          unit: '片'
+        }, {
+          type: '芯片',
+          item: '芯片总功率',
+          unit: 'MW'
+        }, {
+          type: '芯片',
+          item: 'CSS稼动率',
+          unit: '%'
+        }, {
+          type: '芯片',
+          item: '芯片段OEE',
+          unit: '%'
+        }, {
+          type: '芯片',
+          item: '芯片产能利用率',
+          unit: '%'
+        }, {
+          type: '芯片',
+          item: '芯片人均产量',
+          unit: '片/人'
+        }, {
+          type: '芯片',
+          item: '芯片BOM',
+          unit: '元/片'
+        }, {
+          type: '标准组件',
+          item: '标准组件产量',
+          unit: '片'
+        }, {
+          type: '标准组件',
+          item: '标准组件平均功率',
+          unit: 'W'
+        }, {
+          type: '标准组件',
+          item: '标准组件良率',
+          unit: '%'
+        }, {
+          type: '标准组件',
+          item: '标准组件总功率',
+          unit: 'MW'
+        }, {
+          type: '标准组件',
+          item: '封装线OEE',
+          unit: '%'
+        },
+        {
+          type: '标准组件',
+          item: '封装线产能利用率',
+          unit: '%'
+        },
+        {
+          type: '标准组件',
+          item: '标准组件人均产量',
+          unit: '片/人'
+        },
+        {
+          type: '标准组件',
+          item: '封装BOM',
+          unit: '元/片'
+        },
+        {
+          type: 'BIPV',
+          item: '芯片使用量',
+          unit: '%'
+        },
+        {
+          type: 'BIPV',
+          item: 'BIPV产量',
+          unit: 'm2'
+        },
+        {
+          type: 'BIPV',
+          item: '芯片使用率',
+          unit: '%'
+        },
+          {
+          type: 'BIPV',
+          item: '人均产量',
+          unit: 'm2/人'
+        },
+        {
+          type: 'BIPV',
+          item: 'OEM及委外材料成本',
+          unit: '元/片'
+        },
+        {
+          type: 'BIPV',
+          item: '内部材料成本',
+          unit: '元/片'
+        },
+        {
+          type: 'BIPV',
+          item: '综合材料成本',
+          unit: '元/片'
+        },
+      ]
+      res.data.forEach((ele, index) => {
+        let i = index + 1
+        // this.chartMsg.xData.push(ele.titleValue)
+        this.otherProps.push({
+          label: ele.titleValue,
+          props: 'value' + i
+        })
+      })
+      console.log(this.otherProps)
+      res.data.forEach((item, index) => {
+        let i = index + 1
+        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.chipAveragePower
+          dataArr[4]['' + m + ''] = item.chipTotalPower
+          dataArr[5]['' + m + ''] = item.chipCssMarriageRate
+          dataArr[6]['' + m + ''] = item.chipOee
+          dataArr[7]['' + m + ''] = item.chipCapacityUtilizationRate
+          dataArr[8]['' + m + ''] = item.chipAnnualAverageProduction
+          dataArr[9]['' + m + ''] = item.chipBom
+          dataArr[10]['' + m + ''] = item.componentYield
+          dataArr[11]['' + m + ''] = item.componentAveragePower
+          dataArr[12]['' + m + ''] = item.componentYieldRate
+          dataArr[13]['' + m + ''] = item.componentTotalPower
+          dataArr[14]['' + m + ''] = item.componentOee
+          dataArr[15]['' + m + ''] = item.componentCapacityUtilizationRate
+          dataArr[16]['' + m + ''] = item.componentAnnualAverageProduction
+          dataArr[17]['' + m + ''] = item.componentBom
+          dataArr[18]['' + m + ''] = item.bipvChipUsage
+          dataArr[19]['' + m + ''] = item.bipvProductOutput
+          dataArr[20]['' + m + ''] = item.bipvChipUtilizationRate
+          dataArr[21]['' + m + ''] = item.bipvAnnualAverageProduction
+          dataArr[22]['' + m + ''] = item.bipvOeeMaterialCost
+          dataArr[23]['' + m + ''] = item.bipvInsideMaterialCost
+          dataArr[24]['' + m + ''] = item.bipvComprehensiveMaterialCost
+
+        // })
+        // ele.titleValue
+        // .push({
+        //   label: ele.titleValue,
+        //   props: 'value' + index + 1,
+        // })
+      })
+      if (res.data.length === 0) {
+        this.tableData = []
+      } else {
+        if (this.currentMenu !== '瑞昌') {
+          this.tableData = dataArr
+        } else {
+          this.tableData = dataArr.filter(function (item) {
+            return item.type !== "BIPV"
+          });
+        }
+      }
       this.listQuery.total = res.data.total
       if (this.listQuery.total > 0) {
         this.tableData.forEach(item => {
@@ -393,6 +537,14 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
+
+      let fileName = "综合数据.xls";
+      exportComprehensiveDataPage(this.listQuery)
+        .then((response) => {
+          this.$download.excel(response, fileName);
+          this.$message.success("导出成功");
+        })
+        .catch(() => { });
       // this.$modal.confirm('是否确认导出工单数据?').then(() => {
       //   // 处理查询参数
       //   // let params = {...this.listQuery};
diff --git a/src/views/report/produceConversion.vue b/src/views/report/produceConversion.vue
index 1e76b70..874d994 100644
--- a/src/views/report/produceConversion.vue
+++ b/src/views/report/produceConversion.vue
@@ -4,20 +4,20 @@
     <ButtonNav style="padding: 0;" :menus="['邯郸', '瑞昌']" :button-mode="true" @change="currentMenu = $event">
     </ButtonNav>
     <!-- </div> -->
-    <div class="containerTop">
+    <div class="search">
       <el-form :model="listQuery" :inline="true" ref="dataForm" class="blueTip">
         <el-form-item label="时间维度" prop="date">
-          <el-select size="small" clearable v-model="listQuery.type" placeholder="请选择">
+          <el-select size="small" clearable v-model="listQuery.date" placeholder="请选择">
             <el-option v-for="item in timeList" :key="item.value" :label="item.label" :value="item.value">
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item v-show="listQuery.type === 0 || listQuery.type === ''" label="时间范围" prop="reportTime">
+        <el-form-item v-show="listQuery.date === 0 || listQuery.date === ''" label="时间范围" prop="reportTime">
           <el-date-picker size="small" clearable v-model="listQuery.reportTime" type="daterange" range-separator="至"
             start-placeholder="开始日期" value-format="yyyy-MM-dd" @change="changeDayTime" end-placeholder="结束日期">
           </el-date-picker>
         </el-form-item>
-        <el-form-item v-show="listQuery.type === 1" label="时间范围" prop="reportTime">
+        <el-form-item v-show="listQuery.date === 1" label="时间范围" prop="reportTime">
           <el-date-picker size="small" clearable v-model="start" type="week" format="yyyy 第 WW 周" placeholder="选择周"
             style="width: 180px" @change="onValueChange">
           </el-date-picker>
@@ -29,12 +29,12 @@
             {{ date1 }} 至 {{ date2 }}，共 {{ weekNum }} 周
           </span> -->
         </el-form-item>
-        <el-form-item v-show="listQuery.type === 2" label="时间值" prop="reportTime">
+        <el-form-item v-show="listQuery.date === 2" label="时间值" prop="reportTime">
           <el-date-picker size="small" v-model="listQuery.reportTime" type="monthrange" value-format="yyyy-MM-DD"
             range-separator="至" start-placeholder="开始月份" end-placeholder="结束月份" @change="changeTime">
           </el-date-picker>
         </el-form-item>
-        <el-form-item v-show="listQuery.type === 3" label="时间值" prop="reportTime">
+        <el-form-item v-show="listQuery.date === 3" label="时间值" prop="reportTime">
           <el-date-picker size="small" clearable v-model="listQuery.reportTime[0]" value-format="yyyy" type="year"
             placeholder="开始时间">
           </el-date-picker>
@@ -63,11 +63,40 @@
           <!-- <el-button type="success" size="small" plain @click="addFactory">新增</el-button> -->
         </el-form-item>
       </el-form>
-      <!-- <div class="smallTitle">产量转化效率</div> -->
-
-      <!-- <bmSearchBar @getSearch="getSearch" @handleExport="handleExport" /> -->
-      <bm-line-bar :chartHeight="chartHeight" :legendList="legendList" :chartMsg="chartMsg" :chartId="chartId"
-        :chartNum="chartNum" />
+    </div>
+    <div class="containerTop">
+      <el-row v-if="listQuery.date === 2">
+        <el-col :span="16">
+          <div class="blueTip">
+            产量转化效率
+          </div>
+          <bm-line-bar :chartHeight="chartHeight" :legendList="legendList" :chartMsg="chartMsg" :chartId="chartId"
+            :chartNum="chartNum" />
+        </el-col>
+        <el-col :span="8">
+          <div class="blueTip">
+            {{ title }}
+          </div>
+          <produce-line-bar-year-target :chartHeight="chartHeight" :legendList="legendList"
+            :chartMsg="chartMsgYearTarget" :chartId=" 'yearData'" :chartNum="chartNum" />
+        </el-col>
+      </el-row>
+      <el-row v-else>
+        <!-- <el-col :span="24"> -->
+        <div class="blueTip">
+          产量转化效率
+        </div>
+        <bm-line-bar :chartHeight="chartHeight" :legendList="legendList" :chartMsg="chartMsg" :chartId="chartId"
+          :chartNum="chartNum" />
+        <!-- </el-col> -->
+        <!-- <el-col :span="8">
+          <div class="blueTip">
+            {{ title }}
+          </div>
+          <produce-line-bar-year-target :chartHeight="chartHeight" :legendList="legendList"
+            :chartMsg="chartMsgYearTarget" :chartId=" 'yearData'" :chartNum="chartNum" />
+        </el-col> -->
+      </el-row>
       <base-table :table-props="tableProps" :page="listQuery.current" :limit="listQuery.size" :table-data="tableData"
         :max-height="tableH" />
     </div>
@@ -78,9 +107,11 @@
 </template>
 
 <script>
-import { getProduceSituationData } from '@/api/report';
-import bmSearchBar from "./components/bmSearchBar.vue";
-import BmLineBar from "./components/bmLineBar.vue";
+import { getProduceTransData, exportProduceTransData } from '@/api/report';
+import bmSearchBar from "./components/bmSearchBar";
+import BmLineBar from "./components/produceLineBar.vue";
+import produceLineBarYearTarget from "./components/produceLineBarYearTarget.vue";
+
 import ButtonNav from '@/components/ButtonNav'
 import moment from 'moment'
 export default {
@@ -95,11 +126,11 @@ export default {
         pageSize: 999,
         // size: 10,
         // current: 1,
-        factory: null,
+        factorys: null,
         // total: 0,
-        type: 2,
-        startDate: undefined,
-        endDate: undefined,
+        date: 2,
+        beginTime: undefined,
+        endTime: undefined,
         reportTime: []
       },
       timeList: [
@@ -124,35 +155,133 @@ export default {
       chartHeight: this.tableHeight(137) / 2 - 111,
       tableH: this.tableHeight(137) / 2 - 70,
       legendList: [
-        { id: 1, name: "2024年4月目标值", type: 2, color: "#FFCE6A" },
-        { id: 2, name: "2023年4月", type: 1, color: "#8EF0AB" },
-        { id: 3, name: "2024年4月", type: 1, color: "#288AFF" },
+        {
+          id: 1, name: "综合良率", type: 2, color: "#FFCE6A"
+        },
+        {
+          id: 2, name: "FTO投入", type: 1, color: "#8EF0AB"
+        },
+        { id: 3, name: "芯片产量", type: 1, color: "#288AFF" },
+        {
+          id: 3, name: "标准组件产量", type: 1, color: "#288AFF"
+        },
       ],
-      chartMsg: {
-        color: ["#FFCE6A", "#8EF0AB", "#288AFF"],
-        xData: ["成都", "邯郸", "瑞昌"],
-        yName: "单位/%",
+      chartMsgYearTarget: {
+        color: ["#8EF0AB", "#288AFF", '#64BDFF', "#FFCE6A",],
+        xData: [],
+        // yName: "单位/%",
+        yAxis: [
+          {
+            type: "value",
+            name: "单位/片",
+            nameTextStyle: {
+              fontSize: 12,
+              align: "right",
+            },
+            axisLabel: {},
+          },
+          {
+            type: 'value',
+            // inverse: true,
+            name: "单位/%",
+            nameTextStyle: {
+              fontSize: 12,
+              align: "right",
+            },
+            axisLabel: {},
+          }
+        ],
         series: [
           {
-            name: "2024年4月目标值",
+            name: "",
+            // yAxisIndex: 0,
             data: [
-              { name: "%", value: 85 },
-              { name: "%", value: 85 },
-              { name: "%", value: 85 },
-            ],
-            type: "line",
-            symbol: "circle",
-            symbolSize: 6,
+              {
+                value: 1,
+                itemStyle: {
+                  color: '#8EF0AB'
+                }
+              },
+              {
+                value: 2,
+                itemStyle: {
+                  color: '#288AFF'
+                }
+              },
+              {
+                value: 3,
+                itemStyle: {
+                  color: '#64BDFF'
+                }
+              },
+              {
+                value: 0,
+                yAxisIndex: 1,
+                itemStyle: {
+                  color: '#FFCE6A'
+                }
+              }],
+            type: "bar",
+            barWidth: 20,
             label: {
               show: true,
-              color: "#FFAE17",
+              position: [-18, -16],
+              color: "#68C483",
               formatter: function (params) {
-                return params.value.toFixed(2) + "%";
+                return params.value + "片";
               },
             },
           },
           {
-            name: "2023年4月",
+            name: '销量折线图',
+            type: 'bar',
+            data: [0, 0, 0,
+              {
+                value: 5,
+                itemStyle: {
+                  color: '#FFCE6A'
+                }
+              }],
+            barWith: "40%",
+            label: {
+              show: true,
+              position: "top",
+              formatter: "{c}%"
+            },
+            lineStyle: {
+              color: "#ffb122"
+            },
+            yAxisIndex: 1
+          }
+        ],
+      },
+      chartMsg: {
+        color: ["#8EF0AB", "#288AFF", '#64BDFF', "#FFCE6A",],
+        xData: [],
+        yName: "",
+        yAxis: [
+          {
+            type: "value",
+          name: "单位/片",
+            nameTextStyle: {
+              fontSize: 12,
+              align: "right",
+            },
+            axisLabel: {},
+          },
+          {
+            type: "value",
+            name: "单位/%",
+            nameTextStyle: {
+              fontSize: 12,
+              align: "right",
+            },
+            axisLabel: {},
+          }
+        ],
+        series: [
+          {
+            name: "FTO投入",
             data: [
               { name: "%", value: 57.5 },
               { name: "%", value: 21.66 },
@@ -170,7 +299,7 @@ export default {
             },
           },
           {
-            name: "2024年4月",
+            name: "芯片产量",
             data: [
               { name: "%", value: 23.33 },
               { name: "%", value: 7.02 },
@@ -187,6 +316,44 @@ export default {
               },
             },
           },
+          {
+            name: "标准组件产量",
+            data: [
+              { name: "%", value: 23.33 },
+              { name: "%", value: 7.02 },
+              { name: "%", value: 80.2 },
+            ],
+            type: "bar",
+            barWidth: 20,
+            label: {
+              show: true,
+              position: [0, -16],
+              color: "#64BDFF",
+              formatter: function (params) {
+                return params.value.toFixed(2) + "%";
+              },
+            },
+          },
+          {
+            name: "综合良率",
+            data: [
+              { name: "%", value: 85 },
+              { name: "%", value: 85 },
+              { name: "%", value: 85 },
+            ],
+            type: "line",
+            symbol: "circle",
+            // barWidth: 20,
+            symbolSize: 6,
+            yAxisIndex: 1,
+            label: {
+              show: true,
+              color: "#FFAE17",
+              formatter: function (params) {
+                return params.value.toFixed(2) + "%";
+              },
+            },
+          },
         ],
       },
       chartId: "chipYieldBMChart",
@@ -196,6 +363,7 @@ export default {
   components: {
     bmSearchBar,
     BmLineBar,
+    produceLineBarYearTarget,
     ButtonNav
   },
   computed: {
@@ -279,13 +447,13 @@ export default {
           this.start = undefined
           this.end = undefined
         } else {
-          this.listQuery.startDate = Number(this.start)
-          this.listQuery.endDate = Number(this.end)
+          this.listQuery.beginTime = Number(this.start)
+          this.listQuery.endTime = Number(this.end)
         }
       }
       if (!this.start && !this.end) {
-        this.listQuery.startDate = undefined
-        this.listQuery.endDate = undefined
+        this.listQuery.beginTime = undefined
+        this.listQuery.endTime = undefined
       }
       // console.log(e);
     },
@@ -304,12 +472,12 @@ export default {
           });
           this.listQuery.reportTime = [];
         } else {
-          this.listQuery.startDate = this.listQuery.reportTime[0]
-          this.listQuery.endDate = this.listQuery.reportTime[1]
+          this.listQuery.beginTime = this.listQuery.reportTime[0]
+          this.listQuery.endTime = this.listQuery.reportTime[1]
         }
       } else {
-        this.listQuery.startDate = undefined
-        this.listQuery.endDate = undefined
+        this.listQuery.beginTime = undefined
+        this.listQuery.endTime = undefined
       }
     },
     onValueChange(picker, k) { // 选中近k周后触发的操作
@@ -324,15 +492,15 @@ export default {
             type: 'warning'
           });
         } else {
-          this.listQuery.startDate = this.date1
-          this.listQuery.endDate = this.date2
-          // this.listQuery.startDate = Number(moment(this.start.getTime()).format('YYYYWW'))
-          // this.listQuery.endDate = Number(moment(this.end.getTime()).format('YYYYWW'))
+          this.listQuery.beginTime = this.date1
+          this.listQuery.endTime = this.date2
+          // this.listQuery.beginTime = Number(moment(this.start.getTime()).format('YYYYWW'))
+          // this.listQuery.endTime = Number(moment(this.end.getTime()).format('YYYYWW'))
         }
       }
       if (!this.start && !this.end) {
-        this.listQuery.startDate = undefined
-        this.listQuery.endDate = undefined
+        this.listQuery.beginTime = undefined
+        this.listQuery.endTime = undefined
       }
     },
     changeDayTime() {
@@ -345,12 +513,12 @@ export default {
           });
           this.listQuery.reportTime = [];
         } else {
-          this.listQuery.startDate = this.listQuery.reportTime[0]
-          this.listQuery.endDate = this.listQuery.reportTime[1]
+          this.listQuery.beginTime = this.listQuery.reportTime[0]
+          this.listQuery.endTime = this.listQuery.reportTime[1]
         }
       } else {
-        this.listQuery.startDate = undefined
-        this.listQuery.endDate = undefined
+        this.listQuery.beginTime = undefined
+        this.listQuery.endTime = undefined
       }
     },
     getOverView() {
@@ -368,65 +536,118 @@ export default {
     },
     async getDataList() {
       this.otherProps = []
-      this.xData = []
+      this.chartMsg.xData = []
       console.log(this.listQuery);
       if (this.listQuery.type == 3) {
-        this.listQuery.startDate = this.listQuery.reportTime[0]
-        this.listQuery.endDate = this.listQuery.reportTime[1]
+        this.listQuery.beginTime = this.listQuery.reportTime[0]
+        this.listQuery.endTime = this.listQuery.reportTime[1]
       }
       let arr = []
       this.currentMenu === '邯郸' ? arr.push(1) : arr.push(0)
-      this.listQuery.factory = arr
-      const res = await getProduceSituationData(this.listQuery)
+      this.listQuery.factorys = arr
+      const res = await getProduceTransData(this.listQuery)
       let dataArr = [{
         factory: null,
-        item: 'FTO投入',
-        unit: '片'
+        item: '芯片总功率',
+        unit: 'MW'
       },
       {
         factory: null,
-        item: '芯片产量',
-        unit: '片'
+        item: '标准组件总功率',
+        unit: 'MW'
       },
       {
         factory: null,
-        item: '标准组件产量',
-        unit: '片'
-      },
-      {
-        factory: null,
-        item: '综合良率',
+        item: '转化效率',
         unit: '%'
-        },]
-      res.data.list.forEach((ele, index) => {
-        let i = index + 1
-        ele.titleValue
-        this.xData.push(ele.titleValue)
-        this.otherProps.push({
-          label: ele.titleValue,
-          props: 'value' + i
+      }
+      ]
+      res.data.forEach(element => {
+        element.list.forEach((ele, index) => {
+          let i = index + 1
+          this.chartMsg.xData.push(ele.reportTimep)
+          this.otherProps.push({
+            label: ele.reportTimep,
+            props: 'value' + i
+          })
         })
-      })
+      });
       console.log(this.otherProps)
-      res.data.list.forEach((ele, index) => {
+      res.data.forEach((ele, index) => {
         let i = index + 1
         let m = 'value' + i
-        ele.productionSituationDataVOList.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
-        })
+        ele.list.forEach((item, index) => {
+            let i = index + 1
+            let m = 'value' + i
+            // ele.productionSituationDataVOList.forEach((item) => {
+            dataArr[0]['' + m + ''] = item.chipTotalPowers
+            dataArr[0].factory = ele.factory === 1 ? '邯郸' : '瑞昌'
+            dataArr[1].factory = ele.factory === 1 ? '邯郸' : '瑞昌'
+            dataArr[2].factory = ele.factory === 1 ? '邯郸' : '瑞昌'
+            dataArr[3].factory = ele.factory === 1 ? '邯郸' : '瑞昌'
+            dataArr[1]['' + m + ''] = ele.scTotalPowers
+            dataArr[2]['' + m + ''] = ele.conversionEfficiency
+            // dataArr[3]['' + m + ''] = ele.comprehensiveYieldRate
+            // })
+            // ele.titleValue
+            // .push({
+            //   label: ele.titleValue,
+            //   props: 'value' + index + 1,
+            // })
+          })
+        // ele.productionSituationDataVOList.forEach((item) => {
+        // dataArr[0]['' + m + ''] = item.chipTotalPowers
+        // dataArr[0].factory = ele.factory === 1 ? '邯郸' : '瑞昌'
+        // dataArr[1].factory = ele.factory === 1 ? '邯郸' : '瑞昌'
+        // dataArr[2].factory = ele.factory === 1 ? '邯郸' : '瑞昌'
+        // dataArr[3].factory = ele.factory === 1 ? '邯郸' : '瑞昌'
+        // dataArr[1]['' + m + ''] = ele.scTotalPowers
+        // dataArr[2]['' + m + ''] = ele.conversionEfficiency
+        // dataArr[3]['' + m + ''] = ele.comprehensiveYieldRate
+        // })
         // ele.titleValue
         // .push({
         //   label: ele.titleValue,
         //   props: 'value' + index + 1,
         // })
       })
+      for (let i in dataArr[0]) {
+        this.chartMsg.series[0].name = dataArr[0]['item']
+        if (i.search('value') === 0) {
+          this.chartMsg.series[0].data.push({
+            name: dataArr[0]['item'],
+            name: dataArr[0][i]
+          })
+        }
+      }
+      for (let i in dataArr[1]) {
+        this.chartMsg.series[1].name = dataArr[1]['item']
+        if (i.search('value') === 0) {
+          this.chartMsg.series[1].data.push({
+            name: dataArr[1]['item'],
+            name: dataArr[1][i]
+          })
+        }
+      }
+      for (let i in dataArr[2]) {
+        this.chartMsg.series[2].name = dataArr[2]['item']
+        if (i.search('value') === 0) {
+          this.chartMsg.series[2].data.push({
+            name: dataArr[2]['item'],
+            name: dataArr[2][i]
+          })
+        }
+      }
+      for (let i in dataArr[3]) {
+        this.chartMsg.series[3].name = dataArr[3]['item']
+        if (i.search('value') === 0) {
+          this.chartMsg.series[3].data.push({
+            name: dataArr[3]['item'],
+            name: dataArr[3][i]
+          })
+        }
+      }
+
       // this.tableProps = otherProps
       // res.data.list.forEach((ele) => {
       //   console.log(ele);
@@ -442,14 +663,50 @@ export default {
       //     dataArr.push(obj)
       //   })
       // })
+      for (let i in dataArr[0]) {
+        this.chartMsg.series[0].name = dataArr[0]['item']
+        if (i.search('value') === 0) {
+          this.chartMsg.series[0].data.push({
+            name: dataArr[0]['item'],
+            value: dataArr[0][i]
+          })
+        }
+      }
+      for (let i in dataArr[1]) {
+        this.chartMsg.series[1].name = dataArr[1]['item']
+        if (i.search('value') === 0) {
+          this.chartMsg.series[1].data.push({
+            name: dataArr[1]['item'],
+            value: dataArr[1][i]
+          })
+        }
+      }
+      for (let i in dataArr[2]) {
+        this.chartMsg.series[2].name = dataArr[2]['item']
+        if (i.search('value') === 0) {
+          this.chartMsg.series[2].data.push({
+            name: dataArr[2]['item'],
+            value: dataArr[2][i]
+          })
+        }
+      }
+      // for (let i in dataArr[3]) {
+      //   this.chartMsg.series[3].name = dataArr[3]['item']
+      //   if (i.search('value') === 0) {
+      //     this.chartMsg.series[3].data.push({
+      //       name: dataArr[3]['item'],
+      //       name: dataArr[3][i]
+      //     })
+      //   }
+      // }
       console.log(dataArr)
       this.tableData = dataArr
       // this.tableProps.push()
       this.listQuery.total = res.data.total
       if (this.listQuery.total > 0) {
         this.tableData.forEach(item => {
-          item.startTime = item.startDate ? item.startDate[0] + '-' + item.startDate[1] + '-' + item.startDate[2] : '--'
-          item.endTime = item.endDate ? item.endDate[0] + '-' + item.endDate[1] + '-' + item.endDate[2] : '--'
+          item.beginTime = item.beginTime ? item.beginTime[0] + '-' + item.beginTime[1] + '-' + item.beginTime[2] : '--'
+          item.endTime = item.endTime ? item.endTime[0] + '-' + item.endTime[1] + '-' + item.endTime[2] : '--'
         })
       }
     },
@@ -465,6 +722,13 @@ export default {
       console.log("=========================");
     },
     handleExport() {
+      let fileName = "产量转化效率.xls";
+      exportProduceTransData(this.listQuery)
+        .then((response) => {
+          this.$download.excel(response, fileName);
+          this.$message.success("导出成功");
+        })
+        .catch(() => { });
       console.log("导出");
     },
   },
@@ -477,7 +741,7 @@ export default {
   background-color: #fff;
   border-radius: 8px;
   padding: 16px 16px 0 16px;
-  margin-bottom: 8px;
+  margin: 8px 0px;
 }
 
 .containerTop {
diff --git a/src/views/report/productionSituationMW.vue b/src/views/report/productionSituationMW.vue
index b432c4f..0560914 100644
--- a/src/views/report/productionSituationMW.vue
+++ b/src/views/report/productionSituationMW.vue
@@ -1,73 +1,105 @@
 <template>
   <div>
-    <!-- <div class="search"> -->
     <ButtonNav style="padding: 0;" :menus="['邯郸', '瑞昌']" :button-mode="true" @change="currentMenu = $event">
     </ButtonNav>
-    <!-- </div> -->
-    <div class="containerTop">
+    <div class="search">
       <el-form :model="listQuery" :inline="true" ref="dataForm" class="blueTip">
-        <el-form-item label="时间维度" prop="date">
+        <el-form-item label="时间维度" prop="type">
           <el-select size="small" clearable v-model="listQuery.type" placeholder="请选择">
             <el-option v-for="item in timeList" :key="item.value" :label="item.label" :value="item.value">
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item v-show="listQuery.type === 0 || listQuery.type === ''" label="时间范围" prop="reportTime">
-          <el-date-picker size="small" clearable v-model="listQuery.reportTime" type="daterange" range-separator="至"
-            start-placeholder="开始日期" value-format="yyyy-MM-dd" @change="changeDayTime" end-placeholder="结束日期">
+          <el-date-picker size="small" clearable v-model="listQuery.reportTime" type="datetimerange" range-separator="至"
+            start-placeholder="开始日期" value-format="yyyy-MM-dd" format="yyyy-MM-dd" @change="changeDayTime"
+            end-placeholder="结束日期">
           </el-date-picker>
         </el-form-item>
         <el-form-item v-show="listQuery.type === 1" label="时间范围" prop="reportTime">
-          <el-date-picker size="small" clearable v-model="start" type="week" format="yyyy 第 WW 周" placeholder="选择周"
-            style="width: 180px" @change="onValueChange">
+          <el-date-picker size="small" clearable v-model="listQuery.start" type="week" format="yyyy 第 WW 周"
+            placeholder="选择周" style="width: 180px" @change="onValueChange">
           </el-date-picker>
           至
-          <el-date-picker size="small" clearable v-model="end" type="week" format="yyyy 第 WW 周" placeholder="选择周"
-            style="width: 180px" @change="onValueChange">
+          <el-date-picker size="small" clearable v-model="listQuery.end" type="week" format="yyyy 第 WW 周"
+            placeholder="选择周" style="width: 180px" @change="onValueChange">
           </el-date-picker>
-          <!-- <span v-if="start && end" style="margin-left: 10px">
+          <!-- <span v-if="listQuery.start && listQuery.end" style="margin-left: 10px">
             {{ date1 }} 至 {{ date2 }}，共 {{ weekNum }} 周
           </span> -->
         </el-form-item>
-        <el-form-item v-show="listQuery.type === 2" label="时间值" prop="reportTime">
-          <el-date-picker size="small" v-model="listQuery.reportTime" type="monthrange" value-format="yyyy-MM-DD"
-            range-separator="至" start-placeholder="开始月份" end-placeholder="结束月份" @change="changeTime">
+        <el-form-item v-show="listQuery.type === 2" label="时间范围" prop="reportTime">
+          <el-date-picker size="small" clearable v-model="listQuery.reportTime" type="monthrange"
+            value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始月份" end-placeholder="结束月份"
+            @change="changeTime">
           </el-date-picker>
         </el-form-item>
-        <el-form-item v-show="listQuery.type === 3" label="时间值" prop="reportTime">
-          <el-date-picker size="small" clearable v-model="listQuery.reportTime[0]" value-format="yyyy" type="year"
+        <el-form-item v-show="listQuery.type === 3" label="时间范围" prop="reportTime">
+          <el-date-picker size="small" clearable v-model="listQuery.start" value-format="yyyy-MM-dd" type="year"
             placeholder="开始时间">
           </el-date-picker>
           ~
-          <el-date-picker size="small" clearable v-model="listQuery.reportTime[1]" value-format="yyyy" type="year"
+          <el-date-picker size="small" clearable v-model="listQuery.end" value-format="yyyy-MM-dd" type="year"
             placeholder="结束时间" @change="getYear">
           </el-date-picker>
         </el-form-item>
-        <!-- <el-form-item label="玻璃类型" prop="type">
-          <el-select v-model="listQuery.type" placeholder="请选择玻璃类型">
-            <el-option v-for="item in typeList" :key="item.id" :label="item.name" :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item> -->
-        <!-- <el-form-item label="玻璃类型" prop="type">
-          <el-select v-model="listQuery.type" placeholder="请选择玻璃类型">
-            <el-option v-for="item in typeList" :key="item.id" :label="item.name" :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item> -->
         <el-form-item>
           <el-button type="primary" size="small" @click="getDataList">查询</el-button>
-          <el-divider direction="vertical"></el-divider>
-          <!-- <el-button type="primary" size="small" plain @click="handleImport">导入</el-button> -->
           <el-button type="primary" size="small" plain @click="handleExport">导出</el-button>
-          <!-- <el-button type="success" size="small" plain @click="addFactory">新增</el-button> -->
         </el-form-item>
       </el-form>
+    </div>
+    <div class="containerTop">
+
       <!-- <div class="smallTitle">产量转化效率</div> -->
 
       <!-- <bmSearchBar @getSearch="getSearch" @handleExport="handleExport" /> -->
-      <bm-line-bar :chartHeight="chartHeight" :legendList="legendList" :chartMsg="chartMsg" :chartId="chartId"
-        :chartNum="chartNum" />
+      <el-row v-if="this.listQuery.type === 2">
+        <el-col :span="12">
+          <div class="blueTip">
+            生产情况对比
+          </div>
+          <bm-line-bar :type="listQuery.type" style="margin-top: 20px;" :show="false" :chartHeight="chartHeight"
+            :legendList="legendList" :chartMsg="chartMsg" :chartId="chartId" :chartNum="chartNum" />
+        </el-col>
+        <el-col :span="6" style="margin-top: 30px">
+          <bm-line-bar-target :type="listQuery.type" :chartHeight="chartHeight" :legendList="legendList"
+            :chartMsg="chartMsgTarget" :chartId="'chartTarget'" :chartNum="chartNum" />
+        </el-col>
+        <el-col :span="6">
+          <div class="blueTip">
+            {{ title }}
+          </div>
+          <bm-line-bar-year-target :type="listQuery.type" :chartHeight="chartHeight" :legendList="legendList"
+            :chartMsg="chartMsgYearTarget" :chartId="'chartYearTarget'" :chartNum="chartNum" />
+        </el-col>
+      </el-row>
+      <el-row v-else-if="this.listQuery.type === 1 || this.listQuery.type === 0">
+        <el-col :span="18">
+          <div class="blueTip">
+            生产情况对比
+          </div>
+          <bm-line-bar :type="listQuery.type" style="margin-top: 20px;" :show="false" :chartHeight="chartHeight"
+            :legendList="legendList" :chartMsg="chartMsg" :chartId="'chartDay'" :chartNum="chartNum" />
+        </el-col>
+        <el-col :span="6" style="margin-top: 30px">
+          <bm-line-bar-target :type="listQuery.type" :chartHeight="chartHeight" :legendList="legendList"
+            :chartMsg="chartMsgTarget" :chartId="'chartDayTarget'" :chartNum="chartNum" />
+        </el-col>
+        <!-- <el-col :span="6">
+          <div class="blueTip">
+            {{ title }}
+          </div>
+          <bm-line-bar-year-target :chartHeight="chartHeight" :legendList="legendList" :chartMsg="chartMsgYearTarget"
+            :chartId=" 'chartYearTarget'" :chartNum="chartNum" />
+        </el-col> -->
+      </el-row>
+      <el-row v-else>
+        <!-- <el-col :span="12"> -->
+        <bm-line-bar :type="listQuery.type" :chartHeight="chartHeight" :legendList="legendList" :chartMsg="chartMsg"
+          :chartId="chartId" :chartNum="chartNum" />
+        <!-- </el-col> -->
+      </el-row>
       <base-table :table-props="tableProps" :page="listQuery.current" :limit="listQuery.size" :table-data="tableData"
         :max-height="tableH" />
     </div>
@@ -78,18 +110,22 @@
 </template>
 
 <script>
-import { getProductionSituationMWData } from '@/api/report';
+import { getProductionSituationMWData, exportProductionSituationMWData } from '@/api/report';
 import bmSearchBar from "./components/bmSearchBar.vue";
-import BmLineBar from "./components/bmLineBar.vue";
+import BmLineBar from "./components/produceLineBar.vue";
+import BmLineBarTarget from "./components/produceLineBarTarget.vue";
+import BmLineBarYearTarget from "./components/produceLineBarYearTarget.vue";
 import ButtonNav from '@/components/ButtonNav'
 import moment from 'moment'
 export default {
-  name: "ChipYieldBM",
+  name: "componentTotalPowerBM",
   data() {
     return {
       otherProps: [],
       start: undefined,
+      currentMenu: '邯郸',
       end: undefined,
+      title: '',
       listQuery: {
         pageNo: 1,
         pageSize: 999,
@@ -100,7 +136,8 @@ export default {
         type: 2,
         startDate: undefined,
         endDate: undefined,
-        reportTime: []
+        start: undefined,
+        end: undefined,
       },
       timeList: [
         {
@@ -124,35 +161,28 @@ export default {
       chartHeight: this.tableHeight(137) / 2 - 111,
       tableH: this.tableHeight(137) / 2 - 70,
       legendList: [
-        { id: 1, name: "2024年4月目标值", type: 2, color: "#FFCE6A" },
-        { id: 2, name: "2023年4月", type: 1, color: "#8EF0AB" },
-        { id: 3, name: "2024年4月", type: 1, color: "#288AFF" },
+        // { id: 1, name: "FTO投入", type: 1, color: "#FFCE6A" },
+        { id: 2, name: "芯片总功率", type: 1, color: "#8EF0AB" },
+        { id: 3, name: "标准组件总功率", type: 1, color: "#288AFF" },
+          // { id: 4, name: "BIPV产量", type: 1, color: "#64BDFF" },
       ],
-      chartMsg: {
-        color: ["#FFCE6A", "#8EF0AB", "#288AFF"],
-        xData: ["成都", "邯郸", "瑞昌"],
-        yName: "单位/%",
+      chartMsgYearTarget: {
+        color: ["#8EF0AB", "#288AFF"],
+        xData: [],
+        yName: "单位/MW",
+        yAxis: {
+          type: "value",
+          name: "单位/MW",
+          show: true,
+          nameTextStyle: {
+            fontSize: 12,
+            align: "right",
+          },
+          axisLabel: {},
+        },
         series: [
           {
-            name: "2024年4月目标值",
-            data: [
-              { name: "%", value: 85 },
-              { name: "%", value: 85 },
-              { name: "%", value: 85 },
-            ],
-            type: "line",
-            symbol: "circle",
-            symbolSize: 6,
-            label: {
-              show: true,
-              color: "#FFAE17",
-              formatter: function (params) {
-                return params.value.toFixed(2) + "%";
-              },
-            },
-          },
-          {
-            name: "2023年4月",
+            name: "芯片总功率",
             data: [
               { name: "%", value: 57.5 },
               { name: "%", value: 21.66 },
@@ -165,12 +195,12 @@ export default {
               position: [-18, -16],
               color: "#68C483",
               formatter: function (params) {
-                return params.value.toFixed(2) + "%";
+                return params.value
               },
             },
           },
           {
-            name: "2024年4月",
+            name: "标准组件总功率",
             data: [
               { name: "%", value: 23.33 },
               { name: "%", value: 7.02 },
@@ -183,22 +213,109 @@ export default {
               position: [0, -16],
               color: "#288AFF",
               formatter: function (params) {
-                return params.value.toFixed(2) + "%";
+                return params.value
               },
             },
           },
         ],
       },
-      chartId: "chipYieldBMChart",
+      chartMsgTarget: {
+        color: [ "#8EF0AB", "#288AFF",'rgba(104, 196, 131, .5)', 'rgba(40, 138, 255, .5)'],
+        xData: [],
+        yName: "单位/MW",
+        yAxis: {
+          type: "value",
+          name: "单位/MW",
+          show: false,
+          nameTextStyle: {
+            fontSize: 12,
+            align: "right",
+          },
+          axisLabel: {},
+        },
+        series: [
+
+        ],
+      },
+      chartMsg: {
+        color: ["#8EF0AB", "#288AFF"],
+        xData: [],
+        yName: "单位/MW",
+        yAxis:
+        {
+          type: "value",
+          name: "单位/MW",
+          nameTextStyle: {
+            fontSize: 12,
+            align: "right",
+          },
+          axisLabel: {},
+        },
+        series: [
+          {
+            name: "芯片总功率",
+            data: [
+              { name: "%", value: 57.5 },
+              { name: "%", value: 21.66 },
+              { name: "%", value: 18.4 },
+            ],
+            type: "bar",
+            barWidth: 20,
+            label: {
+              show: true,
+              position: [10, -16],
+              color: "#68C483",
+              formatter: function (params) {
+                return params.value
+              },
+            },
+          },
+          {
+            name: "标准组件总功率",
+            data: [
+              { name: "%", value: 23.33 },
+              { name: "%", value: 7.02 },
+              { name: "%", value: 80.2 },
+            ],
+            type: "bar",
+            barWidth: 20,
+            label: {
+              show: true,
+              position: [0, -16],
+              color: "#288AFF",
+              formatter: function (params) {
+                return params.value
+              },
+            },
+          },
+        ],
+      },
+      chartId: "componentTotalPowerBMChart",
       chartNum: 1,
     };
   },
   components: {
     bmSearchBar,
     BmLineBar,
+    BmLineBarTarget,
+    BmLineBarYearTarget,
     ButtonNav
   },
   computed: {
+    dataArr() {
+      if (this.currentMenu != '瑞昌') {
+        return [{
+          factory: null,
+          item: '芯片总功率',
+          unit: 'MW'
+        },
+        {
+          factory: null,
+          item: '	标准组件总功率',
+          unit: 'MW'
+        }]
+      }
+    },
     tableProps() {
       return [
         {
@@ -234,7 +351,7 @@ export default {
   watch: {
     // 监听左侧菜单栏是否展开
     isOpen(val) {
-      if (this.$route.name === "ChipYieldBM") {
+      if (this.$route.name === "productionSituationMW") {
         this.chartNum++;
       }
     },
@@ -249,7 +366,7 @@ export default {
   },
   activated() {
     // 图重新加载，为了防止窗口变化后尺寸图显示不佳，数据不更新
-    if (this.$route.name === "ChipYieldBM") {
+    if (this.$route.name === "productionSituationMW") {
       this.chartNum++;
     }
   },
@@ -262,60 +379,31 @@ export default {
   },
   methods: {
     getYear(e) {
-      if (this.end && Number(this.end) - Number(this.start) > 10) {
+      if (this.listQuery.end - this.listQuery.start > 10 * 365 * 24 * 60 * 60 * 1000) {
         this.$message({
           message: '年份起止时间不能超过十年',
           type: 'warning'
         });
-        this.start = undefined
-        this.end = undefined
+        this.listQuery.reportTime = []
+        this.listQuery.start = undefined
+        this.listQuery.end = undefined
         // console.log();
       } else {
-        if (Number(this.end) < Number(this.start)) {
-          this.$message({
-            message: '结束年份不能小于开始年份',
-            type: 'warning'
-          });
-          this.start = undefined
-          this.end = undefined
-        } else {
-          this.listQuery.startDate = Number(this.start)
-          this.listQuery.endDate = Number(this.end)
-        }
+        this.listQuery.startDate = this.listQuery.start
+        this.listQuery.endDate = this.listQuery.end
       }
-      if (!this.start && !this.end) {
+      if (!this.listQuery.start && !this.listQuery.end) {
         this.listQuery.startDate = undefined
         this.listQuery.endDate = undefined
       }
       // console.log(e);
     },
-    changeTime() {
-      if (this.listQuery.reportTime) {
-        console.log(this.listQuery.reportTime)
-        let start = new Date(this.listQuery.reportTime[0])
-        let end = new Date(this.listQuery.reportTime[1])
-        // const years = Number(this.listQuery.reportTime[1].slice(0, 4)) - Number(this.listQuery.reportTime[0].slice(0, 4))
-        // const months = Number(this.listQuery.reportTime[1].slice(4)) - Number(this.listQuery.reportTime[0].slice(4))
-        // console.log(years);
-        if ((end - start) > 31104000000) {
-          this.$message({
-            message: '时间范围不能超过24个月',
-            type: 'warning'
-          });
-          this.listQuery.reportTime = [];
-        } else {
-          this.listQuery.startDate = this.listQuery.reportTime[0]
-          this.listQuery.endDate = this.listQuery.reportTime[1]
-        }
-      } else {
-        this.listQuery.startDate = undefined
-        this.listQuery.endDate = undefined
-      }
-    },
     onValueChange(picker, k) { // 选中近k周后触发的操作
-      if (this.start && this.end) {
-        this.date1 = moment(this.start.getTime() - 24 * 60 * 60 * 1000).format('YYYY-MM-DD')
-        this.date2 = moment(this.end.getTime() + 5 * 24 * 60 * 60 * 1000).format('YYYY-MM-DD')
+      // console.log(this.listQuery.reportTime[0], this.listQuery.reportTime[1])
+      if (this.listQuery.start && this.listQuery.end) {
+        console.log(this.listQuery.reportTime)
+        this.date1 = moment(this.listQuery.start.getTime() - 24 * 60 * 60 * 1000).format('YYYY-MM-DD HH:mm:ss')
+        this.date2 = moment(this.listQuery.end.getTime() + 5 * 24 * 60 * 60 * 1000).format('YYYY-MM-DD HH:mm:ss')
         const numDays = (new Date(this.date2).getTime() - new Date(this.date1).getTime()) / (24 * 3600 * 1000);
         if (numDays > 168) {
           console.log(numDays)
@@ -324,20 +412,21 @@ export default {
             type: 'warning'
           });
         } else {
-          this.listQuery.startDate = this.date1
-          this.listQuery.endDate = this.date2
-          // this.listQuery.startDate = Number(moment(this.start.getTime()).format('YYYYWW'))
-          // this.listQuery.endDate = Number(moment(this.end.getTime()).format('YYYYWW'))
+          this.listQuery.startDate = moment(this.listQuery.start.getTime() - 24 * 60 * 60 * 1000).format('YYYY-MM-DD')
+          this.listQuery.endDate = moment(this.listQuery.end.getTime() + 5 * 24 * 60 * 60 * 1000).format('YYYY-MM-DD')
         }
       }
-      if (!this.start && !this.end) {
+      if (!this.listQuery.start && !this.listQuery.end) {
         this.listQuery.startDate = undefined
         this.listQuery.endDate = undefined
       }
     },
     changeDayTime() {
       if (this.listQuery.reportTime) {
-        const numDays = Number(this.listQuery.reportTime[1]) - Number(this.listQuery.reportTime[0])
+        // this.createStartDate = moment(new Date(this.listQuery.reportTime[0]), 'yyyy-MM-dd hh:mm:ss');
+        // this.createEndDate = moment(new Date(this.listQuery.reportTime[1]), 'yyyy-MM-dd hh:mm:ss');
+        console.log(this.listQuery.reportTime[1])
+        const numDays = (this.listQuery.reportTime[1] - this.listQuery.reportTime[0]) / (24 * 3600 * 1000);
         if (numDays > 30) {
           this.$message({
             message: '时间范围不能超过30天',
@@ -353,93 +442,463 @@ export default {
         this.listQuery.endDate = undefined
       }
     },
-    getOverView() {
-      // getOverView().then(res => {
-      //   this.data = res.data
-      //   console.log('aa', res.data)
-      // })
-    },
-    otherMethods(val) {
-      this.detailOrUpdateVisible = true;
-      // this.addOrEditTitle = "详情";
-      this.$nextTick(() => {
-        // this.$refs.detailOrUpdate.init(val.data.id);
-      });
+    changeTime(value) {
+      if (this.listQuery.reportTime) {
+        const numDays = this.listQuery.reportTime[1] - this.listQuery.reportTime[0];
+        if (numDays > 2 * 365 * 24 * 60 * 60 * 1000) {
+          this.$message({
+            message: '时间范围不能超过24个月',
+            type: 'warning'
+          });
+          this.listQuery.reportTime = [];
+        } else {
+          this.listQuery.startDate = this.listQuery.reportTime[0]
+          this.listQuery.endDate = this.listQuery.reportTime[1]
+        }
+      } else {
+        this.listQuery.startDate = undefined
+        this.listQuery.endDate = undefined
+      }
     },
     async getDataList() {
       this.otherProps = []
+      this.chartMsg.xData = []
+      this.chartMsgTarget.xData = []
+      this.chartMsgYearTarget.xData = []
       console.log(this.listQuery);
-      if (this.listQuery.type == 3) {
-        this.listQuery.startDate = this.listQuery.reportTime[0]
-        this.listQuery.endDate = this.listQuery.reportTime[1]
-      }
       let arr = []
       this.currentMenu === '邯郸' ? arr.push(1) : arr.push(0)
       this.listQuery.factory = arr
       const res = await getProductionSituationMWData(this.listQuery)
-      let dataArr = [{
-        factory: null,
-        item: '芯片总功率',
-        unit: 'MW'
-      },
-      {
-        factory: null,
-        item: '标准组件总功率',
-        unit: 'MW'
-      }]
-      res.data.list.forEach((ele, index) => {
-        let i = index + 1
-        this.otherProps.push({
-          label: ele.titleValue,
-          props: 'value' + i
+      if (this.listQuery.type === 2) {
+        console.log(res.data.list.slice(res.data.list.length - 2, res.data.list.length));
+        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,
+            props: 'value' + i
+          })
         })
-      })
-      console.log(this.otherProps)
-      res.data.list.forEach((ele, index) => {
-        let i = index + 1
-        let m = 'value' + i
-        ele.productionSituationPowerDataVOList.forEach((item) => {
-          dataArr[0]['' + m + ''] = item.chipTotalPower
-          dataArr[0].factory = item.factory === 1 ? '邯郸' : '瑞昌'
-          dataArr[1].factory = item.factory === 1 ? '邯郸' : '瑞昌'
-          dataArr[1]['' + m + ''] = item.componentTotalPower
+        // res.data.list.forEach((ele) => {
+        res.data.list.slice(0, res.data.list.length - 2).forEach((ele, index) => {
+          // let i = index + 1
+          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
+            })
+            this.chartMsg.series[1].data.push({
+              name: ele.titleValue,
+              value: item.componentTotalPower
+            })
+          })
         })
-        // ele.titleValue
-        // .push({
-        //   label: ele.titleValue,
-        //   props: 'value' + index + 1,
+        this.chartMsgTarget.xData.push(res.data.list[res.data.list.length - 2].titleValue.replace(/[^\d]/g, " "))
+        // this.chartMsgTarget.series = [{
+        //   name: "FTO投入",
+        //   data: [
+        //     // s
+        //     { name: "FTO投入目标", value:res,data,list },
+        //     { name: "%", value: 85 },
+        //     { name: "%", value: 85 },
+        //   ],
+        //   type: "bar",
+        //   barWidth: 20,
+        //   barGap: '0',
+        //   label: {
+        //     show: true,
+        //     position: [-18, -16],
+        //     color: "#FFAE17",
+        //     formatter: function (params) {
+        //       return params.value
+        //     },
+        //   },
+        // },]
+        let arr = []
+        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) {
+              arr.push(
+                {
+                  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
+                    },
+                  },
+                },
+                {
+                  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 {
+              arr.push(
+                {
+                  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
+                    },
+                  },
+                },
+                {
+                  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()
+            // this.chartMsgTarget.series[2].data.push()
+            // this.chartMsgTarget.series[3].data.push()
+          })
+        })
+        console.log('arr', arr)
+        this.chartMsgTarget.series = arr
+        // arr.forEach((ele) => {
+
         // })
-      })
+        res.data.list.slice(res.data.list.length - 1, res.data.list.length).forEach((ele, index) => {
+          // let i = index + 1
+          this.chartMsgYearTarget.xData.push(ele.titleValue)
+          this.title = ele.titleValue
+          ele.productionSituationPowerDataVOList.forEach((item) => {
+            this.chartMsgYearTarget.series[0].data.push({
+              name: ele.titleValue,
+              value: item.chipTotalPower
+            })
+            this.chartMsgYearTarget.series[1].data.push({
+              name: ele.titleValue,
+              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) {
+        console.log(res.data.list.slice(res.data.list.length - 2, res.data.list.length));
+        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,
+            props: 'value' + i
+          })
+        })
+        // res.data.list.forEach((ele) => {
+        res.data.list.slice(0, res.data.list.length - 1).forEach((ele, index) => {
+          // let i = index + 1
+          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
+            })
+            this.chartMsg.series[1].data.push({
+              name: ele.titleValue,
+              value: item.componentTotalPower
+            })
+          })
+        })
+        this.chartMsgTarget.xData.push(res.data.list[res.data.list.length - 1].titleValue)
+        // this.chartMsgTarget.series = [{
+        //   name: "FTO投入",
+        //   data: [
+        //     // s
+        //     { name: "FTO投入目标", value:res,data,list },
+        //     { name: "%", value: 85 },
+        //     { name: "%", value: 85 },
+        //   ],
+        //   type: "bar",
+        //   barWidth: 20,
+        //   barGap: '0',
+        //   label: {
+        //     show: true,
+        //     position: [-18, -16],
+        //     color: "#FFAE17",
+        //     formatter: function (params) {
+        //       return params.value
+        //     },
+        //   },
+        // },]
+        let arr = []
+        res.data.list.slice(res.data.list.length - 1, 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) {
+              arr.push(
+                {
+                  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
+                    },
+                  },
+                },
+                {
+                  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 {
+              arr.push(
+                {
+                  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
+                    },
+                  },
+                },
+                {
+                  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()
+            // this.chartMsgTarget.series[2].data.push()
+            // this.chartMsgTarget.series[3].data.push()
+          })
+        })
+        console.log('arr', arr)
+        this.chartMsgTarget.series = arr
+        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
+          })
+          // 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,
+            props: '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]) {
+          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]
+            })
+          }
+        }
+        for (let i in this.dataArr[1]) {
+          this.chartMsg.series[1].name = this.dataArr[1]['item']
+          if (i.search('value') === 0) {
+            this.chartMsg.series[1].data.push({
+              name: this.dataArr[1]['item'],
+              value: this.dataArr[1][i]
+            })
+          }
+        }
+      }
+      this.tableData = this.dataArr
       // this.tableProps = otherProps
       // res.data.list.forEach((ele) => {
       //   console.log(ele);
-      //   ele.productionSituationDataVOList.forEach((item) => {
+      //   ele.productionSituationPowerDataVOList.forEach((item) => {
       //     let obj = {
       //       bipvProductOutput: item.bipvProductOutput,
-      //       chipYield: item.chipYield,
+      //       componentTotalPower: item.componentTotalPower,
       //       componentYield: item.componentYield,
       //       factory: item.factory,
-      //       ftoInput: item.ftoInput,
+      //       chipTotalPower: item.chipTotalPower,
       //       titleValue:ele.titleValue
       //     }
       //     dataArr.push(obj)
       //   })
       // })
-      console.log(dataArr)
-      this.tableData = dataArr
+      // console.log(dataArr)
       // this.tableProps.push()
       this.listQuery.total = res.data.total
-      if (this.listQuery.total > 0) {
-        this.tableData.forEach(item => {
-          item.startTime = item.startDate ? item.startDate[0] + '-' + item.startDate[1] + '-' + item.startDate[2] : '--'
-          item.endTime = item.endDate ? item.endDate[0] + '-' + item.endDate[1] + '-' + item.endDate[2] : '--'
-        })
-      }
+      // if (this.listQuery.total > 0) {
+      //   this.tableData.forEach(item => {
+      //     item.startTime = item.startDate ? item.startDate[0] + '-' + item.startDate[1] + '-' + item.startDate[2] : '--'
+      //     item.endTime = item.endDate ? item.endDate[0] + '-' + item.endDate[1] + '-' + item.endDate[2] : '--'
+      //   })
+      // }
     },
     _setTableHeight() {
       this.tableH = this.tableHeight(137) / 2 - 70;
       this.chartHeight = this.tableHeight(137) / 2 - 111;
-      if (this.$route.name === "ChipYieldBM") {
+      if (this.$route.name === "componentTotalPowerBM") {
         this.chartNum++;
       }
     },
@@ -448,7 +907,13 @@ export default {
       console.log("=========================");
     },
     handleExport() {
-      console.log("导出");
+      let fileName = "生产情况(片).xls";
+      exportProductionSituationMWData(this.listQuery)
+        .then((response) => {
+          this.$download.excel(response, fileName);
+          this.$message.success("导出成功");
+        })
+        .catch(() => { });
     },
   },
 };
@@ -460,7 +925,7 @@ export default {
   background-color: #fff;
   border-radius: 8px;
   padding: 16px 16px 0 16px;
-  margin-bottom: 8px;
+  margin: 8px 0px;
 }
 
 .containerTop {
diff --git a/src/views/report/productionSituationTablets.vue b/src/views/report/productionSituationTablets.vue
index 42c482f..240b016 100644
--- a/src/views/report/productionSituationTablets.vue
+++ b/src/views/report/productionSituationTablets.vue
@@ -1,74 +1,105 @@
 <template>
   <div>
-    <!-- <div class="search"> -->
     <ButtonNav style="padding: 0;" :menus="['邯郸', '瑞昌']" :button-mode="true" @change="currentMenu = $event">
     </ButtonNav>
-    <!-- </div> -->
-    <div class="containerTop">
+    <div class="search">
       <el-form :model="listQuery" :inline="true" ref="dataForm" class="blueTip">
-        <el-form-item label="时间维度" prop="date">
+        <el-form-item label="时间维度" prop="type">
           <el-select size="small" clearable v-model="listQuery.type" placeholder="请选择">
             <el-option v-for="item in timeList" :key="item.value" :label="item.label" :value="item.value">
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item v-show="listQuery.type === 0 || listQuery.type === ''" label="时间范围" prop="reportTime">
-          <el-date-picker size="small" clearable v-model="listQuery.reportTime" type="daterange" range-separator="至"
-            start-placeholder="开始日期" value-format="yyyy-MM-dd" @change="changeDayTime" end-placeholder="结束日期">
+          <el-date-picker size="small" clearable v-model="listQuery.reportTime" type="datetimerange" range-separator="至"
+            start-placeholder="开始日期" value-format="yyyy-MM-dd" format="yyyy-MM-dd" @change="changeDayTime"
+            end-placeholder="结束日期">
           </el-date-picker>
         </el-form-item>
         <el-form-item v-show="listQuery.type === 1" label="时间范围" prop="reportTime">
-          <el-date-picker size="small" clearable v-model="start" type="week" format="yyyy 第 WW 周" placeholder="选择周"
-            style="width: 180px" @change="onValueChange">
+          <el-date-picker size="small" clearable v-model="listQuery.start" type="week" format="yyyy 第 WW 周"
+            placeholder="选择周" style="width: 180px" @change="onValueChange">
           </el-date-picker>
           至
-          <el-date-picker size="small" clearable v-model="end" type="week" format="yyyy 第 WW 周" placeholder="选择周"
-            style="width: 180px" @change="onValueChange">
+          <el-date-picker size="small" clearable v-model="listQuery.end" type="week" format="yyyy 第 WW 周"
+            placeholder="选择周" style="width: 180px" @change="onValueChange">
           </el-date-picker>
-          <!-- <span v-if="start && end" style="margin-left: 10px">
+          <!-- <span v-if="listQuery.start && listQuery.end" style="margin-left: 10px">
             {{ date1 }} 至 {{ date2 }}，共 {{ weekNum }} 周
           </span> -->
         </el-form-item>
-        <el-form-item v-show="listQuery.type === 2" label="时间值" prop="reportTime">
-          <el-date-picker size="small" v-model="listQuery.reportTime" type="monthrange"
-            value-format="yyyy-MM-DD" range-separator="至" start-placeholder="开始月份" end-placeholder="结束月份"
+        <el-form-item v-show="listQuery.type === 2" label="时间范围" prop="reportTime">
+          <el-date-picker size="small" clearable v-model="listQuery.reportTime" type="monthrange"
+            value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始月份" end-placeholder="结束月份"
             @change="changeTime">
           </el-date-picker>
         </el-form-item>
-        <el-form-item v-show="listQuery.type === 3" label="时间值" prop="reportTime">
-          <el-date-picker size="small" clearable v-model="listQuery.reportTime[0]" value-format="yyyy" type="year"
+        <el-form-item v-show="listQuery.type === 3" label="时间范围" prop="reportTime">
+          <el-date-picker size="small" clearable v-model="listQuery.start" value-format="yyyy-MM-dd" type="year"
             placeholder="开始时间">
           </el-date-picker>
           ~
-          <el-date-picker size="small" clearable v-model="listQuery.reportTime[1]" value-format="yyyy" type="year"
+          <el-date-picker size="small" clearable v-model="listQuery.end" value-format="yyyy-MM-dd" type="year"
             placeholder="结束时间" @change="getYear">
           </el-date-picker>
         </el-form-item>
-        <!-- <el-form-item label="玻璃类型" prop="type">
-          <el-select v-model="listQuery.type" placeholder="请选择玻璃类型">
-            <el-option v-for="item in typeList" :key="item.id" :label="item.name" :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item> -->
-        <!-- <el-form-item label="玻璃类型" prop="type">
-          <el-select v-model="listQuery.type" placeholder="请选择玻璃类型">
-            <el-option v-for="item in typeList" :key="item.id" :label="item.name" :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item> -->
         <el-form-item>
           <el-button type="primary" size="small" @click="getDataList">查询</el-button>
-          <el-divider direction="vertical"></el-divider>
-          <!-- <el-button type="primary" size="small" plain @click="handleImport">导入</el-button> -->
           <el-button type="primary" size="small" plain @click="handleExport">导出</el-button>
-          <!-- <el-button type="success" size="small" plain @click="addFactory">新增</el-button> -->
         </el-form-item>
       </el-form>
+    </div>
+    <div class="containerTop">
+
       <!-- <div class="smallTitle">产量转化效率</div> -->
 
       <!-- <bmSearchBar @getSearch="getSearch" @handleExport="handleExport" /> -->
-      <bm-line-bar :chartHeight="chartHeight" :legendList="legendList" :chartMsg="chartMsg" :chartId="chartId"
-        :chartNum="chartNum" />
+      <el-row v-if="this.listQuery.type === 2">
+        <el-col :span="12">
+          <div class="blueTip">
+            生产情况对比
+          </div>
+          <bm-line-bar :type="listQuery.type" style="margin-top: 20px;" :show="false" :chartHeight="chartHeight"
+            :legendList="legendList" :chartMsg="chartMsg" :chartId="chartId" :chartNum="chartNum" />
+        </el-col>
+        <el-col :span="6" style="margin-top: 30px">
+          <bm-line-bar-target :type="listQuery.type" :chartHeight="chartHeight" :legendList="legendList"
+            :chartMsg="chartMsgTarget" :chartId=" 'chartTarget'" :chartNum="chartNum" />
+        </el-col>
+        <el-col :span="6">
+          <div class="blueTip">
+            {{ title }}
+          </div>
+          <bm-line-bar-year-target :type="listQuery.type" :chartHeight="chartHeight" :legendList="legendList"
+            :chartMsg="chartMsgYearTarget" :chartId=" 'chartYearTarget'" :chartNum="chartNum" />
+        </el-col>
+      </el-row>
+      <el-row v-else-if="this.listQuery.type === 1 || this.listQuery.type === 0">
+        <el-col :span="18">
+          <div class="blueTip">
+            生产情况对比
+          </div>
+          <bm-line-bar :type="listQuery.type" style="margin-top: 20px;" :show="false" :chartHeight="chartHeight"
+            :legendList="legendList" :chartMsg="chartMsg" :chartId="'chartDay'" :chartNum="chartNum" />
+        </el-col>
+        <el-col :span="6" style="margin-top: 30px">
+          <bm-line-bar-target :type="listQuery.type" :chartHeight="chartHeight" :legendList="legendList"
+            :chartMsg="chartMsgTarget" :chartId=" 'chartDayTarget'" :chartNum="chartNum" />
+        </el-col>
+        <!-- <el-col :span="6">
+          <div class="blueTip">
+            {{ title }}
+          </div>
+          <bm-line-bar-year-target :chartHeight="chartHeight" :legendList="legendList" :chartMsg="chartMsgYearTarget"
+            :chartId=" 'chartYearTarget'" :chartNum="chartNum" />
+        </el-col> -->
+      </el-row>
+      <el-row v-else>
+        <!-- <el-col :span="12"> -->
+        <bm-line-bar :type="listQuery.type" :chartHeight="chartHeight" :legendList="legendList" :chartMsg="chartMsg"
+          :chartId="chartId" :chartNum="chartNum" />
+        <!-- </el-col> -->
+      </el-row>
       <base-table :table-props="tableProps" :page="listQuery.current" :limit="listQuery.size" :table-data="tableData"
         :max-height="tableH" />
     </div>
@@ -79,9 +110,11 @@
 </template>
 
 <script>
-import { getProduceSituationData } from '@/api/report';
+import { getProduceSituationData, exportProduceSituationData } from '@/api/report';
 import bmSearchBar from "./components/bmSearchBar.vue";
-import BmLineBar from "./components/bmLineBar.vue";
+import BmLineBar from "./components/produceLineBar.vue";
+import BmLineBarTarget from "./components/produceLineBarTarget.vue";
+import BmLineBarYearTarget from "./components/produceLineBarYearTarget.vue";
 import ButtonNav from '@/components/ButtonNav'
 import moment from 'moment'
 export default {
@@ -90,7 +123,9 @@ export default {
     return {
       otherProps:[],
       start: undefined,
+      currentMenu:'邯郸',
       end: undefined,
+      title:'',
       listQuery: {
         pageNo: 1,
         pageSize:999,
@@ -125,35 +160,47 @@ export default {
       chartHeight: this.tableHeight(137) / 2 - 111,
       tableH: this.tableHeight(137) / 2 - 70,
       legendList: [
-        { id: 1, name: "2024年4月目标值", type: 2, color: "#FFCE6A" },
-        { id: 2, name: "2023年4月", type: 1, color: "#8EF0AB" },
-        { id: 3, name: "2024年4月", type: 1, color: "#288AFF" },
+        { id: 1, name: "FTO投入", type: 1, color: "#FFCE6A" },
+        { id: 2, name: "芯片产量", type: 1, color: "#8EF0AB" },
+        { id: 3, name: "标准组件产量", type: 1, color: "#288AFF" },
+        this.currentMenu == '瑞昌' ? '' :
+        { id: 4, name: "BIPV产量", type: 1, color: "#64BDFF" },
       ],
-      chartMsg: {
-        color: ["#FFCE6A", "#8EF0AB", "#288AFF"],
-        xData: ["成都", "邯郸", "瑞昌"],
-        yName: "单位/%",
+      chartMsgYearTarget: {
+        color: ["#FFCE6A", "#8EF0AB", "#288AFF", '#64BDFF'],
+        xData: [],
+        yName: "单位/片",
+        yAxis: {
+          type: "value",
+          name: "单位/片",
+          show: true,
+          nameTextStyle: {
+            fontSize: 12,
+            align: "right",
+          },
+          axisLabel: {},
+        },
         series: [
           {
-            name: "2024年4月目标值",
+            name: "FTO投入",
             data: [
               { name: "%", value: 85 },
               { name: "%", value: 85 },
               { name: "%", value: 85 },
             ],
-            type: "line",
-            symbol: "circle",
-            symbolSize: 6,
+            type: "bar",
+            barWidth: 20,
             label: {
               show: true,
               color: "#FFAE17",
+              position: [-18, -16],
               formatter: function (params) {
-                return params.value.toFixed(2) + "%";
+                return params.value
               },
             },
           },
           {
-            name: "2023年4月",
+            name: "芯片产量",
             data: [
               { name: "%", value: 57.5 },
               { name: "%", value: 21.66 },
@@ -166,12 +213,12 @@ export default {
               position: [-18, -16],
               color: "#68C483",
               formatter: function (params) {
-                return params.value.toFixed(2) + "%";
+                return params.value
               },
             },
           },
           {
-            name: "2024年4月",
+            name: "标准组件产量",
             data: [
               { name: "%", value: 23.33 },
               { name: "%", value: 7.02 },
@@ -184,7 +231,134 @@ export default {
               position: [0, -16],
               color: "#288AFF",
               formatter: function (params) {
-                return params.value.toFixed(2) + "%";
+                return params.value
+              },
+            },
+          },
+          this.currentMenu == '瑞昌' ? '' :
+            {
+              name: "BIPV产量",
+              data: [
+                { name: "%", value: 23.33 },
+                { name: "%", value: 7.02 },
+                { name: "%", value: 80.2 },
+              ],
+              type: "bar",
+              barWidth: 20,
+              label: {
+                show: true,
+                position: [0, -16],
+                color: "#64BDFF",
+                formatter: function (params) {
+                  return params.value
+                },
+              },
+            },
+        ],
+      },
+      chartMsgTarget: {
+        color: ["#FFCE6A", "#8EF0AB", "#288AFF", '#64BDFF', 'rgba(255, 174, 23, .5)', 'rgba(104, 196, 131, .5)', 'rgba(40, 138, 255, .5)', 'rgba(100,189,255,.2)'],
+        xData: [],
+        yName: "单位/片",
+        yAxis:{
+          type: "value",
+          name: "单位/片",
+          show:false,
+          nameTextStyle: {
+            fontSize: 12,
+            align: "right",
+          },
+          axisLabel: {},
+        },
+        series: [
+
+        ],
+      },
+      chartMsg: {
+      color: ["#FFCE6A", "#8EF0AB", "#288AFF",'#64BDFF'],
+        xData: [],
+        yName: "单位/片",
+        yAxis:
+          {
+            type: "value",
+            name: "单位/片",
+            nameTextStyle: {
+              fontSize: 12,
+              align: "right",
+            },
+            axisLabel: {},
+          },
+        series: [
+          {
+            name: "FTO投入",
+            data: [
+              { name: "%", value: 85 },
+              { name: "%", value: 85 },
+              { name: "%", value: 85 },
+            ],
+            type: "bar",
+            barWidth: 20,
+            label: {
+              show: true,
+              position: [-18, -16],
+              color: "#FFAE17",
+              formatter: function (params) {
+                return params.value
+              },
+            },
+          },
+          {
+            name: "芯片产量",
+            data: [
+              { name: "%", value: 57.5 },
+              { name: "%", value: 21.66 },
+              { name: "%", value: 18.4 },
+            ],
+            type: "bar",
+            barWidth: 20,
+            label: {
+              show: true,
+              position: [10, -16],
+              color: "#68C483",
+              formatter: function (params) {
+                return params.value
+              },
+            },
+          },
+          {
+            name: "标准组件产量",
+            data: [
+              { name: "%", value: 23.33 },
+              { name: "%", value: 7.02 },
+              { name: "%", value: 80.2 },
+            ],
+            type: "bar",
+            barWidth: 20,
+            label: {
+              show: true,
+              position: [0, -16],
+              color: "#288AFF",
+              formatter: function (params) {
+                return params.value
+              },
+            },
+          },
+          this.currentMenu == '瑞昌' ? '' :
+          {
+            name: "BIPV产量",
+            data: [
+              { name: "%", value: 23.33 },
+              { name: "%", value: 7.02 },
+              { name: "%", value: 80.2 },
+            ],
+            type: "bar",
+            barWidth: 20,
+            label: {
+              show: true,
+              position: [10, -16],
+              color: "#64BDFF",
+              formatter: function (params) {
+                return params.value
               },
             },
           },
@@ -197,9 +371,51 @@ export default {
   components: {
     bmSearchBar,
     BmLineBar,
+    BmLineBarTarget,
+    BmLineBarYearTarget,
     ButtonNav
   },
   computed: {
+    dataArr() {
+      if (this.currentMenu != '瑞昌') {
+       return  [{
+          factory: null,
+          item: 'FTO投入',
+          unit: '片'
+        },
+        {
+          factory: null,
+          item: '芯片产量',
+          unit: '片'
+        },
+        {
+          factory: null,
+          item: '标准组件产量',
+          unit: '片'
+        },
+        {
+          factory: null,
+          item: 'BIPV产量',
+          unit: 'm2'
+        },]
+      } else {
+        return [{
+          factory: null,
+          item: 'FTO投入',
+          unit: '片'
+        },
+        {
+          factory: null,
+          item: '芯片产量',
+          unit: '片'
+        },
+        {
+          factory: null,
+          item: '标准组件产量',
+          unit: '片'
+        }]
+      }
+    },
     tableProps() {
       return [
         {
@@ -369,62 +585,645 @@ export default {
     },
     async getDataList() {
       this.otherProps = []
+      this.chartMsg.xData = []
+      this.chartMsgTarget.xData = []
+      this.chartMsgYearTarget.xData = []
       console.log(this.listQuery);
       if (this.listQuery.type == 3) {
-        this.listQuery.startDate = this.listQuery.reportTime[0]
-        this.listQuery.endDate = this.listQuery.reportTime[1]
+        this.listQuery.startDate = this.listQuery.reportTime[0] + '-01-01'
+        this.listQuery.endDate = this.listQuery.reportTime[1] + '-12-31'
       }
       let arr = []
       this.currentMenu === '邯郸' ? arr.push(1) : arr.push(0)
       this.listQuery.factory = arr
       const res = await getProduceSituationData(this.listQuery)
-      let dataArr = [{
-        factory: null,
-        item: 'FTO投入',
-        unit: '片'
-      },
-        {
-          factory: null,
-          item: '芯片产量',
-          unit: '片'
-        },
-        {
-          factory: null,
-          item: '标准组件产量',
-          unit: '片'
-        },
-        {
-          factory: null,
-          item: 'BIPV产量',
-          unit: 'm2'
-        },]
-      res.data.list.forEach((ele, index) => {
-        let i = index +1
-        this.otherProps.push({
-          label: ele.titleValue,
-          props: 'value' + i
+      if (this.listQuery.type === 2) {
+        console.log(res.data.list.slice(res.data.list.length - 2, res.data.list.length));
+        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,
+            props: 'value' + i
+          })
         })
-      })
-      console.log(this.otherProps)
-      res.data.list.forEach((ele, index) => {
-        let i = index + 1
-        let m = 'value' + i
-        ele.productionSituationDataVOList.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.bipvProductOutput
+        // res.data.list.forEach((ele) => {
+        res.data.list.slice(0, res.data.list.length - 2).forEach((ele, index) => {
+          // let i = index + 1
+          this.chartMsg.xData.push(ele.titleValue.replace(/[^\d]/g, " "))
+          ele.productionSituationDataVOList.forEach((item) => {
+            this.chartMsg.series[0].data.push({
+              name: ele.titleValue,
+              value: item.ftoInput
+            })
+            this.chartMsg.series[1].data.push({
+              name: ele.titleValue,
+              value: item.chipYield
+            })
+            this.chartMsg.series[2].data.push({
+              name: ele.titleValue,
+              value: item.componentYield
+            })
+            this.chartMsg.series[3].data.push({
+              name: ele.titleValue,
+              value: item.bipvProductOutput
+            })
+          })
         })
-        // ele.titleValue
-        // .push({
-        //   label: ele.titleValue,
-        //   props: 'value' + index + 1,
+        this.chartMsgTarget.xData.push(res.data.list[res.data.list.length - 2].titleValue.replace(/[^\d]/g, " "))
+        // this.chartMsgTarget.series = [{
+        //   name: "FTO投入",
+        //   data: [
+        //     // s
+        //     { name: "FTO投入目标", value:res,data,list },
+        //     { name: "%", value: 85 },
+        //     { name: "%", value: 85 },
+        //   ],
+        //   type: "bar",
+        //   barWidth: 20,
+        //   barGap: '0',
+        //   label: {
+        //     show: true,
+        //     position: [-18, -16],
+        //     color: "#FFAE17",
+        //     formatter: function (params) {
+        //       return params.value
+        //     },
+        //   },
+        // },]
+        let arr = []
+        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.productionSituationDataVOList.forEach((item) => {
+            if (ele.titleValue.search('目标') != -1) {
+              arr.push({
+                name: "FTO投入目标值",
+                data: [
+                  // s
+                  // { name: 'FTO投入目标', value: item.ftoInput },
+                  { name: 'FTO投入目标值', value: 11 },
+                  // { name: "%", value: 85 },
+                  // { name: "%", value: 85 },
+                ],
+                type: "bar",
+                barWidth: 20,
+                stack:'f',
+                label: {
+                  show: true,
+                  position: [-18, -16],
+                  color: "rgba(255,174,23,.5)",
+                  formatter: function (params) {
+                    return params.value
+                  },
+                },
+              },
+                {
+                  name: "芯片产量目标值",
+                  // barGap: '-100%',
+                  stack: 'a',
+                  data: [
+                    // { name: "芯片产量目标值", value: item.chipYield },
+                    { 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
+                    },
+                  },
+                },
+                {
+                  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
+                    },
+                  },
+                },
+                this.currentMenu == '瑞昌' ? '' :
+                  {
+                    name: "BIPV产量目标值",
+                    stack: 'c',
+                    data: [
+                      // { name: "BIPV产量目标值", value: item.bipvProductOutput },
+                      { name: 'BIPV产量目标值', value: 24 },
+                      // { name: "%", value: 7.02 },
+                      // { name: "%", value: 80.2 },
+                    ],
+                    type: "bar",
+                    barWidth: 20,
+                    label: {
+                      show: true,
+                      position: [0, -16],
+                      color: "rgba(100,189,255,.2)",
+                      formatter: function (params) {
+                        return params.value
+                      },
+                    },
+                  },)
+            } else {
+              arr.push({
+                name: "FTO投入完成值",
+                data: [
+                  // s
+                  // { name: 'FTO投入完成值', value: item.ftoInput },
+                  { name: 'FTO投入完成值', value: 33 },
+                  // { name: "%", value: 85 },
+                  // { name: "%", value: 85 },
+                ],
+                type: "bar",
+                barWidth: 20,
+                stack: 'f',
+                label: {
+                  show: true,
+                  position: [-18, -16],
+                  color: "rgba(255,174,23)",
+                  formatter: function (params) {
+                    return params.value
+                  },
+                },
+              },
+                {
+                  name: "芯片产量完成值",
+                  // barGap: '-100%',
+                  stack: 'a',
+                  data: [
+                    // { name: "芯片产量完成值", value: item.chipYield },
+                    { 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: "标准组件产量完成值",
+                  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.currentMenu == '瑞昌' ? '' :
+                  {
+                    name: "BIPV产量完成值",
+                    stack: 'c',
+                    data: [
+                      // { name: "BIPV产量完成值", value: item.bipvProductOutput },
+                      { name: 'BIPV产量完成值', value: 32 },
+                      // { name: "%", value: 7.02 },
+                      // { name: "%", value: 80.2 },
+                    ],
+                    type: "bar",
+                    barWidth: 20,
+                    label: {
+                      show: true,
+                      position: [0, -16],
+                      color: "rgba(100,189,255)",
+                      formatter: function (params) {
+                        return params.value
+                      },
+                    },
+                  },)
+            }
+
+            // this.chartMsgTarget.series[1].data.push()
+            // this.chartMsgTarget.series[2].data.push()
+            // this.chartMsgTarget.series[3].data.push()
+          })
+        })
+        console.log('arr', arr)
+        this.chartMsgTarget.series = arr
+        // arr.forEach((ele) => {
+
         // })
-      })
+        res.data.list.slice(res.data.list.length - 1, res.data.list.length).forEach((ele, index) => {
+          // let i = index + 1
+          this.chartMsgYearTarget.xData.push(ele.titleValue)
+          this.title = ele.titleValue
+          ele.productionSituationDataVOList.forEach((item) => {
+            this.chartMsgYearTarget.series[0].data.push({
+              name: ele.titleValue,
+              value: item.ftoInput
+            })
+            this.chartMsgYearTarget.series[1].data.push({
+              name: ele.titleValue,
+              value: item.chipYield
+            })
+            this.chartMsgYearTarget.series[2].data.push({
+              name: ele.titleValue,
+              value: item.componentYield
+            })
+            this.chartMsgYearTarget.series[3].data.push({
+              name: ele.titleValue,
+              value: item.bipvProductOutput
+            })
+          })
+        })
+        // })
+        console.log(this.chartMsg.xData)
+        res.data.list.forEach((ele, index) => {
+          let i = index + 1
+          let m = 'value' + i
+          ele.productionSituationDataVOList.forEach((item) => {
+            this.dataArr[0]['' + m + ''] = item.ftoInput
+            this.dataArr[0].factory = item.factory == 1 ? '邯郸' : '瑞昌'
+            this.dataArr[1].factory = item.factory == 1 ? '邯郸' : '瑞昌'
+            this.dataArr[2].factory = item.factory == 1 ? '邯郸' : '瑞昌'
+            // this.dataArr[3].factory = item.factory == 1 ? '邯郸' : '瑞昌'
+            this.dataArr[1]['' + m + ''] = item.chipYield
+            this.dataArr[2]['' + m + ''] = item.componentYield
+            // this.dataArr[3]['' + m + ''] = item.bipvProductOutput
+            if (this.dataArr[3]) {
+              this.dataArr[3].factory = item.factory == 1 ? '邯郸' : '瑞昌'
+              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) {
+        console.log(res.data.list.slice(res.data.list.length - 2, res.data.list.length));
+        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,
+            props: 'value' + i
+          })
+        })
+        // res.data.list.forEach((ele) => {
+        res.data.list.slice(0, res.data.list.length - 1).forEach((ele, index) => {
+          // let i = index + 1
+          this.chartMsg.xData.push(ele.titleValue.replace(/[^\d]/g, " "))
+          ele.productionSituationDataVOList.forEach((item) => {
+            this.chartMsg.series[0].data.push({
+              name: ele.titleValue,
+              value: item.ftoInput
+            })
+            this.chartMsg.series[1].data.push({
+              name: ele.titleValue,
+              value: item.chipYield
+            })
+            this.chartMsg.series[2].data.push({
+              name: ele.titleValue,
+              value: item.componentYield
+            })
+            this.chartMsg.series[3].data.push({
+              name: ele.titleValue,
+              value: item.bipvProductOutput
+            })
+          })
+        })
+        this.chartMsgTarget.xData.push(res.data.list[res.data.list.length - 1].titleValue)
+        // this.chartMsgTarget.series = [{
+        //   name: "FTO投入",
+        //   data: [
+        //     // s
+        //     { name: "FTO投入目标", value:res,data,list },
+        //     { name: "%", value: 85 },
+        //     { name: "%", value: 85 },
+        //   ],
+        //   type: "bar",
+        //   barWidth: 20,
+        //   barGap: '0',
+        //   label: {
+        //     show: true,
+        //     position: [-18, -16],
+        //     color: "#FFAE17",
+        //     formatter: function (params) {
+        //       return params.value
+        //     },
+        //   },
+        // },]
+        let arr = []
+        res.data.list.slice(res.data.list.length - 1, res.data.list.length).forEach((ele, index) => {
+          console.log(ele.titleValue.search('目标'));
+          // let i = index + 1
+          // this.chartMsgTarget.xData.push(ele.titleValue)
+          ele.productionSituationDataVOList.forEach((item) => {
+            if (ele.titleValue.search('目标') != -1) {
+              arr.push({
+                name: "FTO投入目标值",
+                data: [
+                  // s
+                  // { name: 'FTO投入目标', value: item.ftoInput },
+                  { name: 'FTO投入目标值', value: 11 },
+                  // { name: "%", value: 85 },
+                  // { name: "%", value: 85 },
+                ],
+                type: "bar",
+                barWidth: 20,
+                stack: 'f',
+                label: {
+                  show: true,
+                  position: [-18, -16],
+                  color: "rgba(255,174,23,.5)",
+                  formatter: function (params) {
+                    return params.value
+                  },
+                },
+              },
+                {
+                  name: "芯片产量目标值",
+                  // barGap: '-100%',
+                  stack: 'a',
+                  data: [
+                    // { name: "芯片产量目标值", value: item.chipYield },
+                    { 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
+                    },
+                  },
+                },
+                {
+                  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
+                    },
+                  },
+                },
+                this.currentMenu == '瑞昌' ? '' :
+                  {
+                    name: "BIPV产量目标值",
+                    stack: 'c',
+                    data: [
+                      // { name: "BIPV产量目标值", value: item.bipvProductOutput },
+                      { name: 'BIPV产量目标值', value: 24 },
+                      // { name: "%", value: 7.02 },
+                      // { name: "%", value: 80.2 },
+                    ],
+                    type: "bar",
+                    barWidth: 20,
+                    label: {
+                      show: true,
+                      position: [0, -16],
+                      color: "rgba(100,189,255,.2)",
+                      formatter: function (params) {
+                        return params.value
+                      },
+                    },
+                  },)
+            } else {
+              arr.push({
+                name: "FTO投入完成值",
+                data: [
+                  // s
+                  // { name: 'FTO投入完成值', value: item.ftoInput },
+                  { name: 'FTO投入完成值', value: 33 },
+                  // { name: "%", value: 85 },
+                  // { name: "%", value: 85 },
+                ],
+                type: "bar",
+                barWidth: 20,
+                stack: 'f',
+                label: {
+                  show: true,
+                  position: [-18, -16],
+                  color: "rgba(255,174,23)",
+                  formatter: function (params) {
+                    return params.value
+                  },
+                },
+              },
+                {
+                  name: "芯片产量完成值",
+                  // barGap: '-100%',
+                  stack: 'a',
+                  data: [
+                    // { name: "芯片产量完成值", value: item.chipYield },
+                    { 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: "标准组件产量完成值",
+                  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.currentMenu == '瑞昌' ? '' :
+                  {
+                    name: "BIPV产量完成值",
+                    stack: 'c',
+                    data: [
+                      // { name: "BIPV产量完成值", value: item.bipvProductOutput },
+                      { name: 'BIPV产量完成值', value: 32 },
+                      // { name: "%", value: 7.02 },
+                      // { name: "%", value: 80.2 },
+                    ],
+                    type: "bar",
+                    barWidth: 20,
+                    label: {
+                      show: true,
+                      position: [0, -16],
+                      color: "rgba(100,189,255)",
+                      formatter: function (params) {
+                        return params.value
+                      },
+                    },
+                  },)
+            }
+
+            // this.chartMsgTarget.series[1].data.push()
+            // this.chartMsgTarget.series[2].data.push()
+            // this.chartMsgTarget.series[3].data.push()
+          })
+        })
+        console.log('arr', arr)
+        this.chartMsgTarget.series = arr
+        console.log(this.chartMsg.xData)
+        res.data.list.forEach((ele, index) => {
+          let i = index + 1
+          let m = 'value' + i
+          ele.productionSituationDataVOList.forEach((item) => {
+            this.dataArr[0]['' + m + ''] = item.ftoInput
+            this.dataArr[0].factory = item.factory == 1 ? '邯郸' : '瑞昌'
+            this.dataArr[1].factory = item.factory == 1 ? '邯郸' : '瑞昌'
+            this.dataArr[2].factory = item.factory == 1 ? '邯郸' : '瑞昌'
+            // this.dataArr[3].factory = item.factory == 1 ? '邯郸' : '瑞昌'
+            this.dataArr[1]['' + m + ''] = item.chipYield
+            this.dataArr[2]['' + m + ''] = item.componentYield
+            // this.dataArr[3]['' + m + ''] = item.bipvProductOutput
+            if (this.dataArr[3]) {
+              this.dataArr[3].factory = item.factory == 1 ? '邯郸' : '瑞昌'
+              this.dataArr[3]['' + m + ''] = item.bipvProductOutput
+            }
+          })
+          // 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,
+              props: 'value' + i
+            })
+          })
+          console.log(this.otherProps)
+          res.data.list.forEach((ele, index) => {
+            let i = index + 1
+            let m = 'value' + i
+            ele.productionSituationDataVOList.forEach((item) => {
+              this.dataArr[0]['' + m + ''] = item.ftoInput
+              this.dataArr[0].factory = item.factory == 1 ? '邯郸' : '瑞昌'
+              this.dataArr[1].factory = item.factory == 1 ? '邯郸' : '瑞昌'
+              this.dataArr[2].factory = item.factory == 1 ? '邯郸' : '瑞昌'
+              this.dataArr[1]['' + m + ''] = item.chipYield
+              this.dataArr[2]['' + m + ''] = item.componentYield
+              if (this.dataArr[3]) {
+                this.dataArr[3].factory = item.factory == 1 ? '邯郸' : '瑞昌'
+                this.dataArr[3]['' + m + ''] = item.bipvProductOutput
+              }
+            })
+            // ele.titleValue
+            // .push({
+            //   label: ele.titleValue,
+            //   props: 'value' + index + 1,
+            // })
+          })
+        for (let i in this.dataArr[0]) {
+            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]
+              })
+            }
+          }
+        for (let i in this.dataArr[1]) {
+            this.chartMsg.series[1].name = this.dataArr[1]['item']
+            if (i.search('value') === 0) {
+              this.chartMsg.series[1].data.push({
+                name: this.dataArr[1]['item'],
+                value: this.dataArr[1][i]
+              })
+            }
+          }
+        for (let i in this.dataArr[2]) {
+            this.chartMsg.series[2].name = this.dataArr[2]['item']
+            if (i.search('value') === 0) {
+              this.chartMsg.series[2].data.push({
+                name: this.dataArr[2]['item'],
+                value: this.dataArr[2][i]
+              })
+            }
+        }
+        if (this.dataArr[3]) {
+          for (let i in this.dataArr[3]) {
+            this.chartMsg.series[3].name = this.dataArr[3]['item']
+            if (i.search('value') === 0) {
+              this.chartMsg.series[3].data.push({
+                name: this.dataArr[3]['item'],
+                value: this.dataArr[3][i]
+              })
+            }
+          }
+          }
+      }
+      this.tableData = this.dataArr
       // this.tableProps = otherProps
       // res.data.list.forEach((ele) => {
       //   console.log(ele);
@@ -440,16 +1239,15 @@ export default {
       //     dataArr.push(obj)
       //   })
       // })
-      console.log(dataArr)
-      this.tableData = dataArr
+      // console.log(dataArr)
       // this.tableProps.push()
       this.listQuery.total = res.data.total
-      if (this.listQuery.total > 0) {
-        this.tableData.forEach(item => {
-          item.startTime = item.startDate ? item.startDate[0] + '-' + item.startDate[1] + '-' + item.startDate[2] : '--'
-          item.endTime = item.endDate ? item.endDate[0] + '-' + item.endDate[1] + '-' + item.endDate[2] : '--'
-        })
-      }
+      // if (this.listQuery.total > 0) {
+      //   this.tableData.forEach(item => {
+      //     item.startTime = item.startDate ? item.startDate[0] + '-' + item.startDate[1] + '-' + item.startDate[2] : '--'
+      //     item.endTime = item.endDate ? item.endDate[0] + '-' + item.endDate[1] + '-' + item.endDate[2] : '--'
+      //   })
+      // }
     },
     _setTableHeight() {
       this.tableH = this.tableHeight(137) / 2 - 70;
@@ -463,7 +1261,13 @@ export default {
       console.log("=========================");
     },
     handleExport() {
-      console.log("导出");
+      let fileName = "生产情况(片).xls";
+      exportProduceSituationData(this.listQuery)
+        .then((response) => {
+          this.$download.excel(response, fileName);
+          this.$message.success("导出成功");
+        })
+        .catch(() => { });
     },
   },
 };
@@ -475,7 +1279,7 @@ export default {
   background-color: #fff;
   border-radius: 8px;
   padding: 16px 16px 0 16px;
-  margin-bottom: 8px;
+  margin: 8px 0px;
 }
 
 .containerTop {
diff --git a/src/views/report/productionYield.vue b/src/views/report/productionYield.vue
index d6aaf38..bbe12f6 100644
--- a/src/views/report/productionYield.vue
+++ b/src/views/report/productionYield.vue
@@ -4,7 +4,7 @@
     <ButtonNav style="padding: 0;" :menus="['邯郸', '瑞昌']" :button-mode="true" @change="currentMenu = $event">
     </ButtonNav>
     <!-- </div> -->
-    <div class="containerTop">
+    <div class="search">
       <el-form :model="listQuery" :inline="true" ref="dataForm" class="blueTip">
         <el-form-item label="时间维度" prop="date">
           <el-select size="small" clearable v-model="listQuery.type" placeholder="请选择">
@@ -24,7 +24,7 @@
           至
           <el-date-picker size="small" clearable v-model="end" type="week" format="yyyy 第 WW 周" placeholder="选择周"
             style="width: 180px" @change="onValueChange">
-          </el-date-picker>
+          </el-date-picker>6
           <!-- <span v-if="start && end" style="margin-left: 10px">
             {{ date1 }} 至 {{ date2 }}，共 {{ weekNum }} 周
           </span> -->
@@ -63,17 +63,40 @@
           <!-- <el-button type="success" size="small" plain @click="addFactory">新增</el-button> -->
         </el-form-item>
       </el-form>
-      <!-- <div class="smallTitle">产量转化效率</div> -->
-
-      <!-- <bmSearchBar @getSearch="getSearch" @handleExport="handleExport" /> -->
-      <el-col :span="16">
-        <bm-line-bar :chartHeight="chartHeight" :legendList="legendList" :chartMsg="chartMsg" :chartId="chartId"
-          :chartNum="chartNum" />
-      </el-col>
-      <el-col :span="8">
-        <bm-line-bar :chartHeight="chartHeight" :legendList="legendList" :chartMsg="chartMsg" :chartId=" 'yearChart' "
-          :chartNum="chartNum" />
-      </el-col>
+    </div>
+    <div class="containerTop">
+      <el-row v-if="listQuery.type === 2">
+        <el-col :span="16">
+          <div class="blueTip">
+            产量及良率对比
+          </div>
+          <bm-line-bar :chartHeight="chartHeight" :legendList="legendList" :chartMsg="chartMsg" :chartId="chartId"
+            :chartNum="chartNum" />
+        </el-col>
+        <el-col :span="8">
+          <div class="blueTip">
+            {{ title }}
+          </div>
+          <produce-line-bar-year-target :chartHeight="chartHeight" :legendList="legendList"
+            :chartMsg="chartMsgYearTarget" :chartId=" 'yearData'" :chartNum="chartNum" />
+        </el-col>
+      </el-row>
+      <el-row v-else>
+        <!-- <el-col :span="24"> -->
+          <div class="blueTip">
+            产量及良率对比
+          </div>
+          <bm-line-bar :chartHeight="chartHeight" :legendList="legendList" :chartMsg="chartMsg" :chartId="chartId"
+            :chartNum="chartNum" />
+        <!-- </el-col> -->
+        <!-- <el-col :span="8">
+          <div class="blueTip">
+            {{ title }}
+          </div>
+          <produce-line-bar-year-target :chartHeight="chartHeight" :legendList="legendList"
+            :chartMsg="chartMsgYearTarget" :chartId=" 'yearData'" :chartNum="chartNum" />
+        </el-col> -->
+      </el-row>
       <base-table :table-props="tableProps" :page="listQuery.current" :limit="listQuery.size" :table-data="tableData"
         :max-height="tableH" />
     </div>
@@ -84,9 +107,10 @@
 </template>
 
 <script>
-import { getProduceSituationData } from '@/api/report';
-import bmSearchBar from "./components/produceLineBar.vue";
-import BmLineBar from "./components/bmLineBar.vue";
+import { getProductionYieldSituationMWData, exportProductionYieldSituationMWData } from '@/api/report';
+import bmSearchBar from "./components/bmSearchBar";
+import BmLineBar from "./components/produceLineBar.vue";
+import produceLineBarYearTarget from "./components/produceLineBarYearTarget.vue";
 import ButtonNav from '@/components/ButtonNav'
 import moment from 'moment'
 export default {
@@ -96,6 +120,7 @@ export default {
       otherProps: [],
       start: undefined,
       end: undefined,
+      title: '',
       listQuery: {
         pageNo: 1,
         pageSize: 999,
@@ -131,58 +156,154 @@ export default {
       tableH: this.tableHeight(137) / 2 - 70,
       legendList: [
         {
-          id: 1, name: "综合良率", type: 2, color: "#FFCE6A" },
-        { id: 2, name: "标准组件产量", type: 1, color: "#8EF0AB" },
+          id: 1, name: "综合良率", type: 1, color: "#FFCE6A" },
+        {
+          id: 2, name: "FTO投入", type: 1, color: "#8EF0AB" },
         { id: 3, name: "芯片产量", type: 1, color: "#288AFF" },
-        { id: 3, name: "fto投入", type: 1, color: "#64BDFF" },
+        {
+          id: 4, name: "标准组件产量", type: 1, color: "#64BDFF" },
       ],
-      chartMsg: {
-        color: ['#64BDFF', "#8EF0AB", "#288AFF", "#FFCE6A",],
+      chartMsgYearTarget: {
+        color: ["#8EF0AB", "#288AFF", '#64BDFF', "#FFCE6A",],
         xData: [],
-        yName: "单位/%",
+        // yName: "单位/%",
+        yAxis: [
+          {
+            type: "value",
+            name: "单位/片",
+            nameTextStyle: {
+              fontSize: 12,
+              align: "right",
+            },
+            axisLabel: {},
+          },
+          {
+            type: 'value',
+            // inverse: true,
+            name: "单位/%",
+            nameTextStyle: {
+              fontSize: 12,
+              align: "right",
+            },
+            axisLabel: {},
+          }
+        ],
         series: [
           {
             name: "",
+            // yAxisIndex: 0,
             data: [
-              // { name: "%", value: 57.5 },
-              // { name: "%", value: 21.66 },
-              // { name: "%", value: 18.4 },
+              {
+                value: 1,
+                itemStyle: {
+                  color: '#8EF0AB'
+                }
+              },
+              {
+                value: 2,
+                itemStyle: {
+                  color: '#288AFF'
+                }
+              },
+              {
+                value: 3,
+                itemStyle: {
+                  color: '#64BDFF'
+                }
+              },
+              {
+                value: 0,
+                yAxisIndex: 1,
+                itemStyle: {
+                  color: '#FFCE6A'
+                }
+              }],
+            type: "bar",
+            barWidth: 20,
+            label: {
+              show: true,
+              position: [-18, -16],
+              color: "#68C483",
+              formatter: function (params) {
+                return params.value + "片";
+              },
+            },
+          },
+          // {
+          //   name: '销量折线图',
+          //   type: 'bar',
+          //   data: [ 0,0,0,
+          //     {
+          //       value: 5,
+          //       itemStyle: {
+          //         color: '#FFCE6A'
+          //       }
+          //     }],
+          //   barWith: "40%",
+          //   label: {
+          //     show: true,
+          //     position: "top",
+          //     formatter: "{c}%"
+          //   },
+          //   lineStyle: {
+          //     color: "#ffb122"
+          //   },
+          //   yAxisIndex: 1
+          // }
+        ],
+      },
+      chartMsg: {
+        color: ["#8EF0AB", "#288AFF", '#64BDFF', "#FFCE6A",],
+        xData: [],
+        // yName: "单位/%",
+        yAxis: [
+          {
+            type: "value",
+            name: "单位/片",
+            nameTextStyle: {
+              fontSize: 12,
+              align: "right",
+            },
+            axisLabel: {},
+          },
+          {
+            type: 'value',
+            // inverse: true,
+            name: "单位/%",
+            nameTextStyle: {
+              fontSize: 12,
+              align: "right",
+            },
+            axisLabel: {},
+          }
+        ],
+        series: [
+          {
+            name: "",
+            // yAxisIndex: 0,
+            data: [
+              { name: "%", value: 57.5 },
+              { name: "%", value: 21.66 },
+              { name: "%", value: 18.4 },
             ],
             type: "bar",
             barWidth: 20,
             label: {
               show: true,
               position: [-18, -16],
-              color: "#64BDFF",
+              color: "#68C483",
               formatter: function (params) {
-                return params.value.toFixed(2) + "%";
+                return params.value + "片";
               },
             },
           },
           {
             name: "",
+            // yAxisIndex: 0,
             data: [
-              // { name: "%", value: 23.33 },
-              // { name: "%", value: 7.02 },
-              // { name: "%", value: 80.2 },
-            ],
-            type: "bar",
-            barWidth: 20,
-            label: {
-              show: true,
-              position: [0, -16],
-              color: "#8EF0AB",
-              formatter: function (params) {
-                return params.value.toFixed(2) + "%";
-              },
-            },
-          },
-          {
-            name: "",
-            data: [
-              // { name: "%", value: 23.33 },
-              // { name: "%", value: 7.02 },
-              // { name: "%", value: 80.2 },
+              { name: "%", value: 23.33 },
+              { name: "%", value: 7.02 },
+              { name: "%", value: 80.2 },
             ],
             type: "bar",
             barWidth: 20,
@@ -191,20 +312,42 @@ export default {
               position: [0, -16],
               color: "#288AFF",
               formatter: function (params) {
-                return params.value.toFixed(2) + "%";
+                return params.value + "片";
+              },
+            },
+          },
+            {
+              name: "",
+              // yAxisIndex: 0,
+            data: [
+              { name: "%", value: 23.33 },
+              { name: "%", value: 7.02 },
+              { name: "%", value: 80.2 },
+            ],
+            type: "bar",
+            barWidth: 20,
+            label: {
+              show: true,
+              position: [0, -16],
+              stack: '标准组件产量',
+              color: "#64BDFF",
+              formatter: function (params) {
+                return params.value+ "片";
               },
             },
           },
           {
             name: "",
             data: [
-              // { name: "%", value: 85 },
-              // { name: "%", value: 85 },
-              // { name: "%", value: 85 },
+              { name: "%", value: 115 },
+              { name: "%", value: 5 },
+              { name: "%", value: 8 },
             ],
             type: "line",
+            // barWidth: 20,
             symbol: "circle",
             symbolSize: 6,
+            yAxisIndex: 1,
             label: {
               show: true,
               color: "#FFAE17",
@@ -222,6 +365,7 @@ export default {
   components: {
     bmSearchBar,
     BmLineBar,
+    produceLineBarYearTarget,
     ButtonNav
   },
   computed: {
@@ -256,9 +400,15 @@ export default {
     isOpen() {
       return this.$store.getters.sidebar.opened;
     },
+    type() {
+      return this.listQuery.type
+    }
   },
   watch: {
     // 监听左侧菜单栏是否展开
+    type(val) {
+
+    },
     isOpen(val) {
       if (this.$route.name === "ChipYieldBM") {
         this.chartNum++;
@@ -275,7 +425,7 @@ export default {
   },
   activated() {
     // 图重新加载，为了防止窗口变化后尺寸图显示不佳，数据不更新
-    if (this.$route.name === "ChipYieldBM") {
+    if (this.$route.name === "productionYield") {
       this.chartNum++;
     }
   },
@@ -403,119 +553,195 @@ export default {
       let arr = []
       this.currentMenu === '邯郸' ? arr.push(1) : arr.push(0)
       this.listQuery.factory = arr
-      const res = await getProduceSituationData(this.listQuery)
-      let dataArr = [{
-        factory: null,
-        item: 'FTO投入',
-        unit: '片'
-      },
-      {
-        factory: null,
-        item: '芯片产量',
-        unit: '片'
-      },
-      {
-        factory: null,
-        item: '标准组件产量',
-        unit: '片'
-      },
-      {
-        factory: null,
-        item: '综合良率',
-        unit: '%'
-      },]
-      res.data.list.forEach((ele, index) => {
-        let i = index + 1
-        this.chartMsg.xData.push(ele.titleValue)
-        this.otherProps.push({
-          label: ele.titleValue,
-          props: 'value' + i
+      const res = await getProductionYieldSituationMWData(this.listQuery)
+       let dataArr = [{
+          factory: null,
+          item: 'FTO投入',
+          unit: '片'
+        },
+        {
+          factory: null,
+          item: '芯片产量',
+          unit: '片'
+        },
+        {
+          factory: null,
+          item: '标准组件产量',
+          unit: '片'
+        },
+        {
+          factory: null,
+          item: '综合良率',
+          unit: '%'
+        },]
+      if (this.listQuery.type == 2) {
+        res.data.list.forEach((ele, index) => {
+          let i = index + 1
+          this.chartMsg.xData.push(ele.titleValue)
+          this.otherProps.push({
+            label: ele.titleValue,
+            props: 'value' + i
+          })
         })
-      })
-      console.log(this.otherProps)
-      res.data.list.forEach((ele, index) => {
-        let i = index + 1
-        let m = 'value' + i
-        ele.productionSituationDataVOList.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
+        this.chartMsgYearTarget.xData.push('FTO投入', '芯片产量', '标准组件产量', '综合良率')
+        res.data.list.slice(res.data.list.length - 1, res.data.list.length).forEach((ele) => {
+          this.title = ele.titleValue
+          ele.productYieldDataVOList.forEach((item) => {
+            // this.chartMsgYearTarget.series[0].name = 'FTO投入目标值',
+              // this.chartMsgYearTarget.series[1].name = '芯片产量目标值',
+              // this.chartMsgYearTarget.series[2].name = '标准组件产量目标值',
+              // this.chartMsgYearTarget.series[3].name = '综合良率目标值',
+            // this.chartMsgYearTarget.series[0].data = [
+            //   {
+            //     value: item.ftoInput,
+            //     itemStyle: {
+            //       color: '#8EF0AB'
+            //     }
+            //   },
+            //   {
+            //     value: item.chipYield,
+            //     itemStyle: {
+            //       color: '#288AFF'
+            //     }
+            //   },
+            //   {
+            //     value: item.componentYield,
+            //     itemStyle: {
+            //       color: '#64BDFF'
+            //     }
+            //   },
+            //   {
+            //     value: item.ftoInput,
+            //     itemStyle: {
+            //       color: '#FFCE6A'
+            //     }
+            //   }]
+            // 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
+          })
         })
-        // ele.titleValue
-        // .push({
-        //   label: ele.titleValue,
-        //   props: 'value' + index + 1,
-        // })
-      })
-      // this.tableProps = otherProps
-      // res.data.list.forEach((ele) => {
-      //   console.log(ele);
-      //   ele.productionSituationDataVOList.forEach((item) => {
-      //     let obj = {
-      //       bipvProductOutput: item.bipvProductOutput,
-      //       chipYield: item.chipYield,
-      //       componentYield: item.componentYield,
-      //       factory: item.factory,
-      //       ftoInput: item.ftoInput,
-      //       titleValue:ele.titleValue
-      //     }
-      //     dataArr.push(obj)
-      //   })
-      // })
-      for (let i in dataArr[0]) {
-        // console.log(i.search('value'))
-        // dataArr.forEach((ele) => {
-        this.chartMsg.series[0].name = dataArr[0]['item']
-        if (i.search('value') === 0) {
-          this.chartMsg.series[0].data.push({
-            name: dataArr[0]['item'],
-            value: dataArr[0][i]
+        console.log(this.otherProps)
+        res.data.list.forEach((ele, index) => {
+          let i = index + 1
+          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
           })
+        })
+        for (let i in dataArr[0]) {
+          this.chartMsg.series[0].name = dataArr[0]['item']
+          if (i.search('value') === 0) {
+            this.chartMsg.series[0].data.push({
+              name: dataArr[0]['item'],
+              value: dataArr[0][i]
+            })
+          }
         }
-        // })
-      }
-      for (let i in dataArr[1]) {
-        // console.log(i.search('value'))
-        // dataArr.forEach((ele) => {
-        this.chartMsg.series[1].name = dataArr[1]['item']
-        if (i.search('value') === 0) {
-          this.chartMsg.series[1].data.push({
-            name: dataArr[1]['item'],
-            value: dataArr[1][i]
+        for (let i in dataArr[1]) {
+          this.chartMsg.series[1].name = dataArr[1]['item']
+          if (i.search('value') === 0) {
+            this.chartMsg.series[1].data.push({
+              name: dataArr[1]['item'],
+              value: dataArr[1][i]
+            })
+          }
+        }
+        for (let i in dataArr[2]) {
+          this.chartMsg.series[2].name = dataArr[2]['item']
+          if (i.search('value') === 0) {
+            this.chartMsg.series[2].data.push({
+              name: dataArr[2]['item'],
+              value: dataArr[2][i]
+            })
+          }
+        }
+        for (let i in dataArr[3]) {
+          this.chartMsg.series[3].name = dataArr[3]['item']
+          if (i.search('value') === 0) {
+            this.chartMsg.series[3].data.push({
+              name: dataArr[3]['item'],
+              value: dataArr[3][i]
+            })
+          }
+        }
+      } else {
+        res.data.list.slice.forEach((ele, index) => {
+          let i = index + 1
+          this.chartMsg.xData.push(ele.titleValue)
+          this.otherProps.push({
+            label: ele.titleValue,
+            props: 'value' + i
           })
+        })
+        console.log(this.otherProps)
+        if (this.listQuery.type == 2) {
+
         }
-        // })
-      }
-      for (let i in dataArr[2]) {
-        // console.log(i.search('value'))
-        // dataArr.forEach((ele) => {
-        this.chartMsg.series[2].name = dataArr[2]['item']
-        if (i.search('value') === 0) {
-          this.chartMsg.series[2].data.push({
-            name: dataArr[2]['item'],
-            value: dataArr[2][i]
+        res.data.list.forEach((ele, index) => {
+          let i = index + 1
+          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
           })
+        })
+        for (let i in dataArr[0]) {
+          this.chartMsg.series[0].name = dataArr[0]['item']
+          if (i.search('value') === 0) {
+            this.chartMsg.series[0].data.push({
+              name: dataArr[0]['item'],
+              value: dataArr[0][i]
+            })
+          }
         }
-        // })
-      }
-      for (let i in dataArr[3]) {
-        // console.log(i.search('value'))
-        // dataArr.forEach((ele) => {
-        this.chartMsg.series[3].name = dataArr[3]['item']
-        if (i.search('value') === 0) {
-          this.chartMsg.series[3].data.push({
-            name: dataArr[3]['item'],
-            value: dataArr[3][i]
-          })
+        for (let i in dataArr[1]) {
+          this.chartMsg.series[1].name = dataArr[1]['item']
+          if (i.search('value') === 0) {
+            this.chartMsg.series[1].data.push({
+              name: dataArr[1]['item'],
+              value: dataArr[1][i]
+            })
+          }
+        }
+        for (let i in dataArr[2]) {
+          this.chartMsg.series[2].name = dataArr[2]['item']
+          if (i.search('value') === 0) {
+            this.chartMsg.series[2].data.push({
+              name: dataArr[2]['item'],
+              value: dataArr[2][i]
+            })
+          }
+        }
+        for (let i in dataArr[3]) {
+          this.chartMsg.series[3].name = dataArr[3]['item']
+          if (i.search('value') === 0) {
+            this.chartMsg.series[3].data.push({
+              name: dataArr[3]['item'],
+              value: dataArr[3][i]
+            })
+          }
         }
-        // })
       }
-      console.log(this.chartMsg.series)
+
       console.log(dataArr)
       this.tableData = dataArr
       // this.tableProps.push()
@@ -539,7 +765,16 @@ export default {
       console.log("=========================");
     },
     handleExport() {
-      console.log("导出");
+      // this.listQuery.type = val.type;
+      // this.listQuery.startDate = val.startDate;
+      // this.listQuery.factory = val.factory;
+      let fileName = "产品良率.xls";
+      exportProductionYieldSituationMWData(this.listQuery)
+        .then((response) => {
+          this.$download.excel(response, fileName);
+          this.$message.success("导出成功");
+        })
+        .catch(() => { });
     },
   },
 };
@@ -551,7 +786,7 @@ export default {
   background-color: #fff;
   border-radius: 8px;
   padding: 16px 16px 0 16px;
-  margin-bottom: 8px;
+  margin:8px 0 8px 0px;
 }
 
 .containerTop {

From 0eb17fa08b16bea65122dffd3cf57282acb72047 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98937886381=E2=80=99?= <‘937886381@qq.com’>
Date: Thu, 20 Jun 2024 20:54:34 +0800
Subject: [PATCH 04/12] =?UTF-8?q?=E6=8A=A5=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../report/components/produceLineBar.vue      |   4 +-
 .../components/produceLineBarTarget.vue       |   4 +-
 .../components/produceLineBarYearTarget.vue   |   4 +-
 src/views/report/comprehensiveData.vue        | 165 +++++++----------
 src/views/report/productionSituationMW.vue    |   9 +-
 .../report/productionSituationTablets.vue     | 107 +++++------
 src/views/report/productionYield.vue          | 167 +++++++-----------
 7 files changed, 183 insertions(+), 277 deletions(-)

diff --git a/src/views/report/components/produceLineBar.vue b/src/views/report/components/produceLineBar.vue
index aea2cb5..4b63baa 100644
--- a/src/views/report/components/produceLineBar.vue
+++ b/src/views/report/components/produceLineBar.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-06-19 15:28:34
- * @LastEditTime: 2024-06-20 20:30:35
+ * @LastEditTime: 2024-06-20 20:49:07
  * @LastEditors: zhp
  * @Description:
 -->
@@ -58,7 +58,7 @@ export default {
                 "<br/>" +
                 `<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].name.search('率') === "综合良率"
+              `<span style='color:rgba(0,0,0,0.48);font-size:14px;'>${params[i].seriesName === "综合良率"
                   ? (params[i].value ? params[i].value.toFixed(2) : 0.0) + "%"
                 : params[i].seriesName === "转化效率"
                     ? (params[i].value ? params[i].value.toFixed(2) : 0.0) + "%"
diff --git a/src/views/report/components/produceLineBarTarget.vue b/src/views/report/components/produceLineBarTarget.vue
index 2bea640..434f875 100644
--- a/src/views/report/components/produceLineBarTarget.vue
+++ b/src/views/report/components/produceLineBarTarget.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-06-20 16:13:36
- * @LastEditTime: 2024-06-20 20:30:50
+ * @LastEditTime: 2024-06-20 20:49:23
  * @LastEditors: zhp
  * @Description:
 -->
@@ -65,7 +65,7 @@ export default {
                 "<br/>" +
                 `<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.search('率') === "综合良率"
+              `<span style='color:rgba(0,0,0,0.48);font-size:14px;'>${params[i].seriesName === "综合良率"
                   ? (params[i].value ? params[i].value.toFixed(2) : 0.0) + "%"
                 : params[i].seriesName === "转化效率"
                     ? (params[i].value ? params[i].value.toFixed(2) : 0.0) + "%"
diff --git a/src/views/report/components/produceLineBarYearTarget.vue b/src/views/report/components/produceLineBarYearTarget.vue
index 8fb9c80..b0e9d86 100644
--- a/src/views/report/components/produceLineBarYearTarget.vue
+++ b/src/views/report/components/produceLineBarYearTarget.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-06-20 16:13:52
- * @LastEditTime: 2024-06-20 20:30:53
+ * @LastEditTime: 2024-06-20 20:49:28
  * @LastEditors: zhp
  * @Description:
 -->
@@ -58,7 +58,7 @@ export default {
                 "<br/>" +
                 `<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.search('率') === "综合良率"
+              `<span style='color:rgba(0,0,0,0.48);font-size:14px;'>${params[i].seriesName === "综合良率"
                   ? (params[i].value ? params[i].value.toFixed(2) : 0.0) + "%"
                 : params[i].seriesName === "转化效率"
                     ? params[i].value+ "%"
diff --git a/src/views/report/comprehensiveData.vue b/src/views/report/comprehensiveData.vue
index 416d87c..e3529a6 100644
--- a/src/views/report/comprehensiveData.vue
+++ b/src/views/report/comprehensiveData.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-04-15 10:49:13
- * @LastEditTime: 2024-06-20 15:40:06
+ * @LastEditTime: 2024-06-20 20:46:53
  * @LastEditors: zhp
  * @Description:
 -->
@@ -13,58 +13,48 @@
     </div>
     <div class="app-container" style="margin-top: 8px;flex-grow: 1; height: auto;">
       <el-form :model="listQuery" :inline="true" ref="dataForm" class="blueTip">
-        <el-form-item label="时间维度" prop="date">
+        <el-form-item label="时间维度" prop="type">
           <el-select size="small" clearable v-model="listQuery.type" placeholder="请选择">
             <el-option v-for="item in timeList" :key="item.value" :label="item.label" :value="item.value">
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item v-show="listQuery.type === 0 || listQuery.type === ''" label="时间范围" prop="reportTime">
-          <el-date-picker size="small" clearable v-model="listQuery.reportTime" type="daterange" range-separator="至"
-            start-placeholder="开始日期" value-format="yyyy-MM-dd" @change="changeDayTime" end-placeholder="结束日期">
+          <el-date-picker size="small" clearable v-model="listQuery.reportTime" type="datetimerange" range-separator="至"
+            start-placeholder="开始日期" value-format="yyyy-MM-dd" format="yyyy-MM-dd" @change="changeDayTime"
+            end-placeholder="结束日期">
           </el-date-picker>
         </el-form-item>
         <el-form-item v-show="listQuery.type === 1" label="时间范围" prop="reportTime">
-          <el-date-picker size="small" clearable v-model="start" type="week" format="yyyy 第 WW 周" placeholder="选择周"
-            style="width: 180px" @change="onValueChange">
+          <el-date-picker size="small" clearable v-model="listQuery.start" type="week" format="yyyy 第 WW 周"
+            placeholder="选择周" style="width: 180px" @change="onValueChange">
           </el-date-picker>
           至
-          <el-date-picker size="small" clearable v-model="end" type="week" format="yyyy 第 WW 周" placeholder="选择周"
-            style="width: 180px" @change="onValueChange">
+          <el-date-picker size="small" clearable v-model="listQuery.end" type="week" format="yyyy 第 WW 周"
+            placeholder="选择周" style="width: 180px" @change="onValueChange">
+          </el-date-picker>
+          <!-- <span v-if="listQuery.start && listQuery.end" style="margin-left: 10px">
+            {{ date1 }} 至 {{ date2 }}，共 {{ weekNum }} 周
+          </span> -->
+        </el-form-item>
+        <el-form-item v-show="listQuery.type === 2" label="时间范围" prop="reportTime">
+          <el-date-picker size="small" clearable v-model="listQuery.reportTime" type="monthrange"
+            value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始月份" end-placeholder="结束月份"
+            @change="changeTime">
           </el-date-picker>
         </el-form-item>
-        <el-form-item v-show="listQuery.type === 2" label="时间值" prop="reportTime">
-          <el-date-picker size="small" v-model="listQuery.reportTime" type="monthrange" value-format="yyyy-MM-DD"
-            range-separator="至" start-placeholder="开始月份" end-placeholder="结束月份" @change="changeTime">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item v-show="listQuery.type === 3" label="时间值" prop="reportTime">
-          <el-date-picker size="small" clearable v-model="listQuery.reportTime[0]" value-format="yyyy" type="year"
+        <el-form-item v-show="listQuery.type === 3" label="时间范围" prop="reportTime">
+          <el-date-picker size="small" clearable v-model="listQuery.start" value-format="yyyy-MM-dd" type="year"
             placeholder="开始时间">
           </el-date-picker>
           ~
-          <el-date-picker size="small" clearable v-model="listQuery.reportTime[1]" value-format="yyyy" type="year"
+          <el-date-picker size="small" clearable v-model="listQuery.end" value-format="yyyy-MM-dd" type="year"
             placeholder="结束时间" @change="getYear">
           </el-date-picker>
         </el-form-item>
-        <!-- <el-form-item label="玻璃类型" prop="type">
-          <el-select v-model="listQuery.type" placeholder="请选择玻璃类型">
-            <el-option v-for="item in typeList" :key="item.id" :label="item.name" :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item> -->
-        <!-- <el-form-item label="玻璃类型" prop="type">
-          <el-select v-model="listQuery.type" placeholder="请选择玻璃类型">
-            <el-option v-for="item in typeList" :key="item.id" :label="item.name" :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item> -->
         <el-form-item>
           <el-button type="primary" size="small" @click="getDataList">查询</el-button>
-          <el-divider direction="vertical"></el-divider>
-          <!-- <el-button type="primary" size="small" plain @click="handleImport">导入</el-button> -->
           <el-button type="primary" size="small" plain @click="handleExport">导出</el-button>
-          <!-- <el-button type="success" size="small" plain @click="addFactory">新增</el-button> -->
         </el-form-item>
       </el-form>
       <base-table :table-props="tableProps" :page="listQuery.pageNo" :limit="listQuery.pageSize"
@@ -96,8 +86,7 @@ export default {
     return {
       factoryList,
       factoryArray,
-      start: undefined,
-      end: undefined,
+
       listQuery: {
         pageNo: 1,
         pageSize: 999,
@@ -108,6 +97,8 @@ export default {
         type: 2,
         startDate: undefined,
         endDate: undefined,
+        start: undefined,
+        end: undefined,
         reportTime: []
       },
       timeList: [
@@ -201,67 +192,40 @@ export default {
   // },
   mounted() {
     // this.getOverView()
-    const currentMonth = new Date()
-    this.listQuery.reportTime = [moment(currentMonth).format('yyyy-MM-DD'), moment(currentMonth).format('yyyy-MM-DD')]
-    this.changeTime()
+    const today = new Date()
+    const sevenDaysAgo = new Date(today.getTime() - (7 * 24 * 60 * 60 * 1000))
+    this.listQuery.startDate = moment(sevenDaysAgo).format('yyyy-MM-DD')
+    this.listQuery.endDate = moment(today).format('yyyy-MM-DD')
+    this.listQuery.reportTime = [this.listQuery.startDate, this.listQuery.endDate]
     this.getDataList()
   },
   methods: {
     getYear(e) {
-      if (this.end && Number(this.end) - Number(this.start) > 10) {
+      if (this.listQuery.end - this.listQuery.start > 10 * 365 * 24 * 60 * 60 * 1000) {
         this.$message({
           message: '年份起止时间不能超过十年',
           type: 'warning'
         });
-        this.start = undefined
-        this.end = undefined
+        this.listQuery.reportTime = []
+        this.listQuery.start = undefined
+        this.listQuery.end = undefined
         // console.log();
       } else {
-        if (Number(this.end) < Number(this.start)) {
-          this.$message({
-            message: '结束年份不能小于开始年份',
-            type: 'warning'
-          });
-          this.start = undefined
-          this.end = undefined
-        } else {
-          this.listQuery.startDate = Number(this.start)
-          this.listQuery.endDate = Number(this.end)
-        }
+        this.listQuery.startDate = this.listQuery.start
+        this.listQuery.endDate = this.listQuery.end
       }
-      if (!this.start && !this.end) {
+      if (!this.listQuery.start && !this.listQuery.end) {
         this.listQuery.startDate = undefined
         this.listQuery.endDate = undefined
       }
       // console.log(e);
     },
-    changeTime() {
-      if (this.listQuery.reportTime) {
-        console.log(this.listQuery.reportTime)
-        let start = new Date(this.listQuery.reportTime[0])
-        let end = new Date(this.listQuery.reportTime[1])
-        // const years = Number(this.listQuery.reportTime[1].slice(0, 4)) - Number(this.listQuery.reportTime[0].slice(0, 4))
-        // const months = Number(this.listQuery.reportTime[1].slice(4)) - Number(this.listQuery.reportTime[0].slice(4))
-        // console.log(years);
-        if ((end - start) > 31104000000) {
-          this.$message({
-            message: '时间范围不能超过24个月',
-            type: 'warning'
-          });
-          this.listQuery.reportTime = [];
-        } else {
-          this.listQuery.startDate = this.listQuery.reportTime[0]
-          this.listQuery.endDate = this.listQuery.reportTime[1]
-        }
-      } else {
-        this.listQuery.startDate = undefined
-        this.listQuery.endDate = undefined
-      }
-    },
     onValueChange(picker, k) { // 选中近k周后触发的操作
-      if (this.start && this.end) {
-        this.date1 = moment(this.start.getTime() - 24 * 60 * 60 * 1000).format('YYYY-MM-DD')
-        this.date2 = moment(this.end.getTime() + 5 * 24 * 60 * 60 * 1000).format('YYYY-MM-DD')
+      // console.log(this.listQuery.reportTime[0], this.listQuery.reportTime[1])
+      if (this.listQuery.start && this.listQuery.end) {
+        console.log(this.listQuery.reportTime)
+        this.date1 = moment(this.listQuery.start.getTime() - 24 * 60 * 60 * 1000).format('YYYY-MM-DD HH:mm:ss')
+        this.date2 = moment(this.listQuery.end.getTime() + 5 * 24 * 60 * 60 * 1000).format('YYYY-MM-DD HH:mm:ss')
         const numDays = (new Date(this.date2).getTime() - new Date(this.date1).getTime()) / (24 * 3600 * 1000);
         if (numDays > 168) {
           console.log(numDays)
@@ -270,20 +234,21 @@ export default {
             type: 'warning'
           });
         } else {
-          this.listQuery.startDate = this.date1
-          this.listQuery.endDate = this.date2
-          // this.listQuery.startDate = Number(moment(this.start.getTime()).format('YYYYWW'))
-          // this.listQuery.endDate = Number(moment(this.end.getTime()).format('YYYYWW'))
+          this.listQuery.startDate = moment(this.listQuery.start.getTime() - 24 * 60 * 60 * 1000).format('YYYY-MM-DD')
+          this.listQuery.endDate = moment(this.listQuery.end.getTime() + 5 * 24 * 60 * 60 * 1000).format('YYYY-MM-DD')
         }
       }
-      if (!this.start && !this.end) {
+      if (!this.listQuery.start && !this.listQuery.end) {
         this.listQuery.startDate = undefined
         this.listQuery.endDate = undefined
       }
     },
     changeDayTime() {
       if (this.listQuery.reportTime) {
-        const numDays = Number(this.listQuery.reportTime[1]) - Number(this.listQuery.reportTime[0])
+        // this.createStartDate = moment(new Date(this.listQuery.reportTime[0]), 'yyyy-MM-dd hh:mm:ss');
+        // this.createEndDate = moment(new Date(this.listQuery.reportTime[1]), 'yyyy-MM-dd hh:mm:ss');
+        console.log(this.listQuery.reportTime[1])
+        const numDays = (this.listQuery.reportTime[1] - this.listQuery.reportTime[0]) / (24 * 3600 * 1000);
         if (numDays > 30) {
           this.$message({
             message: '时间范围不能超过30天',
@@ -299,26 +264,26 @@ export default {
         this.listQuery.endDate = undefined
       }
     },
-    getOverView() {
-      // getOverView().then(res => {
-      //   this.data = res.data
-      //   console.log('aa', res.data)
-      // })
-    },
-    otherMethods(val) {
-      this.detailOrUpdateVisible = true;
-      // this.addOrEditTitle = "详情";
-      this.$nextTick(() => {
-        // this.$refs.detailOrUpdate.init(val.data.id);
-      });
+    changeTime(value) {
+      if (this.listQuery.reportTime) {
+        const numDays = this.listQuery.reportTime[1] - this.listQuery.reportTime[0];
+        if (numDays > 2 * 365 * 24 * 60 * 60 * 1000) {
+          this.$message({
+            message: '时间范围不能超过24个月',
+            type: 'warning'
+          });
+          this.listQuery.reportTime = [];
+        } else {
+          this.listQuery.startDate = this.listQuery.reportTime[0]
+          this.listQuery.endDate = this.listQuery.reportTime[1]
+        }
+      } else {
+        this.listQuery.startDate = undefined
+        this.listQuery.endDate = undefined
+      }
     },
     async getDataList() {
       this.otherProps = []
-      console.log(this.listQuery);
-      if (this.listQuery.type == 3) {
-        this.listQuery.startDate = this.listQuery.reportTime[0] + '-01-01'
-        this.listQuery.endDate = this.listQuery.reportTime[1] + '-12-31'
-      }
       let arr  = []
       this.currentMenu === '邯郸' ? arr.push(1) : arr.push(2)
       this.listQuery.factory = arr
diff --git a/src/views/report/productionSituationMW.vue b/src/views/report/productionSituationMW.vue
index 0560914..0cf2ec0 100644
--- a/src/views/report/productionSituationMW.vue
+++ b/src/views/report/productionSituationMW.vue
@@ -138,6 +138,7 @@ export default {
         endDate: undefined,
         start: undefined,
         end: undefined,
+        reportTime:[],
       },
       timeList: [
         {
@@ -372,9 +373,11 @@ export default {
   },
   mounted() {
     // this.getOverView()
-    const currentMonth = new Date()
-    this.listQuery.reportTime = [moment(currentMonth).format('yyyy-MM-DD'), moment(currentMonth).format('yyyy-MM-DD')]
-    this.changeTime()
+    const today = new Date()
+    const sevenDaysAgo = new Date(today.getTime() - (7 * 24 * 60 * 60 * 1000))
+    this.listQuery.startDate = moment(sevenDaysAgo).format('yyyy-MM-DD')
+    this.listQuery.endDate = moment(today).format('yyyy-MM-DD')
+    this.listQuery.reportTime = [this.listQuery.startDate, this.listQuery.endDate]
     this.getDataList()
   },
   methods: {
diff --git a/src/views/report/productionSituationTablets.vue b/src/views/report/productionSituationTablets.vue
index 240b016..95e30cb 100644
--- a/src/views/report/productionSituationTablets.vue
+++ b/src/views/report/productionSituationTablets.vue
@@ -472,67 +472,40 @@ export default {
   },
   mounted() {
     // this.getOverView()
-    const currentMonth = new Date()
-    this.listQuery.reportTime = [moment(currentMonth).format('yyyy-MM-DD'), moment(currentMonth).format('yyyy-MM-DD')]
-    this.changeTime()
+    const today = new Date()
+    const sevenDaysAgo = new Date(today.getTime() - (7 * 24 * 60 * 60 * 1000))
+    this.listQuery.startDate = moment(sevenDaysAgo).format('yyyy-MM-DD')
+    this.listQuery.endDate = moment(today).format('yyyy-MM-DD')
+    this.listQuery.reportTime = [this.listQuery.startDate, this.listQuery.endDate]
     this.getDataList()
   },
   methods: {
     getYear(e) {
-      if (this.end && Number(this.end) - Number(this.start) > 10) {
+      if (this.listQuery.end - this.listQuery.start > 10 * 365 * 24 * 60 * 60 * 1000) {
         this.$message({
           message: '年份起止时间不能超过十年',
           type: 'warning'
         });
-        this.start = undefined
-        this.end = undefined
+        this.listQuery.reportTime = []
+        this.listQuery.start = undefined
+        this.listQuery.end = undefined
         // console.log();
       } else {
-        if (Number(this.end) < Number(this.start)) {
-          this.$message({
-            message: '结束年份不能小于开始年份',
-            type: 'warning'
-          });
-          this.start = undefined
-          this.end = undefined
-        } else {
-          this.listQuery.startDate = Number(this.start)
-          this.listQuery.endDate = Number(this.end)
-        }
+        this.listQuery.startDate = this.listQuery.start
+        this.listQuery.endDate = this.listQuery.end
       }
-      if (!this.start && !this.end) {
+      if (!this.listQuery.start && !this.listQuery.end) {
         this.listQuery.startDate = undefined
         this.listQuery.endDate = undefined
       }
       // console.log(e);
     },
-    changeTime() {
-      if (this.listQuery.reportTime) {
-        console.log(this.listQuery.reportTime)
-        let start = new Date(this.listQuery.reportTime[0])
-        let end = new Date(this.listQuery.reportTime[1])
-        // const years = Number(this.listQuery.reportTime[1].slice(0, 4)) - Number(this.listQuery.reportTime[0].slice(0, 4))
-        // const months = Number(this.listQuery.reportTime[1].slice(4)) - Number(this.listQuery.reportTime[0].slice(4))
-        // console.log(years);
-        if ((end - start) > 31104000000) {
-          this.$message({
-            message: '时间范围不能超过24个月',
-            type: 'warning'
-          });
-          this.listQuery.reportTime = [];
-        } else {
-          this.listQuery.startDate = this.listQuery.reportTime[0]
-          this.listQuery.endDate = this.listQuery.reportTime[1]
-        }
-      } else {
-        this.listQuery.startDate = undefined
-        this.listQuery.endDate = undefined
-      }
-    },
     onValueChange(picker, k) { // 选中近k周后触发的操作
-      if (this.start && this.end) {
-        this.date1 = moment(this.start.getTime() - 24 * 60 * 60 * 1000).format('YYYY-MM-DD')
-        this.date2 = moment(this.end.getTime() + 5 * 24 * 60 * 60 * 1000).format('YYYY-MM-DD')
+      // console.log(this.listQuery.reportTime[0], this.listQuery.reportTime[1])
+      if (this.listQuery.start && this.listQuery.end) {
+        console.log(this.listQuery.reportTime)
+        this.date1 = moment(this.listQuery.start.getTime() - 24 * 60 * 60 * 1000).format('YYYY-MM-DD HH:mm:ss')
+        this.date2 = moment(this.listQuery.end.getTime() + 5 * 24 * 60 * 60 * 1000).format('YYYY-MM-DD HH:mm:ss')
         const numDays = (new Date(this.date2).getTime() - new Date(this.date1).getTime()) / (24 * 3600 * 1000);
         if (numDays > 168) {
           console.log(numDays)
@@ -541,20 +514,21 @@ export default {
             type: 'warning'
           });
         } else {
-          this.listQuery.startDate = this.date1
-          this.listQuery.endDate = this.date2
-          // this.listQuery.startDate = Number(moment(this.start.getTime()).format('YYYYWW'))
-          // this.listQuery.endDate = Number(moment(this.end.getTime()).format('YYYYWW'))
+          this.listQuery.startDate = moment(this.listQuery.start.getTime() - 24 * 60 * 60 * 1000).format('YYYY-MM-DD')
+          this.listQuery.endDate = moment(this.listQuery.end.getTime() + 5 * 24 * 60 * 60 * 1000).format('YYYY-MM-DD')
         }
       }
-      if (!this.start && !this.end) {
+      if (!this.listQuery.start && !this.listQuery.end) {
         this.listQuery.startDate = undefined
         this.listQuery.endDate = undefined
       }
     },
     changeDayTime() {
       if (this.listQuery.reportTime) {
-        const numDays = Number(this.listQuery.reportTime[1]) - Number(this.listQuery.reportTime[0])
+        // this.createStartDate = moment(new Date(this.listQuery.reportTime[0]), 'yyyy-MM-dd hh:mm:ss');
+        // this.createEndDate = moment(new Date(this.listQuery.reportTime[1]), 'yyyy-MM-dd hh:mm:ss');
+        console.log(this.listQuery.reportTime[1])
+        const numDays = (this.listQuery.reportTime[1] - this.listQuery.reportTime[0]) / (24 * 3600 * 1000);
         if (numDays > 30) {
           this.$message({
             message: '时间范围不能超过30天',
@@ -570,18 +544,23 @@ export default {
         this.listQuery.endDate = undefined
       }
     },
-    getOverView() {
-      // getOverView().then(res => {
-      //   this.data = res.data
-      //   console.log('aa', res.data)
-      // })
-    },
-    otherMethods(val) {
-      this.detailOrUpdateVisible = true;
-      // this.addOrEditTitle = "详情";
-      this.$nextTick(() => {
-        // this.$refs.detailOrUpdate.init(val.data.id);
-      });
+    changeTime(value) {
+      if (this.listQuery.reportTime) {
+        const numDays = this.listQuery.reportTime[1] - this.listQuery.reportTime[0];
+        if (numDays > 2 * 365 * 24 * 60 * 60 * 1000) {
+          this.$message({
+            message: '时间范围不能超过24个月',
+            type: 'warning'
+          });
+          this.listQuery.reportTime = [];
+        } else {
+          this.listQuery.startDate = this.listQuery.reportTime[0]
+          this.listQuery.endDate = this.listQuery.reportTime[1]
+        }
+      } else {
+        this.listQuery.startDate = undefined
+        this.listQuery.endDate = undefined
+      }
     },
     async getDataList() {
       this.otherProps = []
@@ -589,10 +568,6 @@ export default {
       this.chartMsgTarget.xData = []
       this.chartMsgYearTarget.xData = []
       console.log(this.listQuery);
-      if (this.listQuery.type == 3) {
-        this.listQuery.startDate = this.listQuery.reportTime[0] + '-01-01'
-        this.listQuery.endDate = this.listQuery.reportTime[1] + '-12-31'
-      }
       let arr = []
       this.currentMenu === '邯郸' ? arr.push(1) : arr.push(0)
       this.listQuery.factory = arr
diff --git a/src/views/report/productionYield.vue b/src/views/report/productionYield.vue
index bbe12f6..08a30aa 100644
--- a/src/views/report/productionYield.vue
+++ b/src/views/report/productionYield.vue
@@ -6,61 +6,48 @@
     <!-- </div> -->
     <div class="search">
       <el-form :model="listQuery" :inline="true" ref="dataForm" class="blueTip">
-        <el-form-item label="时间维度" prop="date">
+        <el-form-item label="时间维度" prop="type">
           <el-select size="small" clearable v-model="listQuery.type" placeholder="请选择">
             <el-option v-for="item in timeList" :key="item.value" :label="item.label" :value="item.value">
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item v-show="listQuery.type === 0 || listQuery.type === ''" label="时间范围" prop="reportTime">
-          <el-date-picker size="small" clearable v-model="listQuery.reportTime" type="daterange" range-separator="至"
-            start-placeholder="开始日期" value-format="yyyy-MM-dd" @change="changeDayTime" end-placeholder="结束日期">
+          <el-date-picker size="small" clearable v-model="listQuery.reportTime" type="datetimerange" range-separator="至"
+            start-placeholder="开始日期" value-format="yyyy-MM-dd" format="yyyy-MM-dd" @change="changeDayTime"
+            end-placeholder="结束日期">
           </el-date-picker>
         </el-form-item>
         <el-form-item v-show="listQuery.type === 1" label="时间范围" prop="reportTime">
-          <el-date-picker size="small" clearable v-model="start" type="week" format="yyyy 第 WW 周" placeholder="选择周"
-            style="width: 180px" @change="onValueChange">
+          <el-date-picker size="small" clearable v-model="listQuery.start" type="week" format="yyyy 第 WW 周"
+            placeholder="选择周" style="width: 180px" @change="onValueChange">
           </el-date-picker>
           至
-          <el-date-picker size="small" clearable v-model="end" type="week" format="yyyy 第 WW 周" placeholder="选择周"
-            style="width: 180px" @change="onValueChange">
-          </el-date-picker>6
-          <!-- <span v-if="start && end" style="margin-left: 10px">
+          <el-date-picker size="small" clearable v-model="listQuery.end" type="week" format="yyyy 第 WW 周"
+            placeholder="选择周" style="width: 180px" @change="onValueChange">
+          </el-date-picker>
+          <!-- <span v-if="listQuery.start && listQuery.end" style="margin-left: 10px">
             {{ date1 }} 至 {{ date2 }}，共 {{ weekNum }} 周
           </span> -->
         </el-form-item>
-        <el-form-item v-show="listQuery.type === 2" label="时间值" prop="reportTime">
-          <el-date-picker size="small" v-model="listQuery.reportTime" type="monthrange" value-format="yyyy-MM-DD"
-            range-separator="至" start-placeholder="开始月份" end-placeholder="结束月份" @change="changeTime">
+        <el-form-item v-show="listQuery.type === 2" label="时间范围" prop="reportTime">
+          <el-date-picker size="small" clearable v-model="listQuery.reportTime" type="monthrange"
+            value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始月份" end-placeholder="结束月份"
+            @change="changeTime">
           </el-date-picker>
         </el-form-item>
-        <el-form-item v-show="listQuery.type === 3" label="时间值" prop="reportTime">
-          <el-date-picker size="small" clearable v-model="listQuery.reportTime[0]" value-format="yyyy" type="year"
+        <el-form-item v-show="listQuery.type === 3" label="时间范围" prop="reportTime">
+          <el-date-picker size="small" clearable v-model="listQuery.start" value-format="yyyy-MM-dd" type="year"
             placeholder="开始时间">
           </el-date-picker>
           ~
-          <el-date-picker size="small" clearable v-model="listQuery.reportTime[1]" value-format="yyyy" type="year"
+          <el-date-picker size="small" clearable v-model="listQuery.end" value-format="yyyy-MM-dd" type="year"
             placeholder="结束时间" @change="getYear">
           </el-date-picker>
         </el-form-item>
-        <!-- <el-form-item label="玻璃类型" prop="type">
-          <el-select v-model="listQuery.type" placeholder="请选择玻璃类型">
-            <el-option v-for="item in typeList" :key="item.id" :label="item.name" :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item> -->
-        <!-- <el-form-item label="玻璃类型" prop="type">
-          <el-select v-model="listQuery.type" placeholder="请选择玻璃类型">
-            <el-option v-for="item in typeList" :key="item.id" :label="item.name" :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item> -->
         <el-form-item>
           <el-button type="primary" size="small" @click="getDataList">查询</el-button>
-          <el-divider direction="vertical"></el-divider>
-          <!-- <el-button type="primary" size="small" plain @click="handleImport">导入</el-button> -->
           <el-button type="primary" size="small" plain @click="handleExport">导出</el-button>
-          <!-- <el-button type="success" size="small" plain @click="addFactory">新增</el-button> -->
         </el-form-item>
       </el-form>
     </div>
@@ -83,11 +70,11 @@
       </el-row>
       <el-row v-else>
         <!-- <el-col :span="24"> -->
-          <div class="blueTip">
-            产量及良率对比
-          </div>
-          <bm-line-bar :chartHeight="chartHeight" :legendList="legendList" :chartMsg="chartMsg" :chartId="chartId"
-            :chartNum="chartNum" />
+        <div class="blueTip">
+          产量及良率对比
+        </div>
+        <bm-line-bar :chartHeight="chartHeight" :legendList="legendList" :chartMsg="chartMsg" :chartId="chartId"
+          :chartNum="chartNum" />
         <!-- </el-col> -->
         <!-- <el-col :span="8">
           <div class="blueTip">
@@ -127,6 +114,8 @@ export default {
         // size: 10,
         // current: 1,
         factory: null,
+        start: undefined,
+        end: undefined,
         // total: 0,
         type: 2,
         startDate: undefined,
@@ -431,67 +420,40 @@ export default {
   },
   mounted() {
     // this.getOverView()
-    const currentMonth = new Date()
-    this.listQuery.reportTime = [moment(currentMonth).format('yyyy-MM-DD'), moment(currentMonth).format('yyyy-MM-DD')]
-    this.changeTime()
+    const today = new Date()
+    const sevenDaysAgo = new Date(today.getTime() - (7 * 24 * 60 * 60 * 1000))
+    this.listQuery.startDate = moment(sevenDaysAgo).format('yyyy-MM-DD')
+    this.listQuery.endDate = moment(today).format('yyyy-MM-DD')
+    this.listQuery.reportTime = [this.listQuery.startDate, this.listQuery.endDate]
     this.getDataList()
   },
   methods: {
     getYear(e) {
-      if (this.end && Number(this.end) - Number(this.start) > 10) {
+      if (this.listQuery.end - this.listQuery.start > 10 * 365 * 24 * 60 * 60 * 1000) {
         this.$message({
           message: '年份起止时间不能超过十年',
           type: 'warning'
         });
-        this.start = undefined
-        this.end = undefined
+        this.listQuery.reportTime = []
+        this.listQuery.start = undefined
+        this.listQuery.end = undefined
         // console.log();
       } else {
-        if (Number(this.end) < Number(this.start)) {
-          this.$message({
-            message: '结束年份不能小于开始年份',
-            type: 'warning'
-          });
-          this.start = undefined
-          this.end = undefined
-        } else {
-          this.listQuery.startDate = Number(this.start)
-          this.listQuery.endDate = Number(this.end)
-        }
+        this.listQuery.startDate = this.listQuery.start
+        this.listQuery.endDate = this.listQuery.end
       }
-      if (!this.start && !this.end) {
+      if (!this.listQuery.start && !this.listQuery.end) {
         this.listQuery.startDate = undefined
         this.listQuery.endDate = undefined
       }
       // console.log(e);
     },
-    changeTime() {
-      if (this.listQuery.reportTime) {
-        console.log(this.listQuery.reportTime)
-        let start = new Date(this.listQuery.reportTime[0])
-        let end = new Date(this.listQuery.reportTime[1])
-        // const years = Number(this.listQuery.reportTime[1].slice(0, 4)) - Number(this.listQuery.reportTime[0].slice(0, 4))
-        // const months = Number(this.listQuery.reportTime[1].slice(4)) - Number(this.listQuery.reportTime[0].slice(4))
-        // console.log(years);
-        if ((end - start) > 31104000000) {
-          this.$message({
-            message: '时间范围不能超过24个月',
-            type: 'warning'
-          });
-          this.listQuery.reportTime = [];
-        } else {
-          this.listQuery.startDate = this.listQuery.reportTime[0]
-          this.listQuery.endDate = this.listQuery.reportTime[1]
-        }
-      } else {
-        this.listQuery.startDate = undefined
-        this.listQuery.endDate = undefined
-      }
-    },
     onValueChange(picker, k) { // 选中近k周后触发的操作
-      if (this.start && this.end) {
-        this.date1 = moment(this.start.getTime() - 24 * 60 * 60 * 1000).format('YYYY-MM-DD')
-        this.date2 = moment(this.end.getTime() + 5 * 24 * 60 * 60 * 1000).format('YYYY-MM-DD')
+      // console.log(this.listQuery.reportTime[0], this.listQuery.reportTime[1])
+      if (this.listQuery.start && this.listQuery.end) {
+        console.log(this.listQuery.reportTime)
+        this.date1 = moment(this.listQuery.start.getTime() - 24 * 60 * 60 * 1000).format('YYYY-MM-DD HH:mm:ss')
+        this.date2 = moment(this.listQuery.end.getTime() + 5 * 24 * 60 * 60 * 1000).format('YYYY-MM-DD HH:mm:ss')
         const numDays = (new Date(this.date2).getTime() - new Date(this.date1).getTime()) / (24 * 3600 * 1000);
         if (numDays > 168) {
           console.log(numDays)
@@ -500,20 +462,21 @@ export default {
             type: 'warning'
           });
         } else {
-          this.listQuery.startDate = this.date1
-          this.listQuery.endDate = this.date2
-          // this.listQuery.startDate = Number(moment(this.start.getTime()).format('YYYYWW'))
-          // this.listQuery.endDate = Number(moment(this.end.getTime()).format('YYYYWW'))
+          this.listQuery.startDate = moment(this.listQuery.start.getTime() - 24 * 60 * 60 * 1000).format('YYYY-MM-DD')
+          this.listQuery.endDate = moment(this.listQuery.end.getTime() + 5 * 24 * 60 * 60 * 1000).format('YYYY-MM-DD')
         }
       }
-      if (!this.start && !this.end) {
+      if (!this.listQuery.start && !this.listQuery.end) {
         this.listQuery.startDate = undefined
         this.listQuery.endDate = undefined
       }
     },
     changeDayTime() {
       if (this.listQuery.reportTime) {
-        const numDays = Number(this.listQuery.reportTime[1]) - Number(this.listQuery.reportTime[0])
+        // this.createStartDate = moment(new Date(this.listQuery.reportTime[0]), 'yyyy-MM-dd hh:mm:ss');
+        // this.createEndDate = moment(new Date(this.listQuery.reportTime[1]), 'yyyy-MM-dd hh:mm:ss');
+        console.log(this.listQuery.reportTime[1])
+        const numDays = (this.listQuery.reportTime[1] - this.listQuery.reportTime[0]) / (24 * 3600 * 1000);
         if (numDays > 30) {
           this.$message({
             message: '时间范围不能超过30天',
@@ -529,27 +492,27 @@ export default {
         this.listQuery.endDate = undefined
       }
     },
-    getOverView() {
-      // getOverView().then(res => {
-      //   this.data = res.data
-      //   console.log('aa', res.data)
-      // })
-    },
-    otherMethods(val) {
-      this.detailOrUpdateVisible = true;
-      // this.addOrEditTitle = "详情";
-      this.$nextTick(() => {
-        // this.$refs.detailOrUpdate.init(val.data.id);
-      });
+    changeTime(value) {
+      if (this.listQuery.reportTime) {
+        const numDays = this.listQuery.reportTime[1] - this.listQuery.reportTime[0];
+        if (numDays > 2 * 365 * 24 * 60 * 60 * 1000) {
+          this.$message({
+            message: '时间范围不能超过24个月',
+            type: 'warning'
+          });
+          this.listQuery.reportTime = [];
+        } else {
+          this.listQuery.startDate = this.listQuery.reportTime[0]
+          this.listQuery.endDate = this.listQuery.reportTime[1]
+        }
+      } else {
+        this.listQuery.startDate = undefined
+        this.listQuery.endDate = undefined
+      }
     },
     async getDataList() {
       this.otherProps = []
       this.chartMsg.xData = []
-      console.log(this.listQuery);
-      if (this.listQuery.type == 3) {
-        this.listQuery.startDate = this.listQuery.reportTime[0]
-        this.listQuery.endDate = this.listQuery.reportTime[1]
-      }
       let arr = []
       this.currentMenu === '邯郸' ? arr.push(1) : arr.push(0)
       this.listQuery.factory = arr

From 670d7e5600266d42e1ada458ae1d07ebdab38450 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98937886381=E2=80=99?= <‘937886381@qq.com’>
Date: Fri, 21 Jun 2024 16:04:50 +0800
Subject: [PATCH 05/12] =?UTF-8?q?=E6=8A=A5=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.dev                                      |   9 +-
 src/views/dashboard/charts/ChipInvest.vue     |  10 +-
 src/views/dashboard/charts/RightChartBase.vue |  50 +-
 .../report/components/produceLineBar.vue      |   8 +-
 .../components/produceLineBarTarget.vue       |   6 +-
 .../components/produceLineBarYearTarget.vue   |   8 +-
 .../components/produceLineYieldBarTarget.vue  | 263 +++++++
 src/views/report/comprehensiveData.vue        |  44 +-
 src/views/report/produceConversion.vue        | 437 ++++++------
 src/views/report/productionSituationMW.vue    | 392 ++++++-----
 .../report/productionSituationTablets.vue     | 662 +++++++++---------
 src/views/report/productionYield.vue          | 228 +++---
 12 files changed, 1214 insertions(+), 903 deletions(-)
 create mode 100644 src/views/report/components/produceLineYieldBarTarget.vue

diff --git a/.env.dev b/.env.dev
index 5b6262d..d272df7 100644
--- a/.env.dev
+++ b/.env.dev
@@ -1,8 +1,8 @@
 ###
  # @Author: zhp
  # @Date: 2024-04-28 13:42:51
- # @LastEditTime: 2024-06-20 10:16:40
- # @LastEditors: DY
+ # @LastEditTime: 2024-06-21 13:40:38
+ # @LastEditors: zhp
  # @Description:
 ###
 # 开发环境配置
@@ -13,7 +13,7 @@ VUE_APP_TITLE = 发电玻璃智能管控平台
 
 # 芋道管理系统/开发环境
 # VUE_APP_BASE_API = 'http://192.168.1.70:30307'
-VUE_APP_BASE_API = 'http://glass.kszny.picaiba.com'
+# VUE_APP_BASE_API = 'http://glass.kszny.picaiba.com'
 # 闫阳
 # VUE_APP_BASE_API = 'http://192.168.1.81:48080'
 # 徐
@@ -24,7 +24,8 @@ VUE_APP_BASE_API = 'http://glass.kszny.picaiba.com'
 # VUE_APP_BASE_API = 'http://192.168.1.63:48080'
 # 张一丁
 # VUE_APP_BASE_API = 'http://192.168.4.139:48080'
-
+# 蔡
+VUE_APP_BASE_API = 'http://192.168.1.54:48080'
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
 
diff --git a/src/views/dashboard/charts/ChipInvest.vue b/src/views/dashboard/charts/ChipInvest.vue
index 2a1c763..ed23412 100644
--- a/src/views/dashboard/charts/ChipInvest.vue
+++ b/src/views/dashboard/charts/ChipInvest.vue
@@ -1,8 +1,9 @@
 <!--
-    filename: chip-invest.vue
-    author: liubin
-    date: 2024-04-10 08:59:28
-    description:
+ * @Author: zhp
+ * @Date: 2024-06-03 15:38:31
+ * @LastEditTime: 2024-06-21 15:06:39
+ * @LastEditors: zhp
+ * @Description:
 -->
 
 <template>
@@ -34,6 +35,7 @@ export default {
       xAxis: cities,
     };
   },
+
   computed: {
     series() {
       const chipInvest = this.$store.getters.home.chipInvest;
diff --git a/src/views/dashboard/charts/RightChartBase.vue b/src/views/dashboard/charts/RightChartBase.vue
index d94f8e1..de69b1e 100644
--- a/src/views/dashboard/charts/RightChartBase.vue
+++ b/src/views/dashboard/charts/RightChartBase.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-04-28 13:42:51
- * @LastEditTime: 2024-06-14 09:16:09
+ * @LastEditTime: 2024-06-21 15:02:27
  * @LastEditors: zhp
  * @Description:
 -->
@@ -123,30 +123,30 @@ export default {
             itemStyle: {
               color: "#f3c000",
             },
-            areaStyle: {
-              color: {
-                type: "linear",
-                x: 0,
-                y: 0,
-                x2: 0,
-                y2: 1,
-                colorStops: [
-                  {
-                    offset: 0,
-                    color: "#f3c000", // 0% 处的颜色
-                  },
-                  {
-                    offset: 0.55,
-                    color: "#f3c00033",
-                  },
-                  {
-                    offset: 1,
-                    color: "transparent", // 100% 处的颜色
-                  },
-                ],
-                global: false, // 缺省为 false
-              },
-            },
+            // areaStyle: {
+            //   color: {
+            //     type: "linear",
+            //     x: 0,
+            //     y: 0,
+            //     x2: 0,
+            //     y2: 1,
+            //     colorStops: [
+            //       {
+            //         offset: 0,
+            //         color: "#f3c000", // 0% 处的颜色
+            //       },
+            //       {
+            //         offset: 0.55,
+            //         color: "#f3c00033",
+            //       },
+            //       {
+            //         offset: 1,
+            //         color: "transparent", // 100% 处的颜色
+            //       },
+            //     ],
+            //     global: false, // 缺省为 false
+            //   },
+            // },
             data: [], // this.series[0].data,
           },
           {
diff --git a/src/views/report/components/produceLineBar.vue b/src/views/report/components/produceLineBar.vue
index 4b63baa..eda69d5 100644
--- a/src/views/report/components/produceLineBar.vue
+++ b/src/views/report/components/produceLineBar.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-06-19 15:28:34
- * @LastEditTime: 2024-06-20 20:49:07
+ * @LastEditTime: 2024-06-21 14:37:44
  * @LastEditors: zhp
  * @Description:
 -->
@@ -51,7 +51,7 @@ export default {
             },
           },
           formatter: function (params) {
-            console.log('params', params);
+            // 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 +=
@@ -63,8 +63,8 @@ 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.toFixed(2) : 0.0) + "MW"
-                      : params[i].value + "片"
+                      ? (params[i].value ? params[i] : 0) + "MW"
+                    : (params[i].value ? params[i].value : 0) + "片"
                 }</span>`;
             }
             return res;
diff --git a/src/views/report/components/produceLineBarTarget.vue b/src/views/report/components/produceLineBarTarget.vue
index 434f875..119ed45 100644
--- a/src/views/report/components/produceLineBarTarget.vue
+++ b/src/views/report/components/produceLineBarTarget.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-06-20 16:13:36
- * @LastEditTime: 2024-06-20 20:49:23
+ * @LastEditTime: 2024-06-21 14:37:56
  * @LastEditors: zhp
  * @Description:
 -->
@@ -70,8 +70,8 @@ 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.toFixed(2) : 0.0) + "MW"
-                      : params[i].value + "片"
+                    ? (params[i].value ? params[i] : 0) + "MW"
+                    : (params[i].value ? params[i].value : 0) + "片"
                 }</span>`;
             }
             return res;
diff --git a/src/views/report/components/produceLineBarYearTarget.vue b/src/views/report/components/produceLineBarYearTarget.vue
index b0e9d86..bf0f01d 100644
--- a/src/views/report/components/produceLineBarYearTarget.vue
+++ b/src/views/report/components/produceLineBarYearTarget.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-06-20 16:13:52
- * @LastEditTime: 2024-06-20 20:49:28
+ * @LastEditTime: 2024-06-21 14:37:59
  * @LastEditors: zhp
  * @Description:
 -->
@@ -51,7 +51,7 @@ export default {
             },
           },
           formatter: function (params) {
-            console.log('params', params);
+            // 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 +=
@@ -63,8 +63,8 @@ export default {
                 : params[i].seriesName === "转化效率"
                     ? params[i].value+ "%"
                   : params[i].seriesName.search('总功率') != -1
-                      ? params[i].value + "MW"
-                      : params[i].value + "片"
+                    ? (params[i].value ? params[i] : 0) + "MW"
+                    : (params[i].value ? params[i].value : 0) + "片"
                 }</span>`;
             }
             return res;
diff --git a/src/views/report/components/produceLineYieldBarTarget.vue b/src/views/report/components/produceLineYieldBarTarget.vue
new file mode 100644
index 0000000..411bf8c
--- /dev/null
+++ b/src/views/report/components/produceLineYieldBarTarget.vue
@@ -0,0 +1,263 @@
+<!--
+ * @Author: zhp
+ * @Date: 2024-06-21 09:05:14
+ * @LastEditTime: 2024-06-21 14:38:06
+ * @LastEditors: zhp
+ * @Description:
+-->
+<template>
+  <div>
+    <!-- 暂无数据 -->
+    <div class="no-data-bg" style="position: relative; left: 50%; transform: translateX(-50%)"
+      v-show="this.chartMsg.series.length === 0"></div>
+    <!-- 图例 -->
+    <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>
+          <span v-if="item.type === 2" class="line" :style="{ backgroundColor: item.color }">
+            <span class="line-block" :style="{ backgroundColor: item.color }"></span>
+          </span>
+          {{ item.name }}</span>
+      </div>
+      <div :id="chartId" :style="{ width: '100%', height: chartHeight + 'px' }"></div>
+    </div>
+  </div>
+</template>
+<script>
+import * as echarts from "echarts";
+import { debounce } from "@/utils/debounce";
+export default {
+  name: "bmLineBar",
+  data() {
+    return {
+      myChart: "",
+      option: {
+        color: [],
+        // color: ["#8EF0AB", "#63BDFF", "#288AFF"],
+        grid: {
+          left: -30,
+          right: 0,
+          bottom: 30,
+          top: 30,
+          containLabel:true,
+        },
+        tooltip: {
+          trigger: "axis",
+          axisPointer: {
+            // type: "cross",
+            crossStyle: {
+              color: "rgba(237,237,237,0.5)",
+            },
+          },
+          formatter: function (params) {
+            console.log('params', params)
+            let arr = []
+            var res = ``;
+            // for (var i = 0, l = params.length; i < l; i++) {
+            console.log()
+            if (params[0].axisValue === 'FTO投入' || params[0].axisValue === '芯片产量' || params[0].axisValue === '标准组件产量') {
+              res +=
+                "<br/>" +
+                `<span style='display:inline-block;margin-right:4px;border-radius:10px;width:10px;height:10px;background-color:${params[0].color}'></span>` +
+              `<span style='display:inline-block;width:150px;color:rgba(0,0,0,0.8);font-size:14px;'>${params[0].axisValueLabel}</span>` +
+              `<span style='color:rgba(0,0,0,0.48);font-size:14px;'>${params[0].name === "综合良率"
+                  ? (params[0].value ? params[0].value.toFixed(2) : 0.0) + "%"
+                : params[0].name === "转化效率"
+                    ? (params[0].value ? params[0].value.toFixed(2) : 0.0) + "%"
+                  : params[i].seriesName.search('总功率') != -1
+                    ? (params[i].value ? params[i] : 0) + "MW"
+                    : (params[i].value ? params[i].value : 0) + "片"
+                }</span>`;
+              // }
+            }
+            if (params[1].axisValue === '综合良率' || params[1].axisValue === '转化效率') {
+              res +=
+                "<br/>" +
+                `<span style='display:inline-block;margin-right:4px;border-radius:10px;width:10px;height:10px;background-color:${params[1].color}'></span>` +
+              `<span style='display:inline-block;width:150px;color:rgba(0,0,0,0.8);font-size:14px;'>${params[1].axisValueLabel}</span>` +
+              `<span style='color:rgba(0,0,0,0.48);font-size:14px;'>${params[1].name === "综合良率"
+                ? (params[1].value ? params[1].value.toFixed(2) : 0.0) + "%"
+                : params[1].name === "转化效率"
+                  ? (params[1].value ? params[1].value.toFixed(2) : 0.0) + "%"
+                  : params[i].seriesName.search('总功率') != -1
+                    ? (params[i].value ? params[i] : 0) + "MW"
+                    : (params[i].value ? params[i].value : 0) + "片"
+                }</span>`;
+            }
+            return res;
+          },
+        },
+        xAxis: {
+          type: "category",
+          data: [],
+          axisTick: {
+            show: false,
+          },
+          axisPointer: {
+            type: "shadow",
+          },
+        },
+        dataZoom: [//滚动条
+          {
+            // 设置滚动条的隐藏与显示
+            show: true,
+            // 设置滚动条类型
+            type: "slider",
+            // 设置背景颜色
+            backgroundColor: "rgb(19, 63, 100)",
+            // 设置选中范围的填充颜色
+            fillerColor: "rgb(16, 171, 198)",
+            // 设置边框颜色
+            borderColor: "rgb(19, 63, 100)",
+            // 是否显示detail，即拖拽时候显示详细数值信息
+            showDetail: false,
+            // 数据窗口范围的起始数值
+            startValue: 0,
+            // 数据窗口范围的结束数值（一页显示多少条数据）
+            endValue: 5,
+            // empty：当前数据窗口外的数据，被设置为空。
+            // 即不会影响其他轴的数据范围
+            filterMode: "empty",
+            // 设置滚动条宽度，相对于盒子宽度
+            width: "50%",
+            // 设置滚动条高度
+            height: 8,
+            // 设置滚动条显示位置
+            left: "center",
+            // 是否锁定选择区域（或叫做数据窗口）的大小
+            zoomLoxk: true,
+            // 控制手柄的尺寸
+            handleSize: 0,
+            // dataZoom-slider组件离容器下侧的距离
+            bottom: 3,
+          },
+          {
+            // 没有下面这块的话，只能拖动滚动条，
+            // 鼠标滚轮在区域内不能控制外部滚动条
+            type: "inside",
+            // 滚轮是否触发缩放
+            zoomOnMouseWheel: false,
+            // 鼠标滚轮触发滚动
+            moveOnMouseMove: true,
+            moveOnMouseWheel: true,
+          },
+
+        ],
+        yAxis:undefined,
+        series: [],
+      },
+    };
+  },
+  props: {
+    chartHeight: {
+      type: Number,
+      default: 300,
+    },
+    type: {
+      type: Number,
+      default: 2,
+    },
+    show: {
+      type: Boolean,
+      default: true,
+    },
+    legendList: {
+      type: Array,
+      default: () => [],
+    },
+    chartMsg: {
+      type: Object,
+      default: () => { },
+    },
+    chartId: {
+      type: String,
+      default: "bmChart",
+    },
+    chartNum: {
+      type: Number,
+      default: 1,
+    },
+  },
+  watch: {
+    chartHeight: {
+      handler(newVal) {
+        this.chartHeight = newVal;
+      },
+    },
+    type() {
+      this.canvasReset();
+    },
+    chartNum(val) {
+      this.canvasReset();
+    },
+    chartMsg: {
+      handler(newVal) {
+        this.canvasReset();
+      },
+      deep: true,
+    },
+  },
+  mounted() {
+    this.canvasReset();
+  },
+  methods: {
+    canvasReset() {
+      debounce(() => {
+        this.getMes();
+      }, 500)();
+    },
+    getMes() {
+      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.yAxis.name = this.chartMsg.yName;
+
+      // this.option.yAxis.axisLabel = this.chartMsg.yAxisLabel;
+      this.option.series = this.chartMsg.series;
+      this.option.yAxis = this.chartMsg.yAxis;
+
+      this.myChart.setOption(this.option);
+    },
+  },
+};
+</script>
+<style lang="scss">
+.legendData {
+  text-align: right;
+  position: relative;
+  // right: 30;
+  // top: 10px;
+  .itemData {
+    display: inline-block;
+    margin-right: 10px;
+    font-size: 14px;
+    color: #8c8c8c;
+    .block {
+      width: 10px;
+      height: 10px;
+      display: inline-block;
+      margin-right: 4px;
+    }
+    .line {
+      width: 10px;
+      height: 10px;
+      border-radius: 5px;
+      display: inline-block;
+      margin-right: 4px;
+      position: relative;
+      .line-block {
+        position: absolute;
+        width: 20px;
+        height: 2px;
+        left: -5px;
+        top: 4px;
+      }
+    }
+  }
+}
+</style>
diff --git a/src/views/report/comprehensiveData.vue b/src/views/report/comprehensiveData.vue
index e3529a6..e46da5e 100644
--- a/src/views/report/comprehensiveData.vue
+++ b/src/views/report/comprehensiveData.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-04-15 10:49:13
- * @LastEditTime: 2024-06-20 20:46:53
+ * @LastEditTime: 2024-06-21 15:18:20
  * @LastEditors: zhp
  * @Description:
 -->
@@ -57,8 +57,8 @@
           <el-button type="primary" size="small" plain @click="handleExport">导出</el-button>
         </el-form-item>
       </el-form>
-      <base-table :table-props="tableProps" :page="listQuery.pageNo" :limit="listQuery.pageSize"
-        :table-data="tableData">
+      <base-table :span-method="objectSpanMethod" :table-props="tableProps" :page="listQuery.pageNo"
+        :limit="listQuery.pageSize" :table-data="tableData">
       </base-table>
     </div>
   </div>
@@ -86,7 +86,7 @@ export default {
     return {
       factoryList,
       factoryArray,
-
+      currentMenu:'邯郸',
       listQuery: {
         pageNo: 1,
         pageSize: 999,
@@ -147,7 +147,7 @@ export default {
       otherProps:[],
       tableData: [],
       xAxis: [],
-      currentMenu:null,
+      // currentMenu:null,
       lineData: {},
       data: {}
       // proLineList: [],
@@ -200,6 +200,35 @@ export default {
     this.getDataList()
   },
   methods: {
+    objectSpanMethod({ row, column, rowIndex, columnIndex }) {
+      let spanOneArr = [], concatOne = 0;
+      // let spanTwoArr = [], concatTwo = 0;
+
+      this.tableData.map((item, index) => {
+        // console.log(inde);
+        if (index === 0) {
+          spanOneArr.push(1);
+        } else {
+          //第一列需合并相同内容的判断条件
+          if (item.type === this.tableData[index - 1].type) {
+            spanOneArr[concatOne] += 1;
+            spanOneArr.push(0);
+          } else {
+            spanOneArr.push(1);
+            concatOne = index;
+          };
+        }
+      });
+
+      if (columnIndex === 1) {
+        const _row = spanOneArr[rowIndex];
+        const _col = _row > 0 ? 1 : 0;
+        return {
+          rowspan: _row,
+          colspan: _col
+        }
+      }
+    },
     getYear(e) {
       if (this.listQuery.end - this.listQuery.start > 10 * 365 * 24 * 60 * 60 * 1000) {
         this.$message({
@@ -288,7 +317,7 @@ export default {
       this.currentMenu === '邯郸' ? arr.push(1) : arr.push(2)
       this.listQuery.factory = arr
       const res = await getComprehensiveDataPage(this.listQuery)
-      this.tableData = res.data.list
+      // this.tableData = res.data.list
       let dataArr = [{
         type: '芯片',
         item: 'FTO投入',
@@ -412,7 +441,7 @@ export default {
         // this.chartMsg.xData.push(ele.titleValue)
         this.otherProps.push({
           label: ele.titleValue,
-          props: 'value' + i
+          prop: 'value' + i
         })
       })
       console.log(this.otherProps)
@@ -456,6 +485,7 @@ export default {
         //   props: 'value' + index + 1,
         // })
       })
+      console.log(dataArr);
       if (res.data.length === 0) {
         this.tableData = []
       } else {
diff --git a/src/views/report/produceConversion.vue b/src/views/report/produceConversion.vue
index 874d994..1f45f91 100644
--- a/src/views/report/produceConversion.vue
+++ b/src/views/report/produceConversion.vue
@@ -13,54 +13,41 @@
           </el-select>
         </el-form-item>
         <el-form-item v-show="listQuery.date === 0 || listQuery.date === ''" label="时间范围" prop="reportTime">
-          <el-date-picker size="small" clearable v-model="listQuery.reportTime" type="daterange" range-separator="至"
-            start-placeholder="开始日期" value-format="yyyy-MM-dd" @change="changeDayTime" end-placeholder="结束日期">
+          <el-date-picker size="small" clearable v-model="listQuery.reportTime" type="datetimerange" range-separator="至"
+            start-placeholder="开始日期" value-format="yyyy-MM-dd" format="yyyy-MM-dd" @change="changeDayTime"
+            end-placeholder="结束日期">
           </el-date-picker>
         </el-form-item>
         <el-form-item v-show="listQuery.date === 1" label="时间范围" prop="reportTime">
-          <el-date-picker size="small" clearable v-model="start" type="week" format="yyyy 第 WW 周" placeholder="选择周"
-            style="width: 180px" @change="onValueChange">
+          <el-date-picker size="small" clearable v-model="listQuery.start" type="week" format="yyyy 第 WW 周"
+            placeholder="选择周" style="width: 180px" @change="onValueChange">
           </el-date-picker>
           至
-          <el-date-picker size="small" clearable v-model="end" type="week" format="yyyy 第 WW 周" placeholder="选择周"
-            style="width: 180px" @change="onValueChange">
+          <el-date-picker size="small" clearable v-model="listQuery.end" type="week" format="yyyy 第 WW 周"
+            placeholder="选择周" style="width: 180px" @change="onValueChange">
           </el-date-picker>
-          <!-- <span v-if="start && end" style="margin-left: 10px">
+          <!-- <span v-if="listQuery.start && listQuery.end" style="margin-left: 10px">
             {{ date1 }} 至 {{ date2 }}，共 {{ weekNum }} 周
           </span> -->
         </el-form-item>
-        <el-form-item v-show="listQuery.date === 2" label="时间值" prop="reportTime">
-          <el-date-picker size="small" v-model="listQuery.reportTime" type="monthrange" value-format="yyyy-MM-DD"
-            range-separator="至" start-placeholder="开始月份" end-placeholder="结束月份" @change="changeTime">
+        <el-form-item v-show="listQuery.date === 2" label="时间范围" prop="reportTime">
+          <el-date-picker size="small" clearable v-model="listQuery.reportTime" type="monthrange"
+            value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始月份" end-placeholder="结束月份"
+            @change="changeTime">
           </el-date-picker>
         </el-form-item>
-        <el-form-item v-show="listQuery.date === 3" label="时间值" prop="reportTime">
-          <el-date-picker size="small" clearable v-model="listQuery.reportTime[0]" value-format="yyyy" type="year"
+        <el-form-item v-show="listQuery.date === 3" label="时间范围" prop="reportTime">
+          <el-date-picker size="small" clearable v-model="listQuery.start" value-format="yyyy-MM-dd" type="year"
             placeholder="开始时间">
           </el-date-picker>
           ~
-          <el-date-picker size="small" clearable v-model="listQuery.reportTime[1]" value-format="yyyy" type="year"
+          <el-date-picker size="small" clearable v-model="listQuery.end" value-format="yyyy-MM-dd" type="year"
             placeholder="结束时间" @change="getYear">
           </el-date-picker>
         </el-form-item>
-        <!-- <el-form-item label="玻璃类型" prop="type">
-          <el-select v-model="listQuery.type" placeholder="请选择玻璃类型">
-            <el-option v-for="item in typeList" :key="item.id" :label="item.name" :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item> -->
-        <!-- <el-form-item label="玻璃类型" prop="type">
-          <el-select v-model="listQuery.type" placeholder="请选择玻璃类型">
-            <el-option v-for="item in typeList" :key="item.id" :label="item.name" :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item> -->
         <el-form-item>
           <el-button type="primary" size="small" @click="getDataList">查询</el-button>
-          <el-divider direction="vertical"></el-divider>
-          <!-- <el-button type="primary" size="small" plain @click="handleImport">导入</el-button> -->
           <el-button type="primary" size="small" plain @click="handleExport">导出</el-button>
-          <!-- <el-button type="success" size="small" plain @click="addFactory">新增</el-button> -->
         </el-form-item>
       </el-form>
     </div>
@@ -77,7 +64,7 @@
           <div class="blueTip">
             {{ title }}
           </div>
-          <produce-line-bar-year-target :chartHeight="chartHeight" :legendList="legendList"
+          <produce-line-bar-year-target :chartHeight="chartHeight" :legendList="legendListTarget"
             :chartMsg="chartMsgYearTarget" :chartId=" 'yearData'" :chartNum="chartNum" />
         </el-col>
       </el-row>
@@ -97,8 +84,8 @@
             :chartMsg="chartMsgYearTarget" :chartId=" 'yearData'" :chartNum="chartNum" />
         </el-col> -->
       </el-row>
-      <base-table :table-props="tableProps" :page="listQuery.current" :limit="listQuery.size" :table-data="tableData"
-        :max-height="tableH" />
+      <base-table :span-method="objectSpanMethod" :table-props="tableProps" :page="listQuery.current"
+        :limit="listQuery.size" :table-data="tableData" :max-height="tableH" />
     </div>
     <!-- <div class="containerBottom">
 
@@ -110,7 +97,7 @@
 import { getProduceTransData, exportProduceTransData } from '@/api/report';
 import bmSearchBar from "./components/bmSearchBar";
 import BmLineBar from "./components/produceLineBar.vue";
-import produceLineBarYearTarget from "./components/produceLineBarYearTarget.vue";
+import produceLineBarYearTarget from "./components/produceLineYieldBarTarget.vue";
 
 import ButtonNav from '@/components/ButtonNav'
 import moment from 'moment'
@@ -119,13 +106,10 @@ export default {
   data() {
     return {
       otherProps: [],
-      start: undefined,
-      end: undefined,
+      title:'',
       listQuery: {
-        pageNo: 1,
-        pageSize: 999,
-        // size: 10,
-        // current: 1,
+        start: undefined,
+        end: undefined,
         factorys: null,
         // total: 0,
         date: 2,
@@ -156,19 +140,34 @@ export default {
       tableH: this.tableHeight(137) / 2 - 70,
       legendList: [
         {
-          id: 1, name: "综合良率", type: 2, color: "#FFCE6A"
+          id: 2, name: "芯片总功率", type: 1, color: "#8EF0AB"
+        },
+        { id: 3, name: "标准组件总功率", type: 1, color: "#288AFF" },
+        {
+          id: 1, name: "转化效率", type: 2, color: "#FFCE6A"
+        },
+        // {
+        //   id: 3, name: "", type: 1, color: "#288AFF"
+        // },
+      ],
+      legendListTarget: [
+
+        {
+          id: 2, name: "芯片总功率", type: 1, color: "#8EF0AB"
         },
         {
-          id: 2, name: "FTO投入", type: 1, color: "#8EF0AB"
+          id: 3, name: "标准组件总功率", type: 1, color: "#288AFF"
         },
-        { id: 3, name: "芯片产量", type: 1, color: "#288AFF" },
         {
-          id: 3, name: "标准组件产量", type: 1, color: "#288AFF"
+          id: 1, name: "转化效率", type: 1, color: "#64BDFF"
         },
+        // {
+        //   id: 3, name: "", type: 1, color: "#288AFF"
+        // },
       ],
       chartMsgYearTarget: {
-        color: ["#8EF0AB", "#288AFF", '#64BDFF', "#FFCE6A",],
-        xData: [],
+        color: ["#8EF0AB", "#288AFF","#64BDFF",],
+        xData: ['芯片总功率', '标准组件总功率','转化效率'],
         // yName: "单位/%",
         yAxis: [
           {
@@ -208,17 +207,11 @@ export default {
                   color: '#288AFF'
                 }
               },
-              {
-                value: 3,
-                itemStyle: {
-                  color: '#64BDFF'
-                }
-              },
               {
                 value: 0,
                 yAxisIndex: 1,
                 itemStyle: {
-                  color: '#FFCE6A'
+                  color: '#64BDFF'
                 }
               }],
             type: "bar",
@@ -228,35 +221,36 @@ export default {
               position: [-18, -16],
               color: "#68C483",
               formatter: function (params) {
-                return params.value + "片";
+                return params.value + "MW";
               },
             },
           },
           {
-            name: '销量折线图',
+            name: '',
             type: 'bar',
             data: [0, 0, 0,
               {
                 value: 5,
                 itemStyle: {
-                  color: '#FFCE6A'
+                  color: '#68C483'
                 }
               }],
-            barWith: "40%",
+            type: "bar",
+            barWidth: 20,
             label: {
               show: true,
-              position: "top",
-              formatter: "{c}%"
-            },
-            lineStyle: {
-              color: "#ffb122"
+              position: [-18, -16],
+              color: "#68C483",
+              formatter: function (params) {
+                return params.value + "%";
+              },
             },
             yAxisIndex: 1
           }
         ],
       },
       chartMsg: {
-        color: ["#8EF0AB", "#288AFF", '#64BDFF', "#FFCE6A",],
+        color: ["#8EF0AB", "#288AFF","#FFCE6A",],
         xData: [],
         yName: "",
         yAxis: [
@@ -281,11 +275,8 @@ export default {
         ],
         series: [
           {
-            name: "FTO投入",
+            name: "芯片总功率",
             data: [
-              { name: "%", value: 57.5 },
-              { name: "%", value: 21.66 },
-              { name: "%", value: 18.4 },
             ],
             type: "bar",
             barWidth: 20,
@@ -294,16 +285,13 @@ export default {
               position: [-18, -16],
               color: "#68C483",
               formatter: function (params) {
-                return params.value.toFixed(2) + "%";
+                return params.value.toFixed(2) + "MW";
               },
             },
           },
           {
-            name: "芯片产量",
+            name: "标准组件总功率",
             data: [
-              { name: "%", value: 23.33 },
-              { name: "%", value: 7.02 },
-              { name: "%", value: 80.2 },
             ],
             type: "bar",
             barWidth: 20,
@@ -312,34 +300,13 @@ export default {
               position: [0, -16],
               color: "#288AFF",
               formatter: function (params) {
-                return params.value.toFixed(2) + "%";
+                return params.value.toFixed(2) + "MW";
               },
             },
           },
           {
-            name: "标准组件产量",
+            name: "转化效率",
             data: [
-              { name: "%", value: 23.33 },
-              { name: "%", value: 7.02 },
-              { name: "%", value: 80.2 },
-            ],
-            type: "bar",
-            barWidth: 20,
-            label: {
-              show: true,
-              position: [0, -16],
-              color: "#64BDFF",
-              formatter: function (params) {
-                return params.value.toFixed(2) + "%";
-              },
-            },
-          },
-          {
-            name: "综合良率",
-            data: [
-              { name: "%", value: 85 },
-              { name: "%", value: 85 },
-              { name: "%", value: 85 },
             ],
             type: "line",
             symbol: "circle",
@@ -423,67 +390,69 @@ export default {
   },
   mounted() {
     // this.getOverView()
-    const currentMonth = new Date()
-    this.listQuery.reportTime = [moment(currentMonth).format('yyyy-MM-DD'), moment(currentMonth).format('yyyy-MM-DD')]
-    this.changeTime()
+    const today = new Date()
+    const sevenDaysAgo = new Date(today.getTime() - (7 * 24 * 60 * 60 * 1000))
+    this.listQuery.beginTime = moment(sevenDaysAgo).format('yyyy-MM-DD')
+    this.listQuery.endTime = moment(today).format('yyyy-MM-DD')
+    this.listQuery.reportTime = [this.listQuery.beginTime, this.listQuery.endTime]
     this.getDataList()
   },
   methods: {
+    objectSpanMethod({ row, column, rowIndex, columnIndex }) {
+      let spanOneArr = [], concatOne = 0;
+      // let spanTwoArr = [], concatTwo = 0;
+
+      this.tableData.map((item, index) => {
+        // console.log(inde);
+        if (index === 0) {
+          spanOneArr.push(1);
+        } else {
+          //第一列需合并相同内容的判断条件
+          if (item.factory === this.tableData[index - 1].factory) {
+            spanOneArr[concatOne] += 1;
+            spanOneArr.push(0);
+          } else {
+            spanOneArr.push(1);
+            concatOne = index;
+          };
+        }
+      });
+
+      if (columnIndex === 0) {
+        const _row = spanOneArr[rowIndex];
+        const _col = _row > 0 ? 1 : 0;
+        return {
+          rowspan: _row,
+          colspan: _col
+        }
+      }
+    },
     getYear(e) {
-      if (this.end && Number(this.end) - Number(this.start) > 10) {
+      if (this.listQuery.end - this.listQuery.start > 10 * 365 * 24 * 60 * 60 * 1000) {
         this.$message({
           message: '年份起止时间不能超过十年',
           type: 'warning'
         });
-        this.start = undefined
-        this.end = undefined
+        this.listQuery.reportTime = []
+        this.listQuery.start = undefined
+        this.listQuery.end = undefined
         // console.log();
       } else {
-        if (Number(this.end) < Number(this.start)) {
-          this.$message({
-            message: '结束年份不能小于开始年份',
-            type: 'warning'
-          });
-          this.start = undefined
-          this.end = undefined
-        } else {
-          this.listQuery.beginTime = Number(this.start)
-          this.listQuery.endTime = Number(this.end)
-        }
+        this.listQuery.beginTime = this.listQuery.start
+        this.listQuery.endTime = this.listQuery.end
       }
-      if (!this.start && !this.end) {
+      if (!this.listQuery.start && !this.listQuery.end) {
         this.listQuery.beginTime = undefined
         this.listQuery.endTime = undefined
       }
       // console.log(e);
     },
-    changeTime() {
-      if (this.listQuery.reportTime) {
-        console.log(this.listQuery.reportTime)
-        let start = new Date(this.listQuery.reportTime[0])
-        let end = new Date(this.listQuery.reportTime[1])
-        // const years = Number(this.listQuery.reportTime[1].slice(0, 4)) - Number(this.listQuery.reportTime[0].slice(0, 4))
-        // const months = Number(this.listQuery.reportTime[1].slice(4)) - Number(this.listQuery.reportTime[0].slice(4))
-        // console.log(years);
-        if ((end - start) > 31104000000) {
-          this.$message({
-            message: '时间范围不能超过24个月',
-            type: 'warning'
-          });
-          this.listQuery.reportTime = [];
-        } else {
-          this.listQuery.beginTime = this.listQuery.reportTime[0]
-          this.listQuery.endTime = this.listQuery.reportTime[1]
-        }
-      } else {
-        this.listQuery.beginTime = undefined
-        this.listQuery.endTime = undefined
-      }
-    },
     onValueChange(picker, k) { // 选中近k周后触发的操作
-      if (this.start && this.end) {
-        this.date1 = moment(this.start.getTime() - 24 * 60 * 60 * 1000).format('YYYY-MM-DD')
-        this.date2 = moment(this.end.getTime() + 5 * 24 * 60 * 60 * 1000).format('YYYY-MM-DD')
+      // console.log(this.listQuery.reportTime[0], this.listQuery.reportTime[1])
+      if (this.listQuery.start && this.listQuery.end) {
+        console.log(this.listQuery.reportTime)
+        this.date1 = moment(this.listQuery.start.getTime() - 24 * 60 * 60 * 1000).format('YYYY-MM-DD HH:mm:ss')
+        this.date2 = moment(this.listQuery.end.getTime() + 5 * 24 * 60 * 60 * 1000).format('YYYY-MM-DD HH:mm:ss')
         const numDays = (new Date(this.date2).getTime() - new Date(this.date1).getTime()) / (24 * 3600 * 1000);
         if (numDays > 168) {
           console.log(numDays)
@@ -492,20 +461,21 @@ export default {
             type: 'warning'
           });
         } else {
-          this.listQuery.beginTime = this.date1
-          this.listQuery.endTime = this.date2
-          // this.listQuery.beginTime = Number(moment(this.start.getTime()).format('YYYYWW'))
-          // this.listQuery.endTime = Number(moment(this.end.getTime()).format('YYYYWW'))
+          this.listQuery.beginTime = moment(this.listQuery.start.getTime() - 24 * 60 * 60 * 1000).format('YYYY-MM-DD')
+          this.listQuery.endTime = moment(this.listQuery.end.getTime() + 5 * 24 * 60 * 60 * 1000).format('YYYY-MM-DD')
         }
       }
-      if (!this.start && !this.end) {
+      if (!this.listQuery.start && !this.listQuery.end) {
         this.listQuery.beginTime = undefined
         this.listQuery.endTime = undefined
       }
     },
     changeDayTime() {
       if (this.listQuery.reportTime) {
-        const numDays = Number(this.listQuery.reportTime[1]) - Number(this.listQuery.reportTime[0])
+        // this.createbeginTime = moment(new Date(this.listQuery.reportTime[0]), 'yyyy-MM-dd hh:mm:ss');
+        // this.createendTime = moment(new Date(this.listQuery.reportTime[1]), 'yyyy-MM-dd hh:mm:ss');
+        console.log(this.listQuery.reportTime[1])
+        const numDays = (this.listQuery.reportTime[1] - this.listQuery.reportTime[0]) / (24 * 3600 * 1000);
         if (numDays > 30) {
           this.$message({
             message: '时间范围不能超过30天',
@@ -521,18 +491,23 @@ export default {
         this.listQuery.endTime = undefined
       }
     },
-    getOverView() {
-      // getOverView().then(res => {
-      //   this.data = res.data
-      //   console.log('aa', res.data)
-      // })
-    },
-    otherMethods(val) {
-      this.detailOrUpdateVisible = true;
-      // this.addOrEditTitle = "详情";
-      this.$nextTick(() => {
-        // this.$refs.detailOrUpdate.init(val.data.id);
-      });
+    changeTime(value) {
+      if (this.listQuery.reportTime) {
+        const numDays = this.listQuery.reportTime[1] - this.listQuery.reportTime[0];
+        if (numDays > 2 * 365 * 24 * 60 * 60 * 1000) {
+          this.$message({
+            message: '时间范围不能超过24个月',
+            type: 'warning'
+          });
+          this.listQuery.reportTime = [];
+        } else {
+          this.listQuery.beginTime = this.listQuery.reportTime[0]
+          this.listQuery.endTime = this.listQuery.reportTime[1]
+        }
+      } else {
+        this.listQuery.beginTime = undefined
+        this.listQuery.endTime = undefined
+      }
     },
     async getDataList() {
       this.otherProps = []
@@ -563,30 +538,48 @@ export default {
       }
       ]
       res.data.forEach(element => {
-        element.list.forEach((ele, index) => {
+        element.list.reverse().forEach((ele, index) => {
           let i = index + 1
           this.chartMsg.xData.push(ele.reportTimep)
           this.otherProps.push({
             label: ele.reportTimep,
-            props: 'value' + i
+            prop: 'value' + i
           })
         })
-      });
-      console.log(this.otherProps)
+      })
+      this.chartMsg.xData.push(res.data[0].list[0].reportTimep + '目标')
+      if (this.listQuery.date === 0 || this.listQuery.date === 1 || this.listQuery.date === 2) {
+        this.otherProps.push({
+          label: res.data[0].list[0].reportTimep + '目标',
+          prop: 'dayData'
+        })
+        dataArr[0]['dayData'] = res.data[0].chipTarget
+        dataArr[1]['dayData'] = res.data[0].standTarget
+        dataArr[2]['dayData'] = res.data[0].conversionEfficiencyTarget
+      }
+      if (this.listQuery.date === 2 || this.listQuery.date === 3) {
+        this.otherProps.push({
+          label: res.data[0].yearTarget.targetTime,
+          prop: 'yearData'
+        })
+        dataArr[0]['yearData'] = res.data[0].yearTarget.chipTotalPower
+        dataArr[1]['yearData'] = res.data[0].yearTarget.componentTotalPower
+        dataArr[2]['yearData'] = res.data[0].yearTarget.componentConversionEfficiency
+      }
       res.data.forEach((ele, index) => {
-        let i = index + 1
-        let m = 'value' + i
+        // let i = index + 1
+        // let m = 'value' + i
         ele.list.forEach((item, index) => {
             let i = index + 1
             let m = 'value' + i
             // ele.productionSituationDataVOList.forEach((item) => {
             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].factory = ele.factory === 1 ? '邯郸' : '瑞昌'
-            dataArr[1]['' + m + ''] = ele.scTotalPowers
-            dataArr[2]['' + m + ''] = ele.conversionEfficiency
+
             // dataArr[3]['' + m + ''] = ele.comprehensiveYieldRate
             // })
             // ele.titleValue
@@ -595,74 +588,47 @@ export default {
             //   props: 'value' + index + 1,
             // })
           })
-        // ele.productionSituationDataVOList.forEach((item) => {
-        // dataArr[0]['' + m + ''] = item.chipTotalPowers
-        // dataArr[0].factory = ele.factory === 1 ? '邯郸' : '瑞昌'
-        // dataArr[1].factory = ele.factory === 1 ? '邯郸' : '瑞昌'
-        // dataArr[2].factory = ele.factory === 1 ? '邯郸' : '瑞昌'
-        // dataArr[3].factory = ele.factory === 1 ? '邯郸' : '瑞昌'
-        // dataArr[1]['' + m + ''] = ele.scTotalPowers
-        // dataArr[2]['' + m + ''] = ele.conversionEfficiency
-        // dataArr[3]['' + m + ''] = ele.comprehensiveYieldRate
-        // })
-        // ele.titleValue
-        // .push({
-        //   label: ele.titleValue,
-        //   props: 'value' + index + 1,
-        // })
       })
-      for (let i in dataArr[0]) {
-        this.chartMsg.series[0].name = dataArr[0]['item']
-        if (i.search('value') === 0) {
-          this.chartMsg.series[0].data.push({
-            name: dataArr[0]['item'],
-            name: dataArr[0][i]
-          })
-        }
-      }
-      for (let i in dataArr[1]) {
-        this.chartMsg.series[1].name = dataArr[1]['item']
-        if (i.search('value') === 0) {
-          this.chartMsg.series[1].data.push({
-            name: dataArr[1]['item'],
-            name: dataArr[1][i]
-          })
-        }
-      }
-      for (let i in dataArr[2]) {
-        this.chartMsg.series[2].name = dataArr[2]['item']
-        if (i.search('value') === 0) {
-          this.chartMsg.series[2].data.push({
-            name: dataArr[2]['item'],
-            name: dataArr[2][i]
-          })
-        }
-      }
-      for (let i in dataArr[3]) {
-        this.chartMsg.series[3].name = dataArr[3]['item']
-        if (i.search('value') === 0) {
-          this.chartMsg.series[3].data.push({
-            name: dataArr[3]['item'],
-            name: dataArr[3][i]
-          })
-        }
-      }
-
-      // this.tableProps = otherProps
-      // res.data.list.forEach((ele) => {
-      //   console.log(ele);
-      //   ele.productionSituationDataVOList.forEach((item) => {
-      //     let obj = {
-      //       bipvProductOutput: item.bipvProductOutput,
-      //       chipYield: item.chipYield,
-      //       componentYield: item.componentYield,
-      //       factory: item.factory,
-      //       ftoInput: item.ftoInput,
-      //       titleValue:ele.titleValue
-      //     }
-      //     dataArr.push(obj)
-      //   })
-      // })
+      this.title = res.data[0].yearTarget.targetTime + '目标值'
+      this.chartMsgYearTarget.series[0].data = [
+        {
+          value: res.data[0].yearTarget.chipTotalPower,
+          itemStyle: {
+            color: '#8EF0AB'
+          }
+        },
+        {
+          value: res.data[0].yearTarget.componentTotalPower,
+          itemStyle: {
+            color: '#288AFF'
+          }
+        },
+        {
+          value: null,
+          itemStyle: {
+            color: '#64BDFF'
+          }
+        }]
+      this.chartMsgYearTarget.series[1].data = [
+        {
+          value: null,
+          itemStyle: {
+            color: '#8EF0AB'
+          }
+        },
+        {
+          value: null,
+          itemStyle: {
+            color: '#288AFF'
+          }
+        },
+        {
+          value: res.data[0].yearTarget.componentConversionEfficiency,
+          itemStyle: {
+            color: '#64BDFF'
+          }
+        }]
+      console.log(dataArr);
       for (let i in dataArr[0]) {
         this.chartMsg.series[0].name = dataArr[0]['item']
         if (i.search('value') === 0) {
@@ -699,16 +665,7 @@ export default {
       //     })
       //   }
       // }
-      console.log(dataArr)
       this.tableData = dataArr
-      // this.tableProps.push()
-      this.listQuery.total = res.data.total
-      if (this.listQuery.total > 0) {
-        this.tableData.forEach(item => {
-          item.beginTime = item.beginTime ? item.beginTime[0] + '-' + item.beginTime[1] + '-' + item.beginTime[2] : '--'
-          item.endTime = item.endTime ? item.endTime[0] + '-' + item.endTime[1] + '-' + item.endTime[2] : '--'
-        })
-      }
     },
     _setTableHeight() {
       this.tableH = this.tableHeight(137) / 2 - 70;
diff --git a/src/views/report/productionSituationMW.vue b/src/views/report/productionSituationMW.vue
index 0cf2ec0..ad28d95 100644
--- a/src/views/report/productionSituationMW.vue
+++ b/src/views/report/productionSituationMW.vue
@@ -100,8 +100,8 @@
           :chartId="chartId" :chartNum="chartNum" />
         <!-- </el-col> -->
       </el-row>
-      <base-table :table-props="tableProps" :page="listQuery.current" :limit="listQuery.size" :table-data="tableData"
-        :max-height="tableH" />
+      <base-table :span-method="objectSpanMethod" :table-props="tableProps" :page="listQuery.current"
+        :limit="listQuery.size" :table-data="tableData" :max-height="tableH" />
     </div>
     <!-- <div class="containerBottom">
 
@@ -185,9 +185,6 @@ export default {
           {
             name: "芯片总功率",
             data: [
-              { name: "%", value: 57.5 },
-              { name: "%", value: 21.66 },
-              { name: "%", value: 18.4 },
             ],
             type: "bar",
             barWidth: 20,
@@ -202,11 +199,7 @@ export default {
           },
           {
             name: "标准组件总功率",
-            data: [
-              { name: "%", value: 23.33 },
-              { name: "%", value: 7.02 },
-              { name: "%", value: 80.2 },
-            ],
+            data: [],
             type: "bar",
             barWidth: 20,
             label: {
@@ -221,7 +214,7 @@ export default {
         ],
       },
       chartMsgTarget: {
-        color: [ "#8EF0AB", "#288AFF",'rgba(104, 196, 131, .5)', 'rgba(40, 138, 255, .5)'],
+        color: ["#8EF0AB", 'rgba(104, 196, 131, .3)', "#288AFF", 'rgba(40, 138, 255, .2)',],
         xData: [],
         yName: "单位/MW",
         yAxis: {
@@ -256,9 +249,6 @@ export default {
           {
             name: "芯片总功率",
             data: [
-              { name: "%", value: 57.5 },
-              { name: "%", value: 21.66 },
-              { name: "%", value: 18.4 },
             ],
             type: "bar",
             barWidth: 20,
@@ -274,9 +264,6 @@ export default {
           {
             name: "标准组件总功率",
             data: [
-              { name: "%", value: 23.33 },
-              { name: "%", value: 7.02 },
-              { name: "%", value: 80.2 },
             ],
             type: "bar",
             barWidth: 20,
@@ -381,6 +368,35 @@ export default {
     this.getDataList()
   },
   methods: {
+    objectSpanMethod({ row, column, rowIndex, columnIndex }) {
+      let spanOneArr = [], concatOne = 0;
+      // let spanTwoArr = [], concatTwo = 0;
+
+      this.tableData.map((item, index) => {
+        // console.log(inde);
+        if (index === 0) {
+          spanOneArr.push(1);
+        } else {
+          //第一列需合并相同内容的判断条件
+          if (item.factory === this.tableData[index - 1].factory) {
+            spanOneArr[concatOne] += 1;
+            spanOneArr.push(0);
+          } else {
+            spanOneArr.push(1);
+            concatOne = index;
+          };
+        }
+      });
+
+      if (columnIndex === 0) {
+        const _row = spanOneArr[rowIndex];
+        const _col = _row > 0 ? 1 : 0;
+        return {
+          rowspan: _row,
+          colspan: _col
+        }
+      }
+    },
     getYear(e) {
       if (this.listQuery.end - this.listQuery.start > 10 * 365 * 24 * 60 * 60 * 1000) {
         this.$message({
@@ -480,7 +496,7 @@ export default {
           // this.chartMsg.xData.push(ele.titleValue.replace(/[^\d]/g, " "))
           this.otherProps.push({
             label: ele.titleValue,
-            props: 'value' + i
+            prop: 'value' + i
           })
         })
         // res.data.list.forEach((ele) => {
@@ -520,100 +536,100 @@ export default {
         //   },
         // },]
         let arr = []
+        let chip = []
+        let std = []
         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) {
-              arr.push(
-                {
-                  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
-                    },
+              chip.push({
+                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
                   },
                 },
-                {
-                  name: "标准组件总功率目标值",
-                  stack: 'b',
-                  data: [
-                    { name: "标准组件总功率目标值", value: item.componentYield },
-                    // { name: '标准组件总功率目标值', value: 23 },
+              },)
+              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 {
-              arr.push(
-                {
-                  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
-                    },
+                  // { 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
                   },
                 },
-                {
-                  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
-                    },
+              })
+            } else {
+              chip.unshift({
+                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()
@@ -622,7 +638,7 @@ export default {
           })
         })
         console.log('arr', arr)
-        this.chartMsgTarget.series = arr
+        this.chartMsgTarget.series = [...chip, ...std]
         // arr.forEach((ele) => {
 
         // })
@@ -667,7 +683,7 @@ export default {
           // this.chartMsg.xData.push(ele.titleValue.replace(/[^\d]/g, " "))
           this.otherProps.push({
             label: ele.titleValue,
-            props: 'value' + i
+            prop: 'value' + i
           })
         })
         // res.data.list.forEach((ele) => {
@@ -707,100 +723,100 @@ export default {
         //   },
         // },]
         let arr = []
+        let chip = []
+        let std = []
         res.data.list.slice(res.data.list.length - 1, 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) {
-              arr.push(
-                {
-                  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
-                    },
+              chip.push({
+                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
                   },
                 },
-                {
-                  name: "标准组件总功率目标值",
-                  stack: 'b',
-                  data: [
-                    // { name: "标准组件总功率目标值", value: item.componentYield },
-                    { name: '标准组件总功率目标值', value: 23 },
+              },)
+              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 {
-              arr.push(
-                {
-                  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
-                    },
+                  // { 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
                   },
                 },
-                {
-                  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
-                    },
+              })
+            } else {
+              chip.unshift({
+                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()
@@ -809,7 +825,7 @@ export default {
           })
         })
         console.log('arr', arr)
-        this.chartMsgTarget.series = arr
+        this.chartMsgTarget.series = [...chip,...std]
         console.log(this.chartMsg.xData)
         res.data.list.forEach((ele, index) => {
           let i = index + 1
@@ -834,7 +850,7 @@ export default {
           this.chartMsg.xData.push(ele.titleValue)
           this.otherProps.push({
             label: ele.titleValue,
-            props: 'value' + i
+            prop: 'value' + i
           })
         })
         console.log(this.otherProps)
@@ -872,7 +888,7 @@ export default {
           }
         }
       }
-      this.tableData = this.dataArr
+      this.tableData = res.data.length != 0 ? this.dataArr : []
       // this.tableProps = otherProps
       // res.data.list.forEach((ele) => {
       //   console.log(ele);
@@ -910,7 +926,7 @@ export default {
       console.log("=========================");
     },
     handleExport() {
-      let fileName = "生产情况(片).xls";
+      let fileName = "生产情况(MW).xls";
       exportProductionSituationMWData(this.listQuery)
         .then((response) => {
           this.$download.excel(response, fileName);
diff --git a/src/views/report/productionSituationTablets.vue b/src/views/report/productionSituationTablets.vue
index 95e30cb..27bf95b 100644
--- a/src/views/report/productionSituationTablets.vue
+++ b/src/views/report/productionSituationTablets.vue
@@ -100,8 +100,8 @@
           :chartId="chartId" :chartNum="chartNum" />
         <!-- </el-col> -->
       </el-row>
-      <base-table :table-props="tableProps" :page="listQuery.current" :limit="listQuery.size" :table-data="tableData"
-        :max-height="tableH" />
+      <base-table :span-method="objectSpanMethod" :table-props="tableProps" :page="listQuery.current"
+        :limit="listQuery.size" :table-data="tableData" :max-height="tableH" />
     </div>
     <!-- <div class="containerBottom">
 
@@ -160,14 +160,14 @@ export default {
       chartHeight: this.tableHeight(137) / 2 - 111,
       tableH: this.tableHeight(137) / 2 - 70,
       legendList: [
-        { id: 1, name: "FTO投入", type: 1, color: "#FFCE6A" },
-        { id: 2, name: "芯片产量", type: 1, color: "#8EF0AB" },
-        { id: 3, name: "标准组件产量", type: 1, color: "#288AFF" },
+        { id: 1, name: "FTO投入", type: 1, color: "#8EF0AB" },
+        { id: 2, name: "芯片产量", type: 1, color: "#288AFF" },
+        { id: 3, name: "标准组件产量", type: 1, color: "#64BDFF" },
         this.currentMenu == '瑞昌' ? '' :
-        { id: 4, name: "BIPV产量", type: 1, color: "#64BDFF" },
+          { id: 4, name: "BIPV产量", type: 1, color: "#7164FF" },
       ],
       chartMsgYearTarget: {
-        color: ["#FFCE6A", "#8EF0AB", "#288AFF", '#64BDFF'],
+        color: ["#8EF0AB", "#288AFF", "#64BDFF", '#7164FF'],
         xData: [],
         yName: "单位/片",
         yAxis: {
@@ -184,15 +184,12 @@ export default {
           {
             name: "FTO投入",
             data: [
-              { name: "%", value: 85 },
-              { name: "%", value: 85 },
-              { name: "%", value: 85 },
             ],
             type: "bar",
             barWidth: 20,
             label: {
               show: true,
-              color: "#FFAE17",
+              color: "#8EF0AB",
               position: [-18, -16],
               formatter: function (params) {
                 return params.value
@@ -202,16 +199,13 @@ export default {
           {
             name: "芯片产量",
             data: [
-              { name: "%", value: 57.5 },
-              { name: "%", value: 21.66 },
-              { name: "%", value: 18.4 },
             ],
             type: "bar",
             barWidth: 20,
             label: {
               show: true,
               position: [-18, -16],
-              color: "#68C483",
+              color: "#288AFF",
               formatter: function (params) {
                 return params.value
               },
@@ -220,16 +214,13 @@ export default {
           {
             name: "标准组件产量",
             data: [
-              { name: "%", value: 23.33 },
-              { name: "%", value: 7.02 },
-              { name: "%", value: 80.2 },
             ],
             type: "bar",
             barWidth: 20,
             label: {
               show: true,
               position: [0, -16],
-              color: "#288AFF",
+              color: "#64BDFF",
               formatter: function (params) {
                 return params.value
               },
@@ -238,17 +229,13 @@ export default {
           this.currentMenu == '瑞昌' ? '' :
             {
               name: "BIPV产量",
-              data: [
-                { name: "%", value: 23.33 },
-                { name: "%", value: 7.02 },
-                { name: "%", value: 80.2 },
-              ],
+              data: [],
               type: "bar",
               barWidth: 20,
               label: {
                 show: true,
                 position: [0, -16],
-                color: "#64BDFF",
+                color: "#7164FF",
                 formatter: function (params) {
                   return params.value
                 },
@@ -257,7 +244,7 @@ export default {
         ],
       },
       chartMsgTarget: {
-        color: ["#FFCE6A", "#8EF0AB", "#288AFF", '#64BDFF', 'rgba(255, 174, 23, .5)', 'rgba(104, 196, 131, .5)', 'rgba(40, 138, 255, .5)', 'rgba(100,189,255,.2)'],
+        color: [ "#8EF0AB", 'rgba(104, 196, 131, .3)', "#288AFF", 'rgba(40, 138, 255, .2)', "#64BDFF", 'rgba(100,189,255,.3)', '#7164FF', 'rgba(113,100,255,.2)',],
         xData: [],
         yName: "单位/片",
         yAxis:{
@@ -275,7 +262,7 @@ export default {
         ],
       },
       chartMsg: {
-      color: ["#FFCE6A", "#8EF0AB", "#288AFF",'#64BDFF'],
+        color: ["#8EF0AB", "#288AFF", "#64BDFF", '#7164FF'],
         xData: [],
         yName: "单位/片",
         yAxis:
@@ -292,16 +279,13 @@ export default {
           {
             name: "FTO投入",
             data: [
-              { name: "%", value: 85 },
-              { name: "%", value: 85 },
-              { name: "%", value: 85 },
             ],
             type: "bar",
             barWidth: 20,
             label: {
               show: true,
               position: [-18, -16],
-              color: "#FFAE17",
+              color: "#8EF0AB",
               formatter: function (params) {
                 return params.value
               },
@@ -310,16 +294,13 @@ export default {
           {
             name: "芯片产量",
             data: [
-              { name: "%", value: 57.5 },
-              { name: "%", value: 21.66 },
-              { name: "%", value: 18.4 },
             ],
             type: "bar",
             barWidth: 20,
             label: {
               show: true,
               position: [10, -16],
-              color: "#68C483",
+              color: "#288AFF",
               formatter: function (params) {
                 return params.value
               },
@@ -328,16 +309,13 @@ export default {
           {
             name: "标准组件产量",
             data: [
-              { name: "%", value: 23.33 },
-              { name: "%", value: 7.02 },
-              { name: "%", value: 80.2 },
             ],
             type: "bar",
             barWidth: 20,
             label: {
               show: true,
               position: [0, -16],
-              color: "#288AFF",
+              color: "#64BDFF",
               formatter: function (params) {
                 return params.value
               },
@@ -346,17 +324,13 @@ export default {
           this.currentMenu == '瑞昌' ? '' :
           {
             name: "BIPV产量",
-            data: [
-              { name: "%", value: 23.33 },
-              { name: "%", value: 7.02 },
-              { name: "%", value: 80.2 },
-            ],
+            data: [],
             type: "bar",
             barWidth: 20,
             label: {
               show: true,
               position: [10, -16],
-              color: "#64BDFF",
+              color: "#7164FF",
               formatter: function (params) {
                 return params.value
               },
@@ -480,6 +454,35 @@ export default {
     this.getDataList()
   },
   methods: {
+    objectSpanMethod({ row, column, rowIndex, columnIndex }) {
+      let spanOneArr = [], concatOne = 0;
+      // let spanTwoArr = [], concatTwo = 0;
+
+      this.tableData.map((item, index) => {
+        // console.log(inde);
+        if (index === 0) {
+          spanOneArr.push(1);
+        } else {
+          //第一列需合并相同内容的判断条件
+          if (item.factory === this.tableData[index - 1].factory) {
+            spanOneArr[concatOne] += 1;
+            spanOneArr.push(0);
+          } else {
+            spanOneArr.push(1);
+            concatOne = index;
+          };
+        }
+      });
+
+      if (columnIndex === 0) {
+        const _row = spanOneArr[rowIndex];
+        const _col = _row > 0 ? 1 : 0;
+        return {
+          rowspan: _row,
+          colspan: _col
+        }
+      }
+    },
     getYear(e) {
       if (this.listQuery.end - this.listQuery.start > 10 * 365 * 24 * 60 * 60 * 1000) {
         this.$message({
@@ -579,7 +582,7 @@ export default {
           // this.chartMsg.xData.push(ele.titleValue.replace(/[^\d]/g, " "))
           this.otherProps.push({
             label: ele.titleValue,
-            props: 'value' + i
+            prop: 'value' + i
           })
         })
         // res.data.list.forEach((ele) => {
@@ -626,105 +629,25 @@ export default {
         //     },
         //   },
         // },]
-        let arr = []
+        let fto = []
+        let chip = []
+        let std = []
+        let bipv = []
+
         res.data.list.slice(res.data.list.length - 3, res.data.list.length - 1).forEach((ele, index) => {
-          console.log(ele.titleValue.search('目标'));
+          console.log("ele",ele.titleValue);
           // let i = index + 1
           // this.chartMsgTarget.xData.push(ele.titleValue)
-          ele.productionSituationDataVOList.forEach((item) => {
-            if (ele.titleValue.search('目标') != -1) {
-              arr.push({
+          if (ele.titleValue.search('完成') == -1) {
+            ele.productionSituationDataVOList.forEach((item) => {
+              console.log(item);
+              // if (ele.titleValue.search('目标') != -1) {
+              fto.push({
                 name: "FTO投入目标值",
                 data: [
                   // s
-                  // { name: 'FTO投入目标', value: item.ftoInput },
-                  { name: 'FTO投入目标值', value: 11 },
-                  // { name: "%", value: 85 },
-                  // { name: "%", value: 85 },
-                ],
-                type: "bar",
-                barWidth: 20,
-                stack:'f',
-                label: {
-                  show: true,
-                  position: [-18, -16],
-                  color: "rgba(255,174,23,.5)",
-                  formatter: function (params) {
-                    return params.value
-                  },
-                },
-              },
-                {
-                  name: "芯片产量目标值",
-                  // barGap: '-100%',
-                  stack: 'a',
-                  data: [
-                    // { name: "芯片产量目标值", value: item.chipYield },
-                    { 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
-                    },
-                  },
-                },
-                {
-                  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
-                    },
-                  },
-                },
-                this.currentMenu == '瑞昌' ? '' :
-                  {
-                    name: "BIPV产量目标值",
-                    stack: 'c',
-                    data: [
-                      // { name: "BIPV产量目标值", value: item.bipvProductOutput },
-                      { name: 'BIPV产量目标值', value: 24 },
-                      // { name: "%", value: 7.02 },
-                      // { name: "%", value: 80.2 },
-                    ],
-                    type: "bar",
-                    barWidth: 20,
-                    label: {
-                      show: true,
-                      position: [0, -16],
-                      color: "rgba(100,189,255,.2)",
-                      formatter: function (params) {
-                        return params.value
-                      },
-                    },
-                  },)
-            } else {
-              arr.push({
-                name: "FTO投入完成值",
-                data: [
-                  // s
-                  // { name: 'FTO投入完成值', value: item.ftoInput },
-                  { name: 'FTO投入完成值', value: 33 },
+                  { name: 'FTO投入目标', value: item.ftoInput },
+                  // { name: 'FTO投入目标值', value: 11 },
                   // { name: "%", value: 85 },
                   // { name: "%", value: 85 },
                 ],
@@ -734,40 +657,62 @@ export default {
                 label: {
                   show: true,
                   position: [-18, -16],
-                  color: "rgba(255,174,23)",
+                  color: "rgba(104,196,131,.3)",
                   formatter: function (params) {
                     return params.value
                   },
                 },
-              },
-                {
-                  name: "芯片产量完成值",
-                  // barGap: '-100%',
-                  stack: 'a',
-                  data: [
-                    // { name: "芯片产量完成值", value: item.chipYield },
-                    { 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
-                    },
+              },)
+              chip.push({
+                name: "芯片产量目标值",
+                // barGap: '-100%',
+                stack: 'a',
+                data: [
+                  { name: "芯片产量目标值", value: item.chipYield },
+                  // { 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(40,138,255,.2)",
+                  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(100,189,255,.3)",
+                  formatter: function (params) {
+                    return params.value
+                  },
+                },
+              })
+              bipv.push(this.currentMenu == '瑞昌' ? null :
                 {
-                  name: "标准组件产量完成值",
-                  stack: 'b',
+                  name: "BIPV产量目标值",
+                  stack: 'c',
                   data: [
-                    // { name: "标准组件产量完成值", value: item.componentYield },
-                    { name: '标准组件产量完成值', value: 23 },
+                    { name: "BIPV产量目标值", value: item.bipvProductOutput },
+                    // { name: 'BIPV产量目标值', value: 24 },
                     // { name: "%", value: 7.02 },
                     // { name: "%", value: 80.2 },
                   ],
@@ -776,42 +721,112 @@ export default {
                   label: {
                     show: true,
                     position: [0, -16],
-                    color: "rgba(40,138,255)",
+                    color: "rgba(113,100,255,.2)",
                     formatter: function (params) {
                       return params.value
                     },
                   },
+                },)
+              // } else {
+              // }
+            })
+            console.log("fto",ele.titleValue,fto);
+          } else {
+            ele.productionSituationDataVOList.forEach((item) => {
+              console.log(item);
+              // if (ele.titleValue.search('目标') != -1) {
+              // } else {
+              fto.unshift({
+                name: "FTO投入完成值",
+                data: [
+                  // s
+                  { name: 'FTO投入完成值', value: item.ftoInput },
+                  // { name: 'FTO投入完成值', value: 33 },
+                  // { name: "%", value: 85 },
+                  // { name: "%", value: 85 },
+                ],
+                type: "bar",
+                barWidth: 20,
+                stack: 'f',
+                label: {
+                  show: true,
+                  position: [-18, -16],
+                  color: "rgba(104,196,131)",
+                  formatter: function (params) {
+                    return params.value
+                  },
                 },
-                this.currentMenu == '瑞昌' ? '' :
-                  {
-                    name: "BIPV产量完成值",
-                    stack: 'c',
-                    data: [
-                      // { name: "BIPV产量完成值", value: item.bipvProductOutput },
-                      { name: 'BIPV产量完成值', value: 32 },
-                      // { name: "%", value: 7.02 },
-                      // { name: "%", value: 80.2 },
-                    ],
-                    type: "bar",
-                    barWidth: 20,
-                    label: {
-                      show: true,
-                      position: [0, -16],
-                      color: "rgba(100,189,255)",
-                      formatter: function (params) {
-                        return params.value
-                      },
+              })
+              chip.unshift({
+                name: "芯片产量完成值",
+                // barGap: '-100%',
+                stack: 'a',
+                data: [
+                  { name: "芯片产量完成值", value: item.chipYield },
+                  // { name: '芯片产量完成值', value: 55 },
+                  // { name: "%", value: 21.66 },
+                  // { name: "%", value: 18.4 },
+                ],
+                type: "bar",
+                barWidth: 20,
+                // barGap: '-100%',
+                label: {
+                  show: true,
+                  color: "rgba(40,138,255)",
+                  position: [-18, -16],
+                  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: {
+                  color: "rgba(100,189,255)",
+                  show: true,
+                  position: [0, -16],
+                  formatter: function (params) {
+                    return params.value
+                  },
+                },
+              })
+              bipv.unshift(this.currentMenu == '瑞昌' ? null :
+                {
+                  name: "BIPV产量完成值",
+                  stack: 'c',
+                  data: [
+                    { name: "BIPV产量完成值", value: item.bipvProductOutput },
+                    // { name: 'BIPV产量完成值', value: 32 },
+                    // { name: "%", value: 7.02 },
+                    // { name: "%", value: 80.2 },
+                  ],
+                  type: "bar",
+                  barWidth: 20,
+                  label: {
+                    show: true,
+                    position: [0, -16],
+                    color: "rgba(113,100,255)",
+                    formatter: function (params) {
+                      return params.value
                     },
-                  },)
-            }
-
-            // this.chartMsgTarget.series[1].data.push()
-            // this.chartMsgTarget.series[2].data.push()
-            // this.chartMsgTarget.series[3].data.push()
-          })
+                  },
+                },)
+              // }
+            })
+          }
         })
-        console.log('arr', arr)
-        this.chartMsgTarget.series = arr
+
+        this.chartMsgTarget.series = [...fto, ...chip, ...std, ...bipv]
+        console.log('arr', this.chartMsgTarget.series)
         // arr.forEach((ele) => {
 
         // })
@@ -870,7 +885,7 @@ export default {
           // this.chartMsg.xData.push(ele.titleValue.replace(/[^\d]/g, " "))
           this.otherProps.push({
             label: ele.titleValue,
-            props: 'value' + i
+            prop: 'value' + i
           })
         })
         // res.data.list.forEach((ele) => {
@@ -917,19 +932,26 @@ export default {
         //     },
         //   },
         // },]
-        let arr = []
-        res.data.list.slice(res.data.list.length - 1, res.data.list.length).forEach((ele, index) => {
-          console.log(ele.titleValue.search('目标'));
+        let fto = []
+        let chip = []
+        let std = []
+        let bipv = []
+
+        res.data.list.slice(res.data.list.length - 2, res.data.list.length).forEach((ele, index) => {
+          // console.log("ele", ele.titleValue);
           // let i = index + 1
           // this.chartMsgTarget.xData.push(ele.titleValue)
-          ele.productionSituationDataVOList.forEach((item) => {
-            if (ele.titleValue.search('目标') != -1) {
-              arr.push({
+          if (ele.titleValue.search('完成') == -1) {
+            console.log(ele);
+            ele.productionSituationDataVOList.forEach((item) => {
+              console.log(item);
+              // if (ele.titleValue.search('目标') != -1) {
+              fto.push({
                 name: "FTO投入目标值",
                 data: [
                   // s
-                  // { name: 'FTO投入目标', value: item.ftoInput },
-                  { name: 'FTO投入目标值', value: 11 },
+                  { name: 'FTO投入目标', value: item.ftoInput },
+                  // { name: 'FTO投入目标值', value: 11 },
                   // { name: "%", value: 85 },
                   // { name: "%", value: 85 },
                 ],
@@ -939,41 +961,62 @@ export default {
                 label: {
                   show: true,
                   position: [-18, -16],
-                  color: "rgba(255,174,23,.5)",
+                  color: "rgba(104,196,131,.3)",
                   formatter: function (params) {
                     return params.value
                   },
                 },
-              },
-                {
-                  name: "芯片产量目标值",
-                  // barGap: '-100%',
-                  stack: 'a',
-                  data: [
-                    // { name: "芯片产量目标值", value: item.chipYield },
-                    { 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
-                    },
+              },)
+              chip.push({
+                name: "芯片产量目标值",
+                // barGap: '-100%',
+                stack: 'a',
+                data: [
+                  { name: "芯片产量目标值", value: item.chipYield },
+                  // { 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(40,138,255,.2)",
+                  formatter: function (params) {
+                    return params.value
                   },
                 },
-                {
-                  name: "标准组件产量目标值",
-                  stack: 'b',
-                  data: [
-                    // { name: "标准组件产量目标值", value: item.componentYield },
-                    { name: '标准组件产量目标值', value: 23 },
+              },)
+              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(100,189,255,.3)",
+                  formatter: function (params) {
+                    return params.value
+                  },
+                },
+              })
+              bipv.push(this.currentMenu == '瑞昌' ? null :
+                {
+                  name: "BIPV产量目标值",
+                  stack: 'c',
+                  data: [
+                    { name: "BIPV产量目标值", value: item.bipvProductOutput },
+                    // { name: 'BIPV产量目标值', value: 24 },
                     // { name: "%", value: 7.02 },
                     // { name: "%", value: 80.2 },
                   ],
@@ -982,40 +1025,27 @@ export default {
                   label: {
                     show: true,
                     position: [0, -16],
-                    color: "rgba(40,138,255,.5)",
+                    color: "rgba(113,100,255,.2)",
                     formatter: function (params) {
                       return params.value
                     },
                   },
-                },
-                this.currentMenu == '瑞昌' ? '' :
-                  {
-                    name: "BIPV产量目标值",
-                    stack: 'c',
-                    data: [
-                      // { name: "BIPV产量目标值", value: item.bipvProductOutput },
-                      { name: 'BIPV产量目标值', value: 24 },
-                      // { name: "%", value: 7.02 },
-                      // { name: "%", value: 80.2 },
-                    ],
-                    type: "bar",
-                    barWidth: 20,
-                    label: {
-                      show: true,
-                      position: [0, -16],
-                      color: "rgba(100,189,255,.2)",
-                      formatter: function (params) {
-                        return params.value
-                      },
-                    },
-                  },)
-            } else {
-              arr.push({
+                },)
+              // } else {
+              // }
+            })
+            console.log("fto", ele.titleValue, fto);
+          } else {
+            ele.productionSituationDataVOList.forEach((item) => {
+              console.log(item);
+              // if (ele.titleValue.search('目标') != -1) {
+              // } else {
+              fto.unshift({
                 name: "FTO投入完成值",
                 data: [
                   // s
-                  // { name: 'FTO投入完成值', value: item.ftoInput },
-                  { name: 'FTO投入完成值', value: 33 },
+                  { name: 'FTO投入完成值', value: item.ftoInput },
+                  // { name: 'FTO投入完成值', value: 33 },
                   // { name: "%", value: 85 },
                   // { name: "%", value: 85 },
                 ],
@@ -1025,40 +1055,61 @@ export default {
                 label: {
                   show: true,
                   position: [-18, -16],
-                  color: "rgba(255,174,23)",
+                  color: "rgba(104,196,131)",
                   formatter: function (params) {
                     return params.value
                   },
                 },
-              },
-                {
-                  name: "芯片产量完成值",
-                  // barGap: '-100%',
-                  stack: 'a',
-                  data: [
-                    // { name: "芯片产量完成值", value: item.chipYield },
-                    { 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
-                    },
+              })
+              chip.unshift({
+                name: "芯片产量完成值",
+                // barGap: '-100%',
+                stack: 'a',
+                data: [
+                  { name: "芯片产量完成值", value: item.chipYield },
+                  // { name: '芯片产量完成值', value: 55 },
+                  // { name: "%", value: 21.66 },
+                  // { name: "%", value: 18.4 },
+                ],
+                type: "bar",
+                barWidth: 20,
+                // barGap: '-100%',
+                label: {
+                  show: true,
+                  color: "rgba(40,138,255)",
+                  position: [-18, -16],
+                  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: {
+                  color: "rgba(100,189,255)",
+                  show: true,
+                  position: [0, -16],
+                  formatter: function (params) {
+                    return params.value
+                  },
+                },
+              })
+              bipv.unshift(this.currentMenu == '瑞昌' ? null :
                 {
-                  name: "标准组件产量完成值",
-                  stack: 'b',
+                  name: "BIPV产量完成值",
+                  stack: 'c',
                   data: [
-                    // { name: "标准组件产量完成值", value: item.componentYield },
-                    { name: '标准组件产量完成值', value: 23 },
+                    { name: "BIPV产量完成值", value: item.bipvProductOutput },
+                    // { name: 'BIPV产量完成值', value: 32 },
                     // { name: "%", value: 7.02 },
                     // { name: "%", value: 80.2 },
                   ],
@@ -1067,43 +1118,18 @@ export default {
                   label: {
                     show: true,
                     position: [0, -16],
-                    color: "rgba(40,138,255)",
+                    color: "rgba(113,100,255)",
                     formatter: function (params) {
                       return params.value
                     },
                   },
-                },
-                this.currentMenu == '瑞昌' ? '' :
-                  {
-                    name: "BIPV产量完成值",
-                    stack: 'c',
-                    data: [
-                      // { name: "BIPV产量完成值", value: item.bipvProductOutput },
-                      { name: 'BIPV产量完成值', value: 32 },
-                      // { name: "%", value: 7.02 },
-                      // { name: "%", value: 80.2 },
-                    ],
-                    type: "bar",
-                    barWidth: 20,
-                    label: {
-                      show: true,
-                      position: [0, -16],
-                      color: "rgba(100,189,255)",
-                      formatter: function (params) {
-                        return params.value
-                      },
-                    },
-                  },)
-            }
-
-            // this.chartMsgTarget.series[1].data.push()
-            // this.chartMsgTarget.series[2].data.push()
-            // this.chartMsgTarget.series[3].data.push()
-          })
+                },)
+              // }
+            })
+          }
         })
-        console.log('arr', arr)
-        this.chartMsgTarget.series = arr
-        console.log(this.chartMsg.xData)
+
+        this.chartMsgTarget.series = [...fto, ...chip, ...std, ...bipv]
         res.data.list.forEach((ele, index) => {
           let i = index + 1
           let m = 'value' + i
@@ -1134,7 +1160,7 @@ export default {
             this.chartMsg.xData.push(ele.titleValue)
             this.otherProps.push({
               label: ele.titleValue,
-              props: 'value' + i
+              prop: 'value' + i
             })
           })
           console.log(this.otherProps)
@@ -1198,7 +1224,7 @@ export default {
           }
           }
       }
-      this.tableData = this.dataArr
+      this.tableData = res.data.length != 0 ? this.dataArr : []
       // this.tableProps = otherProps
       // res.data.list.forEach((ele) => {
       //   console.log(ele);
diff --git a/src/views/report/productionYield.vue b/src/views/report/productionYield.vue
index 08a30aa..7b27964 100644
--- a/src/views/report/productionYield.vue
+++ b/src/views/report/productionYield.vue
@@ -64,7 +64,7 @@
           <div class="blueTip">
             {{ title }}
           </div>
-          <produce-line-bar-year-target :chartHeight="chartHeight" :legendList="legendList"
+          <produce-line-bar-year-target :chartHeight="chartHeight" :legendList="legendListTarget"
             :chartMsg="chartMsgYearTarget" :chartId=" 'yearData'" :chartNum="chartNum" />
         </el-col>
       </el-row>
@@ -84,8 +84,8 @@
             :chartMsg="chartMsgYearTarget" :chartId=" 'yearData'" :chartNum="chartNum" />
         </el-col> -->
       </el-row>
-      <base-table :table-props="tableProps" :page="listQuery.current" :limit="listQuery.size" :table-data="tableData"
-        :max-height="tableH" />
+      <base-table :span-method="objectSpanMethod" :table-props="tableProps" :page="listQuery.current"
+        :limit="listQuery.size" :table-data="tableData" :max-height="tableH" />
     </div>
     <!-- <div class="containerBottom">
 
@@ -97,7 +97,7 @@
 import { getProductionYieldSituationMWData, exportProductionYieldSituationMWData } from '@/api/report';
 import bmSearchBar from "./components/bmSearchBar";
 import BmLineBar from "./components/produceLineBar.vue";
-import produceLineBarYearTarget from "./components/produceLineBarYearTarget.vue";
+import produceLineBarYearTarget from "./components/produceLineYieldBarTarget.vue";
 import ButtonNav from '@/components/ButtonNav'
 import moment from 'moment'
 export default {
@@ -145,15 +145,27 @@ export default {
       tableH: this.tableHeight(137) / 2 - 70,
       legendList: [
         {
-          id: 1, name: "综合良率", type: 1, color: "#FFCE6A" },
+          id: 1, name: "综合良率", type: 2, color: "#FFCE6A" },
         {
           id: 2, name: "FTO投入", type: 1, color: "#8EF0AB" },
         { id: 3, name: "芯片产量", type: 1, color: "#288AFF" },
         {
           id: 4, name: "标准组件产量", type: 1, color: "#64BDFF" },
       ],
+      legendListTarget: [
+        {
+          id: 2, name: "FTO投入", type: 1, color: "#8EF0AB"
+        },
+        { id: 3, name: "芯片产量", type: 1, color: "#288AFF" },
+        {
+          id: 4, name: "标准组件产量", type: 1, color: "#64BDFF"
+        },
+        {
+          id: 1, name: "综合良率", type: 1, color: "#7164FF"
+        },
+      ],
       chartMsgYearTarget: {
-        color: ["#8EF0AB", "#288AFF", '#64BDFF', "#FFCE6A",],
+        color: ["#8EF0AB", "#288AFF", '#64BDFF', "#7164FF",],
         xData: [],
         // yName: "单位/%",
         yAxis: [
@@ -181,32 +193,7 @@ export default {
           {
             name: "",
             // yAxisIndex: 0,
-            data: [
-              {
-                value: 1,
-                itemStyle: {
-                  color: '#8EF0AB'
-                }
-              },
-              {
-                value: 2,
-                itemStyle: {
-                  color: '#288AFF'
-                }
-              },
-              {
-                value: 3,
-                itemStyle: {
-                  color: '#64BDFF'
-                }
-              },
-              {
-                value: 0,
-                yAxisIndex: 1,
-                itemStyle: {
-                  color: '#FFCE6A'
-                }
-              }],
+            data: [],
             type: "bar",
             barWidth: 20,
             label: {
@@ -214,31 +201,26 @@ export default {
               position: [-18, -16],
               color: "#68C483",
               formatter: function (params) {
-                return params.value + "片";
+                return params.value
               },
             },
           },
-          // {
-          //   name: '销量折线图',
-          //   type: 'bar',
-          //   data: [ 0,0,0,
-          //     {
-          //       value: 5,
-          //       itemStyle: {
-          //         color: '#FFCE6A'
-          //       }
-          //     }],
-          //   barWith: "40%",
-          //   label: {
-          //     show: true,
-          //     position: "top",
-          //     formatter: "{c}%"
-          //   },
-          //   lineStyle: {
-          //     color: "#ffb122"
-          //   },
-          //   yAxisIndex: 1
-          // }
+          {
+            name: '',
+            // type: 'bar',
+            data: [],
+            type: "bar",
+            barWidth: 20,
+            label: {
+              show: true,
+              position: [-18, -16],
+              color: "#68C483",
+              formatter: function (params) {
+                return params.value
+              },
+            },
+            yAxisIndex: 1
+          }
         ],
       },
       chartMsg: {
@@ -270,11 +252,7 @@ export default {
           {
             name: "",
             // yAxisIndex: 0,
-            data: [
-              { name: "%", value: 57.5 },
-              { name: "%", value: 21.66 },
-              { name: "%", value: 18.4 },
-            ],
+            data: [],
             type: "bar",
             barWidth: 20,
             label: {
@@ -289,11 +267,7 @@ export default {
           {
             name: "",
             // yAxisIndex: 0,
-            data: [
-              { name: "%", value: 23.33 },
-              { name: "%", value: 7.02 },
-              { name: "%", value: 80.2 },
-            ],
+            data: [],
             type: "bar",
             barWidth: 20,
             label: {
@@ -308,17 +282,12 @@ export default {
             {
               name: "",
               // yAxisIndex: 0,
-            data: [
-              { name: "%", value: 23.33 },
-              { name: "%", value: 7.02 },
-              { name: "%", value: 80.2 },
-            ],
+            data: [],
             type: "bar",
             barWidth: 20,
             label: {
               show: true,
               position: [0, -16],
-              stack: '标准组件产量',
               color: "#64BDFF",
               formatter: function (params) {
                 return params.value+ "片";
@@ -327,11 +296,7 @@ export default {
           },
           {
             name: "",
-            data: [
-              { name: "%", value: 115 },
-              { name: "%", value: 5 },
-              { name: "%", value: 8 },
-            ],
+            data: [],
             type: "line",
             // barWidth: 20,
             symbol: "circle",
@@ -428,6 +393,35 @@ export default {
     this.getDataList()
   },
   methods: {
+    objectSpanMethod({ row, column, rowIndex, columnIndex }) {
+      let spanOneArr = [], concatOne = 0;
+      // let spanTwoArr = [], concatTwo = 0;
+
+      this.tableData.map((item, index) => {
+        // console.log(inde);
+        if (index === 0) {
+          spanOneArr.push(1);
+        } else {
+          //第一列需合并相同内容的判断条件
+          if (item.factory === this.tableData[index - 1].factory) {
+            spanOneArr[concatOne] += 1;
+            spanOneArr.push(0);
+          } else {
+            spanOneArr.push(1);
+            concatOne = index;
+          };
+        }
+      });
+
+      if (columnIndex === 0) {
+        const _row = spanOneArr[rowIndex];
+        const _col = _row > 0 ? 1 : 0;
+        return {
+          rowspan: _row,
+          colspan: _col
+        }
+      }
+    },
     getYear(e) {
       if (this.listQuery.end - this.listQuery.start > 10 * 365 * 24 * 60 * 60 * 1000) {
         this.$message({
@@ -543,7 +537,7 @@ export default {
           this.chartMsg.xData.push(ele.titleValue)
           this.otherProps.push({
             label: ele.titleValue,
-            props: 'value' + i
+            prop: 'value' + i
           })
         })
         this.chartMsgYearTarget.xData.push('FTO投入', '芯片产量', '标准组件产量', '综合良率')
@@ -554,31 +548,56 @@ export default {
               // this.chartMsgYearTarget.series[1].name = '芯片产量目标值',
               // this.chartMsgYearTarget.series[2].name = '标准组件产量目标值',
               // this.chartMsgYearTarget.series[3].name = '综合良率目标值',
-            // this.chartMsgYearTarget.series[0].data = [
-            //   {
-            //     value: item.ftoInput,
-            //     itemStyle: {
-            //       color: '#8EF0AB'
-            //     }
-            //   },
-            //   {
-            //     value: item.chipYield,
-            //     itemStyle: {
-            //       color: '#288AFF'
-            //     }
-            //   },
-            //   {
-            //     value: item.componentYield,
-            //     itemStyle: {
-            //       color: '#64BDFF'
-            //     }
-            //   },
-            //   {
-            //     value: item.ftoInput,
-            //     itemStyle: {
-            //       color: '#FFCE6A'
-            //     }
-            //   }]
+            this.chartMsgYearTarget.series[0].data = [
+              {
+                value: item.ftoInput,
+                itemStyle: {
+                  color: '#8EF0AB'
+                }
+              },
+              {
+                value: item.chipYield,
+                itemStyle: {
+                  color: '#288AFF'
+                }
+              },
+              {
+                value: item.componentYield,
+                itemStyle: {
+                  color: '#64BDFF'
+                }
+              },
+              {
+                value: null,
+                itemStyle: {
+                  color: '#FFCE6A'
+                }
+              }]
+            this.chartMsgYearTarget.series[1].data = [
+              {
+                value: null,
+                itemStyle: {
+                  color: '#8EF0AB'
+                }
+              },
+              {
+                value: null,
+                itemStyle: {
+                  color: '#288AFF'
+                }
+              },
+              {
+                value: null,
+                itemStyle: {
+                  color: '#64BDFF'
+                }
+              },
+              {
+                value: item.ftoInput,
+                itemStyle: {
+                  color: '#FFCE6A'
+                }
+              }]
             // dataArr[0]['' + m + ''] = item.ftoInput
             // dataArr[0].factory = item.factory == 1 ? '邯郸' : '瑞昌'
             // dataArr[1].factory = item.factory == 1 ? '邯郸' : '瑞昌'
@@ -646,13 +665,10 @@ export default {
           this.chartMsg.xData.push(ele.titleValue)
           this.otherProps.push({
             label: ele.titleValue,
-            props: 'value' + i
+            prop: 'value' + i
           })
         })
         console.log(this.otherProps)
-        if (this.listQuery.type == 2) {
-
-        }
         res.data.list.forEach((ele, index) => {
           let i = index + 1
           let m = 'value' + i
@@ -706,7 +722,7 @@ export default {
       }
 
       console.log(dataArr)
-      this.tableData = dataArr
+      this.tableData = res.data.length != 0 ? dataArr : []
       // this.tableProps.push()
       this.listQuery.total = res.data.total
       if (this.listQuery.total > 0) {

From c7205e32a370a6a7940238a97757e2f06b741c0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98937886381=E2=80=99?= <‘937886381@qq.com’>
Date: Fri, 21 Jun 2024 16:17:25 +0800
Subject: [PATCH 06/12] =?UTF-8?q?=E6=8A=A5=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/report/produceConversion.vue | 182 +++++++++++++------------
 1 file changed, 94 insertions(+), 88 deletions(-)

diff --git a/src/views/report/produceConversion.vue b/src/views/report/produceConversion.vue
index 1f45f91..bcb508e 100644
--- a/src/views/report/produceConversion.vue
+++ b/src/views/report/produceConversion.vue
@@ -106,7 +106,8 @@ export default {
   data() {
     return {
       otherProps: [],
-      title:'',
+      title: '',
+      currentMenu:'邯郸',
       listQuery: {
         start: undefined,
         end: undefined,
@@ -547,29 +548,30 @@ export default {
           })
         })
       })
-      this.chartMsg.xData.push(res.data[0].list[0].reportTimep + '目标')
-      if (this.listQuery.date === 0 || this.listQuery.date === 1 || this.listQuery.date === 2) {
-        this.otherProps.push({
-          label: res.data[0].list[0].reportTimep + '目标',
-          prop: 'dayData'
-        })
-        dataArr[0]['dayData'] = res.data[0].chipTarget
-        dataArr[1]['dayData'] = res.data[0].standTarget
-        dataArr[2]['dayData'] = res.data[0].conversionEfficiencyTarget
-      }
-      if (this.listQuery.date === 2 || this.listQuery.date === 3) {
-        this.otherProps.push({
-          label: res.data[0].yearTarget.targetTime,
-          prop: 'yearData'
-        })
-        dataArr[0]['yearData'] = res.data[0].yearTarget.chipTotalPower
-        dataArr[1]['yearData'] = res.data[0].yearTarget.componentTotalPower
-        dataArr[2]['yearData'] = res.data[0].yearTarget.componentConversionEfficiency
-      }
-      res.data.forEach((ele, index) => {
-        // let i = index + 1
-        // let m = 'value' + i
-        ele.list.forEach((item, index) => {
+      if (res.data[0].list.length != 0) {
+        this.chartMsg.xData.push(res.data[0].list[0].reportTimep + '目标')
+        if (this.listQuery.date === 0 || this.listQuery.date === 1 || this.listQuery.date === 2) {
+          this.otherProps.push({
+            label: res.data[0].list[0].reportTimep + '目标',
+            prop: 'dayData'
+          })
+          dataArr[0]['dayData'] = res.data[0].list[0].chipTarget
+          dataArr[1]['dayData'] = res.data[0].list[0].standTarget
+          dataArr[2]['dayData'] = res.data[0].list[0].conversionEfficiencyTarget
+        }
+        if (this.listQuery.date === 2 || this.listQuery.date === 3) {
+          this.otherProps.push({
+            label: res.data[0].yearTarget.targetTime,
+            prop: 'yearData'
+          })
+          dataArr[0]['yearData'] = res.data[0].yearTarget.chipTotalPower
+          dataArr[1]['yearData'] = res.data[0].yearTarget.componentTotalPower
+          dataArr[2]['yearData'] = res.data[0].yearTarget.componentConversionEfficiency
+        }
+        res.data.forEach((ele, index) => {
+          // let i = index + 1
+          // let m = 'value' + i
+          ele.list.forEach((item, index) => {
             let i = index + 1
             let m = 'value' + i
             // ele.productionSituationDataVOList.forEach((item) => {
@@ -588,73 +590,77 @@ export default {
             //   props: 'value' + index + 1,
             // })
           })
-      })
-      this.title = res.data[0].yearTarget.targetTime + '目标值'
-      this.chartMsgYearTarget.series[0].data = [
-        {
-          value: res.data[0].yearTarget.chipTotalPower,
-          itemStyle: {
-            color: '#8EF0AB'
+        })
+        this.title = res.data[0].yearTarget.targetTime + '目标值'
+        this.chartMsgYearTarget.series[0].data = [
+          {
+            value: res.data[0].yearTarget.chipTotalPower,
+            itemStyle: {
+              color: '#8EF0AB'
+            }
+          },
+          {
+            value: res.data[0].yearTarget.componentTotalPower,
+            itemStyle: {
+              color: '#288AFF'
+            }
+          },
+          {
+            value: null,
+            itemStyle: {
+              color: '#64BDFF'
+            }
+          }]
+        this.chartMsgYearTarget.series[1].data = [
+          {
+            value: null,
+            itemStyle: {
+              color: '#8EF0AB'
+            }
+          },
+          {
+            value: null,
+            itemStyle: {
+              color: '#288AFF'
+            }
+          },
+          {
+            value: res.data[0].yearTarget.componentConversionEfficiency,
+            itemStyle: {
+              color: '#64BDFF'
+            }
+          }]
+        console.log(dataArr);
+        for (let i in dataArr[0]) {
+          this.chartMsg.series[0].name = dataArr[0]['item']
+          if (i.search('value') === 0) {
+            this.chartMsg.series[0].data.push({
+              name: dataArr[0]['item'],
+              value: dataArr[0][i]
+            })
           }
-        },
-        {
-          value: res.data[0].yearTarget.componentTotalPower,
-          itemStyle: {
-            color: '#288AFF'
-          }
-        },
-        {
-          value: null,
-          itemStyle: {
-            color: '#64BDFF'
-          }
-        }]
-      this.chartMsgYearTarget.series[1].data = [
-        {
-          value: null,
-          itemStyle: {
-            color: '#8EF0AB'
-          }
-        },
-        {
-          value: null,
-          itemStyle: {
-            color: '#288AFF'
-          }
-        },
-        {
-          value: res.data[0].yearTarget.componentConversionEfficiency,
-          itemStyle: {
-            color: '#64BDFF'
-          }
-        }]
-      console.log(dataArr);
-      for (let i in dataArr[0]) {
-        this.chartMsg.series[0].name = dataArr[0]['item']
-        if (i.search('value') === 0) {
-          this.chartMsg.series[0].data.push({
-            name: dataArr[0]['item'],
-            value: dataArr[0][i]
-          })
         }
-      }
-      for (let i in dataArr[1]) {
-        this.chartMsg.series[1].name = dataArr[1]['item']
-        if (i.search('value') === 0) {
-          this.chartMsg.series[1].data.push({
-            name: dataArr[1]['item'],
-            value: dataArr[1][i]
-          })
+        for (let i in dataArr[1]) {
+          this.chartMsg.series[1].name = dataArr[1]['item']
+          if (i.search('value') === 0) {
+            this.chartMsg.series[1].data.push({
+              name: dataArr[1]['item'],
+              value: dataArr[1][i]
+            })
+          }
         }
-      }
-      for (let i in dataArr[2]) {
-        this.chartMsg.series[2].name = dataArr[2]['item']
-        if (i.search('value') === 0) {
-          this.chartMsg.series[2].data.push({
-            name: dataArr[2]['item'],
-            value: dataArr[2][i]
-          })
+        for (let i in dataArr[2]) {
+          this.chartMsg.series[2].name = dataArr[2]['item']
+          if (i.search('value') === 0) {
+            this.chartMsg.series[2].data.push({
+              name: dataArr[2]['item'],
+              value: dataArr[2][i]
+            })
+          }
         }
+      } else {
+        this.chartMsgYearTarget.series[0].data = []
+        this.chartMsgYearTarget.series[1].data = []
       }
       // for (let i in dataArr[3]) {
       //   this.chartMsg.series[3].name = dataArr[3]['item']
@@ -665,7 +671,7 @@ export default {
       //     })
       //   }
       // }
-      this.tableData = dataArr
+      this.tableData =res.data[0].list.length !== 0? dataArr : []
     },
     _setTableHeight() {
       this.tableH = this.tableHeight(137) / 2 - 70;

From a9e176be7401497fe8a2765c99620e644b5602e9 Mon Sep 17 00:00:00 2001
From: juzi <819872918@qq.com>
Date: Fri, 21 Jun 2024 16:20:14 +0800
Subject: [PATCH 07/12] 1

---
 src/views/report/turnoverRateBM/index.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/report/turnoverRateBM/index.vue b/src/views/report/turnoverRateBM/index.vue
index 524de21..0f6ffc7 100644
--- a/src/views/report/turnoverRateBM/index.vue
+++ b/src/views/report/turnoverRateBM/index.vue
@@ -254,6 +254,7 @@ export default {
               data: [],
               type: "bar",
               barWidth: 20,
+              barGap: "100%",
               label: {
                 show: true,
                 position: "top",

From 582484f6dbaeee544bdc553473fe4b09f80ebf90 Mon Sep 17 00:00:00 2001
From: juzi <819872918@qq.com>
Date: Mon, 24 Jun 2024 09:15:51 +0800
Subject: [PATCH 08/12] =?UTF-8?q?=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.dev                                                 | 4 ++--
 .../components/bmSearchBarComplete.vue                   | 9 ++++++++-
 src/views/report/components/bmSearchBar.vue              | 9 ++++++++-
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/.env.dev b/.env.dev
index d272df7..b254433 100644
--- a/.env.dev
+++ b/.env.dev
@@ -13,7 +13,7 @@ VUE_APP_TITLE = 发电玻璃智能管控平台
 
 # 芋道管理系统/开发环境
 # VUE_APP_BASE_API = 'http://192.168.1.70:30307'
-# VUE_APP_BASE_API = 'http://glass.kszny.picaiba.com'
+VUE_APP_BASE_API = 'http://glass.kszny.picaiba.com'
 # 闫阳
 # VUE_APP_BASE_API = 'http://192.168.1.81:48080'
 # 徐
@@ -25,7 +25,7 @@ VUE_APP_TITLE = 发电玻璃智能管控平台
 # 张一丁
 # VUE_APP_BASE_API = 'http://192.168.4.139:48080'
 # 蔡
-VUE_APP_BASE_API = 'http://192.168.1.54:48080'
+# VUE_APP_BASE_API = 'http://192.168.1.54:48080'
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
 
diff --git a/src/views/report/completionStatusIntrBM/components/bmSearchBarComplete.vue b/src/views/report/completionStatusIntrBM/components/bmSearchBarComplete.vue
index cd2e96b..0dbb2da 100644
--- a/src/views/report/completionStatusIntrBM/components/bmSearchBarComplete.vue
+++ b/src/views/report/completionStatusIntrBM/components/bmSearchBarComplete.vue
@@ -20,7 +20,7 @@
     <el-form-item v-show="form.type === 0" label="时间" prop="dayTime">
       <el-date-picker
         size="small"
-        clearable
+        :clearable="false"
         v-model="form.dayTime"
         type="date"
         placeholder="选择日期"
@@ -32,6 +32,7 @@
     <el-form-item v-show="form.type === 1" label="时间" prop="weekTime">
       <el-date-picker
         v-model="form.weekTime"
+        :clearable="false"
         type="week"
         format="yyyy-MM-dd"
         placeholder="选择周"
@@ -43,6 +44,7 @@
     <el-form-item v-show="form.type === 2" label="时间" prop="monthTime">
       <el-date-picker
         v-model="form.monthTime"
+        :clearable="false"
         type="month"
         placeholder="选择月份"
         value-format="yyyy-MM-dd"
@@ -53,6 +55,7 @@
     <el-form-item v-show="form.type === 3" label="时间" prop="yearTime">
       <el-date-picker
         v-model="form.yearTime"
+        :clearable="false"
         type="year"
         placeholder="选择年份"
         value-format="yyyy-MM-dd"
@@ -116,6 +119,10 @@ export default {
           break;
       }
       params.type = this.form.type;
+      if (!params.startDate) {
+        this.$message.warning("时间不能为空");
+        return;
+      }
       if (val === "search") {
         this.$emit("getSearch", params);
       } else {
diff --git a/src/views/report/components/bmSearchBar.vue b/src/views/report/components/bmSearchBar.vue
index f156edc..9d5caa9 100644
--- a/src/views/report/components/bmSearchBar.vue
+++ b/src/views/report/components/bmSearchBar.vue
@@ -19,7 +19,7 @@
     <el-form-item v-show="form.type === 0" label="时间" prop="dayTime">
       <el-date-picker
         size="small"
-        clearable
+        :clearable="false"
         v-model="form.dayTime"
         type="date"
         placeholder="选择日期"
@@ -31,6 +31,7 @@
     <el-form-item v-show="form.type === 1" label="时间" prop="weekTime">
       <el-date-picker
         v-model="form.weekTime"
+        :clearable="false"
         type="week"
         format="yyyy-MM-dd"
         placeholder="选择周"
@@ -42,6 +43,7 @@
     <el-form-item v-show="form.type === 2" label="时间" prop="monthTime">
       <el-date-picker
         v-model="form.monthTime"
+        :clearable="false"
         type="month"
         placeholder="选择月份"
         value-format="yyyy-MM-dd"
@@ -52,6 +54,7 @@
     <el-form-item v-show="form.type === 3" label="时间" prop="yearTime">
       <el-date-picker
         v-model="form.yearTime"
+        :clearable="false"
         type="year"
         placeholder="选择年份"
         value-format="yyyy-MM-dd"
@@ -138,6 +141,10 @@ export default {
           break;
       }
       params.type = this.form.type;
+      if (!params.startDate) {
+        this.$message.warning("时间不能为空");
+        return;
+      }
       if (val === "search") {
         this.$emit("getSearch", params);
       } else {

From 09929406559f5e0288dd28e008f671faa9b30b29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98937886381=E2=80=99?= <‘937886381@qq.com’>
Date: Mon, 24 Jun 2024 09:48:06 +0800
Subject: [PATCH 09/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.dev                                      |  6 +--
 .../report/components/produceLineBar.vue      |  4 +-
 .../components/produceLineBarTarget.vue       | 11 +----
 .../components/produceLineBarYearTarget.vue   |  4 +-
 .../components/produceLineYieldBarTarget.vue  |  4 +-
 src/views/report/comprehensiveData.vue        | 15 +++----
 src/views/report/produceConversion.vue        | 41 +++++--------------
 src/views/report/productionSituationMW.vue    | 12 +++++-
 .../report/productionSituationTablets.vue     | 30 ++++++++++----
 src/views/report/productionYield.vue          | 19 ++++-----
 10 files changed, 69 insertions(+), 77 deletions(-)

diff --git a/.env.dev b/.env.dev
index d272df7..809263f 100644
--- a/.env.dev
+++ b/.env.dev
@@ -1,7 +1,7 @@
 ###
  # @Author: zhp
  # @Date: 2024-04-28 13:42:51
- # @LastEditTime: 2024-06-21 13:40:38
+ # @LastEditTime: 2024-06-24 08:29:45
  # @LastEditors: zhp
  # @Description:
 ###
@@ -13,7 +13,7 @@ VUE_APP_TITLE = 发电玻璃智能管控平台
 
 # 芋道管理系统/开发环境
 # VUE_APP_BASE_API = 'http://192.168.1.70:30307'
-# VUE_APP_BASE_API = 'http://glass.kszny.picaiba.com'
+VUE_APP_BASE_API = 'http://glass.kszny.picaiba.com'
 # 闫阳
 # VUE_APP_BASE_API = 'http://192.168.1.81:48080'
 # 徐
@@ -25,7 +25,7 @@ VUE_APP_TITLE = 发电玻璃智能管控平台
 # 张一丁
 # VUE_APP_BASE_API = 'http://192.168.4.139:48080'
 # 蔡
-VUE_APP_BASE_API = 'http://192.168.1.54:48080'
+# VUE_APP_BASE_API = 'http://192.168.1.54:48080'
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
 
diff --git a/src/views/report/components/produceLineBar.vue b/src/views/report/components/produceLineBar.vue
index eda69d5..55bf8c8 100644
--- a/src/views/report/components/produceLineBar.vue
+++ b/src/views/report/components/produceLineBar.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-06-19 15:28:34
- * @LastEditTime: 2024-06-21 14:37:44
+ * @LastEditTime: 2024-06-24 08:46:34
  * @LastEditors: zhp
  * @Description:
 -->
@@ -83,7 +83,7 @@ export default {
         dataZoom: [//滚动条
           {
             // 设置滚动条的隐藏与显示
-            show: true,
+            show: false,
             // 设置滚动条类型
             type: "slider",
             // 设置背景颜色
diff --git a/src/views/report/components/produceLineBarTarget.vue b/src/views/report/components/produceLineBarTarget.vue
index 119ed45..bd32a6b 100644
--- a/src/views/report/components/produceLineBarTarget.vue
+++ b/src/views/report/components/produceLineBarTarget.vue
@@ -1,14 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-06-20 16:13:36
- * @LastEditTime: 2024-06-21 14:37:56
- * @LastEditors: zhp
- * @Description:
--->
-<!--
- * @Author: zhp
- * @Date: 2024-06-19 15:28:34
- * @LastEditTime: 2024-06-20 16:02:21
+ * @LastEditTime: 2024-06-24 08:46:42
  * @LastEditors: zhp
  * @Description:
 -->
@@ -90,7 +83,7 @@ export default {
         dataZoom: [//滚动条
           {
             // 设置滚动条的隐藏与显示
-            show: true,
+            show: false,
             // 设置滚动条类型
             type: "slider",
             // 设置背景颜色
diff --git a/src/views/report/components/produceLineBarYearTarget.vue b/src/views/report/components/produceLineBarYearTarget.vue
index bf0f01d..a4f9005 100644
--- a/src/views/report/components/produceLineBarYearTarget.vue
+++ b/src/views/report/components/produceLineBarYearTarget.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-06-20 16:13:52
- * @LastEditTime: 2024-06-21 14:37:59
+ * @LastEditTime: 2024-06-24 08:46:46
  * @LastEditors: zhp
  * @Description:
 -->
@@ -83,7 +83,7 @@ export default {
         dataZoom: [//滚动条
           {
             // 设置滚动条的隐藏与显示
-            show: true,
+            show: false,
             // 设置滚动条类型
             type: "slider",
             // 设置背景颜色
diff --git a/src/views/report/components/produceLineYieldBarTarget.vue b/src/views/report/components/produceLineYieldBarTarget.vue
index 411bf8c..e40582c 100644
--- a/src/views/report/components/produceLineYieldBarTarget.vue
+++ b/src/views/report/components/produceLineYieldBarTarget.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-06-21 09:05:14
- * @LastEditTime: 2024-06-21 14:38:06
+ * @LastEditTime: 2024-06-24 08:46:49
  * @LastEditors: zhp
  * @Description:
 -->
@@ -101,7 +101,7 @@ export default {
         dataZoom: [//滚动条
           {
             // 设置滚动条的隐藏与显示
-            show: true,
+            show: false,
             // 设置滚动条类型
             type: "slider",
             // 设置背景颜色
diff --git a/src/views/report/comprehensiveData.vue b/src/views/report/comprehensiveData.vue
index e46da5e..2d9ab0d 100644
--- a/src/views/report/comprehensiveData.vue
+++ b/src/views/report/comprehensiveData.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-04-15 10:49:13
- * @LastEditTime: 2024-06-21 15:18:20
+ * @LastEditTime: 2024-06-24 09:39:27
  * @LastEditors: zhp
  * @Description:
 -->
@@ -58,7 +58,7 @@
         </el-form-item>
       </el-form>
       <base-table :span-method="objectSpanMethod" :table-props="tableProps" :page="listQuery.pageNo"
-        :limit="listQuery.pageSize" :table-data="tableData">
+        :limit="listQuery.pageSize" :table-data="tableData" :max-height="tableH">
       </base-table>
     </div>
   </div>
@@ -101,6 +101,7 @@ export default {
         end: undefined,
         reportTime: []
       },
+      tableH: this.tableHeight(269),
       timeList: [
         {
           value: 0,
@@ -191,6 +192,7 @@ export default {
   //   this.changeTime()
   // },
   mounted() {
+    this.tableH = this.tableHeight(269);
     // this.getOverView()
     const today = new Date()
     const sevenDaysAgo = new Date(today.getTime() - (7 * 24 * 60 * 60 * 1000))
@@ -489,7 +491,7 @@ export default {
       if (res.data.length === 0) {
         this.tableData = []
       } else {
-        if (this.currentMenu !== '瑞昌') {
+        if (this.currentMenu != '瑞昌') {
           this.tableData = dataArr
         } else {
           this.tableData = dataArr.filter(function (item) {
@@ -497,13 +499,6 @@ export default {
           });
         }
       }
-      this.listQuery.total = res.data.total
-      if (this.listQuery.total > 0) {
-        this.tableData.forEach(item => {
-          item.startTime = item.startDate ? item.startDate[0] + '-' + item.startDate[1] + '-' + item.startDate[2] : '--'
-          item.endTime = item.endDate ? item.endDate[0] + '-' + item.endDate[1] + '-' + item.endDate[2] : '--'
-        })
-      }
     },
     buttonClick(val) {
       this.listQuery.factorys = val.factory?.length > 0 ? val.factory : undefined
diff --git a/src/views/report/produceConversion.vue b/src/views/report/produceConversion.vue
index bcb508e..6787cd9 100644
--- a/src/views/report/produceConversion.vue
+++ b/src/views/report/produceConversion.vue
@@ -195,26 +195,7 @@ export default {
           {
             name: "",
             // yAxisIndex: 0,
-            data: [
-              {
-                value: 1,
-                itemStyle: {
-                  color: '#8EF0AB'
-                }
-              },
-              {
-                value: 2,
-                itemStyle: {
-                  color: '#288AFF'
-                }
-              },
-              {
-                value: 0,
-                yAxisIndex: 1,
-                itemStyle: {
-                  color: '#64BDFF'
-                }
-              }],
+            data: [],
             type: "bar",
             barWidth: 20,
             label: {
@@ -229,13 +210,7 @@ export default {
           {
             name: '',
             type: 'bar',
-            data: [0, 0, 0,
-              {
-                value: 5,
-                itemStyle: {
-                  color: '#68C483'
-                }
-              }],
+            data: [],
             type: "bar",
             barWidth: 20,
             label: {
@@ -370,7 +345,7 @@ export default {
   watch: {
     // 监听左侧菜单栏是否展开
     isOpen(val) {
-      if (this.$route.name === "ChipYieldBM") {
+      if (this.$route.name === "produceConversion") {
         this.chartNum++;
       }
     },
@@ -385,7 +360,7 @@ export default {
   },
   activated() {
     // 图重新加载，为了防止窗口变化后尺寸图显示不佳，数据不更新
-    if (this.$route.name === "ChipYieldBM") {
+    if (this.$route.name === "produceConversion") {
       this.chartNum++;
     }
   },
@@ -513,6 +488,12 @@ export default {
     async getDataList() {
       this.otherProps = []
       this.chartMsg.xData = []
+      this.chartMsg.series[0].data = []
+      this.chartMsg.series[1].data = []
+      this.chartMsg.series[2].data = []
+      this.chartMsgYearTarget.series[0].data = []
+      this.chartMsgYearTarget.series[1].data = []
+
       console.log(this.listQuery);
       if (this.listQuery.type == 3) {
         this.listQuery.beginTime = this.listQuery.reportTime[0]
@@ -676,7 +657,7 @@ export default {
     _setTableHeight() {
       this.tableH = this.tableHeight(137) / 2 - 70;
       this.chartHeight = this.tableHeight(137) / 2 - 111;
-      if (this.$route.name === "ChipYieldBM") {
+      if (this.$route.name === "produceConversion") {
         this.chartNum++;
       }
     },
diff --git a/src/views/report/productionSituationMW.vue b/src/views/report/productionSituationMW.vue
index ad28d95..a35f402 100644
--- a/src/views/report/productionSituationMW.vue
+++ b/src/views/report/productionSituationMW.vue
@@ -95,6 +95,9 @@
         </el-col> -->
       </el-row>
       <el-row v-else>
+        <div class="blueTip">
+          生产情况对比
+        </div>
         <!-- <el-col :span="12"> -->
         <bm-line-bar :type="listQuery.type" :chartHeight="chartHeight" :legendList="legendList" :chartMsg="chartMsg"
           :chartId="chartId" :chartNum="chartNum" />
@@ -291,7 +294,7 @@ export default {
   },
   computed: {
     dataArr() {
-      if (this.currentMenu != '瑞昌') {
+      // if (this.currentMenu != '瑞昌') {
         return [{
           factory: null,
           item: '芯片总功率',
@@ -302,7 +305,7 @@ export default {
           item: '	标准组件总功率',
           unit: 'MW'
         }]
-      }
+      // }
     },
     tableProps() {
       return [
@@ -484,6 +487,11 @@ export default {
       this.chartMsg.xData = []
       this.chartMsgTarget.xData = []
       this.chartMsgYearTarget.xData = []
+      this.chartMsg.series[0].data = []
+      this.chartMsg.series[1].data = []
+      this.chartMsgTarget.series = []
+      this.chartMsgYearTarget.series[0].data = []
+      this.chartMsgYearTarget.series[1].data = []
       console.log(this.listQuery);
       let arr = []
       this.currentMenu === '邯郸' ? arr.push(1) : arr.push(0)
diff --git a/src/views/report/productionSituationTablets.vue b/src/views/report/productionSituationTablets.vue
index 27bf95b..c33d94c 100644
--- a/src/views/report/productionSituationTablets.vue
+++ b/src/views/report/productionSituationTablets.vue
@@ -95,6 +95,9 @@
         </el-col> -->
       </el-row>
       <el-row v-else>
+        <div class="blueTip">
+          生产情况对比
+        </div>
         <!-- <el-col :span="12"> -->
         <bm-line-bar :type="listQuery.type" :chartHeight="chartHeight" :legendList="legendList" :chartMsg="chartMsg"
           :chartId="chartId" :chartNum="chartNum" />
@@ -257,9 +260,7 @@ export default {
           },
           axisLabel: {},
         },
-        series: [
-
-        ],
+        series: [],
       },
       chartMsg: {
         color: ["#8EF0AB", "#288AFF", "#64BDFF", '#7164FF'],
@@ -425,7 +426,7 @@ export default {
   watch: {
     // 监听左侧菜单栏是否展开
     isOpen(val) {
-      if (this.$route.name === "ChipYieldBM") {
+      if (this.$route.name === "productionSituationTablets") {
         this.chartNum++;
       }
     },
@@ -440,7 +441,7 @@ export default {
   },
   activated() {
     // 图重新加载，为了防止窗口变化后尺寸图显示不佳，数据不更新
-    if (this.$route.name === "ChipYieldBM") {
+    if (this.$route.name === "productionSituationTablets") {
       this.chartNum++;
     }
   },
@@ -570,6 +571,19 @@ export default {
       this.chartMsg.xData = []
       this.chartMsgTarget.xData = []
       this.chartMsgYearTarget.xData = []
+      this.chartMsg.series[0].data = []
+      this.chartMsg.series[1].data = []
+      this.chartMsg.series[2].data = []
+      if (this.chartMsg.series[3]) {
+        this.chartMsg.series[3].data = []
+      }
+      this.chartMsgTarget.series = []
+      this.chartMsgYearTarget.series[0].data = []
+      this.chartMsgYearTarget.series[1].data = []
+      this.chartMsgYearTarget.series[2].data = []
+      if (this.chartMsgYearTarget.series[3]) {
+        this.chartMsgYearTarget.series[3].data = []
+      }
       console.log(this.listQuery);
       let arr = []
       this.currentMenu === '邯郸' ? arr.push(1) : arr.push(0)
@@ -1187,7 +1201,8 @@ export default {
           })
         for (let i in this.dataArr[0]) {
             this.chartMsg.series[0].name = this.dataArr[0]['item']
-            if (i.search('value') === 0) {
+          if (i.search('value') === 0) {
+            console.log("this.dataArr[0]['item']", this.dataArr[0]['item'], this.dataArr[0][i]);
               this.chartMsg.series[0].data.push({
                 name: this.dataArr[0]['item'],
                 value: this.dataArr[0][i]
@@ -1224,6 +1239,7 @@ export default {
           }
           }
       }
+      console.log(this.dataArr[0]['item'],this.chartMsg.series[0].data)
       this.tableData = res.data.length != 0 ? this.dataArr : []
       // this.tableProps = otherProps
       // res.data.list.forEach((ele) => {
@@ -1253,7 +1269,7 @@ export default {
     _setTableHeight() {
       this.tableH = this.tableHeight(137) / 2 - 70;
       this.chartHeight = this.tableHeight(137) / 2 - 111;
-      if (this.$route.name === "ChipYieldBM") {
+      if (this.$route.name === "productionSituationTablets") {
         this.chartNum++;
       }
     },
diff --git a/src/views/report/productionYield.vue b/src/views/report/productionYield.vue
index 7b27964..7bdfbf2 100644
--- a/src/views/report/productionYield.vue
+++ b/src/views/report/productionYield.vue
@@ -364,7 +364,7 @@ export default {
 
     },
     isOpen(val) {
-      if (this.$route.name === "ChipYieldBM") {
+      if (this.$route.name === "productionYield") {
         this.chartNum++;
       }
     },
@@ -507,6 +507,12 @@ export default {
     async getDataList() {
       this.otherProps = []
       this.chartMsg.xData = []
+      this.chartMsg.series[0].data = []
+      this.chartMsg.series[1].data = []
+      this.chartMsg.series[2].data = []
+      this.chartMsg.series[3].data = []
+      this.chartMsgYearTarget.series[0].data = []
+      this.chartMsgYearTarget.series[1].data = []
       let arr = []
       this.currentMenu === '邯郸' ? arr.push(1) : arr.push(0)
       this.listQuery.factory = arr
@@ -660,7 +666,7 @@ export default {
           }
         }
       } else {
-        res.data.list.slice.forEach((ele, index) => {
+        res.data.list.forEach((ele, index) => {
           let i = index + 1
           this.chartMsg.xData.push(ele.titleValue)
           this.otherProps.push({
@@ -724,18 +730,11 @@ export default {
       console.log(dataArr)
       this.tableData = res.data.length != 0 ? dataArr : []
       // this.tableProps.push()
-      this.listQuery.total = res.data.total
-      if (this.listQuery.total > 0) {
-        this.tableData.forEach(item => {
-          item.startTime = item.startDate ? item.startDate[0] + '-' + item.startDate[1] + '-' + item.startDate[2] : '--'
-          item.endTime = item.endDate ? item.endDate[0] + '-' + item.endDate[1] + '-' + item.endDate[2] : '--'
-        })
-      }
     },
     _setTableHeight() {
       this.tableH = this.tableHeight(137) / 2 - 70;
       this.chartHeight = this.tableHeight(137) / 2 - 111;
-      if (this.$route.name === "ChipYieldBM") {
+      if (this.$route.name === "productionYield") {
         this.chartNum++;
       }
     },

From 5e703350e1a3449398ab3b5c1b9c640c34a4a46b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98937886381=E2=80=99?= <‘937886381@qq.com’>
Date: Mon, 24 Jun 2024 10:39:10 +0800
Subject: [PATCH 10/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/report/comprehensiveData.vue        |  4 +-
 src/views/report/produceConversion.vue        | 12 +++--
 src/views/report/productionSituationMW.vue    | 10 ++--
 .../report/productionSituationTablets.vue     | 49 ++++++++++++++++---
 src/views/report/productionYield.vue          |  8 +--
 5 files changed, 61 insertions(+), 22 deletions(-)

diff --git a/src/views/report/comprehensiveData.vue b/src/views/report/comprehensiveData.vue
index 2d9ab0d..92fe0a3 100644
--- a/src/views/report/comprehensiveData.vue
+++ b/src/views/report/comprehensiveData.vue
@@ -27,11 +27,11 @@
         </el-form-item>
         <el-form-item v-show="listQuery.type === 1" label="时间范围" prop="reportTime">
           <el-date-picker size="small" clearable v-model="listQuery.start" type="week" format="yyyy 第 WW 周"
-            placeholder="选择周" style="width: 180px" @change="onValueChange">
+            placeholder="选择周" style="width: 180px" @change="onValueChange" :picker-options="{'firstDayOfWeek': 1}">
           </el-date-picker>
           至
           <el-date-picker size="small" clearable v-model="listQuery.end" type="week" format="yyyy 第 WW 周"
-            placeholder="选择周" style="width: 180px" @change="onValueChange">
+            placeholder="选择周" style="width: 180px" @change="onValueChange" :picker-options="{'firstDayOfWeek': 1}">
           </el-date-picker>
           <!-- <span v-if="listQuery.start && listQuery.end" style="margin-left: 10px">
             {{ date1 }} 至 {{ date2 }}，共 {{ weekNum }} 周
diff --git a/src/views/report/produceConversion.vue b/src/views/report/produceConversion.vue
index 6787cd9..50477f9 100644
--- a/src/views/report/produceConversion.vue
+++ b/src/views/report/produceConversion.vue
@@ -20,11 +20,11 @@
         </el-form-item>
         <el-form-item v-show="listQuery.date === 1" label="时间范围" prop="reportTime">
           <el-date-picker size="small" clearable v-model="listQuery.start" type="week" format="yyyy 第 WW 周"
-            placeholder="选择周" style="width: 180px" @change="onValueChange">
+            placeholder="选择周" style="width: 180px" @change="onValueChange" :picker-options="{'firstDayOfWeek': 1}">
           </el-date-picker>
           至
           <el-date-picker size="small" clearable v-model="listQuery.end" type="week" format="yyyy 第 WW 周"
-            placeholder="选择周" style="width: 180px" @change="onValueChange">
+            placeholder="选择周" style="width: 180px" @change="onValueChange" :picker-options="{'firstDayOfWeek': 1}">
           </el-date-picker>
           <!-- <span v-if="listQuery.start && listQuery.end" style="margin-left: 10px">
             {{ date1 }} 至 {{ date2 }}，共 {{ weekNum }} 周
@@ -84,7 +84,7 @@
             :chartMsg="chartMsgYearTarget" :chartId=" 'yearData'" :chartNum="chartNum" />
         </el-col> -->
       </el-row>
-      <base-table :span-method="objectSpanMethod" :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">
@@ -107,7 +107,8 @@ export default {
     return {
       otherProps: [],
       title: '',
-      currentMenu:'邯郸',
+      currentMenu: '邯郸',
+      showTable:false,
       listQuery: {
         start: undefined,
         end: undefined,
@@ -652,7 +653,8 @@ export default {
       //     })
       //   }
       // }
-      this.tableData =res.data[0].list.length !== 0? dataArr : []
+      this.tableData = res.data[0].list.length !== 0 ? dataArr : []
+      this.showTable = !this.showTable
     },
     _setTableHeight() {
       this.tableH = this.tableHeight(137) / 2 - 70;
diff --git a/src/views/report/productionSituationMW.vue b/src/views/report/productionSituationMW.vue
index a35f402..fc03753 100644
--- a/src/views/report/productionSituationMW.vue
+++ b/src/views/report/productionSituationMW.vue
@@ -18,11 +18,11 @@
         </el-form-item>
         <el-form-item v-show="listQuery.type === 1" label="时间范围" prop="reportTime">
           <el-date-picker size="small" clearable v-model="listQuery.start" type="week" format="yyyy 第 WW 周"
-            placeholder="选择周" style="width: 180px" @change="onValueChange">
+            placeholder="选择周" style="width: 180px" @change="onValueChange" :picker-options="{'firstDayOfWeek': 1}">
           </el-date-picker>
           至
           <el-date-picker size="small" clearable v-model="listQuery.end" type="week" format="yyyy 第 WW 周"
-            placeholder="选择周" style="width: 180px" @change="onValueChange">
+            placeholder="选择周" style="width: 180px" @change="onValueChange" :picker-options="{'firstDayOfWeek': 1}">
           </el-date-picker>
           <!-- <span v-if="listQuery.start && listQuery.end" style="margin-left: 10px">
             {{ date1 }} 至 {{ date2 }}，共 {{ weekNum }} 周
@@ -103,7 +103,7 @@
           :chartId="chartId" :chartNum="chartNum" />
         <!-- </el-col> -->
       </el-row>
-      <base-table :span-method="objectSpanMethod" :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">
@@ -126,6 +126,7 @@ export default {
     return {
       otherProps: [],
       start: undefined,
+      showTable:false,
       currentMenu: '邯郸',
       end: undefined,
       title: '',
@@ -897,6 +898,7 @@ export default {
         }
       }
       this.tableData = res.data.length != 0 ? this.dataArr : []
+      this.showTable = !this.showTable
       // this.tableProps = otherProps
       // res.data.list.forEach((ele) => {
       //   console.log(ele);
@@ -914,7 +916,7 @@ export default {
       // })
       // console.log(dataArr)
       // this.tableProps.push()
-      this.listQuery.total = res.data.total
+      // this.listQuery.total = res.data.total
       // if (this.listQuery.total > 0) {
       //   this.tableData.forEach(item => {
       //     item.startTime = item.startDate ? item.startDate[0] + '-' + item.startDate[1] + '-' + item.startDate[2] : '--'
diff --git a/src/views/report/productionSituationTablets.vue b/src/views/report/productionSituationTablets.vue
index c33d94c..372370d 100644
--- a/src/views/report/productionSituationTablets.vue
+++ b/src/views/report/productionSituationTablets.vue
@@ -18,11 +18,11 @@
         </el-form-item>
         <el-form-item v-show="listQuery.type === 1" label="时间范围" prop="reportTime">
           <el-date-picker size="small" clearable v-model="listQuery.start" type="week" format="yyyy 第 WW 周"
-            placeholder="选择周" style="width: 180px" @change="onValueChange">
+            placeholder="选择周" style="width: 180px" @change="onValueChange" :picker-options="{'firstDayOfWeek': 1}">
           </el-date-picker>
           至
           <el-date-picker size="small" clearable v-model="listQuery.end" type="week" format="yyyy 第 WW 周"
-            placeholder="选择周" style="width: 180px" @change="onValueChange">
+            placeholder="选择周" style="width: 180px" @change="onValueChange" :picker-options="{'firstDayOfWeek': 1}">
           </el-date-picker>
           <!-- <span v-if="listQuery.start && listQuery.end" style="margin-left: 10px">
             {{ date1 }} 至 {{ date2 }}，共 {{ weekNum }} 周
@@ -103,7 +103,7 @@
           :chartId="chartId" :chartNum="chartNum" />
         <!-- </el-col> -->
       </el-row>
-      <base-table :span-method="objectSpanMethod" :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">
@@ -128,7 +128,8 @@ export default {
       start: undefined,
       currentMenu:'邯郸',
       end: undefined,
-      title:'',
+      title: '',
+      showTable:false,
       listQuery: {
         pageNo: 1,
         pageSize:999,
@@ -425,6 +426,9 @@ export default {
   },
   watch: {
     // 监听左侧菜单栏是否展开
+    dataArr(val) {
+      this.tableData = val
+    },
     isOpen(val) {
       if (this.$route.name === "productionSituationTablets") {
         this.chartNum++;
@@ -902,6 +906,30 @@ export default {
             prop: 'value' + i
           })
         })
+        res.data.list.forEach((ele, index) => {
+          let i = index + 1
+          let m = 'value' + i
+          ele.productionSituationDataVOList.forEach((item) => {
+            this.dataArr[0]['' + m + ''] = item.ftoInput
+            this.dataArr[0].factory = item.factory == 1 ? '邯郸' : '瑞昌'
+            this.dataArr[1].factory = item.factory == 1 ? '邯郸' : '瑞昌'
+            this.dataArr[2].factory = item.factory == 1 ? '邯郸' : '瑞昌'
+            // this.dataArr[3].factory = item.factory == 1 ? '邯郸' : '瑞昌'
+            this.dataArr[1]['' + m + ''] = item.chipYield
+            this.dataArr[2]['' + m + ''] = item.componentYield
+            // this.dataArr[3]['' + m + ''] = item.bipvProductOutput
+            if (this.dataArr[3]) {
+              this.dataArr[3].factory = item.factory == 1 ? '邯郸' : '瑞昌'
+              this.dataArr[3]['' + m + ''] = item.bipvProductOutput
+            }
+          })
+          // ele.titleValue
+          // .push({
+          //   label: ele.titleValue,
+          //   props: 'value' + index + 1,
+          // })
+        })
+
         // res.data.list.forEach((ele) => {
         res.data.list.slice(0, res.data.list.length - 1).forEach((ele, index) => {
           // let i = index + 1
@@ -1048,7 +1076,7 @@ export default {
               // } else {
               // }
             })
-            console.log("fto", ele.titleValue, fto);
+
           } else {
             ele.productionSituationDataVOList.forEach((item) => {
               console.log(item);
@@ -1239,8 +1267,13 @@ export default {
           }
           }
       }
-      console.log(this.dataArr[0]['item'],this.chartMsg.series[0].data)
-      this.tableData = res.data.length != 0 ? this.dataArr : []
+      console.log(this.dataArr)
+      console.log(this.tableData);
+      // this.$nextTick(() => {
+      this.tableData = this.dataArr
+      this.showTable = !this.showTable
+      // })
+      // this.$forceUpdate()
       // this.tableProps = otherProps
       // res.data.list.forEach((ele) => {
       //   console.log(ele);
@@ -1258,7 +1291,7 @@ export default {
       // })
       // console.log(dataArr)
       // this.tableProps.push()
-      this.listQuery.total = res.data.total
+      // this.listQuery.total = res.data.total
       // if (this.listQuery.total > 0) {
       //   this.tableData.forEach(item => {
       //     item.startTime = item.startDate ? item.startDate[0] + '-' + item.startDate[1] + '-' + item.startDate[2] : '--'
diff --git a/src/views/report/productionYield.vue b/src/views/report/productionYield.vue
index 7bdfbf2..61a3176 100644
--- a/src/views/report/productionYield.vue
+++ b/src/views/report/productionYield.vue
@@ -20,11 +20,11 @@
         </el-form-item>
         <el-form-item v-show="listQuery.type === 1" label="时间范围" prop="reportTime">
           <el-date-picker size="small" clearable v-model="listQuery.start" type="week" format="yyyy 第 WW 周"
-            placeholder="选择周" style="width: 180px" @change="onValueChange">
+            placeholder="选择周" style="width: 180px" @change="onValueChange" :picker-options="{'firstDayOfWeek': 1}">
           </el-date-picker>
           至
           <el-date-picker size="small" clearable v-model="listQuery.end" type="week" format="yyyy 第 WW 周"
-            placeholder="选择周" style="width: 180px" @change="onValueChange">
+            placeholder="选择周" style="width: 180px" @change="onValueChange" :picker-options="{'firstDayOfWeek': 1}">
           </el-date-picker>
           <!-- <span v-if="listQuery.start && listQuery.end" style="margin-left: 10px">
             {{ date1 }} 至 {{ date2 }}，共 {{ weekNum }} 周
@@ -84,7 +84,7 @@
             :chartMsg="chartMsgYearTarget" :chartId=" 'yearData'" :chartNum="chartNum" />
         </el-col> -->
       </el-row>
-      <base-table :span-method="objectSpanMethod" :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">
@@ -108,6 +108,7 @@ export default {
       start: undefined,
       end: undefined,
       title: '',
+      showTable:false,
       listQuery: {
         pageNo: 1,
         pageSize: 999,
@@ -729,6 +730,7 @@ export default {
 
       console.log(dataArr)
       this.tableData = res.data.length != 0 ? dataArr : []
+      this.showTable = !this.showTable
       // this.tableProps.push()
     },
     _setTableHeight() {

From 196a615f610802e98f38367c084c0aac62cd5bee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98937886381=E2=80=99?= <‘937886381@qq.com’>
Date: Mon, 24 Jun 2024 10:44:21 +0800
Subject: [PATCH 11/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../report/productionSituationTablets.vue     | 24 -------------------
 1 file changed, 24 deletions(-)

diff --git a/src/views/report/productionSituationTablets.vue b/src/views/report/productionSituationTablets.vue
index 372370d..04247e1 100644
--- a/src/views/report/productionSituationTablets.vue
+++ b/src/views/report/productionSituationTablets.vue
@@ -906,30 +906,6 @@ export default {
             prop: 'value' + i
           })
         })
-        res.data.list.forEach((ele, index) => {
-          let i = index + 1
-          let m = 'value' + i
-          ele.productionSituationDataVOList.forEach((item) => {
-            this.dataArr[0]['' + m + ''] = item.ftoInput
-            this.dataArr[0].factory = item.factory == 1 ? '邯郸' : '瑞昌'
-            this.dataArr[1].factory = item.factory == 1 ? '邯郸' : '瑞昌'
-            this.dataArr[2].factory = item.factory == 1 ? '邯郸' : '瑞昌'
-            // this.dataArr[3].factory = item.factory == 1 ? '邯郸' : '瑞昌'
-            this.dataArr[1]['' + m + ''] = item.chipYield
-            this.dataArr[2]['' + m + ''] = item.componentYield
-            // this.dataArr[3]['' + m + ''] = item.bipvProductOutput
-            if (this.dataArr[3]) {
-              this.dataArr[3].factory = item.factory == 1 ? '邯郸' : '瑞昌'
-              this.dataArr[3]['' + m + ''] = item.bipvProductOutput
-            }
-          })
-          // ele.titleValue
-          // .push({
-          //   label: ele.titleValue,
-          //   props: 'value' + index + 1,
-          // })
-        })
-
         // res.data.list.forEach((ele) => {
         res.data.list.slice(0, res.data.list.length - 1).forEach((ele, index) => {
           // let i = index + 1

From a9392c89997b29a1ed1ef19c85c60584a4334803 Mon Sep 17 00:00:00 2001
From: juzi <819872918@qq.com>
Date: Mon, 24 Jun 2024 13:27:09 +0800
Subject: [PATCH 12/12] 1

---
 .../components/bmSearchBarComplete.vue                       | 5 +++++
 src/views/report/components/bmSearchBar.vue                  | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/src/views/report/completionStatusIntrBM/components/bmSearchBarComplete.vue b/src/views/report/completionStatusIntrBM/components/bmSearchBarComplete.vue
index 0dbb2da..378a8d0 100644
--- a/src/views/report/completionStatusIntrBM/components/bmSearchBarComplete.vue
+++ b/src/views/report/completionStatusIntrBM/components/bmSearchBarComplete.vue
@@ -26,6 +26,7 @@
         placeholder="选择日期"
         value-format="yyyy-MM-dd"
         style="width: 150px"
+        :picker-options="pickerOptions"
       >
       </el-date-picker>
     </el-form-item>
@@ -38,6 +39,7 @@
         placeholder="选择周"
         value-format="yyyy-MM-dd"
         style="width: 150px"
+        :picker-options="pickerOptions"
       >
       </el-date-picker>
     </el-form-item>
@@ -97,6 +99,9 @@ export default {
         { id: 2, name: "月" },
         { id: 3, name: "年" },
       ],
+      pickerOptions: {
+        firstDayOfWeek: 1,
+      },
     };
   },
   methods: {
diff --git a/src/views/report/components/bmSearchBar.vue b/src/views/report/components/bmSearchBar.vue
index 9d5caa9..c88398b 100644
--- a/src/views/report/components/bmSearchBar.vue
+++ b/src/views/report/components/bmSearchBar.vue
@@ -25,6 +25,7 @@
         placeholder="选择日期"
         value-format="yyyy-MM-dd"
         style="width: 150px"
+        :picker-options="pickerOptions"
       >
       </el-date-picker>
     </el-form-item>
@@ -37,6 +38,7 @@
         placeholder="选择周"
         value-format="yyyy-MM-dd"
         style="width: 150px"
+        :picker-options="pickerOptions"
       >
       </el-date-picker>
     </el-form-item>
@@ -118,6 +120,9 @@ export default {
         { id: 0, name: "瑞昌" },
         { id: 1, name: "邯郸" },
       ],
+      pickerOptions: {
+        firstDayOfWeek: 1,
+      },
     };
   },
   methods: {