From 5a34bcc35f527a022fdd092c1d55f9ce82af4012 Mon Sep 17 00:00:00 2001
From: schry <2433098676@qq.com>
Date: Fri, 16 Jun 2023 15:18:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E6=9F=A5=E8=AF=A2=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/udi/trace/search/index.vue     | 29 ++++++++++++++----------
 src/views/udi/trace/searchLive/index.vue | 14 ++++++++----
 2 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/src/views/udi/trace/search/index.vue b/src/views/udi/trace/search/index.vue
index 6439b58..f42fda7 100644
--- a/src/views/udi/trace/search/index.vue
+++ b/src/views/udi/trace/search/index.vue
@@ -711,7 +711,7 @@
 </template>
 
 <script>
-
+import {isBlank} from "@/utils/strUtil";
 import {filterylqxzcrbarmc,filterCpmctymc,
   filterGgxh, filterNameCode, sourceSearch,filterCompanyName,getTraceManuOrderList,
   getManuCodeRelList} from "@/api/udi/udiTrace";
@@ -823,7 +823,12 @@ export default {
       this.filterQuery.page = 1;
       this.getList()
       // 使用递归法定时执行定时器
-      this.monitorOrder = setTimeout(this.orderTimeOut, 10000);
+      if(this.list == undefined || this.list.length <= 0){
+        this.monitorOrder = setTimeout(this.orderTimeOut, 10000);
+      }
+      // if (this.list != null) {
+      //   clearTimeout(this.monitorOrder);
+      // }
     },
       formaterSourceType(row){
       if (row.sourceType == 1) {
@@ -984,18 +989,16 @@ export default {
         page: 1,
         limit: 10,
       };
-      this.list = null
+      this.list = null,
+      this.listOrder = null,
+      this.listCodeRel = null,
       clearTimeout(this.monitorOrder);
-      this.monitorOrder = null
+      this.monitorOrder = ""
       //this.total = 0
     },
     onSubmit() {
       this.orderTimeOut()
-      if (this.list != null) {
-        clearTimeout(this.monitorOrder);
-        this.monitorOrder = null
-        this.showCollapses = true
-      }
+
     },
     getList() {
       this.loading = true;
@@ -1004,9 +1007,11 @@ export default {
         if (res.code === 20000) {
           this.list = res.data || [];
           this.total = res.data.total || 0;
-          console.log(res.data)
-          this.manuOrderQuery.recordCode = res.data.recordCode
-          this.getManuOrderList()
+          console.log(this.list)
+          if (this.list.recordCode != null || this.list.recordCode != "") {
+            this.manuOrderQuery.recordCode = this.list.recordCode
+            this.getManuOrderList()
+          }
         } else {
           this.$message.error(res.message);
           this.list = [];
diff --git a/src/views/udi/trace/searchLive/index.vue b/src/views/udi/trace/searchLive/index.vue
index 5b5b0cb..2c2c39c 100644
--- a/src/views/udi/trace/searchLive/index.vue
+++ b/src/views/udi/trace/searchLive/index.vue
@@ -853,7 +853,9 @@ export default {
       this.filterQuery.page = 1;
       this.getList()
       // 使用递归法定时执行定时器
-      this.monitorOrder = setTimeout(this.orderTimeOut, 10000);
+      if(this.list == undefined || this.list.length <= 0){
+        this.monitorOrder = setTimeout(this.orderTimeOut, 1000);
+      }
     },
     formaterSourceType(row){
       if (row.sourceType == 1) {
@@ -1020,12 +1022,14 @@ export default {
         page: 1,
         limit: 10,
       };
-      this.list = null
-      //this.total = 0
+      this.list = null,
+        this.listOrder = null,
+        this.listCodeRel = null,
+        clearTimeout(this.monitorOrder);
+      this.monitorOrder = ""
     },
     onSubmit() {
-      this.filterQuery.page = 1;
-      this.getList()
+      this.orderTimeOut()
     },
     getList() {
       this.loading = true;