From 86d4b4787748a83e76d048cd6a0b5583a2cd0651 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期一, 21 四月 2025 10:00:24 +0800
Subject: [PATCH] 修改多线程导致数采不成功的问题

---
 src/views/business/inspectionTask/inspection.vue |   35 ++++++++++++++++++++++++-----------
 1 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/src/views/business/inspectionTask/inspection.vue b/src/views/business/inspectionTask/inspection.vue
index 49cf985..5a1ce4c 100644
--- a/src/views/business/inspectionTask/inspection.vue
+++ b/src/views/business/inspectionTask/inspection.vue
@@ -91,9 +91,9 @@
           </el-radio-group>
         </div>
         <div style="display: flex; align-items: center">
-          <el-button v-if="state == 1" size="small" type="primary" @click="openAddUnpass">鏂板涓嶅悎鏍煎娴�</el-button>
+          <!-- <el-button v-if="state == 1" size="small" type="primary" @click="openAddUnpass">鏂板涓嶅悎鏍煎娴�</el-button>
           <el-button v-if="state == 1" size="small" type="primary" @click="unpassCheck">涓嶅悎鏍煎娴�</el-button>
-          <el-button v-if="state > 1" size="small" type="primary" @click="viewUnpassCheck">鏌ョ湅涓嶅悎鏍煎娴�</el-button>
+          <el-button v-if="state > 1" size="small" type="primary" @click="viewUnpassCheck">鏌ョ湅涓嶅悎鏍煎娴�</el-button> -->
           <span v-if="cableTagList.length > 0">&nbsp;&nbsp;鐢电紗閰嶇疆锛�</span>
           <el-select v-if="cableTagList.length > 0" v-model="currentTab" clearable placeholder="璇烽�夋嫨" size="small"
             @change="(m) => handleChangeCableTag(currentSample.id, 0, 'cableTag', m)
@@ -138,6 +138,10 @@
                 type="success">宸叉</el-tag>
             </el-option>
           </el-select>
+          <!-- 缃戝垎浠暟閲囧浗浜�/杩涘彛 -->
+          <NetworkAnalyzerDataAcquisition :itemList="currentSample.insProduct" :param="param"
+            :equipOptions="equipOptions"
+            v-if="currentSample.insProduct && currentSample.insProduct.length > 0 && param" />
           <el-button :loading="dataAcquisitionLoading" v-if="state == 1" size="small" type="primary"
             @click="getDataAcquisitionDevice">鏁版嵁閲囬泦</el-button>
           <el-button :type="dataAcquisitionEidtAble ? '' : 'primary'" v-if="state == 1" size="small"
@@ -285,7 +289,7 @@
                       state == 1
                     "><span :style="`font-family:${n.v.ff} !important;`">{{
                       toFixed(n.v.v, n.v.ct)
-                        }}</span></template>
+                    }}</span></template>
                     <template v-else-if="
                       n.v.ps != undefined &&
                       n.v.ps.value === '鏈�缁堝��' &&
@@ -529,6 +533,7 @@
 import UnPassDialog from "../unpass/components/unPassDialog.vue";
 import AddUnPass from "../unpass/components/addUnPass.vue";
 import InspectionWord from "./components/InspectionWord.vue";
+import NetworkAnalyzerDataAcquisition from "./components/NetworkAnalyzerDataAcquisition.vue";
 import PurchaseVerification from "../unpass/components/PurchaseVerification.vue";
 import {
   doInsOrder,
@@ -563,6 +568,7 @@
     limsTable,
     UnPassDialog,
     InspectionWord,
+    NetworkAnalyzerDataAcquisition,
   },
   data() {
     return {
@@ -966,7 +972,7 @@
         // 璧嬪�煎綋鍓嶆牱鍝佸垪琛�
         this.sampleProduct = res.data.sampleProduct;
         this.currentSample = this.HaveJson(this.sampleProduct[0]);
-        let insProduct = this.HaveJson(this.currentSample.insProduct);
+        // let insProduct = this.HaveJson(this.currentSample.insProduct);
         // 娓╁害銆佹箍搴﹁祴鍊�
         this.otherForm = {
           temperature: this.insOrder.temperature
@@ -1465,6 +1471,7 @@
     },
     // 澶氱嚎绋�
     startWorker() {
+      console.log(`Worker 绾跨▼寮�濮嬭繍琛�...`, this.worker, this.worker0)
       if (this.worker) {
         this.stopWorker(); // 纭繚涔嬪墠鐨� Worker 宸插仠姝�
       }
@@ -1537,7 +1544,7 @@
         repetitionTag: this.repetitionTag
       });
       this.tableLoading = false;
-      if (res.data.length > 0) {
+      if (res.data) {
         return res.data;
       }
     },
@@ -2071,7 +2078,7 @@
             if (obj) {
               this.$set(b, "u", obj.checkUserId);
             }
-            this.param[b.i].testStartTime = []
+            // this.param[b.i].testStartTime = []
             b.i && this.param[b.i] && this.param[b.i].testStartTime.push(b);
           }
           if (b.v.ps != undefined && b.v.ps.value === "缁堟鏃堕棿") {
@@ -2080,7 +2087,7 @@
             if (obj) {
               this.$set(b, "u", obj.checkUserId);
             }
-            this.param[b.i].testEndTime = []
+            // this.param[b.i].testEndTime = []
             b.i && this.param[b.i] && this.param[b.i].testEndTime.push(b);
           }
           if (b.v.ps != undefined && b.v.ps.value === "鏈�缁堝��") {
@@ -2224,13 +2231,21 @@
         }
         try {
           // 璧峰鏃堕棿璧嬪��
-          this.$set(this.param[a.id].testStartTime[0].v, 'v', a.insProductResult.testStartTime[0])
+          let testStartTime = a.insProductResult.testStartTime ? JSON.parse(a.insProductResult.testStartTime) : []
+          for (let i = 0; i < testStartTime.length; i++) {
+            // 鏅�氳澶囧悕绉拌祴鍊�
+            this.param[a.id].testStartTime[i].v.v = testStartTime[i].v;
+          }
         } catch (e) {
 
         }
         try {
           // 缁堟鏃堕棿璧嬪��
-          this.$set(this.param[a.id].testEndTime[0].v, 'v', a.insProductResult.testEndTime[0])
+          let testEndTime = a.insProductResult.testEndTime ? JSON.parse(a.insProductResult.testEndTime) : []
+          for (let i = 0; i < testEndTime.length; i++) {
+            // 鏅�氳澶囧悕绉拌祴鍊�
+            this.param[a.id].testEndTime[i].v.v = testEndTime[i].v;
+          }
         } catch (e) { }
         try {
           // 鏈�缁堝�艰祴鍊�
@@ -2853,8 +2868,6 @@
     },
     // 璧峰鏃堕棿/缁堟鏃堕棿淇濆瓨
     changeTestTime(val, n, type) {
-      // this.param[n.i][type]
-      // console.log(22222, val, n, type, this.param)
       this.$set(this.param[n.i][type][0].v, 'v', val)
       this.saveInsContext(n.i);
     },

--
Gitblit v1.9.3