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

---
 .../processEquValueBom/add-or-updata.vue      |  4 +-
 .../quality/base/qualityScrapLog/index.vue    | 20 ++++-----
 src/views/report/glass/day.vue                | 35 +++++++++-------
 src/views/report/glass/inputTable.vue         |  4 +-
 src/views/report/glass/month.vue              | 41 +++++++++++++++----
 src/views/report/glass/weekly.vue             | 39 ++++++++++++++----
 src/views/report/glass/year.vue               | 39 ++++++++++++++----
 .../report/productionDayReport/index.vue      | 38 ++++++++---------
 .../report/productionMonthReport/index.vue    | 12 +++---
 .../report/productionWeekReport/index.vue     | 10 ++---
 .../report/productionYearReport/index.vue     | 10 ++---
 11 files changed, 163 insertions(+), 89 deletions(-)

diff --git a/src/views/extend/processEquValueBom/add-or-updata.vue b/src/views/extend/processEquValueBom/add-or-updata.vue
index 1e608953..c857d400 100644
--- a/src/views/extend/processEquValueBom/add-or-updata.vue
+++ b/src/views/extend/processEquValueBom/add-or-updata.vue
@@ -2,11 +2,11 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: zhp
- * @LastEditTime: 2024-03-20 09:17:11
+ * @LastEditTime: 2024-03-22 09:01:30
  * @Description:
 -->
 <template>
-  <el-drawer :visible.sync="visible" :show-close="false" :wrapper-closable="false" class="drawer" size="50%">
+  <el-drawer :visible.sync="visible" :show-close="false" :wrapper-closable="true" class="drawer" size="50%">
     <small-title slot="title" :no-padding="true">
       {{ isdetail ? '详情' : !dataForm.id ? '新增' : '编辑' }}
     </small-title>
diff --git a/src/views/quality/base/qualityScrapLog/index.vue b/src/views/quality/base/qualityScrapLog/index.vue
index d495246c..f6adf05e 100644
--- a/src/views/quality/base/qualityScrapLog/index.vue
+++ b/src/views/quality/base/qualityScrapLog/index.vue
@@ -109,15 +109,15 @@ export default {
           param: 'workOrderId',
           filterable: true
         },
-        {
-          type: 'select',
-          label: '班组',
-          selectOptions: [],
-          labelField: 'name',
-          valueField: 'id',
-          param: 'teamId',
-          filterable: true
-        },
+        // {
+        //   type: 'select',
+        //   label: '班组',
+        //   selectOptions: [],
+        //   labelField: 'name',
+        //   valueField: 'id',
+        //   param: 'teamId',
+        //   filterable: true
+        // },
 				{
 					type: 'button',
 					btnName: '查询',
@@ -216,7 +216,7 @@ export default {
 					this.listQuery.pageNo = 1;
 					this.listQuery.pageSize = 10;
           this.listQuery.workOrderId = val.workOrderId ? val.workOrderId : undefined;
-          this.listQuery.teamId = val.teamId ? val.teamId : undefined;
+          // this.listQuery.teamId = val.teamId ? val.teamId : undefined;
 					this.getDataList();
 					break;
 				case 'reset':
diff --git a/src/views/report/glass/day.vue b/src/views/report/glass/day.vue
index 208e0370..e2d53d27 100644
--- a/src/views/report/glass/day.vue
+++ b/src/views/report/glass/day.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-01-24 15:15:24
- * @LastEditTime: 2024-03-18 16:00:41
+ * @LastEditTime: 2024-03-22 10:14:23
  * @LastEditors: zhp
  * @Description:
 -->
@@ -82,8 +82,9 @@ export default {
 		},
     // 获取数据列表
     multipliedByHundred(str) {
+      console.log(str);
       // console.log(str)
-      if (str != 0) {
+      if ( str != 0) {
         let floatVal = parseFloat(str);
         if (isNaN(floatVal)) {
           return 0;
@@ -116,10 +117,10 @@ export default {
           if (ele.det === false) {
             res.data[index].lineName = '合计'
             this.remark = res.data[index].remark
-            res.data[index].dailyOutputTrend = res.data[index].dailyOutputTrend != 0 ? this.multipliedByHundred(res.data[index].dailyOutputTrend) + '%' : res.data[index].dailyOutputTrend == 0 ? 0 : undefined
-            res.data[index].originalGlassStatisticsTrend = res.data[index].originalGlassStatisticsTrend != 0 ? this.multipliedByHundred(res.data[index].originalGlassStatisticsTrend) + '%' : res.data[index].originalGlassStatisticsTrend == 0 ? 0 : undefined
-            res.data[index].actualProductTrend = res.data[index].actualProductTrend != 0 ? this.multipliedByHundred(res.data[index].actualProductTrend) + '%' : res.data[index].actualProductTrend == 0 ? 0 : undefined
-            res.data[index].originalGlassPassTrend = res.data[index].originalGlassPassTrend != 0 ? this.multipliedByHundred(res.data[index].originalGlassPassTrend) + '%' : res.data[index].originalGlassPassTrend == 0 ? 0 : undefined
+            res.data[index].dailyOutputTrend = res.data[index].dailyOutputTrend && res.data[index].dailyOutputTrend != 0 ? this.multipliedByHundred(res.data[index].dailyOutputTrend) + '%' : res.data[index].dailyOutputTrend == 0 ? 0 : null
+            res.data[index].originalGlassStatisticsTrend = res.data[index].dailyOutputTrend && res.data[index].originalGlassStatisticsTrend != 0 ? this.multipliedByHundred(res.data[index].originalGlassStatisticsTrend) + '%' : res.data[index].originalGlassStatisticsTrend == 0 ? 0 : null
+            res.data[index].actualProductTrend = res.data[index].dailyOutputTrend && res.data[index].actualProductTrend != 0 ? this.multipliedByHundred(res.data[index].actualProductTrend) + '%' : res.data[index].actualProductTrend == 0 ? 0 : null
+            res.data[index].originalGlassPassTrend = res.data[index].dailyOutputTrend && res.data[index].originalGlassPassTrend != 0 ? this.multipliedByHundred(res.data[index].originalGlassPassTrend) + '%' : res.data[index].originalGlassPassTrend == 0 ? 0 : null
           }
         })
         res.data.forEach(item => {
@@ -127,10 +128,16 @@ export default {
             if (item.lineId === it.id) {
               console.log(item)
               item.lineName = it.name
-              item.dailyOutputTrend = item.dailyOutputTrend != 0 ? this.multipliedByHundred(item.dailyOutputTrend) + '%' : item.dailyOutputTrend == 0 ? 0 : undefined
-              item.originalGlassStatisticsTrend = item.originalGlassStatisticsTrend != 0 ? this.multipliedByHundred(item.originalGlassStatisticsTrend) + '%' : item.originalGlassStatisticsTrend == 0 ? 0 : undefined
-              item.actualProductTrend = item.actualProductTrend != 0 ? this.multipliedByHundred(item.actualProductTrend) + '%' : item.actualProductTrend == 0 ? 0 : undefined
-              item.originalGlassPassTrend = item.originalGlassPassTrend != 0 ? this.multipliedByHundred(item.originalGlassPassTrend) + '%' : item.originalGlassPassTrend == 0 ? 0 : undefined
+              console.log(item.originalGlassStatisticsTrend);
+              // if (!item.dailyOutputTrend) {
+              //   item.dailyOutputTrend = this.multipliedByHundred(item.dailyOutputTrend) + '%'
+              // } else {
+              //   item.dailyOutputTrend = null
+              // }
+              item.dailyOutputTrend = item.dailyOutputTrend && item.dailyOutputTrend != 0 ? this.multipliedByHundred(item.dailyOutputTrend) + '%' : item.dailyOutputTrend == 0 ? 0 : null
+              item.originalGlassStatisticsTrend = item.dailyOutputTrend && item.originalGlassStatisticsTrend != 0 ? this.multipliedByHundred(item.originalGlassStatisticsTrend) + '%' : item.originalGlassStatisticsTrend == 0 ? 0 : null
+              item.actualProductTrend = item.dailyOutputTrend &&  item.actualProductTrend != 0 ? this.multipliedByHundred(item.actualProductTrend) + '%' : item.actualProductTrend == 0 ? 0 : null
+              item.originalGlassPassTrend = item.dailyOutputTrend && item.originalGlassPassTrend != 0 ? this.multipliedByHundred(item.originalGlassPassTrend) + '%' : item.originalGlassPassTrend == 0 ? 0 : null
             }
           })
         })
@@ -175,11 +182,11 @@ export default {
         // console.log(val.setHours(7, 0, 0))
         // console.log(val.setHours(7, 0, 0) + 24 * 60 * 60 * 1000)
         // let time = this.format(val.setHours(7, 0, 0))
-        this.startTimeStamp = this.format(val.setHours(7, 0, 1)) //+ ' 00:00:00' //new Date(this.startTimeStamp + ' 00:00:00').getTime() / 1000
-        this.endTimeStamp = this.format(val.setHours(7, 0, 0) + 24 * 60 * 60 * 1000) //+ ' 23:59:59' //new Date(this.endTimeStamp + ' 23:59:59').getTime() / 1000
+        this.endTimeStamp = this.format(val.setHours(7, 0, 0)) //+ ' 00:00:00' //new Date(this.startTimeStamp + ' 00:00:00').getTime() / 1000
+        this.startTimeStamp  = this.format(val.setHours(7, 0, 1) - 24 * 60 * 60 * 1000) //+ ' 23:59:59' //new Date(this.endTimeStamp + ' 23:59:59').getTime() / 1000
         // console.log(this.listQuery.reportTime);
-        this.listQuery.reportTime[0] = this.format(val.setHours(7, 0, 1)) //+ ' 00:00:00' //new Date(this.startTimeStamp + ' 00:00:00').getTime() / 1000
-        this.listQuery.reportTime[1] = this.format(val.setHours(7, 0, 0) + 24 * 60 * 60 * 1000) //+ ' 23:59:59' //new Date(this.endTimeStamp + ' 23:59:59').getTime() / 1000
+        this.listQuery.reportTime[1] = this.format(val.setHours(7, 0, 1)) //+ ' 00:00:00' //new Date(this.startTimeStamp + ' 00:00:00').getTime() / 1000
+        this.listQuery.reportTime[0] = this.format(val.setHours(7, 0, 0) + 24 * 60 * 60 * 1000) //+ ' 23:59:59' //new Date(this.endTimeStamp + ' 23:59:59').getTime() / 1000
         console.log(this.listQuery.reportTime);
 			} else {
 					this.listQuery.reportTime = []
diff --git a/src/views/report/glass/inputTable.vue b/src/views/report/glass/inputTable.vue
index 6a68c98e..e112eb3f 100644
--- a/src/views/report/glass/inputTable.vue
+++ b/src/views/report/glass/inputTable.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: Do not edit
  * @Date: 2023-12-13 14:10:04
- * @LastEditTime: 2024-03-18 09:57:30
+ * @LastEditTime: 2024-03-22 09:45:23
  * @LastEditors: zhp
  * @Description:
 -->
@@ -198,6 +198,8 @@ const cols = [
           this.cols[0].children[2].children[1].label = text2
           this.cols[0].children[3].children[0].label = text1
           this.cols[0].children[3].children[1].label = text2
+          this.cols[0].children[4].children[0].label = text1
+          this.cols[0].children[4].children[1].label = text2
           this.cols[0].children[2].label = text3
         }
       }
diff --git a/src/views/report/glass/month.vue b/src/views/report/glass/month.vue
index 9b099a73..087e0796 100644
--- a/src/views/report/glass/month.vue
+++ b/src/views/report/glass/month.vue
@@ -91,6 +91,8 @@ export default {
           strVal += '0';
         }
         return parseFloat(strVal);
+      } else {
+        return null
       }
 
     },
@@ -109,10 +111,10 @@ export default {
           if (ele.det === false) {
             res.data[index].lineName = '合计'
             this.remark = res.data[index].remark
-            res.data[index].dailyOutputTrend = res.data[index].dailyOutputTrend != 0 ? this.multipliedByHundred(res.data[index].dailyOutputTrend) + '%' : res.data[index].dailyOutputTrend == 0 ? 0 : undefined
-            res.data[index].originalGlassStatisticsTrend = res.data[index].originalGlassStatisticsTrend != 0 ? this.multipliedByHundred(res.data[index].originalGlassStatisticsTrend) + '%' : res.data[index].originalGlassStatisticsTrend == 0 ? 0 : undefined
-            res.data[index].actualProductTrend = res.data[index].actualProductTrend != 0 ? this.multipliedByHundred(res.data[index].actualProductTrend) + '%' : res.data[index].actualProductTrend == 0 ? 0 : undefined
-            res.data[index].originalGlassPassTrend = res.data[index].originalGlassPassTrend != 0 ? this.multipliedByHundred(res.data[index].originalGlassPassTrend) + '%' : res.data[index].originalGlassPassTrend == 0 ? 0 : undefined
+            res.data[index].dailyOutputTrend = res.data[index].dailyOutputTrend && res.data[index].dailyOutputTrend != 0 ? this.multipliedByHundred(res.data[index].dailyOutputTrend) + '%' : res.data[index].dailyOutputTrend == 0 ? 0 : null
+            res.data[index].originalGlassStatisticsTrend = res.data[index].dailyOutputTrend && res.data[index].originalGlassStatisticsTrend != 0 ? this.multipliedByHundred(res.data[index].originalGlassStatisticsTrend) + '%' : res.data[index].originalGlassStatisticsTrend == 0 ? 0 : null
+            res.data[index].actualProductTrend = res.data[index].dailyOutputTrend && res.data[index].actualProductTrend != 0 ? this.multipliedByHundred(res.data[index].actualProductTrend) + '%' : res.data[index].actualProductTrend == 0 ? 0 : null
+            res.data[index].originalGlassPassTrend = res.data[index].dailyOutputTrend && res.data[index].originalGlassPassTrend != 0 ? this.multipliedByHundred(res.data[index].originalGlassPassTrend) + '%' : res.data[index].originalGlassPassTrend == 0 ? 0 : null
           }
         })
         res.data.forEach(item => {
@@ -120,15 +122,36 @@ export default {
             if (item.lineId === it.id) {
               console.log(item)
               item.lineName = it.name
-              item.dailyOutputTrend = item.dailyOutputTrend != 0 ? this.multipliedByHundred(item.dailyOutputTrend) + '%' : item.dailyOutputTrend == 0 ? 0 : undefined
-              item.originalGlassStatisticsTrend = item.originalGlassStatisticsTrend != 0 ? this.multipliedByHundred(item.originalGlassStatisticsTrend) + '%' : item.originalGlassStatisticsTrend == 0 ? 0 : undefined
-              item.actualProductTrend = item.actualProductTrend != 0 ? this.multipliedByHundred(item.actualProductTrend) + '%' : item.actualProductTrend == 0 ? 0 : undefined
-              item.originalGlassPassTrend = item.originalGlassPassTrend != 0 ? this.multipliedByHundred(item.originalGlassPassTrend) + '%' : item.originalGlassPassTrend == 0 ? 0 : undefined
+              console.log(item.originalGlassStatisticsTrend);
+              // if (!item.dailyOutputTrend) {
+              //   item.dailyOutputTrend = this.multipliedByHundred(item.dailyOutputTrend) + '%'
+              // } else {
+              //   item.dailyOutputTrend = null
+              // }
+              item.dailyOutputTrend = item.dailyOutputTrend && item.dailyOutputTrend != 0 ? this.multipliedByHundred(item.dailyOutputTrend) + '%' : item.dailyOutputTrend == 0 ? 0 : null
+              item.originalGlassStatisticsTrend = item.dailyOutputTrend && item.originalGlassStatisticsTrend != 0 ? this.multipliedByHundred(item.originalGlassStatisticsTrend) + '%' : item.originalGlassStatisticsTrend == 0 ? 0 : null
+              item.actualProductTrend = item.dailyOutputTrend && item.actualProductTrend != 0 ? this.multipliedByHundred(item.actualProductTrend) + '%' : item.actualProductTrend == 0 ? 0 : null
+              item.originalGlassPassTrend = item.dailyOutputTrend && item.originalGlassPassTrend != 0 ? this.multipliedByHundred(item.originalGlassPassTrend) + '%' : item.originalGlassPassTrend == 0 ? 0 : null
             }
           })
         })
         this.tableData = res.data
-        this.listQuery.total = response.data.length;
+        // this.tableData = response.data.filter(item => {
+        // 	this.proLineList.forEach(it => {
+        //     if (item.lineId === it.id) {
+        //       item.lineName = it.name
+
+        // 		}
+        // 	})
+        // if (item.det === false) {
+        // 	this.all = {
+        // 		id: item.id,
+        // 		remark: item.remark
+        // 	}
+        // }
+        // return item.det === true
+        // });
+        this.listQuery.total = res.data.length;
         this.dataListLoading = false;
       });
     },
diff --git a/src/views/report/glass/weekly.vue b/src/views/report/glass/weekly.vue
index 7df919b7..1f5316de 100644
--- a/src/views/report/glass/weekly.vue
+++ b/src/views/report/glass/weekly.vue
@@ -200,10 +200,10 @@ export default {
           if (ele.det === false) {
             res.data[index].lineName = '合计'
             this.remark = res.data[index].remark
-            res.data[index].dailyOutputTrend = res.data[index].dailyOutputTrend != 0 ? this.multipliedByHundred(res.data[index].dailyOutputTrend) + '%' : res.data[index].dailyOutputTrend == 0 ? 0 : undefined
-            res.data[index].originalGlassStatisticsTrend = res.data[index].originalGlassStatisticsTrend != 0 ? this.multipliedByHundred(res.data[index].originalGlassStatisticsTrend) + '%' : res.data[index].originalGlassStatisticsTrend == 0 ? 0 : undefined
-            res.data[index].actualProductTrend = res.data[index].actualProductTrend != 0 ? this.multipliedByHundred(res.data[index].actualProductTrend) + '%' : res.data[index].actualProductTrend == 0 ? 0 : undefined
-            res.data[index].originalGlassPassTrend = res.data[index].originalGlassPassTrend != 0 ? this.multipliedByHundred(res.data[index].originalGlassPassTrend) + '%' : res.data[index].originalGlassPassTrend == 0 ? 0 : undefined
+            res.data[index].dailyOutputTrend = res.data[index].dailyOutputTrend && res.data[index].dailyOutputTrend != 0 ? this.multipliedByHundred(res.data[index].dailyOutputTrend) + '%' : res.data[index].dailyOutputTrend == 0 ? 0 : null
+            res.data[index].originalGlassStatisticsTrend = res.data[index].dailyOutputTrend && res.data[index].originalGlassStatisticsTrend != 0 ? this.multipliedByHundred(res.data[index].originalGlassStatisticsTrend) + '%' : res.data[index].originalGlassStatisticsTrend == 0 ? 0 : null
+            res.data[index].actualProductTrend = res.data[index].dailyOutputTrend && res.data[index].actualProductTrend != 0 ? this.multipliedByHundred(res.data[index].actualProductTrend) + '%' : res.data[index].actualProductTrend == 0 ? 0 : null
+            res.data[index].originalGlassPassTrend = res.data[index].dailyOutputTrend && res.data[index].originalGlassPassTrend != 0 ? this.multipliedByHundred(res.data[index].originalGlassPassTrend) + '%' : res.data[index].originalGlassPassTrend == 0 ? 0 : null
           }
         })
         res.data.forEach(item => {
@@ -211,15 +211,36 @@ export default {
             if (item.lineId === it.id) {
               console.log(item)
               item.lineName = it.name
-              item.dailyOutputTrend = item.dailyOutputTrend != 0 ? this.multipliedByHundred(item.dailyOutputTrend) + '%' : item.dailyOutputTrend == 0 ? 0 : undefined
-              item.originalGlassStatisticsTrend = item.originalGlassStatisticsTrend != 0 ? this.multipliedByHundred(item.originalGlassStatisticsTrend) + '%' : item.originalGlassStatisticsTrend == 0 ? 0 : undefined
-              item.actualProductTrend = item.actualProductTrend != 0 ? this.multipliedByHundred(item.actualProductTrend) + '%' : item.actualProductTrend == 0 ? 0 : undefined
-              item.originalGlassPassTrend = item.originalGlassPassTrend != 0 ? this.multipliedByHundred(item.originalGlassPassTrend) + '%' : item.originalGlassPassTrend == 0 ? 0 : undefined
+              console.log(item.originalGlassStatisticsTrend);
+              // if (!item.dailyOutputTrend) {
+              //   item.dailyOutputTrend = this.multipliedByHundred(item.dailyOutputTrend) + '%'
+              // } else {
+              //   item.dailyOutputTrend = null
+              // }
+              item.dailyOutputTrend = item.dailyOutputTrend && item.dailyOutputTrend != 0 ? this.multipliedByHundred(item.dailyOutputTrend) + '%' : item.dailyOutputTrend == 0 ? 0 : null
+              item.originalGlassStatisticsTrend = item.dailyOutputTrend && item.originalGlassStatisticsTrend != 0 ? this.multipliedByHundred(item.originalGlassStatisticsTrend) + '%' : item.originalGlassStatisticsTrend == 0 ? 0 : null
+              item.actualProductTrend = item.dailyOutputTrend && item.actualProductTrend != 0 ? this.multipliedByHundred(item.actualProductTrend) + '%' : item.actualProductTrend == 0 ? 0 : null
+              item.originalGlassPassTrend = item.dailyOutputTrend && item.originalGlassPassTrend != 0 ? this.multipliedByHundred(item.originalGlassPassTrend) + '%' : item.originalGlassPassTrend == 0 ? 0 : null
             }
           })
         })
         this.tableData = res.data
-        this.listQuery.total = response.data.length;
+        // this.tableData = response.data.filter(item => {
+        // 	this.proLineList.forEach(it => {
+        //     if (item.lineId === it.id) {
+        //       item.lineName = it.name
+
+        // 		}
+        // 	})
+        // if (item.det === false) {
+        // 	this.all = {
+        // 		id: item.id,
+        // 		remark: item.remark
+        // 	}
+        // }
+        // return item.det === true
+        // });
+        this.listQuery.total = res.data.length;
         this.dataListLoading = false;
       });
     },
diff --git a/src/views/report/glass/year.vue b/src/views/report/glass/year.vue
index 6bff74f9..63a5dc3a 100644
--- a/src/views/report/glass/year.vue
+++ b/src/views/report/glass/year.vue
@@ -111,10 +111,10 @@ export default {
           if (ele.det === false) {
             res.data[index].lineName = '合计'
             this.remark = res.data[index].remark
-            res.data[index].dailyOutputTrend = res.data[index].dailyOutputTrend != 0 ? this.multipliedByHundred(res.data[index].dailyOutputTrend) + '%' : res.data[index].dailyOutputTrend == 0 ? 0 : undefined
-            res.data[index].originalGlassStatisticsTrend = res.data[index].originalGlassStatisticsTrend != 0 ? this.multipliedByHundred(res.data[index].originalGlassStatisticsTrend) + '%' : res.data[index].originalGlassStatisticsTrend == 0 ? 0 : undefined
-            res.data[index].actualProductTrend = res.data[index].actualProductTrend != 0 ? this.multipliedByHundred(res.data[index].actualProductTrend) + '%' : res.data[index].actualProductTrend == 0 ? 0 : undefined
-            res.data[index].originalGlassPassTrend = res.data[index].originalGlassPassTrend != 0 ? this.multipliedByHundred(res.data[index].originalGlassPassTrend) + '%' : res.data[index].originalGlassPassTrend == 0 ? 0 : undefined
+            res.data[index].dailyOutputTrend = res.data[index].dailyOutputTrend && res.data[index].dailyOutputTrend != 0 ? this.multipliedByHundred(res.data[index].dailyOutputTrend) + '%' : res.data[index].dailyOutputTrend == 0 ? 0 : null
+            res.data[index].originalGlassStatisticsTrend = res.data[index].dailyOutputTrend && res.data[index].originalGlassStatisticsTrend != 0 ? this.multipliedByHundred(res.data[index].originalGlassStatisticsTrend) + '%' : res.data[index].originalGlassStatisticsTrend == 0 ? 0 : null
+            res.data[index].actualProductTrend = res.data[index].dailyOutputTrend && res.data[index].actualProductTrend != 0 ? this.multipliedByHundred(res.data[index].actualProductTrend) + '%' : res.data[index].actualProductTrend == 0 ? 0 : null
+            res.data[index].originalGlassPassTrend = res.data[index].dailyOutputTrend && res.data[index].originalGlassPassTrend != 0 ? this.multipliedByHundred(res.data[index].originalGlassPassTrend) + '%' : res.data[index].originalGlassPassTrend == 0 ? 0 : null
           }
         })
         res.data.forEach(item => {
@@ -122,15 +122,36 @@ export default {
             if (item.lineId === it.id) {
               console.log(item)
               item.lineName = it.name
-              item.dailyOutputTrend = item.dailyOutputTrend != 0 ? this.multipliedByHundred(item.dailyOutputTrend) + '%' : item.dailyOutputTrend == 0 ? 0 : undefined
-              item.originalGlassStatisticsTrend = item.originalGlassStatisticsTrend != 0 ? this.multipliedByHundred(item.originalGlassStatisticsTrend) + '%' : item.originalGlassStatisticsTrend == 0 ? 0 : undefined
-              item.actualProductTrend = item.actualProductTrend != 0 ? this.multipliedByHundred(item.actualProductTrend) + '%' : item.actualProductTrend == 0 ? 0 : undefined
-              item.originalGlassPassTrend = item.originalGlassPassTrend != 0 ? this.multipliedByHundred(item.originalGlassPassTrend) + '%' : item.originalGlassPassTrend == 0 ? 0 : undefined
+              console.log(item.originalGlassStatisticsTrend);
+              // if (!item.dailyOutputTrend) {
+              //   item.dailyOutputTrend = this.multipliedByHundred(item.dailyOutputTrend) + '%'
+              // } else {
+              //   item.dailyOutputTrend = null
+              // }
+              item.dailyOutputTrend = item.dailyOutputTrend && item.dailyOutputTrend != 0 ? this.multipliedByHundred(item.dailyOutputTrend) + '%' : item.dailyOutputTrend == 0 ? 0 : null
+              item.originalGlassStatisticsTrend = item.dailyOutputTrend && item.originalGlassStatisticsTrend != 0 ? this.multipliedByHundred(item.originalGlassStatisticsTrend) + '%' : item.originalGlassStatisticsTrend == 0 ? 0 : null
+              item.actualProductTrend = item.dailyOutputTrend && item.actualProductTrend != 0 ? this.multipliedByHundred(item.actualProductTrend) + '%' : item.actualProductTrend == 0 ? 0 : null
+              item.originalGlassPassTrend = item.dailyOutputTrend && item.originalGlassPassTrend != 0 ? this.multipliedByHundred(item.originalGlassPassTrend) + '%' : item.originalGlassPassTrend == 0 ? 0 : null
             }
           })
         })
         this.tableData = res.data
-        this.listQuery.total = response.data.length;
+        // this.tableData = response.data.filter(item => {
+        // 	this.proLineList.forEach(it => {
+        //     if (item.lineId === it.id) {
+        //       item.lineName = it.name
+
+        // 		}
+        // 	})
+        // if (item.det === false) {
+        // 	this.all = {
+        // 		id: item.id,
+        // 		remark: item.remark
+        // 	}
+        // }
+        // return item.det === true
+        // });
+        this.listQuery.total = res.data.length;
         this.dataListLoading = false;
       });
     },
diff --git a/src/views/report/productionDayReport/index.vue b/src/views/report/productionDayReport/index.vue
index 2dcd82e4..437cea52 100644
--- a/src/views/report/productionDayReport/index.vue
+++ b/src/views/report/productionDayReport/index.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-12-12 13:45:25
- * @LastEditTime: 2024-03-18 15:24:10
+ * @LastEditTime: 2024-03-22 09:36:12
  * @LastEditors: zhp
  * @Description:
 -->
@@ -49,7 +49,7 @@
             <template slot-scope="scope">
               <el-input v-if="!disabled" v-model="scope.row.inputTrend" :disabled="!disabled"></el-input>
               <span v-else>{{ scope.row.inputTrend ? parseFloat((scope.row.inputTrend * 100).toFixed(2)) + '%' :
-                undefined}} </span>
+              null}} </span>
             </template>
           </el-table-column>
         </el-table-column>
@@ -73,7 +73,7 @@
               <el-input v-if="!disabled" v-model="scope.row.goodProductTrend" :disabled="!disabled">
               </el-input>
               <span v-else>{{ scope.row.goodProductTrend ? parseFloat((scope.row.goodProductTrend * 100).toFixed(2)) +
-                '%' : undefined }} </span>
+              '%' : null }} </span>
             </template>
           </el-table-column>
         </el-table-column>
@@ -82,8 +82,8 @@
             <template slot-scope="scope">
               <el-input v-if="!disabled" v-model="scope.row.missCheckNow" :disabled="disabled"></el-input>
               <span v-else>{{ scope.row.missCheckNow ? parseFloat((scope.row.missCheckNow *
-                100).toFixed(2)) +
-                '%' : undefined }}
+              100).toFixed(2)) +
+              '%' : null }}
               </span>
             </template>
           </el-table-column>
@@ -91,8 +91,8 @@
             <template slot-scope="scope">
               <el-input v-if="!disabled" v-model="scope.row.missCheckHis" :disabled="disabled"></el-input>
               <span v-else>{{ scope.row.missCheckHis ? parseFloat((scope.row.missCheckHis *
-                100).toFixed(2)) +
-                '%' : undefined }}
+              100).toFixed(2)) +
+              '%' : null }}
               </span>
             </template>
           </el-table-column>
@@ -101,8 +101,8 @@
               <el-input v-if="!disabled" v-model="scope.row.missCheckTrend" :disabled="!disabled">
               </el-input>
               <span v-else>{{ scope.row.missCheckTrend ? parseFloat((scope.row.missCheckTrend *
-                100).toFixed(2)) +
-                '%' : undefined }}
+              100).toFixed(2)) +
+              '%' : null }}
               </span>
             </template>
           </el-table-column>
@@ -113,8 +113,8 @@
               <el-input v-if="!disabled" v-model="scope.row.goodProductPassNow" :disabled="!disabled">
               </el-input>
               <span v-else>{{ scope.row.goodProductPassNow ? parseFloat((scope.row.goodProductPassNow *
-                100).toFixed(2)) +
-                '%' : undefined }}
+              100).toFixed(2)) +
+              '%' : null }}
               </span>
             </template>
           </el-table-column>
@@ -123,8 +123,8 @@
               <el-input v-if="!disabled" v-model="scope.row.goodProductPassHis" :disabled="!disabled">
               </el-input>
               <span v-else>{{ scope.row.goodProductPassHis ? parseFloat((scope.row.goodProductPassHis *
-                100).toFixed(2)) +
-                '%' : undefined }}
+              100).toFixed(2)) +
+              '%' : null }}
               </span>
             </template>
           </el-table-column>
@@ -133,8 +133,8 @@
               <el-input v-if="!disabled" v-model="scope.row.goodProductPassTrend" :disabled="!disabled">
               </el-input>
               <span v-else>{{ scope.row.goodProductPassTrend ? parseFloat((scope.row.goodProductPassTrend *
-                100).toFixed(2)) +
-                '%' : undefined }}
+                            100).toFixed(2)) +
+              '%' : null }}
               </span>
             </template>
           </el-table-column>
@@ -146,7 +146,7 @@
         <span v-else>{{ remark ? remark : '请输入备注' }} </span>
       </div> -->
     </el-table>
-    <div style="height: 50px;" class="remark" >
+    <div style="height: 50px;" class="remark">
       <el-input placeholder="备注" v-model="remark" :disabled="disabled">
       </el-input>
     </div>
@@ -480,8 +480,8 @@ export default {
         // console.log(val.setHours(7, 0, 0))
         // console.log(val.setHours(7, 0, 0) + 24 * 60 * 60 * 1000)
         // let time = this.format(val.setHours(7, 0, 0))
-        this.listQuery.reportTime[0] = this.format(val.setHours(7, 0, 1)) //+ ' 00:00:00' //new Date(this.startTimeStamp + ' 00:00:00').getTime() / 1000
-        this.listQuery.reportTime[1] = this.format(val.setHours(7, 0, 0) + 24 * 60 * 60 * 1000) //+ ' 23:59:59' //new Date(this.endTimeStamp + ' 23:59:59').getTime() / 1000
+        this.listQuery.reportTime[1] = this.format(val.setHours(7, 0, 0)) //+ ' 00:00:00' //new Date(this.startTimeStamp + ' 00:00:00').getTime() / 1000
+        this.listQuery.reportTime[0] = this.format(val.setHours(7, 0, 1) - 24 * 60 * 60 * 1000) //+ ' 23:59:59' //new Date(this.endTimeStamp + ' 23:59:59').getTime() / 1000
         this.timeTips = this.listQuery.reportTime[0] + ' - ' + this.listQuery.reportTime[1]
         // console.log(this.listQuery.reportTime);
       } else {
@@ -510,7 +510,7 @@ export default {
           //返回一个新创建的 Blob 对象，其内容由参数中给定的数组串联组成。
           new Blob([wbout], { type: "application/octet-stream" }),
           //设置导出文件名称
-          "许昌安彩月成品生产汇总.xlsx"
+          "许昌安彩日成品生产汇总.xlsx"
         );
       } catch (e) {
         if (typeof console !== "undefined") console.log(e, wbout);
diff --git a/src/views/report/productionMonthReport/index.vue b/src/views/report/productionMonthReport/index.vue
index d0ef5154..2aeb6138 100644
--- a/src/views/report/productionMonthReport/index.vue
+++ b/src/views/report/productionMonthReport/index.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-12-12 13:45:25
- * @LastEditTime: 2024-03-18 15:27:53
+ * @LastEditTime: 2024-03-22 09:56:14
  * @LastEditors: zhp
  * @Description:
 -->
@@ -78,7 +78,7 @@
           </el-table-column>
         </el-table-column>
         <el-table-column label="原片漏检率" align="center">
-          <el-table-column prop="missCheckNow" label="今日" align="center">
+          <el-table-column prop="missCheckNow" label="本月" align="center">
             <template slot-scope="scope">
               <el-input v-if="!disabled" v-model="scope.row.missCheckNow" :disabled="disabled"></el-input>
               <span v-else>{{ scope.row.missCheckNow ? parseFloat((scope.row.missCheckNow *
@@ -87,7 +87,7 @@
               </span>
             </template>
           </el-table-column>
-          <el-table-column prop="missCheckHis" label="昨日" align="center">
+          <el-table-column prop="missCheckHis" label="上月" align="center">
             <template slot-scope="scope">
               <el-input v-if="!disabled" v-model="scope.row.missCheckHis" :disabled="disabled"></el-input>
               <span v-else>{{ scope.row.missCheckHis ? parseFloat((scope.row.missCheckHis *
@@ -108,7 +108,7 @@
           </el-table-column>
         </el-table-column>
         <el-table-column label="综合良品率" align="center">
-          <el-table-column prop="goodProductPassNow" label="今日" align="center">
+          <el-table-column prop="goodProductPassNow" label="本月" align="center">
             <template slot-scope="scope">
               <el-input v-if="!disabled" v-model="scope.row.goodProductPassNow" :disabled="!disabled">
               </el-input>
@@ -118,7 +118,7 @@
               </span>
             </template>
           </el-table-column>
-          <el-table-column prop="goodProductPassHis" label="昨日" align="center">
+          <el-table-column prop="goodProductPassHis" label="上月" align="center">
             <template slot-scope="scope">
               <el-input v-if="!disabled" v-model="scope.row.goodProductPassHis" :disabled="!disabled">
               </el-input>
@@ -128,7 +128,7 @@
               </span>
             </template>
           </el-table-column>
-          <el-table-column prop="goodProductPassTrend" label="增减" align="center">
+          <el-table-column prop="goodProductPassTrend" label="增减" align="center"> 
             <template slot-scope="scope">
               <el-input v-if="!disabled" v-model="scope.row.goodProductPassTrend" :disabled="!disabled">
               </el-input>
diff --git a/src/views/report/productionWeekReport/index.vue b/src/views/report/productionWeekReport/index.vue
index 84b7eb48..f907c3bf 100644
--- a/src/views/report/productionWeekReport/index.vue
+++ b/src/views/report/productionWeekReport/index.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-12-12 13:45:25
- * @LastEditTime: 2024-03-18 15:25:48
+ * @LastEditTime: 2024-03-22 09:47:20
  * @LastEditors: zhp
  * @Description:
 -->
@@ -81,7 +81,7 @@
           </el-table-column>
         </el-table-column>
         <el-table-column label="原片漏检率" align="center">
-          <el-table-column prop="missCheckNow" label="今日" align="center">
+          <el-table-column prop="missCheckNow" label="本周" align="center">
             <template slot-scope="scope">
               <el-input v-if="!disabled" v-model="scope.row.missCheckNow" :disabled="disabled"></el-input>
               <span v-else>{{ scope.row.missCheckNow ? parseFloat((scope.row.missCheckNow *
@@ -90,7 +90,7 @@
               </span>
             </template>
           </el-table-column>
-          <el-table-column prop="missCheckHis" label="昨日" align="center">
+          <el-table-column prop="missCheckHis" label="上周" align="center">
             <template slot-scope="scope">
               <el-input v-if="!disabled" v-model="scope.row.missCheckHis" :disabled="disabled"></el-input>
               <span v-else>{{ scope.row.missCheckHis ? parseFloat((scope.row.missCheckHis *
@@ -111,7 +111,7 @@
           </el-table-column>
         </el-table-column>
         <el-table-column label="综合良品率" align="center">
-          <el-table-column prop="goodProductPassNow" label="今日" align="center">
+          <el-table-column prop="goodProductPassNow" label="本周" align="center">
             <template slot-scope="scope">
               <el-input v-if="!disabled" v-model="scope.row.goodProductPassNow" :disabled="!disabled">
               </el-input>
@@ -121,7 +121,7 @@
               </span>
             </template>
           </el-table-column>
-          <el-table-column prop="goodProductPassHis" label="昨日" align="center">
+          <el-table-column prop="goodProductPassHis" label="上周" align="center">
             <template slot-scope="scope">
               <el-input v-if="!disabled" v-model="scope.row.goodProductPassHis" :disabled="!disabled">
               </el-input>
diff --git a/src/views/report/productionYearReport/index.vue b/src/views/report/productionYearReport/index.vue
index 4a156c4e..10a5842a 100644
--- a/src/views/report/productionYearReport/index.vue
+++ b/src/views/report/productionYearReport/index.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-12-12 13:45:25
- * @LastEditTime: 2024-03-18 15:25:54
+ * @LastEditTime: 2024-03-22 09:47:09
  * @LastEditors: zhp
  * @Description:
 -->
@@ -83,7 +83,7 @@
           </el-table-column>
         </el-table-column>
         <el-table-column label="原片漏检率" align="center">
-          <el-table-column prop="missCheckNow" label="今日" align="center">
+          <el-table-column prop="missCheckNow" label="今年" align="center">
             <template slot-scope="scope">
               <el-input v-if="!disabled" v-model="scope.row.missCheckNow" :disabled="disabled"></el-input>
               <span v-else>{{ scope.row.missCheckNow ? parseFloat((scope.row.missCheckNow *
@@ -92,7 +92,7 @@
               </span>
             </template>
           </el-table-column>
-          <el-table-column prop="missCheckHis" label="昨日" align="center">
+          <el-table-column prop="missCheckHis" label="去年" align="center">
             <template slot-scope="scope">
               <el-input v-if="!disabled" v-model="scope.row.missCheckHis" :disabled="disabled"></el-input>
               <span v-else>{{ scope.row.missCheckHis ? parseFloat((scope.row.missCheckHis *
@@ -113,7 +113,7 @@
           </el-table-column>
         </el-table-column>
         <el-table-column label="综合良品率" align="center">
-          <el-table-column prop="goodProductPassNow" label="今日" align="center">
+          <el-table-column prop="goodProductPassNow" label="今年" align="center">
             <template slot-scope="scope">
               <el-input v-if="!disabled" v-model="scope.row.goodProductPassNow" :disabled="!disabled">
               </el-input>
@@ -123,7 +123,7 @@
               </span>
             </template>
           </el-table-column>
-          <el-table-column prop="goodProductPassHis" label="昨日" align="center">
+          <el-table-column prop="goodProductPassHis" label="去年" align="center">
             <template slot-scope="scope">
               <el-input v-if="!disabled" v-model="scope.row.goodProductPassHis" :disabled="!disabled">
               </el-input>