浏览代码

优化模型模块

liling 1 年之前
父节点
当前提交
ea13fc68c6
共有 2 个文件被更改,包括 17 次插入5 次删除
  1. 2 2
      src/pages/components/draw/DrawDesigns.vue
  2. 15 3
      src/pages/components/drawModal/LineDouble.vue

+ 2 - 2
src/pages/components/draw/DrawDesigns.vue

@@ -548,8 +548,8 @@ export default {
                         endText.value = end.text.value//结束文本
                         startTarget.value = start.properties
                         endTarget.value = end.properties
-                        console.log(copyColor.value, 'copy');
-                        console.log(data, 'data');
+                        //console.log(copyColor.value, 'copy');
+                        //console.log(data, 'data');
                         // if (copyColor.value == '#255CE7') {
                         //     lf.value.graphModel.updateText(data.data.id, "GOOSE");
                         // } else if (copyColor.value == 'orange') {

+ 15 - 3
src/pages/components/drawModal/LineDouble.vue

@@ -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,