|
@@ -333,20 +333,39 @@ const getSearchNodeTablesall = async (type) => {
|
|
|
primaryKeyId: nodeId,
|
|
|
type: authBtnTabKey.value,
|
|
|
tableType: type,
|
|
|
- isAdd: 1
|
|
|
+ // isAdd: 1
|
|
|
+ isAdd:isaddType?1:''
|
|
|
})
|
|
|
//处理数据
|
|
|
isLoading.value = false
|
|
|
if (!error && code === 200) {
|
|
|
// listItemData.value = getArrValue(data)
|
|
|
- if(type==1){
|
|
|
+ if(type===1){
|
|
|
testData.value= getArrValue(data)
|
|
|
testData.value.forEach((item)=>{
|
|
|
+ let bussDataInfoTrialData=item.bussDataInfoTrial
|
|
|
+ if(Object.keys(bussDataInfoTrialData).length!==0){
|
|
|
+ for(var key in bussDataInfoTrialData){
|
|
|
+ console.log(key,bussDataInfoTrialData[key])
|
|
|
+ item[key]=bussDataInfoTrialData[key]
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
orgAlllistData.value.push(item)
|
|
|
+
|
|
|
+
|
|
|
})
|
|
|
}else{
|
|
|
reportData.value= getArrValue(data)
|
|
|
reportData.value.forEach((item)=>{
|
|
|
+ let bussDataInfoTrialData=item.bussDataInfoTrial
|
|
|
+ if(Object.keys(bussDataInfoTrialData).length!==0){
|
|
|
+ for(var key in bussDataInfoTrialData){
|
|
|
+ console.log(key,bussDataInfoTrialData[key])
|
|
|
+ item[key]=bussDataInfoTrialData[key]
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
orgAlllistData.value.push(item)
|
|
|
})
|
|
|
}
|