|
@@ -210,7 +210,9 @@
|
|
|
<el-scrollbar v-loading="insertDataTableLoading" >
|
|
|
<el-table :data="insertDataTable" border stripe @selection-change="insertDataTableCheck">
|
|
|
<el-table-column type="selection" width="55" />
|
|
|
- <el-table-column prop="key_12__3_1" label="数据名称"/>
|
|
|
+ <!-- <el-table-column prop="key_12__3_1" label="数据名称"/> -->
|
|
|
+ <el-table-column prop="key" label="字段名称"/>
|
|
|
+ <el-table-column prop="value" label="数值"/>
|
|
|
<!-- <el-table-column prop="action" label="操作" width="120" align="center">
|
|
|
<template #default="{row}">
|
|
|
<el-checkbox size="large" @change="insertDataTableCheck(row)"/>
|
|
@@ -1402,7 +1404,7 @@ const thirdtabtoggleSelection=(rows)=> {
|
|
|
//获取试验表中的data数据接口:
|
|
|
const getBussddataInfotrialData = async ()=>{
|
|
|
insertDataTableLoading.value=true;
|
|
|
- const {error, code, data} = await dataApi.getBussddataInfotrial({
|
|
|
+ const {error, code, data} = await dataApi.getBussddataInfotrialList({
|
|
|
// id:testReportId.value,
|
|
|
id:currowid.value,
|
|
|
pkeyId:checPkd.value[0]['pKeyId'],
|
|
@@ -1410,7 +1412,17 @@ const getBussddataInfotrialData = async ()=>{
|
|
|
|
|
|
insertDataTableLoading.value = false
|
|
|
if (!error && code === 200) {
|
|
|
- insertDataTable.value = getArrValue(data)
|
|
|
+ // insertDataTable.value = getArrValue(data)
|
|
|
+ let arrobj=getObjValue(data)
|
|
|
+ let arr=[]
|
|
|
+ for (var key of Object.keys(arrobj)) {
|
|
|
+ arr.push({
|
|
|
+ key:key,
|
|
|
+ value:arrobj[key]
|
|
|
+ })
|
|
|
+ }
|
|
|
+ insertDataTable.value =arr
|
|
|
+
|
|
|
} else {
|
|
|
insertDataTable.value = []
|
|
|
|
|
@@ -1432,7 +1444,7 @@ const submitinsertData = async () => {
|
|
|
const form = formData.value[item.index]
|
|
|
const val =[]
|
|
|
multipleSelection.value.forEach((item)=>{
|
|
|
- val.push(item['key_12__3_1'])
|
|
|
+ val.push(item['value'])
|
|
|
})
|
|
|
const newval=val.join('、')
|
|
|
formData.value[item.index][item.KeyName] = setPosInsert(item.startPos, item.endPos, form[item.KeyName], newval)
|