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

---
 src/api/report/index.js                       |  15 +
 src/store/modules/home.js                     |   5 +-
 .../components/sub/bar/BarChartChipOEE.vue    |  50 +-
 .../components/sub/bar/BarChartChipTrans.vue  |  50 +-
 .../factoryData/components/BarChartBase.vue   |  15 +-
 .../copilot/factoryData/components/Order.vue  |   6 +-
 src/views/report/comprehensiveData.vue        | 255 ++++----
 src/views/report/produceConversion.vue        | 548 ++++++++++--------
 src/views/report/productionSituationMW.vue    | 490 ++++++++++++++++
 .../report/productionSituationTablets.vue     | 490 ++++++++++++++++
 src/views/report/productionYield.vue          | 490 ++++++++++++++++
 11 files changed, 1966 insertions(+), 448 deletions(-)
 create mode 100644 src/api/report/index.js
 create mode 100644 src/views/report/productionSituationMW.vue
 create mode 100644 src/views/report/productionSituationTablets.vue
 create mode 100644 src/views/report/productionYield.vue

diff --git a/src/api/report/index.js b/src/api/report/index.js
new file mode 100644
index 0000000..243341e
--- /dev/null
+++ b/src/api/report/index.js
@@ -0,0 +1,15 @@
+/*
+ * @Author: zhp
+ * @Date: 2024-06-17 09:41:03
+ * @LastEditTime: 2024-06-17 09:54:26
+ * @LastEditors: zhp
+ * @Description:
+ */
+import request from '@/utils/request'
+export function getComprehensiveDataPage(data) {
+  return request({
+    url: 'ip/comprehensive/data/get/comprehensive/data',
+    method: 'get',
+    params: data
+  })
+}
diff --git a/src/store/modules/home.js b/src/store/modules/home.js
index 234fa10..8a2652a 100644
--- a/src/store/modules/home.js
+++ b/src/store/modules/home.js
@@ -436,7 +436,10 @@ function splitCurrentAndPrevious(factoryListResponse, targetListResponse, prodOu
     if (preData && preData[0] != null) {
     for (const factory of preData) {
       const fId = getPreFactoryId(factory);
-         chipInvest.previous[fId] = factory.previousYearInputNumber;
+      if (factory.previousGlassType === 0) {
+      chipInvest.previous[fId] = factory.inputNumber
+      }
+        //  chipInvest.previous[fId] = factory.previousYearInputNumber;
       if (![0, 1, 2].includes(factory.previousGlassType)) continue;
       const _t = [chipOutput, stdOutput, bipvOutput][factory.previousGlassType];
       // if (fId) {
diff --git a/src/views/copilot/efficiency/components/sub/bar/BarChartChipOEE.vue b/src/views/copilot/efficiency/components/sub/bar/BarChartChipOEE.vue
index c227aef..6d7f58f 100644
--- a/src/views/copilot/efficiency/components/sub/bar/BarChartChipOEE.vue
+++ b/src/views/copilot/efficiency/components/sub/bar/BarChartChipOEE.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-05-07 13:22:43
- * @LastEditTime: 2024-06-14 10:05:37
+ * @LastEditTime: 2024-06-17 09:22:17
  * @LastEditors: zhp
  * @Description:
 -->
@@ -180,30 +180,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/copilot/efficiency/components/sub/bar/BarChartChipTrans.vue b/src/views/copilot/efficiency/components/sub/bar/BarChartChipTrans.vue
index 79475ff..848f32d 100644
--- a/src/views/copilot/efficiency/components/sub/bar/BarChartChipTrans.vue
+++ b/src/views/copilot/efficiency/components/sub/bar/BarChartChipTrans.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-05-23 15:50:44
- * @LastEditTime: 2024-06-06 15:13:06
+ * @LastEditTime: 2024-06-17 09:23:39
  * @LastEditors: zhp
  * @Description:
 -->
@@ -180,30 +180,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/copilot/factoryData/components/BarChartBase.vue b/src/views/copilot/factoryData/components/BarChartBase.vue
index 5bf1725..534d37e 100644
--- a/src/views/copilot/factoryData/components/BarChartBase.vue
+++ b/src/views/copilot/factoryData/components/BarChartBase.vue
@@ -1,19 +1,24 @@
 <template>
-  <div class="left-chart-base">
-    <!-- <div class="legend">
+  <chart-container class="bar-chart-base">
+    <div class="left-chart-base">
+      <!-- <div class="legend">
       <span v-for="item in legend" :key="item.label" class="legend-item"
         :style="{ fontSize: isFullscreen ? '0.85vw' : '0.73vw' }">{{ item.label }}</span>
     </div> -->
 
-    <div id="factoryEnergyChart" style="width: 100%; height: 100%"></div>
-  </div>
+      <div id="factoryEnergyChart" style="width: 100%; height: 100%"></div>
+    </div>
+  </chart-container>
 </template>
 <script>
 import { debounce } from "@/utils/debounce";
 import * as echarts from "echarts";
+import ChartContainer from "../../components/ChartContainer.vue";
+
 // import CopilotButton from "./chartButton"
 export default {
   components: {
+    ChartContainer
     // CopilotButton,
   },
   name: "Energy",
@@ -68,7 +73,7 @@ export default {
             },
           },
           axisLabel: {
-            rotate:45,
+            // rotate:45,
             color: "rgba(255, 255, 255, 0.7)",
             fontSize: 12,
           },
diff --git a/src/views/copilot/factoryData/components/Order.vue b/src/views/copilot/factoryData/components/Order.vue
index 693e1ee..e9eb35a 100644
--- a/src/views/copilot/factoryData/components/Order.vue
+++ b/src/views/copilot/factoryData/components/Order.vue
@@ -41,7 +41,7 @@ export default {
         data: [],
         rowNum: 12,
         waitTime: 3000,
-        columnWidth: [100],
+        columnWidth: [150],
         align: ["center"],
         carousel: "page",
       },
@@ -104,8 +104,8 @@ export default {
             }</span>`
           );
           arr.push(
-            `<span title=${this.prodOrder[i].inStatus || ""}>${
-            this.prodOrder[i].inStatus || ""
+            `<span title=${this.prodOrder[i].orderStatus || ""}>${
+            this.prodOrder[i].orderStatus === 0 ? '未开始' : this.prodOrder[i].orderStatus === 1 ? '进行中' : '已完成' || ""
             }</span>`
           );
           arr.push(
diff --git a/src/views/report/comprehensiveData.vue b/src/views/report/comprehensiveData.vue
index b3a181d..88d82a3 100644
--- a/src/views/report/comprehensiveData.vue
+++ b/src/views/report/comprehensiveData.vue
@@ -1,50 +1,30 @@
 <!--
  * @Author: zhp
  * @Date: 2024-04-15 10:49:13
- * @LastEditTime: 2024-06-07 16:22:57
+ * @LastEditTime: 2024-06-17 14:01:39
  * @LastEditors: zhp
  * @Description:
 -->
 <template>
   <div style="display: flex; flex-direction: column; min-height: calc(100vh - 96px - 35px)">
-    <!-- <div class="app-container"
-      style="margin-top: 8px; padding: 0 16px; height: auto; font-size: 20px; text-align: center;">
-      <p style="margin-bottom: 0">数据概览</p>
-      <div class="view">
-        <div v-for="(item, index) in data" :key="index">
-          <p style="color: rgb(194,128,255)">{{ item }}</p>
-          <p>{{ index }}</p>
-        </div>
-      </div>
-    </div> -->
     <div class="" style="height: auto;">
       <ButtonNav style="padding: 0;" :menus="['邯郸', '瑞昌']" :button-mode="true" @change="currentMenu = $event">
-        <!-- <template v-slot:tab1>
-          <div style="margin: 20px; background: #f001;">
-            Page1: 状态时序图
-          </div>
-        </template>
-        <template v-slot:tab2>
-          <div style="margin: 20px">
-            Page2: 产量时序图
-          </div>
-        </template> -->
       </ButtonNav>
     </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-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 === 1 || listQuery.date === ''" 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="yyyyMMdd" @change="changeDayTime" end-placeholder="结束日期">
+            start-placeholder="开始日期" value-format="yyyy-MM-dd HH:mm:ss" @change="changeDayTime" end-placeholder="结束日期">
           </el-date-picker>
         </el-form-item>
-        <el-form-item v-show="listQuery.date === 2" 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>
@@ -52,21 +32,20 @@
           <el-date-picker size="small" clearable v-model="end" type="week" format="yyyy 第 WW 周" placeholder="选择周"
             style="width: 180px" @change="onValueChange">
           </el-date-picker>
-          <!-- <span v-if="start && end" style="margin-left: 10px">
-            {{ date1 }} 至 {{ date2 }}，共 {{ weekNum }} 周
-          </span> -->
         </el-form-item>
-        <el-form-item v-show="listQuery.date === 3" label="时间值" prop="reportTime">
-          <el-date-picker size="small" v-model="listQuery.reportTime" type="monthrange" value-format="yyyyMM"
-            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 HH:mm:ss" range-separator="至" start-placeholder="开始月份" end-placeholder="结束月份"
+            @change="changeTime">
           </el-date-picker>
         </el-form-item>
-        <el-form-item v-show="listQuery.date === 4" label="时间值" prop="reportTime">
-          <el-date-picker size="small" clearable v-model="start" value-format="yyyy" type="year" placeholder="开始时间">
+        <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>
           ~
-          <el-date-picker size="small" clearable v-model="end" value-format="yyyy" type="year" placeholder="结束时间"
-            @change="getYear">
+          <el-date-picker size="small" clearable v-model="listQuery.reportTime[1]" value-format="yyyy" type="year"
+            placeholder="结束时间" @change="getYear">
           </el-date-picker>
         </el-form-item>
         <!-- <el-form-item label="玻璃类型" prop="type">
@@ -91,26 +70,20 @@
       </el-form>
       <base-table :table-props="tableProps" :page="listQuery.pageNo" :limit="listQuery.pageSize"
         :table-data="tableData">
-        <method-btn v-if="tableBtn.length" slot="handleBtn" label="操作" :width="120" fixed="right"
-          :method-list="tableBtn" @clickBtn="handleClick" />
       </base-table>
-      <pagination :limit.sync="listQuery.pageSize" :page.sync="listQuery.pageNo" :total="listQuery.total"
-        @pagination="getDataList" />
     </div>
-    <!-- <add-or-update v-if="detailOrUpdateVisible" ref="detailOrUpdate" :date="listQuery.date"
-      @refreshDataList="successSubmit" @destroy="detailOrUpdateVisible = false" /> -->
   </div>
 </template>
 
 <script>
 // import { parseTime } from '../../core/mixins/code-filter';
-// import { getWorkOrderPage, exportExcel, getOverView } from '@/api/produceData/order';
+import { getComprehensiveDataPage } from '@/api/report';
 // import { getWorkOrderPage, exportExcel, getOverView } from '@/components/buttonNav'
 // import inputTable from './inputTable.vue';
 // import lineChart from './lineChart';
 import moment from 'moment'
 import ButtonNav from '@/components/ButtonNav'
-import basicPage from '@/mixins/basic-page'
+// import basicPage from '@/mixins/basic-page'
 // import AddOrUpdate from './add-or-updata';
 import { factoryList, factoryArray } from "@/utils/constants";
 import { publicFormatter } from "@/utils/dict";
@@ -119,7 +92,7 @@ import { publicFormatter } from "@/utils/dict";
 // import * as XLSX from 'xlsx'
 export default {
   components: { ButtonNav },
-  mixins: [basicPage],
+  // mixins: [basicPage],
   data() {
     return {
       factoryList,
@@ -127,30 +100,30 @@ export default {
       start: undefined,
       end: undefined,
       listQuery: {
-        size: 10,
-        current: 1,
-        factorys: null,
-        total: 0,
-        date: 3,
-        beginTime: undefined,
-        endTime: undefined,
+        // size: 10,
+        // current: 1,
+        factory: null,
+        // total: 0,
+        type: 2,
+        startDate: undefined,
+        endDate: undefined,
         reportTime: []
       },
       timeList: [
         {
-          value: 1,
+          value: 0,
           label: '日'
         },
         {
-          value: 2,
+          value: 1,
           label: '周'
         },
         {
-          value: 3,
+          value: 2,
           label: '月'
         },
         {
-          value: 4,
+          value: 3,
           label: '年'
         }
       ],
@@ -201,48 +174,49 @@ export default {
           // 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
-        }
+        // {
+        //   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
+        // }
       ],
       tableData: [],
       xAxis: [],
+      currentMenu:null,
       lineData: {},
       data: {}
       // proLineList: [],
@@ -254,16 +228,17 @@ export default {
       return Math.round((this.end - this.start) / (24 * 60 * 60 * 1000 * 7)) + 1
     },
   },
-  created() {
-    const currentMonth = new Date()
-    this.listQuery.reportTime = [moment(currentMonth).format('yyyyMM'), moment(currentMonth).format('yyyyMM')]
-    this.changeTime()
-  },
+  // created() {
+  //   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.changeTime()
+  // },
   mounted() {
-    this.getOverView()
+    // this.getOverView()
     const currentMonth = new Date()
-    this.listQuery.reportTime = [moment(currentMonth).format('yyyyMM'), moment(currentMonth).format('yyyyMM')]
+    this.listQuery.reportTime = [moment(currentMonth).format('yyyy-MM-DD HH:mm:ss'), moment(currentMonth).format('yyyy-MM-DD HH:mm:ss')]
     this.changeTime()
+    this.getDataList()
   },
   methods: {
     getYear(e) {
@@ -284,33 +259,37 @@ 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);
     },
     changeTime() {
       if (this.listQuery.reportTime) {
-        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))
-        if (years * 12 + months > 24) {
+        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 = Number(this.listQuery.reportTime[0])
-          this.listQuery.endTime = Number(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周后触发的操作
@@ -325,13 +304,15 @@ export default {
             type: 'warning'
           });
         } else {
-          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() {
@@ -344,12 +325,12 @@ export default {
           });
           this.listQuery.reportTime = [];
         } else {
-          this.listQuery.beginTime = Number(this.listQuery.reportTime[0])
-          this.listQuery.endTime = Number(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() {
@@ -366,26 +347,32 @@ export default {
       });
     },
     async getDataList() {
-      // const res = await getWorkOrderPage(this.listQuery)
-      // this.tableData = res.data.list
-      // 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] : '--'
-      //   })
-      // }
+      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.factory = this.currentMenu === '邯郸' ? 1 : 2
+      const res = await getComprehensiveDataPage(this.listQuery)
+      this.tableData = res.data.list
+      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
-      this.listQuery.orderStatus = val.orderStatus?.length > 0 ? val.orderStatus : undefined
-      this.listQuery.time = val.timeSlot?.length > 0 ? val.timeSlot : undefined
+      // this.listQuery.orderStatus = val.orderStatus?.length > 0 ? val.orderStatus : undefined
+      // this.listQuery.time = val.timeSlot?.length > 0 ? val.timeSlot : undefined
       switch (val.btnName) {
         case 'search':
-          this.listQuery.pageNo = 1;
-          this.listQuery.pageSize = 20;
+          // this.listQuery.pageNo = 1;
+          // this.listQuery.pageSize = 20;
           if (this.listQuery.time) {
-            this.getDataList();
+            // this.getDataList();
           } else {
             this.$message.warning('请选择时间范围！')
           }
diff --git a/src/views/report/produceConversion.vue b/src/views/report/produceConversion.vue
index 8fa9c14..3112330 100644
--- a/src/views/report/produceConversion.vue
+++ b/src/views/report/produceConversion.vue
@@ -1,36 +1,23 @@
-<!--
- * @Author: zhp
- * @Date: 2024-06-11 08:45:34
- * @LastEditTime: 2024-06-11 11:08:27
- * @LastEditors: zhp
- * @Description:
--->
 <template>
-  <div style="display: flex; flex-direction: column; min-height: calc(100vh - 96px - 35px)">
-    <!-- <div class="app-container"
-      style="margin-top: 8px; padding: 0 16px; height: auto; font-size: 20px; text-align: center;">
-      <p style="margin-bottom: 0">数据概览</p>
-      <div class="view">
-        <div v-for="(item, index) in data" :key="index">
-          <p style="color: rgb(194,128,255)">{{ item }}</p>
-          <p>{{ index }}</p>
-        </div>
-      </div>
-    </div> -->
-    <div class="app-container" style="flex: 1;min-height: 40vh;">
+  <div>
+    <!-- <div class="search"> -->
+      <ButtonNav style="padding: 0;" :menus="['邯郸', '瑞昌']" :button-mode="true" @change="currentMenu = $event">
+      </ButtonNav>
+    <!-- </div> -->
+    <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 === 1 || listQuery.date === ''" 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="yyyyMMdd" @change="changeDayTime" end-placeholder="结束日期">
+            start-placeholder="开始日期" value-format="yyyy-MM-dd HH:mm:ss" @change="changeDayTime" end-placeholder="结束日期">
           </el-date-picker>
         </el-form-item>
-        <el-form-item v-show="listQuery.date === 2" 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>
@@ -42,17 +29,19 @@
             {{ date1 }} 至 {{ date2 }}，共 {{ weekNum }} 周
           </span> -->
         </el-form-item>
-        <el-form-item v-show="listQuery.date === 3" label="时间值" prop="reportTime">
-          <el-date-picker size="small" v-model="listQuery.reportTime" type="monthrange" value-format="yyyyMM"
-            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 HH:mm:ss" range-separator="至" start-placeholder="开始月份" end-placeholder="结束月份"
+            @change="changeTime">
           </el-date-picker>
         </el-form-item>
-        <el-form-item v-show="listQuery.date === 4" label="时间值" prop="reportTime">
-          <el-date-picker size="small" clearable v-model="start" value-format="yyyy" type="year" placeholder="开始时间">
+        <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>
           ~
-          <el-date-picker size="small" clearable v-model="end" value-format="yyyy" type="year" placeholder="结束时间"
-            @change="getYear">
+          <el-date-picker size="small" clearable v-model="listQuery.reportTime[1]" value-format="yyyy" type="year"
+            placeholder="结束时间" @change="getYear">
           </el-date-picker>
         </el-form-item>
         <!-- <el-form-item label="玻璃类型" prop="type">
@@ -75,185 +64,241 @@
           <!-- <el-button type="success" size="small" plain @click="addFactory">新增</el-button> -->
         </el-form-item>
       </el-form>
-      <line-chart  ref="lineChart" style="height: 90%; width: 100%"></line-chart>
+      <!-- <div class="smallTitle">产量转化效率</div> -->
+
+      <!-- <bmSearchBar @getSearch="getSearch" @handleExport="handleExport" /> -->
+      <bm-line-bar :chartHeight="chartHeight" :legendList="legendList" :chartMsg="chartMsg" :chartId="chartId"
+        :chartNum="chartNum" />
+      <base-table :table-props="tableProps" :page="listQuery.current" :limit="listQuery.size" :table-data="tableData"
+        :max-height="tableH" />
     </div>
-    <div class="app-container" style="margin-top: 8px;flex: 1">
-      <base-table :table-props="tableProps" :page="listQuery.pageNo" :limit="listQuery.pageSize"
-        :table-data="tableData">
-        <method-btn v-if="tableBtn.length" slot="handleBtn" label="操作" :width="120" fixed="right"
-          :method-list="tableBtn" @clickBtn="handleClick" />
-      </base-table>
-      <pagination :limit.sync="listQuery.pageSize" :page.sync="listQuery.pageNo" :total="listQuery.total"
-        @pagination="getDataList" />
-    </div>
-    <!-- <add-or-update v-if="detailOrUpdateVisible" ref="detailOrUpdate" :date="listQuery.date"
-      @refreshDataList="successSubmit" @destroy="detailOrUpdateVisible = false" /> -->
+    <!-- <div class="containerBottom">
+
+    </div> -->
   </div>
 </template>
 
 <script>
-// import { parseTime } from '../../core/mixins/code-filter';
-// import { getWorkOrderPage, exportExcel, getOverView } from '@/api/produceData/order';
-// import { getWorkOrderPage, exportExcel, getOverView } from '@/components/buttonNav'
-// import inputTable from './inputTable.vue';
-// import lineChart from './lineChart';
-import moment from 'moment'
+import bmSearchBar from "./components/bmSearchBar.vue";
+import BmLineBar from "./components/bmLineBar.vue";
 import ButtonNav from '@/components/ButtonNav'
-import basicPage from '@/mixins/basic-page'
-// import AddOrUpdate from './add-or-updata';
-import { factoryList, factoryArray } from "@/utils/constants";
-import { publicFormatter } from "@/utils/dict";
-import lineChart from "./components/lineChart";
-
-// import FileSaver from 'file-saver'
-// import * as XLSX from 'xlsx'
+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 {
-  components: { ButtonNav, lineChart },
-  mixins: [basicPage],
+  name: "ChipYieldBM",
   data() {
     return {
-      factoryList,
-      factoryArray,
+      tableProps,
       start: undefined,
       end: undefined,
       listQuery: {
-        size: 10,
-        current: 1,
-        factorys: null,
-        total: 0,
-        date: 3,
-        beginTime: undefined,
-        endTime: undefined,
+        // size: 10,
+        // current: 1,
+        factory: null,
+        // total: 0,
+        type: 2,
+        startDate: undefined,
+        endDate: undefined,
         reportTime: []
       },
       timeList: [
         {
-          value: 1,
+          value: 0,
           label: '日'
         },
         {
-          value: 2,
+          value: 1,
           label: '周'
         },
         {
-          value: 3,
+          value: 2,
           label: '月'
         },
         {
-          value: 4,
+          value: 3,
           label: '年'
         }
       ],
-      detailOrUpdateVisible: false,
-      tableBtn: [
-        {
-          type: 'detail',
-          btnName: '详情',
-        },
-        // {
-        //     type: 'delete',
-        //     btnName: '删除',
-        //   },
-      ].filter((v) => v),
-      typeList: [
-        {
-          name: '芯片',
-          id: 0,
-        },
-        {
-          name: '标准组件',
-          id: 1,
-        },
-        {
-          name: 'BIPV产品',
-          id: 2,
-        },
+      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" },
       ],
-      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
-        }
+      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" },
       ],
-      tableData: [],
-      xAxis: [],
-      lineData: {},
-      data: {}
-      // proLineList: [],
-      // all: {}
+      chartMsg: {
+        color: ["#FFCE6A", "#8EF0AB", "#288AFF"],
+        xData: ["成都", "邯郸", "瑞昌"],
+        yName: "单位/%",
+        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月",
+            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",
+              formatter: function (params) {
+                return params.value.toFixed(2) + "%";
+              },
+            },
+          },
+          {
+            name: "2024年4月",
+            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.toFixed(2) + "%";
+              },
+            },
+          },
+        ],
+      },
+      chartId: "chipYieldBMChart",
+      chartNum: 1,
     };
   },
+  components: {
+    bmSearchBar,
+    BmLineBar,
+    ButtonNav
+  },
   computed: {
     weekNum() {
       return Math.round((this.end - this.start) / (24 * 60 * 60 * 1000 * 7)) + 1
     },
+    isOpen() {
+      return this.$store.getters.sidebar.opened;
+    },
+  },
+  watch: {
+    // 监听左侧菜单栏是否展开
+    isOpen(val) {
+      if (this.$route.name === "ChipYieldBM") {
+        this.chartNum++;
+      }
+    },
   },
   created() {
-    const currentMonth = new Date()
-    this.listQuery.reportTime = [moment(currentMonth).format('yyyyMM'), moment(currentMonth).format('yyyyMM')]
-    this.changeTime()
+    this.tableH = this.tableHeight(137) / 2 - 70;
+    this.chartHeight = this.tableHeight(137) / 2 - 111;
+    window.addEventListener("resize", this._setTableHeight);
+  },
+  destroyed() {
+    window.removeEventListener("resize", this._setTableHeight);
+  },
+  activated() {
+    // 图重新加载，为了防止窗口变化后尺寸图显示不佳，数据不更新
+    if (this.$route.name === "ChipYieldBM") {
+      this.chartNum++;
+    }
   },
   mounted() {
-    this.getOverView()
+    // this.getOverView()
     const currentMonth = new Date()
-    this.listQuery.reportTime = [moment(currentMonth).format('yyyyMM'), moment(currentMonth).format('yyyyMM')]
+    this.listQuery.reportTime = [moment(currentMonth).format('yyyy-MM-DD HH:mm:ss'), moment(currentMonth).format('yyyy-MM-DD HH:mm:ss')]
     this.changeTime()
+    this.getDataList()
   },
   methods: {
     getYear(e) {
@@ -274,33 +319,37 @@ 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);
     },
     changeTime() {
       if (this.listQuery.reportTime) {
-        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))
-        if (years * 12 + months > 24) {
+        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 = Number(this.listQuery.reportTime[0])
-          this.listQuery.endTime = Number(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周后触发的操作
@@ -315,13 +364,15 @@ export default {
             type: 'warning'
           });
         } else {
-          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() {
@@ -334,12 +385,12 @@ export default {
           });
           this.listQuery.reportTime = [];
         } else {
-          this.listQuery.beginTime = Number(this.listQuery.reportTime[0])
-          this.listQuery.endTime = Number(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() {
@@ -356,73 +407,53 @@ export default {
       });
     },
     async getDataList() {
-      // const res = await getWorkOrderPage(this.listQuery)
-      // this.tableData = res.data.list
-      // 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
-      this.listQuery.orderStatus = val.orderStatus?.length > 0 ? val.orderStatus : undefined
-      this.listQuery.time = val.timeSlot?.length > 0 ? val.timeSlot : undefined
-      switch (val.btnName) {
-        case 'search':
-          this.listQuery.pageNo = 1;
-          this.listQuery.pageSize = 20;
-          if (this.listQuery.time) {
-            this.getDataList();
-          } else {
-            this.$message.warning('请选择时间范围！')
-          }
-          break;
-        case 'export':
-          if (this.listQuery.time) {
-            this.handleExport();
-          } else {
-            this.$message.warning('请选择时间范围！')
-          }
-          break;
-        default:
-          console.log(val);
+      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.factory = this.currentMenu === '邯郸' ? 1 : 2
+      const res = await getComprehensiveDataPage(this.listQuery)
+      this.tableData = res.data.list
+      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") {
+        this.chartNum++;
+      }
+    },
+    getSearch(val) {
+      console.log(val);
+      console.log("=========================");
+    },
     handleExport() {
-      // this.$modal.confirm('是否确认导出工单数据?').then(() => {
-      //   // 处理查询参数
-      //   // let params = {...this.listQuery};
-      //   // params.current = 1;
-      //   // params.size = 999;
-      //   this.exportLoading = true;
-      //   return exportExcel({
-      //     factorys: this.listQuery.factorys,
-      //     orderStatus: this.listQuery.orderStatus,
-      //     time: this.listQuery.time
-      //   });
-      // }).then(response => {
-      //   this.$download.excel(response, '工单数据.xls');
-      //   this.exportLoading = false;
-      // }).catch(() => { })
+      console.log("导出");
     },
   },
 };
 </script>
 
-<style scoped>
-/* .blueTip { */
-/* padding-bottom: 10px; */
-/* } */
-/* .blueTi */
-.view {
-  display: flex;
-  justify-content: space-around;
-  align-items: center;
-  flex: 1;
+<style lang="scss" scoped>
+.search {
+  // height: calc((100px));
+  background-color: #fff;
+  border-radius: 8px;
+  padding: 16px 16px 0 16px;
+  margin-bottom: 8px;
+}
+.containerTop{
+  height: calc((100vh - 170px));
+  background-color: #fff;
+  border-radius: 8px;
+  padding: 16px;
 }
 
 .blueTip::before {
@@ -435,16 +466,23 @@ export default {
   margin-right: 8PX;
   margin-top: 8px;
 }
+.containerTop {
+  margin-top: 8px;
 
-.app-container {
-  margin: 0 0px 0;
-  background-color: #fff;
-  border-radius: 4px;
-  padding: 16px 16px 0;
-  height: calc(100vh - 134px);
-  overflow: auto;
-}
-.noBack{
-  background-color:black;
+  .smallTitle {
+    font-size: 16px;
+    color: #000;
+    margin-bottom: 15px;
+  }
+
+  .smallTitle::before {
+    display: inline-block;
+    width: 4px;
+    height: 16px;
+    background: #0b58ff;
+    content: "";
+    margin-right: 8px;
+    vertical-align: -3px;
+  }
 }
 </style>
diff --git a/src/views/report/productionSituationMW.vue b/src/views/report/productionSituationMW.vue
new file mode 100644
index 0000000..23906a7
--- /dev/null
+++ b/src/views/report/productionSituationMW.vue
@@ -0,0 +1,490 @@
+<template>
+  <div>
+    <!-- <div class="search"> -->
+    <ButtonNav style="padding: 0;" :menus="['邯郸', '瑞昌']" :button-mode="true" @change="currentMenu = $event">
+    </ButtonNav>
+    <!-- </div> -->
+    <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.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 HH:mm:ss" @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>
+          至
+          <el-date-picker size="small" clearable v-model="end" type="week" format="yyyy 第 WW 周" placeholder="选择周"
+            style="width: 180px" @change="onValueChange">
+          </el-date-picker>
+          <!-- <span v-if="start && 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 HH:mm:ss" 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"
+            placeholder="开始时间">
+          </el-date-picker>
+          ~
+          <el-date-picker size="small" clearable v-model="listQuery.reportTime[1]" value-format="yyyy" 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 class="smallTitle">产量转化效率</div> -->
+
+      <!-- <bmSearchBar @getSearch="getSearch" @handleExport="handleExport" /> -->
+      <bm-line-bar :chartHeight="chartHeight" :legendList="legendList" :chartMsg="chartMsg" :chartId="chartId"
+        :chartNum="chartNum" />
+      <base-table :table-props="tableProps" :page="listQuery.current" :limit="listQuery.size" :table-data="tableData"
+        :max-height="tableH" />
+    </div>
+    <!-- <div class="containerBottom">
+
+    </div> -->
+  </div>
+</template>
+
+<script>
+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,
+      start: undefined,
+      end: undefined,
+      listQuery: {
+        // size: 10,
+        // current: 1,
+        factory: null,
+        // total: 0,
+        type: 2,
+        startDate: undefined,
+        endDate: undefined,
+        reportTime: []
+      },
+      timeList: [
+        {
+          value: 0,
+          label: '日'
+        },
+        {
+          value: 1,
+          label: '周'
+        },
+        {
+          value: 2,
+          label: '月'
+        },
+        {
+          value: 3,
+          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" },
+      ],
+      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" },
+      ],
+      chartMsg: {
+        color: ["#FFCE6A", "#8EF0AB", "#288AFF"],
+        xData: ["成都", "邯郸", "瑞昌"],
+        yName: "单位/%",
+        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月",
+            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",
+              formatter: function (params) {
+                return params.value.toFixed(2) + "%";
+              },
+            },
+          },
+          {
+            name: "2024年4月",
+            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.toFixed(2) + "%";
+              },
+            },
+          },
+        ],
+      },
+      chartId: "chipYieldBMChart",
+      chartNum: 1,
+    };
+  },
+  components: {
+    bmSearchBar,
+    BmLineBar,
+    ButtonNav
+  },
+  computed: {
+    weekNum() {
+      return Math.round((this.end - this.start) / (24 * 60 * 60 * 1000 * 7)) + 1
+    },
+    isOpen() {
+      return this.$store.getters.sidebar.opened;
+    },
+  },
+  watch: {
+    // 监听左侧菜单栏是否展开
+    isOpen(val) {
+      if (this.$route.name === "ChipYieldBM") {
+        this.chartNum++;
+      }
+    },
+  },
+  created() {
+    this.tableH = this.tableHeight(137) / 2 - 70;
+    this.chartHeight = this.tableHeight(137) / 2 - 111;
+    window.addEventListener("resize", this._setTableHeight);
+  },
+  destroyed() {
+    window.removeEventListener("resize", this._setTableHeight);
+  },
+  activated() {
+    // 图重新加载，为了防止窗口变化后尺寸图显示不佳，数据不更新
+    if (this.$route.name === "ChipYieldBM") {
+      this.chartNum++;
+    }
+  },
+  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.changeTime()
+    this.getDataList()
+  },
+  methods: {
+    getYear(e) {
+      if (this.end && Number(this.end) - Number(this.start) > 10) {
+        this.$message({
+          message: '年份起止时间不能超过十年',
+          type: 'warning'
+        });
+        this.start = undefined
+        this.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)
+        }
+      }
+      if (!this.start && !this.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 HH:mm:ss')
+        this.date2 = moment(this.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)
+          this.$message({
+            message: '周范围不能超过24周',
+            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'))
+        }
+      }
+      if (!this.start && !this.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])
+        if (numDays > 30) {
+          this.$message({
+            message: '时间范围不能超过30天',
+            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
+      }
+    },
+    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);
+      });
+    },
+    async getDataList() {
+      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.factory = this.currentMenu === '邯郸' ? 1 : 2
+      const res = await getComprehensiveDataPage(this.listQuery)
+      this.tableData = res.data.list
+      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") {
+        this.chartNum++;
+      }
+    },
+    getSearch(val) {
+      console.log(val);
+      console.log("=========================");
+    },
+    handleExport() {
+      console.log("导出");
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.search {
+  // height: calc((100px));
+  background-color: #fff;
+  border-radius: 8px;
+  padding: 16px 16px 0 16px;
+  margin-bottom: 8px;
+}
+
+.containerTop {
+  height: calc((100vh - 170px));
+  background-color: #fff;
+  border-radius: 8px;
+  padding: 16px;
+}
+
+.blueTip::before {
+  display: inline-block;
+  content: '';
+  width: 4px;
+  height: 18px;
+  background: #0B58FF;
+  border-radius: 1px;
+  margin-right: 8PX;
+  margin-top: 8px;
+}
+
+.containerTop {
+  margin-top: 8px;
+
+  .smallTitle {
+    font-size: 16px;
+    color: #000;
+    margin-bottom: 15px;
+  }
+
+  .smallTitle::before {
+    display: inline-block;
+    width: 4px;
+    height: 16px;
+    background: #0b58ff;
+    content: "";
+    margin-right: 8px;
+    vertical-align: -3px;
+  }
+}
+</style>
diff --git a/src/views/report/productionSituationTablets.vue b/src/views/report/productionSituationTablets.vue
new file mode 100644
index 0000000..23906a7
--- /dev/null
+++ b/src/views/report/productionSituationTablets.vue
@@ -0,0 +1,490 @@
+<template>
+  <div>
+    <!-- <div class="search"> -->
+    <ButtonNav style="padding: 0;" :menus="['邯郸', '瑞昌']" :button-mode="true" @change="currentMenu = $event">
+    </ButtonNav>
+    <!-- </div> -->
+    <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.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 HH:mm:ss" @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>
+          至
+          <el-date-picker size="small" clearable v-model="end" type="week" format="yyyy 第 WW 周" placeholder="选择周"
+            style="width: 180px" @change="onValueChange">
+          </el-date-picker>
+          <!-- <span v-if="start && 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 HH:mm:ss" 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"
+            placeholder="开始时间">
+          </el-date-picker>
+          ~
+          <el-date-picker size="small" clearable v-model="listQuery.reportTime[1]" value-format="yyyy" 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 class="smallTitle">产量转化效率</div> -->
+
+      <!-- <bmSearchBar @getSearch="getSearch" @handleExport="handleExport" /> -->
+      <bm-line-bar :chartHeight="chartHeight" :legendList="legendList" :chartMsg="chartMsg" :chartId="chartId"
+        :chartNum="chartNum" />
+      <base-table :table-props="tableProps" :page="listQuery.current" :limit="listQuery.size" :table-data="tableData"
+        :max-height="tableH" />
+    </div>
+    <!-- <div class="containerBottom">
+
+    </div> -->
+  </div>
+</template>
+
+<script>
+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,
+      start: undefined,
+      end: undefined,
+      listQuery: {
+        // size: 10,
+        // current: 1,
+        factory: null,
+        // total: 0,
+        type: 2,
+        startDate: undefined,
+        endDate: undefined,
+        reportTime: []
+      },
+      timeList: [
+        {
+          value: 0,
+          label: '日'
+        },
+        {
+          value: 1,
+          label: '周'
+        },
+        {
+          value: 2,
+          label: '月'
+        },
+        {
+          value: 3,
+          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" },
+      ],
+      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" },
+      ],
+      chartMsg: {
+        color: ["#FFCE6A", "#8EF0AB", "#288AFF"],
+        xData: ["成都", "邯郸", "瑞昌"],
+        yName: "单位/%",
+        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月",
+            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",
+              formatter: function (params) {
+                return params.value.toFixed(2) + "%";
+              },
+            },
+          },
+          {
+            name: "2024年4月",
+            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.toFixed(2) + "%";
+              },
+            },
+          },
+        ],
+      },
+      chartId: "chipYieldBMChart",
+      chartNum: 1,
+    };
+  },
+  components: {
+    bmSearchBar,
+    BmLineBar,
+    ButtonNav
+  },
+  computed: {
+    weekNum() {
+      return Math.round((this.end - this.start) / (24 * 60 * 60 * 1000 * 7)) + 1
+    },
+    isOpen() {
+      return this.$store.getters.sidebar.opened;
+    },
+  },
+  watch: {
+    // 监听左侧菜单栏是否展开
+    isOpen(val) {
+      if (this.$route.name === "ChipYieldBM") {
+        this.chartNum++;
+      }
+    },
+  },
+  created() {
+    this.tableH = this.tableHeight(137) / 2 - 70;
+    this.chartHeight = this.tableHeight(137) / 2 - 111;
+    window.addEventListener("resize", this._setTableHeight);
+  },
+  destroyed() {
+    window.removeEventListener("resize", this._setTableHeight);
+  },
+  activated() {
+    // 图重新加载，为了防止窗口变化后尺寸图显示不佳，数据不更新
+    if (this.$route.name === "ChipYieldBM") {
+      this.chartNum++;
+    }
+  },
+  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.changeTime()
+    this.getDataList()
+  },
+  methods: {
+    getYear(e) {
+      if (this.end && Number(this.end) - Number(this.start) > 10) {
+        this.$message({
+          message: '年份起止时间不能超过十年',
+          type: 'warning'
+        });
+        this.start = undefined
+        this.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)
+        }
+      }
+      if (!this.start && !this.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 HH:mm:ss')
+        this.date2 = moment(this.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)
+          this.$message({
+            message: '周范围不能超过24周',
+            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'))
+        }
+      }
+      if (!this.start && !this.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])
+        if (numDays > 30) {
+          this.$message({
+            message: '时间范围不能超过30天',
+            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
+      }
+    },
+    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);
+      });
+    },
+    async getDataList() {
+      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.factory = this.currentMenu === '邯郸' ? 1 : 2
+      const res = await getComprehensiveDataPage(this.listQuery)
+      this.tableData = res.data.list
+      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") {
+        this.chartNum++;
+      }
+    },
+    getSearch(val) {
+      console.log(val);
+      console.log("=========================");
+    },
+    handleExport() {
+      console.log("导出");
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.search {
+  // height: calc((100px));
+  background-color: #fff;
+  border-radius: 8px;
+  padding: 16px 16px 0 16px;
+  margin-bottom: 8px;
+}
+
+.containerTop {
+  height: calc((100vh - 170px));
+  background-color: #fff;
+  border-radius: 8px;
+  padding: 16px;
+}
+
+.blueTip::before {
+  display: inline-block;
+  content: '';
+  width: 4px;
+  height: 18px;
+  background: #0B58FF;
+  border-radius: 1px;
+  margin-right: 8PX;
+  margin-top: 8px;
+}
+
+.containerTop {
+  margin-top: 8px;
+
+  .smallTitle {
+    font-size: 16px;
+    color: #000;
+    margin-bottom: 15px;
+  }
+
+  .smallTitle::before {
+    display: inline-block;
+    width: 4px;
+    height: 16px;
+    background: #0b58ff;
+    content: "";
+    margin-right: 8px;
+    vertical-align: -3px;
+  }
+}
+</style>
diff --git a/src/views/report/productionYield.vue b/src/views/report/productionYield.vue
new file mode 100644
index 0000000..23906a7
--- /dev/null
+++ b/src/views/report/productionYield.vue
@@ -0,0 +1,490 @@
+<template>
+  <div>
+    <!-- <div class="search"> -->
+    <ButtonNav style="padding: 0;" :menus="['邯郸', '瑞昌']" :button-mode="true" @change="currentMenu = $event">
+    </ButtonNav>
+    <!-- </div> -->
+    <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.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 HH:mm:ss" @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>
+          至
+          <el-date-picker size="small" clearable v-model="end" type="week" format="yyyy 第 WW 周" placeholder="选择周"
+            style="width: 180px" @change="onValueChange">
+          </el-date-picker>
+          <!-- <span v-if="start && 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 HH:mm:ss" 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"
+            placeholder="开始时间">
+          </el-date-picker>
+          ~
+          <el-date-picker size="small" clearable v-model="listQuery.reportTime[1]" value-format="yyyy" 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 class="smallTitle">产量转化效率</div> -->
+
+      <!-- <bmSearchBar @getSearch="getSearch" @handleExport="handleExport" /> -->
+      <bm-line-bar :chartHeight="chartHeight" :legendList="legendList" :chartMsg="chartMsg" :chartId="chartId"
+        :chartNum="chartNum" />
+      <base-table :table-props="tableProps" :page="listQuery.current" :limit="listQuery.size" :table-data="tableData"
+        :max-height="tableH" />
+    </div>
+    <!-- <div class="containerBottom">
+
+    </div> -->
+  </div>
+</template>
+
+<script>
+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,
+      start: undefined,
+      end: undefined,
+      listQuery: {
+        // size: 10,
+        // current: 1,
+        factory: null,
+        // total: 0,
+        type: 2,
+        startDate: undefined,
+        endDate: undefined,
+        reportTime: []
+      },
+      timeList: [
+        {
+          value: 0,
+          label: '日'
+        },
+        {
+          value: 1,
+          label: '周'
+        },
+        {
+          value: 2,
+          label: '月'
+        },
+        {
+          value: 3,
+          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" },
+      ],
+      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" },
+      ],
+      chartMsg: {
+        color: ["#FFCE6A", "#8EF0AB", "#288AFF"],
+        xData: ["成都", "邯郸", "瑞昌"],
+        yName: "单位/%",
+        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月",
+            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",
+              formatter: function (params) {
+                return params.value.toFixed(2) + "%";
+              },
+            },
+          },
+          {
+            name: "2024年4月",
+            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.toFixed(2) + "%";
+              },
+            },
+          },
+        ],
+      },
+      chartId: "chipYieldBMChart",
+      chartNum: 1,
+    };
+  },
+  components: {
+    bmSearchBar,
+    BmLineBar,
+    ButtonNav
+  },
+  computed: {
+    weekNum() {
+      return Math.round((this.end - this.start) / (24 * 60 * 60 * 1000 * 7)) + 1
+    },
+    isOpen() {
+      return this.$store.getters.sidebar.opened;
+    },
+  },
+  watch: {
+    // 监听左侧菜单栏是否展开
+    isOpen(val) {
+      if (this.$route.name === "ChipYieldBM") {
+        this.chartNum++;
+      }
+    },
+  },
+  created() {
+    this.tableH = this.tableHeight(137) / 2 - 70;
+    this.chartHeight = this.tableHeight(137) / 2 - 111;
+    window.addEventListener("resize", this._setTableHeight);
+  },
+  destroyed() {
+    window.removeEventListener("resize", this._setTableHeight);
+  },
+  activated() {
+    // 图重新加载，为了防止窗口变化后尺寸图显示不佳，数据不更新
+    if (this.$route.name === "ChipYieldBM") {
+      this.chartNum++;
+    }
+  },
+  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.changeTime()
+    this.getDataList()
+  },
+  methods: {
+    getYear(e) {
+      if (this.end && Number(this.end) - Number(this.start) > 10) {
+        this.$message({
+          message: '年份起止时间不能超过十年',
+          type: 'warning'
+        });
+        this.start = undefined
+        this.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)
+        }
+      }
+      if (!this.start && !this.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 HH:mm:ss')
+        this.date2 = moment(this.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)
+          this.$message({
+            message: '周范围不能超过24周',
+            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'))
+        }
+      }
+      if (!this.start && !this.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])
+        if (numDays > 30) {
+          this.$message({
+            message: '时间范围不能超过30天',
+            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
+      }
+    },
+    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);
+      });
+    },
+    async getDataList() {
+      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.factory = this.currentMenu === '邯郸' ? 1 : 2
+      const res = await getComprehensiveDataPage(this.listQuery)
+      this.tableData = res.data.list
+      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") {
+        this.chartNum++;
+      }
+    },
+    getSearch(val) {
+      console.log(val);
+      console.log("=========================");
+    },
+    handleExport() {
+      console.log("导出");
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.search {
+  // height: calc((100px));
+  background-color: #fff;
+  border-radius: 8px;
+  padding: 16px 16px 0 16px;
+  margin-bottom: 8px;
+}
+
+.containerTop {
+  height: calc((100vh - 170px));
+  background-color: #fff;
+  border-radius: 8px;
+  padding: 16px;
+}
+
+.blueTip::before {
+  display: inline-block;
+  content: '';
+  width: 4px;
+  height: 18px;
+  background: #0B58FF;
+  border-radius: 1px;
+  margin-right: 8PX;
+  margin-top: 8px;
+}
+
+.containerTop {
+  margin-top: 8px;
+
+  .smallTitle {
+    font-size: 16px;
+    color: #000;
+    margin-bottom: 15px;
+  }
+
+  .smallTitle::before {
+    display: inline-block;
+    width: 4px;
+    height: 16px;
+    background: #0b58ff;
+    content: "";
+    margin-right: 8px;
+    vertical-align: -3px;
+  }
+}
+</style>