diff --git a/src/views/board/scanDown/index.vue b/src/views/board/scanDown/index.vue
index e3da89f..483de03 100644
--- a/src/views/board/scanDown/index.vue
+++ b/src/views/board/scanDown/index.vue
@@ -129,7 +129,7 @@ export default {
       zhddhj: 0,
       title: [
         '成品产量',
-        '终检一次不合格率',
+        '终检一次返修率',
         'LOSS(分钟)',
         '入库标准节拍(秒)',
         'LOSS分类',
@@ -472,7 +472,7 @@ export default {
                   },
                 },
                 {
-                  name: '不合格率',
+                  name: '返修率',
                   type: 'line',
                   yAxisIndex: 1,
                   data: e.map(val => val.Y_VALUE_TWO),
diff --git a/src/views/report/qualityInspection/index.vue b/src/views/report/qualityInspection/index.vue
index e3c96c1..dd27751 100644
--- a/src/views/report/qualityInspection/index.vue
+++ b/src/views/report/qualityInspection/index.vue
@@ -17,14 +17,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-<!--      <el-form-item label="工序编号" prop="processCode">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.processCode"-->
-<!--          placeholder="请输入工序编号"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
+      <!--      <el-form-item label="工序编号" prop="processCode">-->
+      <!--        <el-input-->
+      <!--          v-model="queryParams.processCode"-->
+      <!--          placeholder="请输入工序编号"-->
+      <!--          clearable-->
+      <!--          @keyup.enter.native="handleQuery"-->
+      <!--        />-->
+      <!--      </el-form-item>-->
       <el-form-item label="检测项编号" prop="testItemCode">
         <el-input
           v-model="queryParams.testItemCode"
@@ -43,15 +43,27 @@
           />
         </el-select>
       </el-form-item>
-
-<!--      <el-form-item label="检测时间" prop="inspectorTime">-->
-<!--        <el-date-picker clearable-->
-<!--          v-model="queryParams.inspectorTime"-->
-<!--          type="date"-->
-<!--          value-format="yyyy-MM-dd"-->
-<!--          placeholder="请选择检测时间">-->
-<!--        </el-date-picker>-->
-<!--      </el-form-item>-->
+      <el-form-item label="质检工位" prop="stationCode">
+        <el-select v-model="queryParams.stationCode" placeholder="请选择质检工位">
+          <el-option
+            v-for="item in productLineList"
+            :key="item.productLineCode"
+            :label="item.productLineName"
+            :value="item.productLineCode"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="检测时间" prop="inspectorTime">
+        <el-date-picker
+          v-model="daterangeBeginTime"
+          style="width: 340px"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          type="datetimerange"
+          range-separator="-"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+        ></el-date-picker>
+      </el-form-item>
 
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -60,27 +72,27 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-<!--      <el-col :span="1.5">-->
-<!--        <el-button-->
-<!--          type="primary"-->
-<!--          plain-->
-<!--          icon="el-icon-plus"-->
-<!--          size="mini"-->
-<!--          @click="handleAdd"-->
-<!--          v-hasPermi="['report:qualityInspection:add']"-->
-<!--        >新增</el-button>-->
-<!--      </el-col>-->
-<!--      <el-col :span="1.5">-->
-<!--        <el-button-->
-<!--          type="success"-->
-<!--          plain-->
-<!--          icon="el-icon-edit"-->
-<!--          size="mini"-->
-<!--          :disabled="single"-->
-<!--          @click="handleUpdate"-->
-<!--          v-hasPermi="['report:qualityInspection:edit']"-->
-<!--        >修改</el-button>-->
-<!--      </el-col>-->
+      <!--      <el-col :span="1.5">-->
+      <!--        <el-button-->
+      <!--          type="primary"-->
+      <!--          plain-->
+      <!--          icon="el-icon-plus"-->
+      <!--          size="mini"-->
+      <!--          @click="handleAdd"-->
+      <!--          v-hasPermi="['report:qualityInspection:add']"-->
+      <!--        >新增</el-button>-->
+      <!--      </el-col>-->
+      <!--      <el-col :span="1.5">-->
+      <!--        <el-button-->
+      <!--          type="success"-->
+      <!--          plain-->
+      <!--          icon="el-icon-edit"-->
+      <!--          size="mini"-->
+      <!--          :disabled="single"-->
+      <!--          @click="handleUpdate"-->
+      <!--          v-hasPermi="['report:qualityInspection:edit']"-->
+      <!--        >修改</el-button>-->
+      <!--      </el-col>-->
       <el-col :span="1.5">
         <el-button
           type="danger"
@@ -90,7 +102,8 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['report:qualityInspection:remove']"
-        >删除</el-button>
+        >删除
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -100,13 +113,14 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['report:qualityInspection:export']"
-        >导出</el-button>
+        >导出
+        </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="qualityInspectionList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="主键标识" align="center" prop="objId" v-if="columns[0].visible"/>
       <el-table-column label="箱体码" align="center" prop="barCode" v-if="columns[1].visible" width="120"/>
       <el-table-column label="物料名称" align="center" prop="materialName" v-if="columns[2].visible" width="150"/>
@@ -149,24 +163,24 @@
           <span>{{ parseTime(scope.row.updatedTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
-<!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
-<!--        <template slot-scope="scope">-->
-<!--          <el-button-->
-<!--            size="mini"-->
-<!--            type="text"-->
-<!--            icon="el-icon-edit"-->
-<!--            @click="handleUpdate(scope.row)"-->
-<!--            v-hasPermi="['report:qualityInspection:edit']"-->
-<!--          >修改</el-button>-->
-<!--          <el-button-->
-<!--            size="mini"-->
-<!--            type="text"-->
-<!--            icon="el-icon-delete"-->
-<!--            @click="handleDelete(scope.row)"-->
-<!--            v-hasPermi="['report:qualityInspection:remove']"-->
-<!--          >删除</el-button>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
+      <!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
+      <!--        <template slot-scope="scope">-->
+      <!--          <el-button-->
+      <!--            size="mini"-->
+      <!--            type="text"-->
+      <!--            icon="el-icon-edit"-->
+      <!--            @click="handleUpdate(scope.row)"-->
+      <!--            v-hasPermi="['report:qualityInspection:edit']"-->
+      <!--          >修改</el-button>-->
+      <!--          <el-button-->
+      <!--            size="mini"-->
+      <!--            type="text"-->
+      <!--            icon="el-icon-delete"-->
+      <!--            @click="handleDelete(scope.row)"-->
+      <!--            v-hasPermi="['report:qualityInspection:remove']"-->
+      <!--          >删除</el-button>-->
+      <!--        </template>-->
+      <!--      </el-table-column>-->
     </el-table>
 
     <pagination
@@ -181,22 +195,22 @@
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="箱体码" prop="barCode">
-          <el-input v-model="form.barCode" placeholder="请输入箱体码" />
+          <el-input v-model="form.barCode" placeholder="请输入箱体码"/>
         </el-form-item>
         <el-form-item label="物料名称" prop="materialName">
-          <el-input v-model="form.materialName" placeholder="请输入物料名称" />
+          <el-input v-model="form.materialName" placeholder="请输入物料名称"/>
         </el-form-item>
         <el-form-item label="工序编号" prop="processCode">
-          <el-input v-model="form.processCode" placeholder="请输入工序编号" />
+          <el-input v-model="form.processCode" placeholder="请输入工序编号"/>
         </el-form-item>
         <el-form-item label="检测项编号" prop="testItemCode">
-          <el-input v-model="form.testItemCode" placeholder="请输入检测项编号" />
+          <el-input v-model="form.testItemCode" placeholder="请输入检测项编号"/>
         </el-form-item>
         <el-form-item label="质量缺陷编码" prop="qualityDefectCode">
-          <el-input v-model="form.qualityDefectCode" placeholder="请输入质量缺陷编码" />
+          <el-input v-model="form.qualityDefectCode" placeholder="请输入质量缺陷编码"/>
         </el-form-item>
         <el-form-item label="质量缺陷名称" prop="qualityDefectName">
-          <el-input v-model="form.qualityDefectName" placeholder="请输入质量缺陷名称" />
+          <el-input v-model="form.qualityDefectName" placeholder="请输入质量缺陷名称"/>
         </el-form-item>
         <el-form-item label="处理措施" prop="treatmentMeasure">
           <el-radio-group v-model="form.treatmentMeasure">
@@ -204,11 +218,12 @@
               v-for="dict in dict.type.treatment_measures"
               :key="dict.value"
               :label="dict.value"
-            >{{dict.label}}</el-radio>
+            >{{ dict.label }}
+            </el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item label="处理结果" prop="processResult">
-          <el-input v-model="form.processResult" placeholder="请输入处理结果" />
+          <el-input v-model="form.processResult" placeholder="请输入处理结果"/>
         </el-form-item>
         <el-form-item label="是否下静态线" prop="isLowerLine">
           <el-radio-group v-model="form.isLowerLine">
@@ -216,46 +231,50 @@
               v-for="dict in dict.type.sys_yes_no"
               :key="dict.value"
               :label="dict.value"
-            >{{dict.label}}</el-radio>
+            >{{ dict.label }}
+            </el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item label="班组编号" prop="groupCode">
-          <el-input v-model="form.groupCode" placeholder="请输入班组编号" />
+          <el-input v-model="form.groupCode" placeholder="请输入班组编号"/>
         </el-form-item>
         <el-form-item label="检测人员" prop="inspectorCode">
-          <el-input v-model="form.inspectorCode" placeholder="请输入检测人员" />
+          <el-input v-model="form.inspectorCode" placeholder="请输入检测人员"/>
         </el-form-item>
         <el-form-item label="检测时间" prop="inspectorTime">
           <el-date-picker clearable
-            v-model="form.inspectorTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择检测时间">
+                          v-model="form.inspectorTime"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="请选择检测时间"
+          >
           </el-date-picker>
         </el-form-item>
         <el-form-item label="返修次数" prop="reworkNumber">
-          <el-input v-model="form.reworkNumber" placeholder="请输入返修次数" />
+          <el-input v-model="form.reworkNumber" placeholder="请输入返修次数"/>
         </el-form-item>
         <el-form-item label="返修完成时间" prop="finishTime">
           <el-date-picker clearable
-            v-model="form.finishTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择返修完成时间">
+                          v-model="form.finishTime"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="请选择返修完成时间"
+          >
           </el-date-picker>
         </el-form-item>
         <el-form-item label="是否标识" prop="isFlag">
-          <el-input v-model="form.isFlag" placeholder="请输入是否标识" />
+          <el-input v-model="form.isFlag" placeholder="请输入是否标识"/>
         </el-form-item>
         <el-form-item label="更新人" prop="updatedBy">
-          <el-input v-model="form.updatedBy" placeholder="请输入更新人" />
+          <el-input v-model="form.updatedBy" placeholder="请输入更新人"/>
         </el-form-item>
         <el-form-item label="更新时间" prop="updatedTime">
           <el-date-picker clearable
-            v-model="form.updatedTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择更新时间">
+                          v-model="form.updatedTime"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="请选择更新时间"
+          >
           </el-date-picker>
         </el-form-item>
       </el-form>
@@ -268,10 +287,18 @@
 </template>
 
 <script>
-import { listQualityInspection, getQualityInspection, delQualityInspection, addQualityInspection, updateQualityInspection } from "@/api/report/qualityInspection";
+import {
+  listQualityInspection,
+  getQualityInspection,
+  delQualityInspection,
+  addQualityInspection,
+  updateQualityInspection
+} from '@/api/report/qualityInspection'
+import { parseTime } from '@//utils/ruoyi'
+import { findProductLineList } from '@//api/base/productLine'
 
 export default {
-  name: "QualityInspection",
+  name: 'QualityInspection',
   dicts: ['sys_yes_no', 'treatment_measures'],
   data() {
     return {
@@ -289,8 +316,10 @@ export default {
       total: 0,
       // 质检记录管理表格数据
       qualityInspectionList: [],
+      // 更新时间时间范围
+      daterangeBeginTime: [],
       // 弹出层标题
-      title: "",
+      title: '',
       // 是否显示弹出层
       open: false,
       // 查询参数
@@ -318,51 +347,64 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {
-      },
+      rules: {},
       columns: [
-            { key: 0, label: `主键标识`, visible: false },
-            { key: 1, label: `箱体码`, visible: true },
-            { key: 2, label: `物料名称`, visible: true },
-            { key: 3, label: `工序编号`, visible: true },
-            { key: 4, label: `检测项编号`, visible: false },
-            { key: 5, label: `质量缺陷编码`, visible: true },
-            { key: 6, label: `质量缺陷名称`, visible: true },
-            { key: 7, label: `处理措施`, visible: true },
-            { key: 8, label: `处理结果`, visible: true },
-            { key: 9, label: `是否下静态线`, visible: false },
-            { key: 10, label: `班组编号`, visible: false },
-            { key: 11, label: `检测人员编号`, visible: false },
-            { key: 12, label: `检测时间`, visible: true },
-            { key: 13, label: `返修次数`, visible: true },
-            { key: 14, label: `返修完成时间`, visible: true },
-            { key: 15, label: `是否标识`, visible: false },
-            { key: 16, label: `更新人`, visible: false },
-            { key: 17, label: `更新时间`, visible: false },
-            { key: 18, label: `工序名称`, visible: true },
-            { key: 19, label: `班组名称`, visible: true },
-            { key: 20, label: `检测人员名称`, visible: true },
-            { key: 21, label: `工位名称`, visible: true },
-        ]
-    };
+        { key: 0, label: `主键标识`, visible: false },
+        { key: 1, label: `箱体码`, visible: true },
+        { key: 2, label: `物料名称`, visible: true },
+        { key: 3, label: `工序编号`, visible: true },
+        { key: 4, label: `检测项编号`, visible: false },
+        { key: 5, label: `质量缺陷编码`, visible: true },
+        { key: 6, label: `质量缺陷名称`, visible: true },
+        { key: 7, label: `处理措施`, visible: true },
+        { key: 8, label: `处理结果`, visible: true },
+        { key: 9, label: `是否下静态线`, visible: false },
+        { key: 10, label: `班组编号`, visible: false },
+        { key: 11, label: `检测人员编号`, visible: false },
+        { key: 12, label: `检测时间`, visible: true },
+        { key: 13, label: `返修次数`, visible: true },
+        { key: 14, label: `返修完成时间`, visible: true },
+        { key: 15, label: `是否标识`, visible: false },
+        { key: 16, label: `更新人`, visible: false },
+        { key: 17, label: `更新时间`, visible: false },
+        { key: 18, label: `工序名称`, visible: true },
+        { key: 19, label: `班组名称`, visible: true },
+        { key: 20, label: `检测人员名称`, visible: true },
+        { key: 21, label: `工位名称`, visible: true }
+      ],
+      productLineList: []
+    }
   },
   created() {
-    this.getList();
+    findProductLineList({ productLineType: 2, stationType: 2 }).then(response => {
+      this.productLineList = response.data
+    })
+    const nowDate = parseTime(new Date(), '{y}-{m}-{d}')
+    this.daterangeBeginTime[0] = nowDate + ' 00:00:00'
+    this.daterangeBeginTime[1] = nowDate + ' 23:59:59'
+    this.getList()
   },
   methods: {
     /** 查询质检记录管理列表 */
     getList() {
-      this.loading = true;
+      this.loading = true
+      if (null != this.daterangeBeginTime && '' != this.daterangeBeginTime) {
+        this.queryParams.beginBeginTime = this.daterangeBeginTime[0]
+        this.queryParams.endBeginTime = this.daterangeBeginTime[1]
+      } else {
+        this.queryParams.beginBeginTime = null
+        this.queryParams.endBeginTime = null
+      }
       listQualityInspection(this.queryParams).then(response => {
-        this.qualityInspectionList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
+        this.qualityInspectionList = response.rows
+        this.total = response.total
+        this.loading = false
+      })
     },
     // 取消按钮
     cancel() {
-      this.open = false;
-      this.reset();
+      this.open = false
+      this.reset()
     },
     // 表单重置
     reset() {
@@ -385,70 +427,74 @@ export default {
         isFlag: null,
         updatedBy: null,
         updatedTime: null
-      };
-      this.resetForm("form");
+      }
+      const nowDate = parseTime(new Date(), '{y}-{m}-{d}')
+      this.daterangeBeginTime[0] = nowDate + ' 00:00:00'
+      this.daterangeBeginTime[1] = nowDate + ' 23:59:59'
+      this.resetForm('form')
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
+      this.queryParams.pageNum = 1
+      this.getList()
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
+      this.resetForm('queryForm')
+      this.handleQuery()
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.objId)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
     handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加质检记录管理";
+      this.reset()
+      this.open = true
+      this.title = '添加质检记录管理'
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      this.reset();
+      this.reset()
       const objId = row.objId || this.ids
       getQualityInspection(objId).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改质检记录管理";
-      });
+        this.form = response.data
+        this.open = true
+        this.title = '修改质检记录管理'
+      })
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs['form'].validate(valid => {
         if (valid) {
           if (this.form.objId != null) {
             updateQualityInspection(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
+              this.$modal.msgSuccess('修改成功')
+              this.open = false
+              this.getList()
+            })
           } else {
             addQualityInspection(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
+              this.$modal.msgSuccess('新增成功')
+              this.open = false
+              this.getList()
+            })
           }
         }
-      });
+      })
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const objIds = row.objId || this.ids;
+      const objIds = row.objId || this.ids
       this.$modal.confirm('是否确认删除质检记录管理编号为"' + objIds + '"的数据项？').then(function() {
-        return delQualityInspection(objIds);
+        return delQualityInspection(objIds)
       }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+        this.getList()
+        this.$modal.msgSuccess('删除成功')
+      }).catch(() => {
+      })
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -457,5 +503,5 @@ export default {
       }, `qualityInspection_${new Date().getTime()}.xlsx`)
     }
   }
-};
+}
 </script>