From 78077b794e54a1283e797346454808dcae2fee84 Mon Sep 17 00:00:00 2001
From: jinna <jn517618@163.com>
Date: Fri, 27 Mar 2026 17:31:14 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productionTesting/productionQuality.vue   | 52 +++++++++----------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/src/views/productionTesting/productionQuality.vue b/src/views/productionTesting/productionQuality.vue
index 4a755ec..8ba590c 100644
--- a/src/views/productionTesting/productionQuality.vue
+++ b/src/views/productionTesting/productionQuality.vue
@@ -141,7 +141,7 @@
             <el-table
               :data="scope.row.wpItemDetailList"
               show-overflow-tooltip
-              v-if="scope.row.item.specialType == 3 && scope.row.wpItemDetailList.length > 0"
+              v-if="scope.row.item.name == '尺寸检测' && scope.row.wpItemDetailList && scope.row.wpItemDetailList.length > 0"
               style="margin: 12px"
             >
               <el-table-column label="镀前镀后" prop="testType" align="center"></el-table-column>
@@ -203,7 +203,7 @@
             <el-table
               :data="thicknessData"
               show-overflow-tooltip
-              v-if="scope.row.item.specialType == 1"
+              v-if="scope.row.item.name == '厚度检测'"
               style="margin: 12px"
             >
               <el-table-column width="57px">
@@ -323,13 +323,13 @@
           width="150px"
         >
           <template #default="scope">
-            <div v-if="scope.row.item.specialType == '1'">
+            <div v-if="scope.row.item.name == '厚度检测'">
               <el-button @click="testMeasurementData(scope.row, scope.$index)" link type="primary">
                 <!-- {{!isStart ? '测厚数据' : '结束查询'}} -->
                 测厚数据
               </el-button>
             </div>
-            <div v-else-if="scope.row.item.specialType == '3'">
+            <div v-else-if="scope.row.item.name == '尺寸检测'">
               <el-button @click="testValue(scope.row, scope.$index)" link type="primary"
                 >测试值填写</el-button
               >
@@ -459,7 +459,7 @@ export default {
       secondInderval:null,
       form: {},
       getDChyData:[],
-      showDialog: true,
+      showDialog: false,
       page: {
         pageSize: 10,
         currentPage: 1,
@@ -959,7 +959,7 @@ export default {
     },
     getRowClass(row, index) {
       let res = [];
-      if (row.row.item.specialType != '3' && row.row.item.specialType != '1')
+      if (row.row.item.name != '尺寸检测' && row.row.item.name != '厚度检测')
         //即改行没有子元素时，添加row-expand-cover类
         // res.push('row-expand-cover')
         return 'row-expand-cover';
@@ -1054,22 +1054,22 @@ export default {
         // endTime:endTime, 
         allData,
         // count:val
-      }).catch(res =>{
+      }).then(res =>{
         console.log('res111111111111',res)
-        // if (res.data.data != null) {
-          // const resultList = res.data.data;
+        if (res.data.data != null) {
+          const resultList = res.data.data;
           
-          const resultList = [{
-            IP:"10.15.3.26",
-            devCode:"Ni/CuZn59",
-            devId:"LG020029",
-            fi1etime: "2025/11/21 16:38:32",
-            measurings: [
-              {unit: "um", name: "Ni", value: "8.92142"}, 
-              {unit: "/", name: "Cu", value: "/"},
-              {unit: "/", name: "Cu", value: "/"}
-            ]
-          }]
+          // const resultList = [{
+          //   IP:"10.15.3.26",
+          //   devCode:"Ni/CuZn59",
+          //   devId:"LG020029",
+          //   fi1etime: "2025/11/21 16:38:32",
+          //   measurings: [
+          //     {unit: "um", name: "Ni", value: "8.92142"}, 
+          //     {unit: "/", name: "Cu", value: "/"},
+          //     {unit: "/", name: "Cu", value: "/"}
+          //   ]
+          // }]
           console.log('resultList--------------',resultList)
           console.log('getDChyData--------------',this.getDChyData)
           if (resultList.length > 0) {
@@ -1139,7 +1139,7 @@ export default {
           }
           this.getDChyData = [...map.values()];
           console.log('this.getDChyData',this.getDChyData)
-        // }
+        }
       })
     },
     testValue(row, index) {
@@ -1174,7 +1174,7 @@ export default {
     gainYDValue(){
       this.vxeTableData.forEach(item => {
         console.log('item---------------------',item)
-        if ((item.item.specialType == '2') && (item.checkUserRealName == '')) {
+        if ((item.item.name == '硬度检测') && (item.checkUserRealName == '')) {
           refreshHardness().then(res =>{
             console.log('refre--------------',res)
             if(res.data.data.length > 0){
@@ -1200,7 +1200,7 @@ export default {
     submit(){
       let params = {}
       this.detailInfo.wpItemList.map(item =>{
-        if(item.item.specialType == '1'){
+        if(item.item.name == '厚度检测'){
           item.wpItemDetailList = [...this.thicknessData]
         }
       })
@@ -1234,7 +1234,7 @@ export default {
             this.vxeTableData.map(item1 =>{
               if(item1.checkUserRealName == ''){
                 if(item.item.name == item1.item.name){
-                  if(item.item.specialType != '1' && item.item.specialType != '2' && item.item.specialType != '3'){
+                  if(item.item.name != '厚度检测' && item.item.name != '硬度检测' && item.item.name != '尺寸检测'){
                     item1.checkValue = item.checkValue
                   }
                   item1.testQty = item.testQty
@@ -1324,7 +1324,7 @@ export default {
         if(this.dialogData.ppsName != '烧结包装防护'){
           this.vxeTableData.forEach(item =>{
             console.log('item--------------',item)
-            if(item.item.specialType == '2' && (item.checkUserId == -1 || item.checkUserRealName == '')){
+            if(item.item.name == '硬度检测' && (item.checkUserId == -1 || item.checkUserRealName == '')){
               // this.ydInterval = setInterval(() =>{
                 refreshHardness().then(res =>{
                   console.log('res2--------------------------',res)
@@ -1335,7 +1335,7 @@ export default {
                 })
               // },window.YINGDU_Trigger)
             }
-            if(item.item.specialType == 1){
+            if(item.item.name == '厚度检测'){
               console.log('item------------------',item)
               this.thicknessData = item.wpItemDetailList
             }