16 changed files with 104 additions and 195 deletions
--- a/src/views/cost/energyCost/index.vue
+++ b/src/views/cost/energyCost/index.vue
@ -30,7 +30,6 @@ import {
 } from '@/api/cost/costEneryAutoReport';
 import { getEnergyTypeListAll } from '@/api/base/energyType';
 import { publicFormatter } from '@/utils/dict';
-import moment from 'moment';

 const tableProps = [
 	{
@ -136,23 +135,15 @@ export default {
 					this.listQuery.pageSize = 10;
 					this.listQuery.energyTypeId = val.energyTypeId;
          this.listQuery.searchTime = val.searchTime ? val.searchTime[0] : null;
-					this.listQuery.startTime = val.searchTime
-						? moment(val.searchTime[0]).startOf('day').format('x')
-						: null;
-					this.listQuery.endTime = val.searchTime
-						? moment(val.searchTime[1]).endOf('day').format('x')
-						: null;
+					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
+					this.listQuery.endTime = val.searchTime ? val.searchTime[1] : null;
 					this.getDataList();
 					break;
 				case 'export':
          const data = {
            energyTypeId:val.energyTypeId,
-            startTime : val.searchTime
-						? moment(val.searchTime[0]).startOf('day').format('x')
-						: null,
-            endTime : val.searchTime
-						? moment(val.searchTime[1]).endOf('day').format('x')
-						: null,
+            startTime : val.searchTime ? val.searchTime[0] : null,
+            endTime : val.searchTime ? val.searchTime[1] : null,
          }
 					this.handleExport(data);
 					break;
--- a/src/views/cost/rawMaterialConfig/add-or-updata.vue
+++ b/src/views/cost/rawMaterialConfig/add-or-updata.vue
@ -2,7 +2,7 @@
 * @Author: zwq
 * @Date: 2023-08-01 13:52:10
 * @LastEditors: zwq
- * @LastEditTime: 2024-03-21 15:59:26
+ * @LastEditTime: 2024-02-19 09:36:50
 * @Description:
 -->
 <template>
@ -44,7 +44,7 @@
 							v-for="item in urlOptions.dictList.dict0"
 							:key="item.id"
 							:label="item.label"
-							:value="parseInt(item.value)"></el-option>
+							:value="item.value"></el-option>
 					</el-select>
 				</el-form-item>
 			</el-col>
--- a/src/views/cost/rawMaterialCost/index.vue
+++ b/src/views/cost/rawMaterialCost/index.vue
@ -152,12 +152,8 @@ export default {
 				case 'export':
 					this.listQuery.materialId = val.materialId;
 					this.listQuery.searchTime = val.searchTime ? val.searchTime[0] : null;
-					this.listQuery.startTime = val.searchTime
-						? moment(val.searchTime[0]).startOf('day').format('x')
-						: null;
-					this.listQuery.endTime = val.searchTime
-						? moment(val.searchTime[1]).endOf('day').format('x')
-						: null;
+					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
+					this.listQuery.endTime = val.searchTime ? val.searchTime[1] : null;
 					this.handleExport();
 					break;
 				default:
--- a/src/views/equipment/timing-diagram/status/chart.js
+++ b/src/views/equipment/timing-diagram/status/chart.js
@ -112,7 +112,7 @@ export default class GanttGraph {
            // top: 12 + 128 * this.gridIndex,
            top: 12 + 104 * this.gridIndex,
            right: 48,
-            left: 183,
+            left: 88,
            height: 56
        }
    }
--- a/src/views/equipment/timing-diagram/status/index.vue
+++ b/src/views/equipment/timing-diagram/status/index.vue
@ -119,7 +119,7 @@ export default {
 					selectOptions: [],
 					param: 'lineId',
 					onchange: true,
-					filterable: true,
+					filterable: true
 				},
 				{
 					type: 'select',
@ -127,7 +127,7 @@ export default {
 					placeholder: '请选择工段',
 					selectOptions: [],
 					param: 'sectionId',
-					filterable: true,
+					filterable: true
 				},
 				// 时间段
 				{
@ -174,20 +174,20 @@ export default {
 			// demo: [
 			// 	[
 			// 		{
-			// 			equipmentName: '一大线四区2小线清洗机',
+			// 			equipmentName: '下片机',
 			// 			duration: 30,
 			// 			relativeDuration: 0.6,
 			// 			status: 0,
 			// 			startPos: 0,
-			// 			startTime: 1711073203686,
+			//             startTime: 1691568181000,
 			// 		},
 			// 		{
-			// 			equipmentName: '一大线四区2小线清洗机',
+			// 			equipmentName: '下片机',
 			// 			duration: 20,
 			// 			relativeDuration: 0.4,
 			// 			status: 2,
 			// 			startPos: 30,
-			// 			startTime: 1711072203686,
+			//             startTime: 1691569981000
 			// 		},
 			// 	],
 			// ],
@ -259,10 +259,6 @@ export default {
 					(eq) => eq[0].equipmentId
 				);
 				this.graphList = this.objectToArray(data);
-				// this.graphList = this.demo.map(item => {
-				// 	item.key = item[0].equipmentName;
-				// 	return item;
-				// });
 			}
 		},

--- 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-22 09:01:30
+ * @LastEditTime: 2024-03-20 09:17:11
 * @Description:
 -->
 <template>
-  <el-drawer :visible.sync="visible" :show-close="false" :wrapper-closable="true" class="drawer" size="50%">
+  <el-drawer :visible.sync="visible" :show-close="false" :wrapper-closable="false" class="drawer" size="50%">
    <small-title slot="title" :no-padding="true">
      {{ isdetail ? '详情' : !dataForm.id ? '新增' : '编辑' }}
    </small-title>
--- 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':
--- 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-22 10:14:23
+ * @LastEditTime: 2024-03-18 16:00:41
 * @LastEditors: zhp
 * @Description:
 -->
@ -82,9 +82,8 @@ 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;
@ -117,10 +116,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 && 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[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.forEach(item => {
@ -128,16 +127,10 @@ export default {
            if (item.lineId === it.id) {
              console.log(item)
              item.lineName = it.name
-              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
+              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
            }
          })
        })
@ -182,11 +175,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.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
+        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
        // console.log(this.listQuery.reportTime);
-        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
+        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
        console.log(this.listQuery.reportTime);
 			} else {
 					this.listQuery.reportTime = []
--- 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-22 09:45:23
+ * @LastEditTime: 2024-03-18 09:57:30
 * @LastEditors: zhp
 * @Description:
 -->
@ -198,8 +198,6 @@ 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
        }
      }
--- a/src/views/report/glass/month.vue
+++ b/src/views/report/glass/month.vue
@ -91,8 +91,6 @@ export default {
          strVal += '0';
        }
        return parseFloat(strVal);
-      } else {
-        return null
      }

    },
@ -111,10 +109,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 && 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[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.forEach(item => {
@ -122,36 +120,15 @@ export default {
            if (item.lineId === it.id) {
              console.log(item)
              item.lineName = it.name
-              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
+              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
            }
          })
        })
        this.tableData = res.data
-        // 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.listQuery.total = response.data.length;
        this.dataListLoading = false;
      });
    },
--- 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 && 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[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.forEach(item => {
@ -211,36 +211,15 @@ export default {
            if (item.lineId === it.id) {
              console.log(item)
              item.lineName = it.name
-              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
+              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
            }
          })
        })
        this.tableData = res.data
-        // 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.listQuery.total = response.data.length;
        this.dataListLoading = false;
      });
    },
--- 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 && 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[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.forEach(item => {
@ -122,36 +122,15 @@ export default {
            if (item.lineId === it.id) {
              console.log(item)
              item.lineName = it.name
-              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
+              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
            }
          })
        })
        this.tableData = res.data
-        // 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.listQuery.total = response.data.length;
        this.dataListLoading = false;
      });
    },
--- 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-22 09:36:12
+ * @LastEditTime: 2024-03-18 15:24:10
 * @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)) + '%' :
-              null}} </span>
+                undefined}} </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)) +
-              '%' : null }} </span>
+                '%' : undefined }} </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)) +
-              '%' : null }}
+                100).toFixed(2)) +
+                '%' : undefined }}
              </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)) +
-              '%' : null }}
+                100).toFixed(2)) +
+                '%' : undefined }}
              </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)) +
-              '%' : null }}
+                100).toFixed(2)) +
+                '%' : undefined }}
              </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)) +
-              '%' : null }}
+                100).toFixed(2)) +
+                '%' : undefined }}
              </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)) +
-              '%' : null }}
+                100).toFixed(2)) +
+                '%' : undefined }}
              </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)) +
-              '%' : null }}
+                100).toFixed(2)) +
+                '%' : undefined }}
              </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[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.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.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);
--- 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-22 09:56:14
+ * @LastEditTime: 2024-03-18 15:27:53
 * @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>
--- 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-22 09:47:20
+ * @LastEditTime: 2024-03-18 15:25:48
 * @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>
--- 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-22 09:47:09
+ * @LastEditTime: 2024-03-18 15:25:54
 * @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>