From 8025d00709b26c8af870192b81d852d4ea1a2790 Mon Sep 17 00:00:00 2001
From: helloDy <1615073571@qq.com>
Date: Sun, 28 Apr 2024 17:04:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=9F=E7=89=87=E6=97=B6=E9=97=B4=EF=BC=8Cbu?=
 =?UTF-8?q?g?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/quality/base/qualityIsra/index.vue  |  7 ++---
 .../base/qualityScrapLog/add-or-updata.vue    |  8 ++---
 .../quality/base/qualityScrapLog/index.vue    |  2 +-
 .../monitoring/originalGlassRetrace/index.vue | 31 ++++++++++++++++---
 4 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/src/views/quality/base/qualityIsra/index.vue b/src/views/quality/base/qualityIsra/index.vue
index e7586efa..085434f6 100644
--- a/src/views/quality/base/qualityIsra/index.vue
+++ b/src/views/quality/base/qualityIsra/index.vue
@@ -199,10 +199,9 @@ export default {
       this.queryParams.lineName = this.$route.query.lineName
       this.searchBarFormConfig[2].defaultSelect = this.$route.query.lineName
     }
-    if (this.$route.query.originalGlassOutputTime) {
-      console.log('你好', this.$route.query.originalGlassOutputTime)
-      this.queryParams.startTime = parseTime(new Date(Number(this.$route.query.originalGlassOutputTime)))
-      this.queryParams.endTime = parseTime(new Date(Number(this.$route.query.originalGlassOutputTime)))
+    if (this.$route.query.startTime && this.$route.query.endTime) {
+      this.queryParams.startTime = parseTime(new Date(Number(this.$route.query.startTime)))
+      this.queryParams.endTime = parseTime(new Date(Number(this.$route.query.endTime)))
       this.searchBarFormConfig[3].defaultSelect = [
         this.queryParams.startTime,
         this.queryParams.endTime,
diff --git a/src/views/quality/base/qualityScrapLog/add-or-updata.vue b/src/views/quality/base/qualityScrapLog/add-or-updata.vue
index 9e944998..a32e25c5 100644
--- a/src/views/quality/base/qualityScrapLog/add-or-updata.vue
+++ b/src/views/quality/base/qualityScrapLog/add-or-updata.vue
@@ -1,8 +1,8 @@
 <!--
  * @Author: zhp
  * @Date: 2023-11-06 15:15:30
- * @LastEditTime: 2024-04-09 15:14:08
- * @LastEditors: zhp
+ * @LastEditTime: 2024-04-28 10:19:33
+ * @LastEditors: DY
  * @Description:
 -->
 <template>
@@ -60,7 +60,7 @@
     </el-row>
     <el-col :span="8">
       <el-form-item label="来源" prop="source">
-        <el-select v-model="dataForm.source" placeholder="请选择来源" multiple>
+        <el-select v-model="dataForm.source" placeholder="请选择来源">
           <el-option v-for="dict in sourceList" :key="dict.id" :label="dict.name" :value="dict.id" />
         </el-select>
       </el-form-item>
@@ -111,7 +111,7 @@ export default {
 			dataForm: {
         id: undefined,
         logTime: undefined,
-        source:1,
+        source: 2,
         detId: undefined,
         workOrderId: null,
         teamId: undefined,
diff --git a/src/views/quality/base/qualityScrapLog/index.vue b/src/views/quality/base/qualityScrapLog/index.vue
index d03bc214..85b2a10e 100644
--- a/src/views/quality/base/qualityScrapLog/index.vue
+++ b/src/views/quality/base/qualityScrapLog/index.vue
@@ -63,7 +63,7 @@ const tableProps = [
   {
     prop: 'source',
     label: '来源',
-    filter: (val) => val == 1 ? '平板端' : '网页端'
+    filter: (val) => ['', '平板端', '网页端'][val]
   },
 ];
 
diff --git a/src/views/quality/monitoring/originalGlassRetrace/index.vue b/src/views/quality/monitoring/originalGlassRetrace/index.vue
index c1f9342e..a88a6d0e 100644
--- a/src/views/quality/monitoring/originalGlassRetrace/index.vue
+++ b/src/views/quality/monitoring/originalGlassRetrace/index.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-08-01 14:55:51
  * @LastEditors: DY
- * @LastEditTime: 2024-04-26 09:58:51
+ * @LastEditTime: 2024-04-28 16:10:20
  * @Description:
 -->
 <template>
@@ -47,7 +47,7 @@
 		</el-form>
     <!-- <base-table :max-height="tableH" :table-props="tableProps" :page="listQuery.pageNo" :limit="listQuery.pageSize"
       :table-data="list"> -->
-    <base-table :max-height="tableH" :table-props="tableProps"
+    <base-table :max-height="tableH" :table-props="tableProps" :page="1" :limit="100"
       :table-data="list">
       <method-btn v-if="tableBtn.length" slot="handleBtn" :width="220" label="缺陷操作" :method-list="tableBtn"
         @clickBtn="handleClick" />
@@ -282,12 +282,31 @@ export default {
     handleClick(raw) {
 			if (raw.type === 'detail1') {
         // 原片缺陷
+        // console.log('你好', raw.data._pageIndex)
+        // const tempArray = this?.list[raw.data._pageIndex]
+        // console.log('你好tempArray', tempArray)
+        // let startTime = raw.data.originalGlassOutputTime
+        // if (tempArray) {
+        //   startTime = tempArray.originalGlassOutputTime
+        // }
+        // console.log('你好', parseTime(raw.data.originalGlassOutputTime))
+        const startTime = new Date(raw.data.originalGlassOutputTime)
+        const endTime = new Date(raw.data.originalGlassOutputTime)
+        startTime.setHours(startTime.getHours() - 1)
+        startTime.setMinutes(0)
+        startTime.setSeconds(0)
+        endTime.setHours(endTime.getHours() + 1)
+        endTime.setMinutes(0)
+        // endTime.setSeconds(0)
+        // console.log('设置时间', startTime, parseTime(startTime))
+        // console.log('设置时间11', endTime, parseTime(endTime))
 				this.$router.push({
           path: '/quality/base/quality-isra',
           query: {
             // deepProcessingLineId: raw.data.deepProcessingLineId,
             lineName: raw.data.deepProcessingLineName,
-            originalGlassOutputTime: raw.data.originalGlassOutputTime
+            endTime: endTime,
+            startTime: startTime
           },
         });
 			} else {
@@ -328,7 +347,11 @@ export default {
       } else {
         if (this.useTime === true) {
           if (this.listQuery.packTime !== null && this.listQuery.packTime !== '' && this.listQuery.lineName !== null && this.listQuery.lineName !== '') {
-            getOriginalGlassRetrace({ ...this.listQuery }).then(res => {
+
+            getOriginalGlassRetrace({
+              lineNameList: [this.listQuery.lineName],
+               ...this.listQuery
+            }).then(res => {
               console.log(res);
               this.list = res.data || []
               console.log(this.list);