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

---
 src/api/base/qualityInspectionBoxBtn.js       |  9 +-
 src/api/quality/deviceParameters.js           |  4 +-
 .../packagingPrintModel/add-or-updata.vue     |  4 +-
 .../processEquMaterialBom/add-or-updata.vue   | 90 +++++++++---------
 .../extend/processEquMaterialBom/index.vue    | 21 +++++
 .../processEquValueBom/add-or-updata.vue      | 94 ++++++++++---------
 src/views/extend/processEquValueBom/index.vue | 22 +++++
 src/views/extend/processFlow/index.vue        |  6 +-
 .../qualityInspectionBoxBtn/index.vue         |  9 +-
 .../qualityInspectionBoxPermissions/index.vue |  6 +-
 .../qualityInspectionBoxPermissions/row.vue   | 46 +++++++++
 .../quality/base/qualityHotMaterial/index.vue | 25 ++++-
 .../base/qualityScrapLog/add-or-updata.vue    | 20 ++--
 .../quality/base/qualityScrapLog/basic-add.js |  8 +-
 .../base/qualityScrapLog/detail-or-updata.vue | 17 ++--
 .../quality/base/qualityScrapLog/index.vue    |  2 +-
 .../monitoring/processTraceability/index.vue  |  8 +-
 17 files changed, 254 insertions(+), 137 deletions(-)
 create mode 100644 src/views/quality/base/basicData/qualityInspectionBoxPermissions/row.vue

diff --git a/src/api/base/qualityInspectionBoxBtn.js b/src/api/base/qualityInspectionBoxBtn.js
index 18954b61..cbf98967 100644
--- a/src/api/base/qualityInspectionBoxBtn.js
+++ b/src/api/base/qualityInspectionBoxBtn.js
@@ -1,7 +1,7 @@
 /*
  * @Author: zhp
  * @Date: 2023-12-04 14:10:37
- * @LastEditTime: 2023-12-14 10:06:03
+ * @LastEditTime: 2024-03-19 15:02:49
  * @LastEditors: zhp
  * @Description:
  */
@@ -26,10 +26,11 @@ export function updateQualityInspectionBoxBtn(data) {
 }
 
 // 删除安灯按钮16键对应
-export function deleteQualityInspectionBoxBtn(id) {
+export function deleteQualityInspectionBoxBtn(query) {
   return request({
-    url: '/base/quality-inspection-box-btn/delete?id=' + id,
-    method: 'delete'
+    url: 'base/quality-inspection-box-btn/deleteByLineSection',
+    method: 'delete',
+    params: query
   })
 }
 
diff --git a/src/api/quality/deviceParameters.js b/src/api/quality/deviceParameters.js
index 848e20b5..f0a39799 100644
--- a/src/api/quality/deviceParameters.js
+++ b/src/api/quality/deviceParameters.js
@@ -1,7 +1,7 @@
 /*
  * @Author: zhp
  * @Date: 2023-10-18 09:33:57
- * @LastEditTime: 2024-03-15 15:18:09
+ * @LastEditTime: 2024-03-20 15:39:27
  * @LastEditors: zhp
  * @Description:
  */
@@ -36,7 +36,7 @@ export function exportEnergyPlcExcel(query) {
 
 export function exportEquipmentTraceabilityExcel(query) {
   return request({
-    url: '/analysis/equipment-analysis/export-excel',
+    url: '/analysis/equipment-analysis/export-efficiency',
     method: 'get',
     params: query,
     responseType: 'blob'
diff --git a/src/views/base/packagingPrintModel/add-or-updata.vue b/src/views/base/packagingPrintModel/add-or-updata.vue
index d68de22c..e89a6227 100644
--- a/src/views/base/packagingPrintModel/add-or-updata.vue
+++ b/src/views/base/packagingPrintModel/add-or-updata.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-10-17 16:50:19
- * @LastEditTime: 2024-01-22 09:55:32
+ * @LastEditTime: 2024-03-20 08:36:01
  * @LastEditors: zhp
  * @Description:
 -->
@@ -23,7 +23,7 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="标签类型" prop="typeId">
-                <el-select v-model="dataForm.typeId" style="width: 100%;" placeholder="请选择打印方式" clearable>
+                <el-select v-model="dataForm.typeId" style="width: 100%;" placeholder="请选择标签类型" clearable>
                   <el-option v-for="dict in typeList" :key="dict.id" :label="dict.name" :value="dict.id" />
                 </el-select>
               </el-form-item>
diff --git a/src/views/extend/processEquMaterialBom/add-or-updata.vue b/src/views/extend/processEquMaterialBom/add-or-updata.vue
index 0cb1aed6..4723d506 100644
--- a/src/views/extend/processEquMaterialBom/add-or-updata.vue
+++ b/src/views/extend/processEquMaterialBom/add-or-updata.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: zhp
- * @LastEditTime: 2023-12-08 13:59:20
+ * @LastEditTime: 2024-03-20 09:18:30
  * @Description:
 -->
 <template>
@@ -12,49 +12,47 @@
     </small-title>
     <div class="content">
       <!-- <div class="visual-part"> -->
-        <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()"
-          label-width="100px" label-position="top">
-          <el-row :gutter="24">
-            <el-col :span="8">
-              <el-form-item label="设备名称" prop="equipmentId">
-                <el-select v-model="dataForm.equipmentId" filterable :disabled="isdetail" style="width: 100%"
-                  @change="getCode" placeholder="请选择设备名称">
-                  <el-option v-for="dict in equipmentList" :key=" dict.id" :label="dict.name" :value="dict.id" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="设备编码" prop="equipmentCode">
-                <el-input v-model="dataForm.equipmentCode" clearable :disabled="isdetail" placeholder="请输入设备编码" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="设备Bom编码" prop="code">
-                <el-input v-model="dataForm.code" clearable :disabled="isdetail" placeholder="请输入设备Bom编码" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row :gutter="24">
-            <el-col :span="8">
-              <el-form-item label="设备物料BOM名称" prop="name">
-                <el-input v-model="dataForm.name" clearable :disabled="isdetail" placeholder="请输入设备物料BOM名称" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="当前状态" prop="enabled">
-                <el-select v-model="dataForm.enabled" filterable :disabled="isdetail" style="width: 100%"
-                  placeholder="请选择当前状态">
-                  <el-option v-for="dict in enableList" :key=" dict.id" :label="dict.name" :value="dict.id" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="备注" prop="remark">
-                <el-input v-model="dataForm.remark" :disabled="isdetail" clearable placeholder="请输入备注" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
+      <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()"
+        label-width="100px" label-position="top">
+        <el-row :gutter="24">
+          <el-col :span="8">
+            <el-form-item label="设备名称" prop="equipmentId">
+              <el-select v-model="dataForm.equipmentId" filterable :disabled="isdetail" style="width: 100%"
+                @change="getCode" placeholder="请选择设备名称">
+                <el-option v-for="dict in equipmentList" :key=" dict.id" :label="dict.name" :value="dict.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="设备编码" prop="equipmentCode">
+              <el-input v-model="dataForm.equipmentCode" clearable :disabled="isdetail" placeholder="请输入设备编码" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="设备Bom编码" prop="code">
+              <el-input v-model="dataForm.code" clearable :disabled="isdetail" placeholder="请输入设备Bom编码" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="8">
+            <el-form-item label="设备物料BOM名称" prop="name">
+              <el-input v-model="dataForm.name" clearable :disabled="isdetail" placeholder="请输入设备物料BOM名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="当前状态" prop="enabled">
+              <el-switch v-model="dataForm.enabled" :active-value="1" :inactive-value="0">
+              </el-switch>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model="dataForm.remark" :disabled="isdetail" clearable placeholder="请输入备注" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
       <!-- </div> -->
       <div class="attr-list" v-if="idAttrShow">
         <small-title style="margin: 16px 0; padding-left: 8px" :no-padding="true">
@@ -77,9 +75,9 @@
           :limit.sync="listQuery.pageSize" :page-sizes="[5, 10, 15]" @pagination="getList" />
       </div>
     </div>
-    <div  class="drawer-body__footer">
+    <div class="drawer-body__footer">
       <el-button style="" @click="goback()">取消</el-button>
-      <el-button  type="primary" @click="dataFormSubmit()">确定</el-button>
+      <el-button type="primary" @click="dataFormSubmit()">确定</el-button>
     </div>
     <attr-add v-if="addOrUpdateVisible" ref="addOrUpdate" :product-id="dataForm.id" @refreshDataList="getList" />
   </el-drawer>
diff --git a/src/views/extend/processEquMaterialBom/index.vue b/src/views/extend/processEquMaterialBom/index.vue
index 31dedc8e..5c062b68 100644
--- a/src/views/extend/processEquMaterialBom/index.vue
+++ b/src/views/extend/processEquMaterialBom/index.vue
@@ -93,6 +93,7 @@ export default {
           labelField: 'name',
           valueField: 'id',
           param: 'equipmentId',
+          filterable: true
         },
         {
           type: 'input',
@@ -146,6 +147,26 @@ export default {
         });
       }
     },
+    deleteHandle(id, name, index) {
+      this.$confirm(`是否确认删除设备物料bom${name}`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.urlOptions.deleteURL(id).then(({ data }) => {
+            this.$message({
+              message: "操作成功",
+              type: "success",
+              duration: 1500,
+              onClose: () => {
+                this.getDataList();
+              },
+            });
+          });
+        })
+        .catch(() => { });
+    },
     getDict() {
       getEquipmentList().then((res) => {
         // console.log(res);
diff --git a/src/views/extend/processEquValueBom/add-or-updata.vue b/src/views/extend/processEquValueBom/add-or-updata.vue
index b594ca73..1e608953 100644
--- a/src/views/extend/processEquValueBom/add-or-updata.vue
+++ b/src/views/extend/processEquValueBom/add-or-updata.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: zhp
- * @LastEditTime: 2024-03-08 09:14:38
+ * @LastEditTime: 2024-03-20 09:17:11
  * @Description:
 -->
 <template>
@@ -12,51 +12,53 @@
     </small-title>
     <div class="content">
       <!-- <div class="visual-part"> -->
-        <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()"
-          label-width="100px" label-position="top">
-          <el-row :gutter="24">
-            <el-col :span="8">
-              <el-form-item label="设备名称" prop="equipmentId">
-                <el-select v-model="dataForm.equipmentId" filterable :disabled="isdetail" style="width: 100%"
-                  @change="getCode" placeholder="请选择设备名称">
-                  <el-option v-for="dict in equipmentList" :key=" dict.id" :label="dict.name" :value="dict.id" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="设备编码" prop="equipmentCode">
-                <el-input v-model="dataForm.equipmentCode" clearable :disabled="isdetail" placeholder="请输入设备编码" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="参数Bom编码" prop="code">
-                <el-input v-model="dataForm.code" clearable :disabled="isdetail" placeholder="请输入参数Bom编码" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row :gutter="24">
-            <el-col :span="8">
-              <el-form-item label="设备参数BOM名称" prop="name">
-                <el-input v-model="dataForm.name" clearable :disabled="isdetail" placeholder="请输入设备参数BOM名称" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="当前状态" prop="enabled">
-                <!-- <el-switch v-model="dataForm.enabled" :active-value="1" :inactive-value="0" /> -->
-                <el-select v-model="dataForm.enabled" filterable :disabled="isdetail" style="width: 100%"
-                  placeholder="请选择当前状态">
-                  <el-option v-for="dict in enableList" :key=" dict.id" :label="dict.name" :value="dict.id" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="备注" prop="remark">
-                <el-input v-model="dataForm.remark" :disabled="isdetail" clearable placeholder="请输入备注" />
-              </el-form-item>
-            </el-col>
-          </el-row>
+      <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()"
+        label-width="100px" label-position="top">
+        <el-row :gutter="24">
+          <el-col :span="8">
+            <el-form-item label="设备名称" prop="equipmentId">
+              <el-select v-model="dataForm.equipmentId" filterable :disabled="isdetail" style="width: 100%"
+                @change="getCode" placeholder="请选择设备名称">
+                <el-option v-for="dict in equipmentList" :key=" dict.id" :label="dict.name" :value="dict.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="设备编码" prop="equipmentCode">
+              <el-input v-model="dataForm.equipmentCode" clearable :disabled="isdetail" placeholder="请输入设备编码" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="参数Bom编码" prop="code">
+              <el-input v-model="dataForm.code" clearable :disabled="isdetail" placeholder="请输入参数Bom编码" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="8">
+            <el-form-item label="设备参数BOM名称" prop="name">
+              <el-input v-model="dataForm.name" clearable :disabled="isdetail" placeholder="请输入设备参数BOM名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="当前状态" prop="enabled">
+              <!-- <el-switch v-model="dataForm.enabled" :active-value="1" :inactive-value="0" /> -->
+              <!-- <el-select v-model="dataForm.enabled" filterable :disabled="isdetail" style="width: 100%"
+                placeholder="请选择当前状态">
+                <el-option v-for="dict in enableList" :key=" dict.id" :label="dict.name" :value="dict.id" />
+              </el-select> -->
+              <el-switch v-model="dataForm.enabled" :active-value="1" :inactive-value="0">
+              </el-switch>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model="dataForm.remark" :disabled="isdetail" clearable placeholder="请输入备注" />
+            </el-form-item>
+          </el-col>
+        </el-row>
 
-        </el-form>
+      </el-form>
       <!-- </div> -->
       <!-- <div v-if="!isdetail" class="drawer-body__footer">
 
@@ -83,7 +85,7 @@
           :limit.sync="listQuery.pageSize" :page-sizes="[5, 10, 15]" @pagination="getList" />
       </div>
     </div>
-    <div  v-if="!isdetail" class="drawer-body__footer">
+    <div v-if="!isdetail" class="drawer-body__footer">
       <el-button style="" @click="goback()">取消</el-button>
       <el-button type="primary" @click="dataFormSubmit()">确定</el-button>
     </div>
diff --git a/src/views/extend/processEquValueBom/index.vue b/src/views/extend/processEquValueBom/index.vue
index 536abef5..e21525a0 100644
--- a/src/views/extend/processEquValueBom/index.vue
+++ b/src/views/extend/processEquValueBom/index.vue
@@ -93,6 +93,8 @@ export default {
           labelField: 'name',
           valueField: 'id',
           param: 'equipmentId',
+          filterable: true
+          // filter
         },
         {
           type: 'input',
@@ -158,6 +160,26 @@ export default {
         })
       })
     },
+    deleteHandle(id, name, index) {
+      this.$confirm(`是否确认删除设备参数bom${ name}`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.urlOptions.deleteURL(id).then(({ data }) => {
+            this.$message({
+              message: "操作成功",
+              type: "success",
+              duration: 1500,
+              onClose: () => {
+                this.getDataList();
+              },
+            });
+          });
+        })
+        .catch(() => { });
+    },
     // 获取数据列表
     getDataList() {
       this.dataListLoading = true;
diff --git a/src/views/extend/processFlow/index.vue b/src/views/extend/processFlow/index.vue
index 9bb152da..5dbeac98 100644
--- a/src/views/extend/processFlow/index.vue
+++ b/src/views/extend/processFlow/index.vue
@@ -1,8 +1,8 @@
-<!-- 
+<!--
     filename: index.vue
     author: liubin
     date: 2023-10-19 10:03:42
-    description: 
+    description:
 -->
 
 <template>
@@ -189,7 +189,7 @@ export default {
 						input: true,
 						label: '工艺编码',
 						prop: 'code',
-						// url: '/base/core-equipment/getCode',
+            url: '/extend/process-flow/getCode',
 					},
 				],
 				[
diff --git a/src/views/quality/base/basicData/qualityInspectionBoxBtn/index.vue b/src/views/quality/base/basicData/qualityInspectionBoxBtn/index.vue
index c17356cc..6ffe2832 100644
--- a/src/views/quality/base/basicData/qualityInspectionBoxBtn/index.vue
+++ b/src/views/quality/base/basicData/qualityInspectionBoxBtn/index.vue
@@ -166,13 +166,20 @@ export default {
 			this.resetForm('form');
     },
     deleteHandle(id, name, index, data) {
+      console.log(data)
+      // const params = new URLSearchParams();
+      // params.append('productionLineId', data.productionLineId)
+      // params.append('sectionId', data.sectionId);
       this.$confirm(`确认要删除产线名为${data.productionLineName}的数据项?`, "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
       })
         .then(() => {
-          this.urlOptions.deleteURL(data.id).then(({ data }) => {
+          this.urlOptions.deleteURL({
+            'productionLineId': data.productionLineId,
+            'sectionId': data.sectionId,
+          }).then(({ data }) => {
             this.$message({
               message: "操作成功",
               type: "success",
diff --git a/src/views/quality/base/basicData/qualityInspectionBoxPermissions/index.vue b/src/views/quality/base/basicData/qualityInspectionBoxPermissions/index.vue
index 364770fe..ac0fb483 100644
--- a/src/views/quality/base/basicData/qualityInspectionBoxPermissions/index.vue
+++ b/src/views/quality/base/basicData/qualityInspectionBoxPermissions/index.vue
@@ -34,6 +34,7 @@ import basicPage from './basic-page';
 import moment from 'moment';
 import addOrUpdate from './dialogForm.vue';
 import ProcessBomList from './ProcessBomList.vue';
+import row from './row.vue';
 export default {
 	name: 'QualityInspectionBoxBtn',
   mixins: [basicPage],
@@ -115,7 +116,8 @@ export default {
 				},
 				{
           prop: 'datas',
-					label: '产线及工段',
+          label: '产线及工段',
+          subcomponent: row
 				}
 			],
 			// 查询参数
@@ -168,7 +170,7 @@ export default {
       this.urlOptions.getDataListURL(this.listQuery).then(res => {
         this.tableData = res.data.list.map((item) => {
           return {
-            datas: item.strList ? item.strList.toString() : null,
+            datas: item.strList || null,
             nickName: item.nickName,
             userName: item.userName,
             userId: item.userId
diff --git a/src/views/quality/base/basicData/qualityInspectionBoxPermissions/row.vue b/src/views/quality/base/basicData/qualityInspectionBoxPermissions/row.vue
new file mode 100644
index 00000000..6a446ca8
--- /dev/null
+++ b/src/views/quality/base/basicData/qualityInspectionBoxPermissions/row.vue
@@ -0,0 +1,46 @@
+<!--
+ * @Author: zhp
+ * @Date: 2024-03-20 10:01:01
+ * @LastEditTime: 2024-03-20 10:03:39
+ * @LastEditors: zhp
+ * @Description:
+-->
+<template>
+  <div class="tableInner">
+    <div v-for="(item,index) in injectData.datas" :key="index">
+    <span> {{ item }} </span>
+    </div>
+    <!-- <el-input-number v-model="list[itemProp]" @blur="changeInput" :min="0" :max="100000000" style="width: 100%" :controls='false'></el-input-number> -->
+  </div>
+</template>
+<script>
+export default {
+  name: 'InputArea',
+  props: {
+    injectData: {
+      type: Object,
+      default: () => ({})
+    },
+    itemProp: {
+      type: String
+    }
+  },
+  data() {
+    return {
+      list: this.injectData
+    }
+  },
+  methods: {
+    // changeInput() {
+    //   this.$emit('emitData', this.list)
+    // }
+  }
+}
+</script>
+<style lang="scss">
+// .tableInner .el-input__inner {
+//   border: none;
+//   padding: 0;
+//   height: 33px;
+// }
+</style>
diff --git a/src/views/quality/base/qualityHotMaterial/index.vue b/src/views/quality/base/qualityHotMaterial/index.vue
index 9e97cbc7..73cc5df8 100644
--- a/src/views/quality/base/qualityHotMaterial/index.vue
+++ b/src/views/quality/base/qualityHotMaterial/index.vue
@@ -59,12 +59,18 @@ const tableProps = [
   },
   {
     prop: 'materialGrade',
-    label: '原料等级'
+    label: '原料等级',
+    filter: (val) => val == 1 ? 'A' : val == 2 ? 'B' : 'C',
   },
   {
     prop: 'checkerName',
     label: '检测人员'
   },
+  {
+    prop: 'checkTime',
+    label: '检测时间',
+    filter: parseTime
+  },
 ];
 
 export default {
@@ -112,6 +118,19 @@ export default {
           labelField: 'name',
           valueField: 'id',
           param: 'materialId',
+        },
+        {
+          type: 'datePicker',
+          label: '时间段',
+          dateType: 'daterange',
+          format: 'yyyy-MM-dd HH:mm:ss',
+          valueFormat: "yyyy-MM-dd HH:mm:ss",
+          rangeSeparator: '-',
+          startPlaceholder: '开始时间',
+          endPlaceholder: '结束时间',
+          param: 'checkTime',
+          defaultSelect: [],
+          width: 250
         },
 				{
 					type: 'button',
@@ -159,7 +178,7 @@ export default {
       });
     },
     deleteHandle(id, name, index, data) {
-      this.$confirm(`确认要删除序号为${index}的数据项?`, "提示", {
+      this.$confirm(`确认要删除序号${index}?`, "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
@@ -189,7 +208,7 @@ export default {
 					this.listQuery.pageNo = 1;
 					this.listQuery.pageSize = 10;
           this.listQuery.materialId = val.materialId ? val.materialId : undefined;
-          // this.listQuery.typeId = val.typeId ? val.typeId : undefined;
+          this.listQuery.checkTime = val.checkTime ? val.checkTime : undefined;
 					this.getDataList();
 					break;
 				case 'reset':
diff --git a/src/views/quality/base/qualityScrapLog/add-or-updata.vue b/src/views/quality/base/qualityScrapLog/add-or-updata.vue
index 1302121a..4917fe93 100644
--- a/src/views/quality/base/qualityScrapLog/add-or-updata.vue
+++ b/src/views/quality/base/qualityScrapLog/add-or-updata.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-11-06 15:15:30
- * @LastEditTime: 2024-03-15 14:31:10
+ * @LastEditTime: 2024-03-20 09:38:10
  * @LastEditors: zhp
  * @Description:
 -->
@@ -22,7 +22,8 @@
       </el-col>
       <el-col :span="8">
         <el-form-item label="报废时间" prop="logTime">
-          <el-date-picker style="width: 100%;" v-model="dataForm.logTime" type="datetime" value-format="timestamp" placeholder="选择日期">
+          <el-date-picker style="width: 100%;" v-model="dataForm.logTime" type="datetime" value-format="timestamp"
+            placeholder="选择日期">
           </el-date-picker>
         </el-form-item>
       </el-col>
@@ -51,18 +52,17 @@
       </el-col>
     </el-row>
     <el-row :gutter="20">
-      <el-col :span="8">
+      <el-col :span="24">
         <el-form-item label="描述" prop="description">
-          <el-input v-model="dataForm.description" placeholder="请输入描述" />
-        </el-form-item>
-      </el-col>
-
-      <el-col :span="8">
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="dataForm.remark" placeholder="备注" />
+          <el-input v-model="dataForm.description" type="textarea" :rows="4" placeholder="请输入描述" />
         </el-form-item>
       </el-col>
     </el-row>
+    <el-col :span="8">
+      <el-form-item label="备注" prop="remark">
+        <el-input v-model="dataForm.remark" placeholder="备注" />
+      </el-form-item>
+    </el-col>
   </el-form>
 </template>
 
diff --git a/src/views/quality/base/qualityScrapLog/basic-add.js b/src/views/quality/base/qualityScrapLog/basic-add.js
index b3324cc2..376156f1 100644
--- a/src/views/quality/base/qualityScrapLog/basic-add.js
+++ b/src/views/quality/base/qualityScrapLog/basic-add.js
@@ -1,7 +1,7 @@
 /*
  * @Author: zhp
  * @Date: 2024-02-28 09:51:25
- * @LastEditTime: 2024-03-15 14:34:29
+ * @LastEditTime: 2024-03-20 09:42:46
  * @LastEditors: zhp
  * @Description:
  */
@@ -24,10 +24,9 @@ export default {
     }
   },
   created() {
-    this.dataForm.logTime = this.format(new Date().getTime())
     console.log(this.dataForm.logTime);
   },
-  mounted () {
+  mounted() {
   },
   // activated() {
   // },
@@ -50,7 +49,8 @@ export default {
         this.getArr()
       }
       this.$nextTick(() => {
-        this.$refs["dataForm"].resetFields();
+        this.$refs["dataForm"].resetFields()
+        this.dataForm.logTime = new Date()
         if (this.dataForm.id) {
           this.urlOptions.infoURL(id).then(response => {
             console.log(response)
diff --git a/src/views/quality/base/qualityScrapLog/detail-or-updata.vue b/src/views/quality/base/qualityScrapLog/detail-or-updata.vue
index 143a2e0b..32e0b484 100644
--- a/src/views/quality/base/qualityScrapLog/detail-or-updata.vue
+++ b/src/views/quality/base/qualityScrapLog/detail-or-updata.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-11-06 15:15:30
- * @LastEditTime: 2024-03-15 14:33:12
+ * @LastEditTime: 2024-03-20 09:40:42
  * @LastEditors: zhp
  * @Description:
 -->
@@ -57,18 +57,17 @@
         </el-col>
       </el-row>
       <el-row :gutter="20">
-        <el-col :span="8">
+        <el-col :span="24">
           <el-form-item label="描述" prop="description">
-            <el-input v-model="dataForm.description" placeholder="请输入描述" disabled />
-          </el-form-item>
-        </el-col>
-
-        <el-col :span="8">
-          <el-form-item label="备注" prop="remark">
-            <el-input v-model="dataForm.remark" placeholder="备注" disabled />
+            <el-input v-model="dataForm.description" type="textarea" :rows="4" placeholder="请输入描述" />
           </el-form-item>
         </el-col>
       </el-row>
+      <el-col :span="8">
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="dataForm.remark" placeholder="备注" />
+        </el-form-item>
+      </el-col>
     </el-form>
   </el-dialog>
 
diff --git a/src/views/quality/base/qualityScrapLog/index.vue b/src/views/quality/base/qualityScrapLog/index.vue
index 819023f8..d5b6daf7 100644
--- a/src/views/quality/base/qualityScrapLog/index.vue
+++ b/src/views/quality/base/qualityScrapLog/index.vue
@@ -59,7 +59,7 @@ const tableProps = [
 	{
     prop: 'detContent',
     label: '报废原因'
-	},
+  },
   {
     prop: 'source',
     label: '来源',
diff --git a/src/views/quality/monitoring/processTraceability/index.vue b/src/views/quality/monitoring/processTraceability/index.vue
index 6f332aac..743b9a60 100644
--- a/src/views/quality/monitoring/processTraceability/index.vue
+++ b/src/views/quality/monitoring/processTraceability/index.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-08-01 14:55:51
  * @LastEditors: zhp
- * @LastEditTime: 2024-03-15 15:22:59
+ * @LastEditTime: 2024-03-20 09:25:40
  * @Description:
 -->
 <template>
@@ -124,7 +124,7 @@ export default {
           label: '时间段',
           dateType: 'daterange',
           format: 'yyyy-MM-dd',
-          valueFormat: "yyyy-MM-dd",
+          valueFormat: "timestamp",
           rangeSeparator: '-',
           startPlaceholder: '开始时间',
           endPlaceholder: '结束时间',
@@ -251,8 +251,8 @@ export default {
         this.listQuery.orderName = val.orderName ? val.orderName :undefined
         // this.queryParams.status = val.status
         if (val.timeVal && val.timeVal.length != 0 ) {
-        this.listQuery.startTime =  val.timeVal[0] + ' 00:00:00'
-        this.listQuery.endTime = val.timeVal[1] + ' 23:59:59'
+        this.listQuery.startTime =  val.timeVal[0]
+        this.listQuery.endTime = val.timeVal[1]
         } else {
           this.listQuery.startTime = undefined
           this.listQuery.endTime = undefined

From 6f937e197696d053a21c3ec80cd836d52042dd00 Mon Sep 17 00:00:00 2001
From: juzi <819872918@qq.com>
Date: Thu, 21 Mar 2024 08:27:35 +0800
Subject: [PATCH 2/9] =?UTF-8?q?=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yoyAnalysis/components/lineChart.vue      | 14 ++---
 .../monitoring/energyOverlimitLog/index.vue   | 58 +++++++++----------
 2 files changed, 31 insertions(+), 41 deletions(-)

diff --git a/src/views/energy/analysis/yoyAnalysis/components/lineChart.vue b/src/views/energy/analysis/yoyAnalysis/components/lineChart.vue
index b7e4f9a3..ae20f590 100644
--- a/src/views/energy/analysis/yoyAnalysis/components/lineChart.vue
+++ b/src/views/energy/analysis/yoyAnalysis/components/lineChart.vue
@@ -1,8 +1,5 @@
 <template>
-  <div 
-    id="analysischartLine"
-    style="width: 100%;height: 100%;"
-  ></div>
+  <div id="analysischartLine" style="width: 100%;height: 100%;"></div>
 </template>
 <script>
 import * as echarts from 'echarts'
@@ -56,11 +53,10 @@ export default {
       let yData = []
       for (let j = 0; j < arr.length; j++) {
         for (let k = 0; k < keys.length; k++) {
-          if (keys[k].indexOf(arr[j]+'_上年同期') > -1 || keys[k].indexOf(arr[j]+'_能源消耗') > -1) {
+          if (keys[k].indexOf(arr[j] + '_上年同期') > -1 || keys[k].indexOf(arr[j] + '_能源消耗') > -1) {
             let obj = {
               name: '',
               type: 'line',
-              stack: 'Total',
               data: []
             }
             obj.name = keys[k]
@@ -71,14 +67,14 @@ export default {
       for (let i = 0; i < this.chartData.length; i++) {
         xData.push(this.chartData[i].time)
         for (let p = 0; p < yData.length; p++) {
-          yData[p].data.push(this.chartData[i][ yData[p].name])
+          yData[p].data.push(this.chartData[i][yData[p].name])
         }
       }
       var option = {
-        color:['#FFDC94','#8EF0AB','#63BDFF','#288AFF','#7164FF','#FF6860','#FF9747','#B0EB42','#D680FF','#0043D2'],
+        color: ['#FFDC94', '#8EF0AB', '#63BDFF', '#288AFF', '#7164FF', '#FF6860', '#FF9747', '#B0EB42', '#D680FF', '#0043D2'],
         legend: {
           data: keys,
-          right:'1%'
+          right: '1%'
         },
         tooltip: {
           trigger: 'axis'
diff --git a/src/views/energy/monitoring/energyOverlimitLog/index.vue b/src/views/energy/monitoring/energyOverlimitLog/index.vue
index 1cffef1e..4f8d24d7 100644
--- a/src/views/energy/monitoring/energyOverlimitLog/index.vue
+++ b/src/views/energy/monitoring/energyOverlimitLog/index.vue
@@ -2,40 +2,22 @@
   <div class="app-container energyOverlimitLog">
 
     <!-- 搜索工作栏 -->
-    <search-bar
-      :formConfigs="formConfig"
-      ref="searchBarForm"
-      @headBtnClick="buttonClick"
-    />
+    <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
     <el-tabs v-model="activeName" @tab-click="toggleTab">
       <el-tab-pane label="自动抄表" name="auto"></el-tab-pane>
       <el-tab-pane label="手动抄表" name="manual"></el-tab-pane>
     </el-tabs>
     <!-- 列表 -->
     <div v-if="activeName === 'auto'">
-      <base-table
-        :page="queryParams.pageNo"
-        :limit="queryParams.pageSize"
-        :table-props="tableProps"
-        :table-data="list"
-        :max-height="tableH"
-      />
+      <base-table :page="queryParams.pageNo" :limit="queryParams.pageSize" :table-props="tableProps" :table-data="list"
+        :max-height="tableH" />
     </div>
     <div v-if="activeName === 'manual'">
-      <base-table
-        :page="queryParams.pageNo"
-        :limit="queryParams.pageSize"
-        :table-props="tableProps2"
-        :table-data="list2"
-        :max-height="tableH"
-      />
+      <base-table :page="queryParams.pageNo" :limit="queryParams.pageSize" :table-props="tableProps2"
+        :table-data="list2" :max-height="tableH" />
     </div>
-    <pagination
-      :page.sync="queryParams.pageNo"
-      :limit.sync="queryParams.pageSize"
-      :total="total"
-      @pagination="getList"
-    />
+    <pagination :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize" :total="total"
+      @pagination="getList" />
   </div>
 </template>
 
@@ -160,8 +142,8 @@ export default {
         method: '1'
       },
       typeList: [
-        {id: 1, name: '合并'},
-        {id: 2, name: '详细'}
+        { id: 1, name: '合并' },
+        { id: 2, name: '详细' }
       ]
     };
   },
@@ -183,7 +165,7 @@ export default {
     getList() {
       getEnergyOverlimitLogPage(this.queryParams).then(response => {
         let arr = response.data.list || [];
-        arr&&arr.map((item) => {
+        arr && arr.map((item) => {
           this.typeList.map((i) => {
             if (item.type === i.id) {
               item.type = i.name
@@ -191,15 +173,21 @@ export default {
           })
           if (item.minValue && item.maxValue) {
             item.limitValue = item.minValue + '-' + item.maxValue
-          } else if(item.minValue){
+          } else if (item.minValue) {
             item.limitValue = '最小值' + item.minValue
-          }else if(item.maxValue){
+          } else if (item.maxValue) {
             item.limitValue = '最大值' + item.maxValue
           } else {
             item.limitValue = ''
           }
         })
-        this.list = arr
+        if (this.queryParams.method === '1') {
+          this.list = arr
+          this.list2 = []
+        } else {
+          this.list2 = arr
+          this.list1 = []
+        }
         this.total = response.data.total;
       });
     },
@@ -212,7 +200,7 @@ export default {
     toggleTab() {
       if (this.activeName === 'auto') {
         this.queryParams.method = '1'
-      }else{
+      } else {
         this.queryParams.method = '2'
       }
       this.queryParams.pageNo = 1
@@ -232,21 +220,27 @@ export default {
     height: 2px;
     background-color: #e4e7ed;
   }
+
   .el-tabs__nav-wrap::after {
     width: 0;
   }
+
   .el-tabs__item {
     padding: 0 10px;
   }
+
   .el-tabs__item:hover {
     color: rgba(0, 0, 0, 0.85);
   }
+
   .el-tabs__item.is-active {
     color: rgba(0, 0, 0, 0.85);
   }
+
   .el-tabs__item {
     color: rgba(0, 0, 0, 0.45);
   }
+
   .searchBarBox {
     margin-bottom: 0;
   }

From 57071bc24a94d68b4a63adb76bdaf5a6d7acdfd1 Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Thu, 21 Mar 2024 10:45:06 +0800
Subject: [PATCH 3/9] bugfix zentao

---
 .../specialEquipment/check/Content-add.vue    |  4 ++-
 .../check/Content-add_detail.vue              | 12 +++++++
 .../specialEquipment/check/Content-edit.vue   |  4 +++
 src/views/specialEquipment/check/Record.vue   |  2 +-
 src/views/specialEquipment/check/add.vue      |  1 +
 .../maintain/Monitor--detail.vue              | 12 +++----
 .../specialEquipment/maintain/Monitor.vue     |  5 +--
 .../maintain/PlanConfig--addContent.vue       |  4 +++
 .../specialEquipment/maintain/Record.vue      |  2 ++
 .../maintain/WaitingList--add--unplanned.vue  |  2 ++
 .../specialEquipment/maintain/WaitingList.vue | 19 ++++++++--
 .../WaitingListUnplanned--add_detail.vue      | 35 ++++++++++++++++++-
 12 files changed, 89 insertions(+), 13 deletions(-)

diff --git a/src/views/specialEquipment/check/Content-add.vue b/src/views/specialEquipment/check/Content-add.vue
index 67aeab10..7f334286 100644
--- a/src/views/specialEquipment/check/Content-add.vue
+++ b/src/views/specialEquipment/check/Content-add.vue
@@ -24,6 +24,8 @@
 				<el-form-item label="部门" prop="departmentId">
 					<el-select
 						v-model="dataForm.departmentId"
+						filterable
+						clearable
 						:placeholder="`请选择部门`">
 						<el-option
 							v-for="opt in departmentOptions"
@@ -167,7 +169,7 @@ export default {
 				const workerlist = await this.$axios(
 					// '/base/core-worker/listAll'
 					'/base/core-worker/workerList'
-					);
+				);
 				if (workerlist.code == 0) {
 					inspectorList = inspectorList.concat(
 						workerlist.data.map((item) => ({
diff --git a/src/views/specialEquipment/check/Content-add_detail.vue b/src/views/specialEquipment/check/Content-add_detail.vue
index 4d5865e8..6fc64acb 100644
--- a/src/views/specialEquipment/check/Content-add_detail.vue
+++ b/src/views/specialEquipment/check/Content-add_detail.vue
@@ -155,6 +155,18 @@ export default {
 						rules: [
 							{ required: true, message: '设备不能为空', trigger: 'blur' },
 						],
+						bind: {
+							clearable: true,
+							filterable: true
+						}
+					},
+					{
+						input: true,
+						label: '巡检项目',
+						prop: 'program',
+						rules: [
+							{ required: true, message: '巡检项目不能为空', trigger: 'blur' },
+						],
 					},
 				],
 				[
diff --git a/src/views/specialEquipment/check/Content-edit.vue b/src/views/specialEquipment/check/Content-edit.vue
index 1a7c8326..81c90c2e 100644
--- a/src/views/specialEquipment/check/Content-edit.vue
+++ b/src/views/specialEquipment/check/Content-edit.vue
@@ -251,6 +251,10 @@ export default {
 						rules: [
 							{ required: true, message: '设备不能为空', trigger: 'blur' },
 						],
+						bind: {
+							filterable: true,
+							clearable: true,
+						}
 					},
 				],
 				[
diff --git a/src/views/specialEquipment/check/Record.vue b/src/views/specialEquipment/check/Record.vue
index 815f81de..a1402435 100644
--- a/src/views/specialEquipment/check/Record.vue
+++ b/src/views/specialEquipment/check/Record.vue
@@ -91,7 +91,7 @@ export default {
 			tableProps: [
 				{ prop: 'name', label: '巡检单名称' },
 				{ prop: 'department', label: '部门' },
-				{ prop: 'actualCheckTime', label: '巡检时间', filter: parseTime },
+				{ prop: 'planCheckTime', label: '巡检时间', filter: parseTime },
 				{ prop: 'groupClass', label: '班次' },
 				// {
 				// 	prop: '_detail',
diff --git a/src/views/specialEquipment/check/add.vue b/src/views/specialEquipment/check/add.vue
index b793d809..a954f3c1 100644
--- a/src/views/specialEquipment/check/add.vue
+++ b/src/views/specialEquipment/check/add.vue
@@ -109,6 +109,7 @@ export default {
 				departmentId: null,
 				planCheckTime: null,
 				confirmTimeLimit: null,
+				checkPeriod: null,
 				groupClass: null,
 				remark: null,
 				// special: true,
diff --git a/src/views/specialEquipment/maintain/Monitor--detail.vue b/src/views/specialEquipment/maintain/Monitor--detail.vue
index 29449ea2..c305ff97 100644
--- a/src/views/specialEquipment/maintain/Monitor--detail.vue
+++ b/src/views/specialEquipment/maintain/Monitor--detail.vue
@@ -40,37 +40,37 @@
 							<el-row :gutter="20">
 								<el-col :span="8">
 									<el-form-item label="保养计划名称" prop="name">
-										<span>{{ form.name }}</span>
+										<span>{{ form.name || '---' }}</span>
 									</el-form-item>
 								</el-col>
 
 								<el-col :span="8">
 									<el-form-item label="部门" prop="departmentName">
-										<span>{{ form.departmentName }}</span>
+										<span>{{ form.departmentName || '---' }}</span>
 									</el-form-item>
 								</el-col>
 
 								<el-col :span="8">
 									<el-form-item label="产线名" prop="lineName">
-										<span>{{ form.lineName }}</span>
+										<span>{{ form.lineName || '---' }}</span>
 									</el-form-item>
 								</el-col>
 
 								<el-col :span="8">
 									<el-form-item label="保养频率" prop="maintenancePeriod">
-										<span>{{ form.maintenancePeriod }}</span>
+										<span>{{ form.maintenancePeriod || '---' }}</span>
 									</el-form-item>
 								</el-col>
 
 								<el-col :span="8">
 									<el-form-item label="保养时长" prop="maintainDuration">
-										<span>{{ form.maintainDuration }}</span>
+										<span>{{ form.maintainDuration || '---' }}</span>
 									</el-form-item>
 								</el-col>
 
 								<el-col :span="8">
 									<el-form-item label="计划保养人员" prop="maintainer">
-										<span>{{ form.maintainer }}</span>
+										<span>{{ form.maintainer || '---' }}</span>
 									</el-form-item>
 								</el-col>
 							</el-row>
diff --git a/src/views/specialEquipment/maintain/Monitor.vue b/src/views/specialEquipment/maintain/Monitor.vue
index e56c3e2a..637ff9c3 100644
--- a/src/views/specialEquipment/maintain/Monitor.vue
+++ b/src/views/specialEquipment/maintain/Monitor.vue
@@ -119,7 +119,7 @@ const btn = {
 	render: function (h) {
 		return (
 			<el-button type="text" onClick={this.handleClick}>
-				{this.injectData.name}
+				{this.injectData.entryText}
 			</el-button>
 		);
 	},
@@ -188,7 +188,7 @@ export default {
 				{
 					prop: 'opt2',
 					label: '保养内容',
-					name: '详情',
+					entryText: '详情',
 					subcomponent: btn,
 					width: 100,
 				},
@@ -386,6 +386,7 @@ export default {
 				case '保养内容':
 					this.monitorDetailVisible = true;
 					this.$nextTick(() => {
+						console.log('value', value);
 						this.$refs.monitorDetailDrawer.show(value);
 					});
 					break;
diff --git a/src/views/specialEquipment/maintain/PlanConfig--addContent.vue b/src/views/specialEquipment/maintain/PlanConfig--addContent.vue
index fea136d1..cf8f95bf 100644
--- a/src/views/specialEquipment/maintain/PlanConfig--addContent.vue
+++ b/src/views/specialEquipment/maintain/PlanConfig--addContent.vue
@@ -188,6 +188,10 @@ export default {
 						rules: [
 							{ required: true, message: '设备不能为空', trigger: 'blur' },
 						],
+						bind: {
+							filterable: true,
+							clearable: true,
+						}
 					},
 				],
 				[
diff --git a/src/views/specialEquipment/maintain/Record.vue b/src/views/specialEquipment/maintain/Record.vue
index 5e0b7a97..8175f3ea 100644
--- a/src/views/specialEquipment/maintain/Record.vue
+++ b/src/views/specialEquipment/maintain/Record.vue
@@ -296,6 +296,8 @@ export default {
 					placeholder: '请选择保养计划名称',
 					param: 'maintainPlanId',
 					defaultSelect: null,
+					filterable: true,
+					clearable: true
 				},
 				// 开始结束时间
 				{
diff --git a/src/views/specialEquipment/maintain/WaitingList--add--unplanned.vue b/src/views/specialEquipment/maintain/WaitingList--add--unplanned.vue
index 068c0137..3cf2778d 100644
--- a/src/views/specialEquipment/maintain/WaitingList--add--unplanned.vue
+++ b/src/views/specialEquipment/maintain/WaitingList--add--unplanned.vue
@@ -269,6 +269,7 @@ export default {
 	},
 	mounted() {
 		// !this.edit && this.getCode('/base/equipment-maintain-plan/getCode');
+		// this.getList('code');
 		this.getList('maintainer');
 		this.getList('department');
 		this.getList('line');
@@ -328,6 +329,7 @@ export default {
 				'/base/core-department/listAll',
 				'/base/core-worker/workerList',
 				// '/base/core-worker/listAll',
+				'/base/equipment-maintain-log/getCode',
 			];
 			let res;
 			switch (source) {
diff --git a/src/views/specialEquipment/maintain/WaitingList.vue b/src/views/specialEquipment/maintain/WaitingList.vue
index 89faded4..3d943f59 100644
--- a/src/views/specialEquipment/maintain/WaitingList.vue
+++ b/src/views/specialEquipment/maintain/WaitingList.vue
@@ -381,6 +381,8 @@ export default {
 					placeholder: '请选择保养计划名称',
 					param: 'maintainPlanId',
 					defaultSelect: null,
+					clearable: true,
+					filterable: true,
 				},
 				// 开始结束时间
 				{
@@ -669,8 +671,21 @@ export default {
 		/** 新增按钮操作 */
 		handleAdd() {
 			this.reset();
-			this.open = true;
-			this.title = '添加待确认保养记录';
+			this.$axios({
+				url: '/base/equipment-maintain-log/getCode',
+			})
+				.then((res) => {
+					if (res.code == 0) {
+						this.form.maintainOrderNumber = res.data;
+						this.open = true;
+						this.title = '添加待确认保养记录';
+					}
+				})
+				.catch((err) => {
+					this.$message.error('获取保养单号出错');
+					this.open = true;
+					this.title = '添加待确认保养记录';
+				});
 		},
 
 		getConfirmed() {
diff --git a/src/views/specialEquipment/maintain/WaitingListUnplanned--add_detail.vue b/src/views/specialEquipment/maintain/WaitingListUnplanned--add_detail.vue
index 65ac8674..0e4b02cf 100644
--- a/src/views/specialEquipment/maintain/WaitingListUnplanned--add_detail.vue
+++ b/src/views/specialEquipment/maintain/WaitingListUnplanned--add_detail.vue
@@ -9,7 +9,9 @@
 	<el-drawer
 		:visible="visible"
 		:show-close="false"
-		:wrapper-closable="false"
+		:wrapperClosable="true"
+		:close-on-click-modal="true"
+		:before-close="handleConfirmClose"
 		class="drawer"
 		custom-class="mes-drawer"
 		size="60%"
@@ -172,6 +174,10 @@ export default {
 						rules: [
 							{ required: true, message: '设备不能为空', trigger: 'blur' },
 						],
+						bind: {
+							filterable: true,
+							clearable: true,
+						},
 					},
 				],
 				[
@@ -253,6 +259,33 @@ export default {
 		// this.getList('line');
 	},
 	methods: {
+		/** 确认是否关闭 */
+		async handleConfirmClose() {
+			try {
+				if (
+					await this.$confirm(
+						<div style="position: relative; margin-bottom: 26px; overflow: visible;">
+							<h1 style="font-size: 16px; font-weight: bold; color: #000c;">
+								确认要关闭页面吗?
+							</h1>
+						</div>,
+						// <p style="font-size: 14px; color: #0008; position: absolute; top: 24px;">
+						// 	确定关闭将不保留编辑内容
+						// </p>
+						{
+							confirmButtonText: '确 定',
+							cancelButtonText: '取 消',
+							type: 'warning',
+						}
+					)
+				) {
+					this.handleConfirm();
+				}
+			} catch (err) {
+				return false;
+			}
+		},
+
 		handleSearchBarBtnClick(btn) {
 			switch (btn.btnName) {
 				case 'search':

From d70887fef0dfb30f7af94975c3ae98bbb6bcfe12 Mon Sep 17 00:00:00 2001
From: zwq <zwq229436@163.com>
Date: Thu, 21 Mar 2024 13:43:09 +0800
Subject: [PATCH 4/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=88=90=E6=9C=ACbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/cost/energyCostHis/index.vue      | 9 +++++++++
 src/views/cost/rawMaterialCostHis/index.vue | 9 +++++++++
 2 files changed, 18 insertions(+)

diff --git a/src/views/cost/energyCostHis/index.vue b/src/views/cost/energyCostHis/index.vue
index 685896ac..44287284 100644
--- a/src/views/cost/energyCostHis/index.vue
+++ b/src/views/cost/energyCostHis/index.vue
@@ -111,6 +111,7 @@ export default {
 					startPlaceholder: '开始时间',
 					endPlaceholder: '结束时间',
 					param: 'searchTime',
+					defaultSelect: [],
 				},
 				{
 					type: 'button',
@@ -132,6 +133,14 @@ export default {
 	},
 	components: {},
 	created() {
+		const end = new Date();
+		const start = new Date();
+		start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+		this.formConfig[2].defaultSelect = [start, end];
+		this.listQuery.reportTime = [
+			moment(start).startOf('day').format('x'),
+			moment(end).endOf('day').format('x'),
+		];
 		getEnergyTypeListAll().then((response) => {
 			this.formConfig[1].selectOptions = response.data;
 		});
diff --git a/src/views/cost/rawMaterialCostHis/index.vue b/src/views/cost/rawMaterialCostHis/index.vue
index 2e22c970..05636063 100644
--- a/src/views/cost/rawMaterialCostHis/index.vue
+++ b/src/views/cost/rawMaterialCostHis/index.vue
@@ -110,6 +110,7 @@ export default {
 					startPlaceholder: '开始时间',
 					endPlaceholder: '结束时间',
 					param: 'searchTime',
+					defaultSelect: [],
 				},
 				{
 					type: 'button',
@@ -131,6 +132,14 @@ export default {
 	},
 	components: {},
 	created() {
+		const end = new Date();
+		const start = new Date();
+		start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+		this.formConfig[2].defaultSelect = [start, end];
+		this.listQuery.times = [
+			moment(start).startOf('day').format('x'),
+			moment(end).endOf('day').format('x'),
+		];
 		getHotMaterialList().then((response) => {
 			this.formConfig[1].selectOptions = response.data;
 		});

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

---
 .env.dev                                      |   4 +-
 .../OperationalOverview/processingBoard.vue   | 130 ++++++++++--------
 .../base/qualityHotMaterial/add-or-updata.vue |  53 +++----
 .../quality/base/qualityHotMaterial/index.vue |   1 +
 src/views/quality/base/qualityIsra/index.vue  |  32 +++--
 .../quality/base/qualityScrapDet/index.vue    |   2 +
 .../quality/base/qualityScrapLog/index.vue    |   2 +
 .../monitoring/deviceParameters/index.vue     |  39 +++---
 .../equipmentTraceability/index.vue           | 125 +++++++----------
 .../monitoring/materielDateFrom/index.vue     |   9 +-
 .../monitoring/originalGlassRetrace/index.vue |  12 +-
 .../monitoring/statisticalData/index.vue      |   6 +-
 12 files changed, 220 insertions(+), 195 deletions(-)

diff --git a/.env.dev b/.env.dev
index 34598f0d..2f3ffe42 100644
--- a/.env.dev
+++ b/.env.dev
@@ -1,7 +1,7 @@
 ###
  # @Author: Do not edit
  # @Date: 2023-08-29 09:40:39
- # @LastEditTime: 2024-03-13 14:57:16
+ # @LastEditTime: 2024-03-21 14:45:52
  # @LastEditors: zhp
  # @Description:
 ###
@@ -25,7 +25,7 @@ VUE_APP_BASE_API = 'http://192.168.0.33:48082'
 # VUE_APP_BASE_API = 'http://192.168.1.78:48082'
 # VUE_APP_BASE_API = 'http://192.168.1.47:48082'
 # socket地址
-VUE_APP_Socket_API = 'ws://192.168.0.30:8888'
+VUE_APP_Socket_API = 'ws://192.168.0.33:48082'
 VUE_APP_Socket_Dcs_API = 'ws://10.70.180.10:8081'
 
 # 积木报表指向地址
diff --git a/src/views/OperationalOverview/processingBoard.vue b/src/views/OperationalOverview/processingBoard.vue
index d2f23723..dcf702b4 100644
--- a/src/views/OperationalOverview/processingBoard.vue
+++ b/src/views/OperationalOverview/processingBoard.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-07-19 15:18:30
  * @LastEditors: zhp
- * @LastEditTime: 2024-03-12 09:34:06
+ * @LastEditTime: 2024-03-21 16:07:39
  * @Description:
 -->
 <template>
@@ -633,7 +633,7 @@ export default {
     this.eqConfig.data = eqArr
     this.$refs['eqScrollBoard'].updateRows(eqArr)
     this.$refs.productLineChart.initChart(['D61', 'D62', 'D63', 'D64', 'D65',], [98, 97, 98.7, 98.5, 98.3,], [3134, 2323, 3232, 3233, 2321])
-    this.getList()
+    // this.getList()
     this.initWebSocket()
     this.SJGInitWebSocket()
     this.getTimes()
@@ -671,52 +671,52 @@ export default {
   //   removeEventListener('resize', resizeFun)
   // },
   methods: {
-    getList() {
-      this.$axios.get(
-        'base/core-production-line/listAll',
-        'get',
-        this.queryParams
-      ).then((res) => {
-        // console.log('11111', res);
-        this.productLineList = res.data
-      })
-      this.$axios.get(
-        'base/quality-inspection-record/dayStatistics',
-        'get',
-      ).then((res) => {
-        // console.log('11111', res);
-        let processArr = qualityMonthList.map((item, index) => [
-          // console.log(item)
-          `<span style="color:rgba(255,255,255,0.5)" >${index + 1 || ''}
-            </span>`,
-          // formatDate(item.planStartTime) || '',
-          `
-          <span style="color:rgba(255,255,255,0.5)" >${item.productionLineName || ''}
-            </span>`,
-          `<span style="color:rgba(255,255,255,0.5)">${item.sectionName || ''}</span>`,
-          `<span style="color:rgba(255,255,255,0.5)">${item.count || ''}</span>`,
-          `<span style="color:rgba(255,255,255,0.5)">${item.inspectionTypeName || ''}</span>`,
-        ])
-        this.processConfig.data = processArr
-        this.$refs['processScrollBoard'].updateRows(processArr)
-        // if (res.data.length !==0) {
-        //   let processArr = res.data.map((item, index) => [
-        //     // console.log(item)
-        //     `<span style="color:rgba(255,255,255,0.5)" >${index + 1 || ''}
-        //     </span>`,
-        //     // formatDate(item.planStartTime) || '',
-        //     `
-        //   <span style="color:rgba(255,255,255,0.5)" >${item.productionLineName || ''}
-        //     </span>`,
-        //     `<span style="color:rgba(255,255,255,0.5)">${item.sectionName || ''}</span>`,
-        //     `<span style="color:rgba(255,255,255,0.5)">${item.count || ''}</span>`,
-        //     `<span style="color:rgba(255,255,255,0.5)">${item.inspectionTypeName || ''}</span>`,
-        //   ])
-        //   this.processConfig.data = processArr
-        //   this.$refs['processScrollBoard'].updateRows(processArr)
-        // }
-      })
-    },
+    // getList() {
+    //   // this.$axios.get(
+    //   //   'base/core-production-line/listAll',
+    //   //   'get',
+    //   //   this.queryParams
+    //   // ).then((res) => {
+    //   //   // console.log('11111', res);
+    //   //   this.productLineList = res.data
+    //   // })
+    //   this.$axios.get(
+    //     'base/quality-inspection-record/dayStatistics',
+    //     'get',
+    //   ).then((res) => {
+    //     // console.log('11111', res);
+    //     let processArr = qualityMonthList.map((item, index) => [
+    //       // console.log(item)
+    //       `<span style="color:rgba(255,255,255,0.5)" >${index + 1 || ''}
+    //         </span>`,
+    //       // formatDate(item.planStartTime) || '',
+    //       `
+    //       <span style="color:rgba(255,255,255,0.5)" >${item.productionLineName || ''}
+    //         </span>`,
+    //       `<span style="color:rgba(255,255,255,0.5)">${item.sectionName || ''}</span>`,
+    //       `<span style="color:rgba(255,255,255,0.5)">${item.count || ''}</span>`,
+    //       `<span style="color:rgba(255,255,255,0.5)">${item.inspectionTypeName || ''}</span>`,
+    //     ])
+    //     this.processConfig.data = processArr
+    //     this.$refs['processScrollBoard'].updateRows(processArr)
+    //     // if (res.data.length !==0) {
+    //     //   let processArr = res.data.map((item, index) => [
+    //     //     // console.log(item)
+    //     //     `<span style="color:rgba(255,255,255,0.5)" >${index + 1 || ''}
+    //     //     </span>`,
+    //     //     // formatDate(item.planStartTime) || '',
+    //     //     `
+    //     //   <span style="color:rgba(255,255,255,0.5)" >${item.productionLineName || ''}
+    //     //     </span>`,
+    //     //     `<span style="color:rgba(255,255,255,0.5)">${item.sectionName || ''}</span>`,
+    //     //     `<span style="color:rgba(255,255,255,0.5)">${item.count || ''}</span>`,
+    //     //     `<span style="color:rgba(255,255,255,0.5)">${item.inspectionTypeName || ''}</span>`,
+    //     //   ])
+    //     //   this.processConfig.data = processArr
+    //     //   this.$refs['processScrollBoard'].updateRows(processArr)
+    //     // }
+    //   })
+    // },
     getTimes() {
       setInterval(this.getTimesInterval, 1000);
     },
@@ -837,24 +837,25 @@ export default {
         this.$refs['eqScrollBoard'].updateRows(eqArr)
         // console.log(SJGWsData.orderList)
       } else if (this.SJGWsData.type === 'productline') {
+        console.log('aaaaaaaaaaaaaaaaaaa', this.SJGWsData);
         // console.log(this.wsData.detData);
         let nameList = []
         let passRateList = []
         let outputNumList = []
 
         // console.log('2222222222', this.productLineList);
-        this.productLineList.forEach((item) => {
+        // this.productLineList.forEach((item) => {
           this.SJGWsData.detData.forEach((ele) => {
-            if (item.id == ele.productionLineId) {
-              if (item.name.substr(0, 1) == "D") {
-                console.log(ele)
-                nameList.push(item.name)
+            // if (item.id == ele.productionLineId) {
+              // if (item.name.substr(0, 1) == "D") {
+                // console.log(ele)
+                nameList.push(ele.lineName)
                 outputNumList.push(ele.outputNum)
                 passRateList.push(ele.passRate)
-              }
-            }
+              // }
+            // }
           })
-        })
+        // })
         // progressRateList = EnergyNameList
         // let EnergyDataList = []
         // this.SJGWsData.detData.forEach((ele) => {
@@ -864,7 +865,22 @@ export default {
         // console.log(this.EnergyMonitoringNameList)
         // console.log(this.EnergyMonitoringList)
         // this.$nextTick(() => {
-        this.$refs.productLineChart.initChart(Array.from(new Set(nameList)), passRateList, outputNumList)
+        this.$refs.productLineChart.initChart(nameList, passRateList, outputNumList)
+      } else if (this.SJGInitWebSocket === 'inspection') {
+        let processArr = qualityMonthList.map((item, index) => [
+          // console.log(item)
+          `<span style="color:rgba(255,255,255,0.5)" >${index + 1 || ''}
+            </span>`,
+          // formatDate(item.planStartTime) || '',
+          `
+          <span style="color:rgba(255,255,255,0.5)" >${item.productionLineName || ''}
+            </span>`,
+          `<span style="color:rgba(255,255,255,0.5)">${item.sectionName || ''}</span>`,
+          `<span style="color:rgba(255,255,255,0.5)">${item.count || ''}</span>`,
+          `<span style="color:rgba(255,255,255,0.5)">${item.inspectionTypeName || ''}</span>`,
+        ])
+        this.processConfig.data = processArr
+        this.$refs['processScrollBoard'].updateRows(processArr)
       }
     },
     // 数据发送
diff --git a/src/views/quality/base/qualityHotMaterial/add-or-updata.vue b/src/views/quality/base/qualityHotMaterial/add-or-updata.vue
index 409713a8..c7a415cc 100644
--- a/src/views/quality/base/qualityHotMaterial/add-or-updata.vue
+++ b/src/views/quality/base/qualityHotMaterial/add-or-updata.vue
@@ -1,12 +1,12 @@
 <!--
  * @Author: zhp
  * @Date: 2023-12-08 13:46:17
- * @LastEditTime: 2024-03-15 14:54:38
+ * @LastEditTime: 2024-03-21 10:40:52
  * @LastEditors: zhp
  * @Description:
 -->
 <template>
-  <el-drawer :visible.sync="visible" :show-close="true" :wrapper-closable="false" class="drawer" size="50%">
+  <el-drawer :visible.sync="visible" :show-close="true" :wrapper-closable="true" class="drawer" size="50%">
     <small-title slot="title" :no-padding="true" @close="handleClose">
       {{ isdetail ? '详情' : !dataForm.id ? '新增' : '编辑' }}
     </small-title>
@@ -114,7 +114,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="原料等级" prop="materialGrade">
-              <el-select :disabled="isdetail" v-model="dataForm.materialGrade" placeholder="请选择" style="width: 100%;">
+              <el-select :disabled="isdetail" v-model="dataForm.materialGrade" placeholder="请选择">
                 <el-option v-for="item in gradeList" :key="item.value" :label="item.label" :value="item.value">
                 </el-option>
               </el-select>
@@ -122,14 +122,14 @@
           </el-col>
         </el-row>
         <el-form-item label="备注" prop="remark">
-          <el-input :disabled="isdetail" v-model="dataForm.remark" placeholder="请填写备注" style="width: 100%;">
+          <el-input @input="onInput" :disabled="isdetail" v-model="dataForm.remark" placeholder="请填写备注">
           </el-input>
         </el-form-item>
       </el-form>
 
       <!-- </div> -->
-      <div class="attr-list" v-if="idAttrShow">
-        <!-- <small-title style="margin: 16px 0; padding-left: 8px" :no-padding="true">
+      <!-- <div class="attr-list" v-if="idAttrShow"> -->
+      <!-- <small-title style="margin: 16px 0; padding-left: 8px" :no-padding="true">
           设备物料明细
         </small-title>
 
@@ -147,9 +147,9 @@
         </base-table>
         <pagination v-show="listQuery.total > 0" :total="listQuery.total" :page.sync="listQuery.pageNo"
           :limit.sync="listQuery.pageSize" :page-sizes="[5, 10, 15]" @pagination="getList" /> -->
-      </div>
+      <!-- </div> -->
     </div>
-    <div class="drawer-body__footer">
+    <div v-if="!isdetail" class="drawer-body__footer">
       <el-button style="" @click="goback()">取消</el-button>
       <el-button type="primary" @click="dataFormSubmit()">确定</el-button>
     </div>
@@ -237,7 +237,7 @@ export default {
         checkValueList: [],
         checkResult: '',
         materialGrade: undefined,
-        remark:null,
+        remark:undefined,
 			},
 			productAttrList: [],
 			visible: false,
@@ -257,6 +257,9 @@ export default {
   mounted() {
   },
   methods: {
+    onInput() {
+      this.$forceUpdate();
+    },
     judgeValue(val, minValue, maxValue, index) {
       if (val >= minValue && val <= maxValue) {
         console.log(val)
@@ -268,7 +271,7 @@ export default {
       }
     },
     handleClose() {
-      this.ingredientList = undefined
+      this.ingredientList = []
       console.log(222222222);
     },
     dataFormSubmit() {
@@ -454,17 +457,17 @@ export default {
 		// 	});
 		// },
 		init(id, isdetail) {
-      this.initData()
+      // this.initData()
       this.getDict()
       this.ingredientList = []
 			this.isdetail = isdetail || false;
 			this.dataForm.id = id || undefined;
 			this.visible = true;
-			if (id) {
-				this.idAttrShow = true
-			} else {
-				this.idAttrShow = false
-			}
+			// if (id) {
+			// 	this.idAttrShow = true
+			// } else {
+			// 	this.idAttrShow = false
+			// }
 
 			this.$nextTick(() => {
 				this.$refs['dataForm'].resetFields();
@@ -537,9 +540,9 @@ export default {
 					// 获取产品属性列表
 					// this.getList();
 				} else {
-					if (this.urlOptions.isGetCode) {
-            this.getCode()
-          }
+					// if (this.urlOptions.isGetCode) {
+          //   this.getCode()
+          // }
 				}
 			});
 		},
@@ -553,12 +556,12 @@ export default {
 			this.isdetail = false;
 		},
 		// 新增 / 修改
-		addNew(id) {
-			this.addOrUpdateVisible = true;
-			this.$nextTick(() => {
-				this.$refs.addOrUpdate.init(id,this.dataForm.id);
-			});
-		}
+		// addNew(id) {
+		// 	this.addOrUpdateVisible = true;
+		// 	this.$nextTick(() => {
+		// 		this.$refs.addOrUpdate.init(id,this.dataForm.id);
+		// 	});
+		// }
 	}
 };
 </script>
diff --git a/src/views/quality/base/qualityHotMaterial/index.vue b/src/views/quality/base/qualityHotMaterial/index.vue
index 73cc5df8..a55a8577 100644
--- a/src/views/quality/base/qualityHotMaterial/index.vue
+++ b/src/views/quality/base/qualityHotMaterial/index.vue
@@ -118,6 +118,7 @@ export default {
           labelField: 'name',
           valueField: 'id',
           param: 'materialId',
+          filterable: true
         },
         {
           type: 'datePicker',
diff --git a/src/views/quality/base/qualityIsra/index.vue b/src/views/quality/base/qualityIsra/index.vue
index 5abee7d4..df021858 100644
--- a/src/views/quality/base/qualityIsra/index.vue
+++ b/src/views/quality/base/qualityIsra/index.vue
@@ -32,7 +32,7 @@
             <!-- </span> -->
             <el-tabs style="margin-top: 10px;" v-model="activeName" type="card" @tab-click="handleClick">
               <el-tab-pane label="天" name="day">
-                <div id="mapDayMain" style="height: 500px;width: 1000px;"></div>
+                <div id="mapDayMain" style="margin-bottom: 30px;height: 500px;width: 1000px;"></div>
                 <div id="listDayMain" style="height: 500px;width: 1000px;"></div>
               </el-tab-pane>
               <el-tab-pane label="周" name="week">
@@ -232,18 +232,23 @@ export default {
         var option;
         option = {
           title: {
-            text: '各类型缺陷对比图'
+            text: '各类型缺陷对比图',
+            // top:'5px'
           },
           tooltip: {
             trigger: 'axis'
           },
           legend: {
-            data: mapLegendData
+            data: mapLegendData,
+            top: "10%",
+            y: 'top',
+            x:'left'
           },
           grid: {
             left: '3%',
             right: '4%',
             bottom: '3%',
+            top:'20%',
             containLabel: true
           },
           // toolbox: {
@@ -299,7 +304,7 @@ export default {
             trigger: 'axis'
           },
           legend: {
-            data: ['缺陷数量', '缺陷率']
+            data: ['缺陷数量', '缺陷率'],
           },
           grid: {
             left: '3%',
@@ -345,15 +350,15 @@ export default {
               type: 'bar',
               barWidth: '3%',
               data: listNumArr,
-              label: {
-                show: true, //开启显示
-                position: 'top', //在上方显示
-                // formatter: '{c}%',//显示百分号
-                textStyle: { //数值样式
-                  color: 'black',//字体颜色
-                  fontSize: 20//字体大小
-                }
-              }
+              // label: {
+              //   show: true, //开启显示
+              //   position: 'top', //在上方显示
+              //   // formatter: '{c}%',//显示百分号
+              //   textStyle: { //数值样式
+              //     color: 'black',//字体颜色
+              //     fontSize: 12//字体大小
+              //   }
+              // }
             },
             {
               name: '缺陷率',
@@ -464,6 +469,7 @@ export default {
         this.queryParams.endTime = val.checkTime ? val.checkTime[1] : undefined
 
         this.getList()
+        this.getData()
       }
      console.log(val);
     }
diff --git a/src/views/quality/base/qualityScrapDet/index.vue b/src/views/quality/base/qualityScrapDet/index.vue
index 0444b0b2..d4113692 100644
--- a/src/views/quality/base/qualityScrapDet/index.vue
+++ b/src/views/quality/base/qualityScrapDet/index.vue
@@ -101,6 +101,7 @@ export default {
           label: '报废原因',
           placeholder: '报废原因',
           param: 'content',
+          // filterable: true
         },
         {
           type: 'select',
@@ -109,6 +110,7 @@ export default {
           labelField: 'name',
           valueField: 'id',
           param: 'typeId',
+          filterable: true
         },
 				{
 					type: 'button',
diff --git a/src/views/quality/base/qualityScrapLog/index.vue b/src/views/quality/base/qualityScrapLog/index.vue
index d5b6daf7..d495246c 100644
--- a/src/views/quality/base/qualityScrapLog/index.vue
+++ b/src/views/quality/base/qualityScrapLog/index.vue
@@ -107,6 +107,7 @@ export default {
           labelField: 'name',
           valueField: 'id',
           param: 'workOrderId',
+          filterable: true
         },
         {
           type: 'select',
@@ -115,6 +116,7 @@ export default {
           labelField: 'name',
           valueField: 'id',
           param: 'teamId',
+          filterable: true
         },
 				{
 					type: 'button',
diff --git a/src/views/quality/monitoring/deviceParameters/index.vue b/src/views/quality/monitoring/deviceParameters/index.vue
index 1146b523..2570360a 100644
--- a/src/views/quality/monitoring/deviceParameters/index.vue
+++ b/src/views/quality/monitoring/deviceParameters/index.vue
@@ -17,10 +17,10 @@
         @mouseleave="factoryListOpen = false">
         {{ currentFactory?.label || '点我选择设备' }}
         <div class="factory-list__wrapper" :class="{ open: factoryListOpen }">
-          <ul class="factory-list" v-if="sidebarContent.length" @click.prevent="factoryChangeHandler">
-            <li v-for="fc in sidebarContent" :key="fc.id" :data-value="fc.id" class="factory-list__item"
+          <ul class="factory-list" v-if="sidebarContent.length" @click.capture="factoryChangeHandler">
+            <li v-for="fc in sidebarContent" :key="fc.id" class="factory-list__item"
               :class="{ 'is-current': fc.id == currentFactory?.id }">
-              <span>
+              <span :data-value="fc.id">
                 {{ fc.label }}
               </span>
               <svg-icon v-if="fc.id == currentFactory?.id" icon-class="Confirm" style="height: 14px; width: 14px" />
@@ -95,12 +95,12 @@ export default {
       factoryListOpen: false,
       currentFactory: null,
       factoryList: [
-        { name: '1', value: 1 },
-        { name: '2', value: 2 },
-        { name: '3', value: 3 },
-        { name: '4', value: 4 },
-        { name: '5', value: 5 },
-        { name: '6', value: 6 },
+        // { name: '1', value: 1 },
+        // { name: '2', value: 2 },
+        // { name: '3', value: 3 },
+        // { name: '4', value: 4 },
+        // { name: '5', value: 5 },
+        // { name: '6', value: 6 },
       ],
       sidebarContent: [
         // {
@@ -486,14 +486,12 @@ export default {
     },
 
     async getTree(id) {
-      getTreeData({id:id}).then((res) => {
-        console.log(res.data);
-        this.sidebarContent = res.data;
-        this.buildTree(res.data);
-        console.log('tree', this.sidebarContent);
-        // console.log(this.formConfig[0].selectOptions);
-        // this.listQuery.total = response.data.total;
-      })
+      const res = await getTreeData({ id: id })
+      console.log(res.data)
+      this.buildTree(res.data);
+      this.sidebarContent = res.data;
+      console.log('tree', this.sidebarContent)
+      console.log(this.sidebarContent);
       // const { data } = await this.$axios('/base/core-factory/getTreeByWorkOrder');
       // console.log(data)
 
@@ -504,10 +502,13 @@ export default {
     },
 
     factoryChangeHandler(event) {
-      this.factoryListOpen = false;
+      this.currentFactory =undefined
+      this.factoryListOpen = false
+      console.log(event.target.dataset);
       const fcId = event.target.dataset.value;
       this.handleSidebarItemClick({ id: fcId, type: '工厂' });
-      this.currentFactory = this.sidebarContent.find((item) => item.id == fcId);
+      this.currentFactory = this.sidebarContent.find((item) => item.id == fcId)
+      console.log(this.currentFactory);
     },
 
     handleSidebarItemClick({ label, id, type }) {
diff --git a/src/views/quality/monitoring/equipmentTraceability/index.vue b/src/views/quality/monitoring/equipmentTraceability/index.vue
index 94ad1e3b..fa7b95f1 100644
--- a/src/views/quality/monitoring/equipmentTraceability/index.vue
+++ b/src/views/quality/monitoring/equipmentTraceability/index.vue
@@ -6,83 +6,60 @@
 -->
 
 <template>
-	<div class="app-container allow-overflow">
-		<!-- 搜索工作栏 -->
-		<SearchBar
-			:formConfigs="searchBarFormConfig"
-			ref="search-bar"
-			@headBtnClick="handleSearchBarBtnClick" />
+  <div class="app-container allow-overflow">
+    <!-- 搜索工作栏 -->
+    <SearchBar :formConfigs="searchBarFormConfig" ref="search-bar" @headBtnClick="handleSearchBarBtnClick" />
 
-		<el-row>
-			<el-col class="custom-tabs">
-				<el-tabs
-					v-model="activeName"
-					:stretch="true"
-					@tab-click="handleTabClick">
-					<el-tab-pane :label="'\u2002数据列表\u2002'" name="table">
-						<!-- 列表 -->
-						<base-table
-							class="base-table__margin"
-							:table-props="tableProps"
-							:page="1"
-							:limit="10"
-							:table-data="list"
-							@emitFun="handleEmitFun"></base-table>
-					</el-tab-pane>
-					<el-tab-pane
-						:label="'\u3000可视化\u3000'"
-						name="graph"
-						style="overflow: inherit">
-						<div
-							v-if="activeName == 'graph'"
-							class="graph"
-							style="
+    <el-row>
+      <el-col class="custom-tabs">
+        <el-tabs v-model="activeName" :stretch="true" @tab-click="handleTabClick">
+          <el-tab-pane :label="'\u2002数据列表\u2002'" name="table">
+            <!-- 列表 -->
+            <base-table class="base-table__margin" :table-props="tableProps" :page="1" :limit="10" :max-height="tableH"
+              :table-data="list" @emitFun="handleEmitFun"></base-table>
+          </el-tab-pane>
+          <el-tab-pane :label="'\u3000可视化\u3000'" name="graph" style="overflow: inherit">
+            <div v-if="activeName == 'graph'" class="graph" style="
 								overflow: inherit;
 								display: flex;
 								flex-direction: column;
 								position: relative;
 							">
-							<div class="blue-title">各设备加工数量</div>
-							<div class="legend">
-								<div class="legend-item">
-									<span class="icon blue"></span>
-									<span class="text">工作时长</span>
-								</div>
-								<div class="legend-item">
-									<span class="icon green"></span>
-									<span class="text">停机时长</span>
-								</div>
-								<div class="legend-item">
-									<span class="icon purple"></span>
-									<span class="text">故障时长</span>
-								</div>
-								<div class="legend-item">
-									<span class="icon yellow"></span>
-									<span class="text">速度开动率</span>
-								</div>
-							</div>
-							<div class="graph-grid">
-								<div class="bg-grid grid-line">
-									<div
-										class="grid-item"
-										v-for="item in list.length"
-										:key="item"></div>
-								</div>
+              <div class="blue-title">各设备加工数量</div>
+              <div class="legend">
+                <div class="legend-item">
+                  <span class="icon blue"></span>
+                  <span class="text">工作时长</span>
+                </div>
+                <div class="legend-item">
+                  <span class="icon green"></span>
+                  <span class="text">停机时长</span>
+                </div>
+                <div class="legend-item">
+                  <span class="icon purple"></span>
+                  <span class="text">故障时长</span>
+                </div>
+                <div class="legend-item">
+                  <span class="icon yellow"></span>
+                  <span class="text">速度开动率</span>
+                </div>
+              </div>
+              <div class="graph-grid">
+                <div class="bg-grid grid-line">
+                  <div class="grid-item" v-for="item in list.length" :key="item"></div>
+                </div>
 
-								<div class="bg-grid grid-charts">
-									<pie-chart
-										v-for="item in list"
-										:key="item.id"
-										:value="item" />
-									<!-- <pie-chart v-for="item in 5" :key="item" :value="item" /> -->
-								</div>
-							</div>
-						</div>
-					</el-tab-pane>
-				</el-tabs>
-			</el-col>
-		</el-row>
-	</div>
+                <div class="bg-grid grid-charts">
+                  <pie-chart v-for="item in list" :key="item.id" :value="item" />
+                  <!-- <pie-chart v-for="item in 5" :key="item" :value="item" /> -->
+                </div>
+              </div>
+            </div>
+          </el-tab-pane>
+        </el-tabs>
+      </el-col>
+    </el-row>
+  </div>
 </template>
 
 <script>
@@ -116,7 +93,8 @@ export default {
 			// 				btnName: '删除',
 			// 		  }
 			// 		: undefined,
-			// ].filter((v) => v),
+      // ].filter((v) => v),
+      tableH: this.tableHeight(260),
 			tableProps: [
 				{ prop: 'factoryName', label: '工厂' },
 				{ prop: 'lineName', label: '产线' },
@@ -331,7 +309,10 @@ export default {
 			list: [],
 		};
 	},
-	created() {
+  created() {
+    window.addEventListener('resize', () => {
+      this.tableH = this.tableHeight(260)
+    })
 		this.getWorkOrder()
 		// this.getLine();
 		this.getList();
diff --git a/src/views/quality/monitoring/materielDateFrom/index.vue b/src/views/quality/monitoring/materielDateFrom/index.vue
index 4929b7e8..a2191caf 100644
--- a/src/views/quality/monitoring/materielDateFrom/index.vue
+++ b/src/views/quality/monitoring/materielDateFrom/index.vue
@@ -2,13 +2,14 @@
  * @Author: zwq
  * @Date: 2023-08-01 14:55:51
  * @LastEditors: zhp
- * @LastEditTime: 2023-12-01 16:41:40
+ * @LastEditTime: 2024-03-21 15:14:04
  * @Description:
 -->
 <template>
   <div class="app-container">
     <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
-    <base-table :table-props="tableProps" :page="listQuery.pageNo" :limit="listQuery.pageSize" :table-data="list">
+    <base-table :max-height="tableH" :table-props="tableProps" :page="listQuery.pageNo" :limit="listQuery.pageSize"
+      :table-data="list">
       <!-- <method-btn v-if="tableBtn.length" slot="handleBtn" :width="120" label="操作" :method-list="tableBtn"
         @clickBtn="handleClick" /> -->
     </base-table>
@@ -81,6 +82,7 @@ export default {
       //   // exportURL: exportPackingExcel,
       // },
       tableProps,
+      tableH: this.tableHeight(260),
       tableBtn: [
         this.$auth.hasPermi(`base:packaging-print-log:update`)
           ? {
@@ -172,6 +174,9 @@ export default {
     // AddOrUpdate,
   },
   created() {
+    window.addEventListener('resize', () => {
+      this.tableH = this.tableHeight(260)
+    })
     this.getList()
     this.getDict()
   },
diff --git a/src/views/quality/monitoring/originalGlassRetrace/index.vue b/src/views/quality/monitoring/originalGlassRetrace/index.vue
index 75faf29f..3d1280ad 100644
--- a/src/views/quality/monitoring/originalGlassRetrace/index.vue
+++ b/src/views/quality/monitoring/originalGlassRetrace/index.vue
@@ -2,13 +2,14 @@
  * @Author: zwq
  * @Date: 2023-08-01 14:55:51
  * @LastEditors: zhp
- * @LastEditTime: 2024-03-01 10:27:29
+ * @LastEditTime: 2024-03-21 15:17:05
  * @Description:
 -->
 <template>
   <div class="app-container">
     <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
-    <base-table :table-props="tableProps" :page="listQuery.pageNo" :limit="listQuery.pageSize" :table-data="list">
+    <base-table :max-height="tableH" :table-props="tableProps" :page="listQuery.pageNo" :limit="listQuery.pageSize"
+      :table-data="list">
       <!-- <method-btn v-if="tableBtn.length" slot="handleBtn" :width="120" label="操作" :method-list="tableBtn"
         @clickBtn="handleClick" /> -->
     </base-table>
@@ -118,6 +119,7 @@ export default {
         startTime: undefined,
         endTime:undefined,
       },
+      tableH: this.tableHeight(260),
       formConfig: [
         {
           type: 'select',
@@ -125,7 +127,8 @@ export default {
           selectOptions: [],
           labelField: 'name',
           valueField: 'name',
-          param: 'workOrderName'
+          param: 'workOrderName',
+          filterable: true
         },
         // {
         //   type: 'datePicker',
@@ -181,6 +184,9 @@ export default {
     // AddOrUpdate,
   },
   created() {
+    window.addEventListener('resize', () => {
+      this.tableH = this.tableHeight(260)
+    })
     this.getList()
     this.getDict()
   },
diff --git a/src/views/quality/monitoring/statisticalData/index.vue b/src/views/quality/monitoring/statisticalData/index.vue
index e11dfc86..ec67b71e 100644
--- a/src/views/quality/monitoring/statisticalData/index.vue
+++ b/src/views/quality/monitoring/statisticalData/index.vue
@@ -74,14 +74,16 @@ export default {
           multiple: true,
           labelField: 'name',
           valueField: 'id',
-          defaultSelect: []
+          defaultSelect: [],
+          filterable: true
         },
 				{
 					type: 'select',
 					label: '产品',
           placeholder: '请选择产品',
           param: 'productionId',
-					selectOptions: [],
+          selectOptions: [],
+          filterable: true
 				},
 				// {
 				// 	type: 'input',

From 14afb6d4b1c7d6818b795720daafa514d3e0ce11 Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Fri, 22 Mar 2024 10:01:14 +0800
Subject: [PATCH 6/9] =?UTF-8?q?update=20=E8=AE=BE=E5=A4=87=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E6=97=B6=E5=BA=8F=E5=9B=BE=E8=AE=BE=E5=A4=87=E5=90=8D?=
 =?UTF-8?q?=E9=95=BF=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../equipment/timing-diagram/status/chart.js  |  2 +-
 .../equipment/timing-diagram/status/index.vue | 50 ++++++++++---------
 2 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/src/views/equipment/timing-diagram/status/chart.js b/src/views/equipment/timing-diagram/status/chart.js
index 70032a00..63596f86 100644
--- 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: 88,
+            left: 183,
             height: 56
         }
     }
diff --git a/src/views/equipment/timing-diagram/status/index.vue b/src/views/equipment/timing-diagram/status/index.vue
index 94cb15ca..2b1f5559 100644
--- 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,
 				},
 				// 时间段
 				{
@@ -171,26 +171,26 @@ export default {
 			eqList: [],
 			startTime: null,
 			gantt: null,
-			// demo: [
-			// 	[
-			// 		{
-			// 			equipmentName: '下片机',
-			// 			duration: 30,
-			// 			relativeDuration: 0.6,
-			// 			status: 0,
-			// 			startPos: 0,
-			//             startTime: 1691568181000,
-			// 		},
-			// 		{
-			// 			equipmentName: '下片机',
-			// 			duration: 20,
-			// 			relativeDuration: 0.4,
-			// 			status: 2,
-			// 			startPos: 30,
-			//             startTime: 1691569981000
-			// 		},
-			// 	],
-			// ],
+			demo: [
+				[
+					{
+						equipmentName: '一大线四区2小线清洗机',
+						duration: 30,
+						relativeDuration: 0.6,
+						status: 0,
+						startPos: 0,
+						startTime: 1711073203686,
+					},
+					{
+						equipmentName: '一大线四区2小线清洗机',
+						duration: 20,
+						relativeDuration: 0.4,
+						status: 2,
+						startPos: 30,
+						startTime: 1711072203686,
+					},
+				],
+			],
 		};
 	},
 	computed: {},
@@ -258,7 +258,11 @@ export default {
 				this.existingEquipments = Object.values(data).map(
 					(eq) => eq[0].equipmentId
 				);
-				this.graphList = this.objectToArray(data);
+				// this.graphList = this.objectToArray(data);
+				this.graphList = this.demo.map(item => {
+					item.key = item[0].equipmentName;
+					return item;
+				});
 			}
 		},
 

From dc94bfd51f828a2dd502e209adbdc033536c5321 Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Fri, 22 Mar 2024 10:10:57 +0800
Subject: [PATCH 7/9] 1

---
 .../equipment/timing-diagram/status/index.vue | 50 +++++++++----------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/views/equipment/timing-diagram/status/index.vue b/src/views/equipment/timing-diagram/status/index.vue
index 2b1f5559..8ab97201 100644
--- a/src/views/equipment/timing-diagram/status/index.vue
+++ b/src/views/equipment/timing-diagram/status/index.vue
@@ -171,26 +171,26 @@ export default {
 			eqList: [],
 			startTime: null,
 			gantt: null,
-			demo: [
-				[
-					{
-						equipmentName: '一大线四区2小线清洗机',
-						duration: 30,
-						relativeDuration: 0.6,
-						status: 0,
-						startPos: 0,
-						startTime: 1711073203686,
-					},
-					{
-						equipmentName: '一大线四区2小线清洗机',
-						duration: 20,
-						relativeDuration: 0.4,
-						status: 2,
-						startPos: 30,
-						startTime: 1711072203686,
-					},
-				],
-			],
+			// demo: [
+			// 	[
+			// 		{
+			// 			equipmentName: '一大线四区2小线清洗机',
+			// 			duration: 30,
+			// 			relativeDuration: 0.6,
+			// 			status: 0,
+			// 			startPos: 0,
+			// 			startTime: 1711073203686,
+			// 		},
+			// 		{
+			// 			equipmentName: '一大线四区2小线清洗机',
+			// 			duration: 20,
+			// 			relativeDuration: 0.4,
+			// 			status: 2,
+			// 			startPos: 30,
+			// 			startTime: 1711072203686,
+			// 		},
+			// 	],
+			// ],
 		};
 	},
 	computed: {},
@@ -258,11 +258,11 @@ export default {
 				this.existingEquipments = Object.values(data).map(
 					(eq) => eq[0].equipmentId
 				);
-				// this.graphList = this.objectToArray(data);
-				this.graphList = this.demo.map(item => {
-					item.key = item[0].equipmentName;
-					return item;
-				});
+				this.graphList = this.objectToArray(data);
+				// this.graphList = this.demo.map(item => {
+				// 	item.key = item[0].equipmentName;
+				// 	return item;
+				// });
 			}
 		},
 

From 75970472200ccac40c586f602253fb2eb73ff512 Mon Sep 17 00:00:00 2001
From: zwq <zwq229436@163.com>
Date: Fri, 22 Mar 2024 10:17:03 +0800
Subject: [PATCH 8/9] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=88=90=E6=9C=ACbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/cost/energyCost/index.vue             | 17 +++++++++++++----
 .../cost/rawMaterialConfig/add-or-updata.vue    |  4 ++--
 src/views/cost/rawMaterialCost/index.vue        |  8 ++++++--
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/src/views/cost/energyCost/index.vue b/src/views/cost/energyCost/index.vue
index a0e122aa..7d7ec099 100644
--- a/src/views/cost/energyCost/index.vue
+++ b/src/views/cost/energyCost/index.vue
@@ -30,6 +30,7 @@ import {
 } from '@/api/cost/costEneryAutoReport';
 import { getEnergyTypeListAll } from '@/api/base/energyType';
 import { publicFormatter } from '@/utils/dict';
+import moment from 'moment';
 
 const tableProps = [
 	{
@@ -135,15 +136,23 @@ 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 ? val.searchTime[0] : null;
-					this.listQuery.endTime = val.searchTime ? val.searchTime[1] : 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.getDataList();
 					break;
 				case 'export':
           const data = {
             energyTypeId:val.energyTypeId,
-            startTime : val.searchTime ? val.searchTime[0] : null,
-            endTime : val.searchTime ? val.searchTime[1] : null,
+            startTime : val.searchTime
+						? moment(val.searchTime[0]).startOf('day').format('x')
+						: null,
+            endTime : val.searchTime
+						? moment(val.searchTime[1]).endOf('day').format('x')
+						: null,
           }
 					this.handleExport(data);
 					break;
diff --git a/src/views/cost/rawMaterialConfig/add-or-updata.vue b/src/views/cost/rawMaterialConfig/add-or-updata.vue
index 1196e9ae..c2387006 100644
--- 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-02-19 09:36:50
+ * @LastEditTime: 2024-03-21 15:59:26
  * @Description:
 -->
 <template>
@@ -44,7 +44,7 @@
 							v-for="item in urlOptions.dictList.dict0"
 							:key="item.id"
 							:label="item.label"
-							:value="item.value"></el-option>
+							:value="parseInt(item.value)"></el-option>
 					</el-select>
 				</el-form-item>
 			</el-col>
diff --git a/src/views/cost/rawMaterialCost/index.vue b/src/views/cost/rawMaterialCost/index.vue
index 12759f01..961c5f67 100644
--- a/src/views/cost/rawMaterialCost/index.vue
+++ b/src/views/cost/rawMaterialCost/index.vue
@@ -152,8 +152,12 @@ export default {
 				case 'export':
 					this.listQuery.materialId = val.materialId;
 					this.listQuery.searchTime = val.searchTime ? val.searchTime[0] : null;
-					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
-					this.listQuery.endTime = val.searchTime ? val.searchTime[1] : 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.handleExport();
 					break;
 				default:

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 9/9] =?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>