待测样品

src/views/tentative/detect/components/ListItem.vue

@@ -14,7 +14,7 @@
                             </div -->
                             <div class="item-title truncate text-lg">{{ item.nodeName }}</div>
                             <div class="hc-extra-text-box">
-                                <el-link type="primary" @click.stop="linkAcquisitionClick(item)">关联设备数据</el-link>
+                                <el-link type="primary" @click.stop="linkAcquisitionClick(item, index)">关联设备数据</el-link>
                                 <HcTooltip v-if="item.isCopyTab === 1" keys="wbs_del_table">
                                     <el-link type="danger" :disabled="item.isBussShow === 2 || delClickLoading" @click.stop="delClick(item, index)">删除本表</el-link>
                                 </HcTooltip>
@@ -220,7 +220,7 @@
 
     <!-- 关联设备数据 -->
     <hc-new-dialog v-model="isLinkAcquisition" is-footer-center is-table title="关联设备数据" widths="80%" @close="linksAcquisitionClose">
-        <LinkAcquisition v-if="isLinkAcquisition" v-model="linkAcquisitionItem.loadDataId" />
+        <LinkAcquisition v-if="isLinkAcquisition" v-model="linkAcquisitionLoadDataId" @change="linkAcquisitionChange" />
         <template #footer>
             <el-button @click="linksAcquisitionClose">取消</el-button>
             <el-button hc-btn type="primary" @click="linksAcquisitionClick">确定</el-button>
@@ -1691,16 +1691,25 @@ const actionTipModalClose = () => {
 
 //关联设备数据
 const isLinkAcquisition = ref(false)
-const linkAcquisitionItem = ref({})
-const linkAcquisitionClick = (item) => {
-    linkAcquisitionItem.value = item
-  isLinkAcquisition.value = true
+const linkAcquisitionLoadDataId = ref('')
+const linkAcquisitionIndex = ref(-1)
+const linkAcquisitionClick = ({ loadDataId }, index) => {
+    linkAcquisitionLoadDataId.value = loadDataId
+    linkAcquisitionIndex.value = index
+    isLinkAcquisition.value = true
+}
 
+const linkAcquisitionChange = (id) => {
+    linkAcquisitionLoadDataId.value = id
 }
 
 //确定
 const linksAcquisitionClick = () => {
-  linksAcquisitionClose()
+    const index = linkAcquisitionIndex.value
+    const id = linkAcquisitionLoadDataId.value
+    listDatas.value[index].loadDataId = id
+    console.log(listDatas.value, id)
+    linksAcquisitionClose()
 }
 
 //关闭关联

src/views/tentative/detect/components/linkAcquisition.vue

@@ -44,7 +44,7 @@
                     <el-tag v-if="row.dataStatus === 2" type="success" effect="dark">已引用</el-tag>
                     <el-tag v-else type="info" effect="dark">未引用</el-tag>
                 </template>
-                <template #key24="{ row }">
+                <template #action="{ row }">
                     <el-link v-if="row.id == dataId" type="warning" @click="rowCancel(row)">取消选择</el-link>
                     <el-link v-else type="primary" @click="rowSelect(row)">选择</el-link>
                     <!-- el-link v-if="row.key24 === 2" type="info">选择</el-link -->
@@ -155,6 +155,7 @@ const menuSelect = (parent, item) => {
             },
             { key: 'dataQualified', name: '试验结果是否合格', width: 100, align: 'center' },
             { key: 'dataStatus', name: '数据状态', width: 100, align: 'center' },
+            { key: 'action', name: '操作', width: 100, align: 'center', fixed: 'right' },
         ]
     } else if (parent.dictKey === '2') {
         //万能机
@@ -235,6 +236,7 @@ const menuSelect = (parent, item) => {
                 ],
             },
             { key: 'dataStatus', name: '数据状态', width: 100, align: 'center' },
+            { key: 'action', name: '操作', width: 100, align: 'center', fixed: 'right' },
         ]
     }
     //获取表格数据
@@ -284,7 +286,7 @@ const tableColumn = ref([
     },
     { key: 'dataQualified', name: '试验结果是否合格', width: 100, align: 'center' },
     { key: 'dataStatus', name: '数据状态', width: 100, align: 'center' },
-    { key: 'key24', name: '操作', width: 100, align: 'center' },
+    { key: 'action', name: '操作', width: 100, align: 'center', fixed: 'right' },
 ])
 const tableData = ref([])
 

src/views/tentative/detect/test-form.vue

@@ -1041,6 +1041,7 @@ const tableFormSaveClick = async () => {
   } else {
     let FormData
     let curform = await ListItemRef.value?.setFormChart()
+      console.log(curform)
     //let curform = ListItemRef.value?.getFormData()
     setAllListData(curform)
     let operTrue = alllistData.value.filter(e => e.oper) //操作的数据
@@ -1076,6 +1077,7 @@ const tableFormSaveClick = async () => {
                 nodeId: routerQuery?.nodeId,
                 isCollapseLoad: false,
                 isBussShow: item1.isBussShow,
+                  loadDataId: item1.loadDataId,
               }
               // 过滤存在的key_的键值
               let ishasKey = Object.keys(item1).filter(e => e.indexOf('key_') >= 0)
@@ -1127,7 +1129,7 @@ const tableFormSaveClick = async () => {
               nodeId: routerQuery?.nodeId,
               isCollapseLoad: false,
               isBussShow: item1.isBussShow,
-
+                loadDataId: item1.loadDataId,
             }
             // 过滤存在的key_的键值
             let ishasKey = Object.keys(item1).filter(e => e.indexOf('key_') >= 0)
@@ -1156,6 +1158,7 @@ const tableFormSaveClick = async () => {
           nodeId: routerQuery?.nodeId,
           isCollapseLoad: false,
           isBussShow: item.isBussShow,
+            loadDataId: item.loadDataId,
         }
         // 过滤存在的key_的键值
         let ishasKey = Object.keys(item).filter(e => e.indexOf('key_') >= 0)