|
@@ -142,8 +142,16 @@ export default {
|
|
|
modelIds.value = props.modelId
|
|
|
starts.value = props.startTarget
|
|
|
ends.value = props.endTarget
|
|
|
- startTxt.value = props.startText
|
|
|
- endTxt.value = props.endText
|
|
|
+ if(props.startText==null || props.startText==''){
|
|
|
+ startTxt.value = starts.value.ied_type
|
|
|
+ }else{
|
|
|
+ startTxt.value = props.startText
|
|
|
+ }
|
|
|
+ if(props.endText==null || props.endText==''){
|
|
|
+ endTxt.value = ends.value.ied_type
|
|
|
+ }else{
|
|
|
+ endTxt.value = props.endText
|
|
|
+ }
|
|
|
numStatus.value = props.numCase
|
|
|
gv.value = props.lineType
|
|
|
await flow.getModelAndIed({
|
|
@@ -161,6 +169,7 @@ export default {
|
|
|
curList.value = [];
|
|
|
return;
|
|
|
}
|
|
|
+
|
|
|
let tmpList = [];
|
|
|
//对结果进行重排排序:将已关联到输出装置的端子排在前面
|
|
|
res.data.forEach((item, index) => {
|
|
@@ -171,6 +180,7 @@ export default {
|
|
|
tmpList.push(item)
|
|
|
}
|
|
|
})
|
|
|
+
|
|
|
curList.value = tmpList
|
|
|
//pastLoading.value = false
|
|
|
} else {
|
|
@@ -195,6 +205,7 @@ export default {
|
|
|
outList.value = [];
|
|
|
return;
|
|
|
}
|
|
|
+
|
|
|
//对结果进行重排排序:将已关联到输出装置的端子排在前面
|
|
|
let tmpList = [];
|
|
|
res.data.forEach((item, index) => {
|
|
@@ -205,6 +216,7 @@ export default {
|
|
|
tmpList.push(item)
|
|
|
}
|
|
|
})
|
|
|
+
|
|
|
outList.value = tmpList;
|
|
|
// 将 setTimeout 移动到 then 方法中
|
|
|
setTimeout(() => {
|
|
@@ -234,7 +246,7 @@ export default {
|
|
|
console.error(`Element with ID ${line.start} or ${line.end} not found.`);
|
|
|
}
|
|
|
});
|
|
|
- }, 1000);
|
|
|
+ }, 100);
|
|
|
} else {
|
|
|
ElMessage({
|
|
|
message: res.msg,
|