huangxingxing 8 ay önce
ebeveyn
işleme
1b9c3b28e9

+ 1 - 1
src/control/vtkModel.js

@@ -1124,7 +1124,7 @@ safetypathremove(){
         if (pid == pipeActor.pipe.id) {
           pipeActor.actor.getProperty().setColor(GREEN);
           this.lastActor = pipeActor.actor;
-          this.selectObj = pipeActor.node;
+          this.selectObj = pipeActor.pipe;
           this.renderer.addActor(this.lastActor);
           this.renderWindow.render();
           return;

+ 3 - 0
src/view/components/InfoBoundary.vue

@@ -716,6 +716,9 @@ const xiugai = () => {
     bformInline.value.temperature = xiugaiobj.value.temperature;
     bformInline.value.polcon1 = xiugaiobj.value.polcon1;
     bformInline.value.polcon2 = xiugaiobj.value.polcon2;
+
+     //选中指定管道
+    vtkmodel.selectByNodeId(nid.value); 
   }
 };
 //边界的添加

+ 13 - 9
src/view/components/InfoDisaster.vue

@@ -2085,7 +2085,7 @@ const newtable = (e) => {
 
   zhtext.value = "添加";
   vtkmodel.clearJgAddMode() ;
-  vtkmodel.selectPipes();
+  // vtkmodel.selectPipes();
   dialogtrue.value.jgSelect();
 
 
@@ -2101,12 +2101,16 @@ const xiugaitable = () => {
     sdialog.value.dianadddialog = true;
     aid.value = tableobj.value.aid;
     firepid.value = tableobj.value.pid;
+
     source.site = tableobj.value.site;
     selectstr.value = tableobj.value.pname;
     console.log(tableobj.value);
 
     vtkmodel.clearJgAddMode() ;
-    vtkmodel.selectPipes();
+    //选中指定管道
+    vtkmodel.selectByPipeId(tableobj.value.pid); 
+    vtkmodel.addpipsite(tableobj.value.pid, tableobj.value.site);
+    // vtkmodel.selectPipes();
     dialogtrue.value.jgSelect();
     vtkmodel.addpipsite( firepid.value,source.site )
   }
@@ -2288,7 +2292,7 @@ const wanewadd=()=>{
  tableobj.value={};
  dialogtrue.value.jgSelect();
  vtkmodel.clearJgAddMode() ;
- vtkmodel.selectPipes();
+//  vtkmodel.selectPipes();
 
 
 
@@ -2434,7 +2438,7 @@ const wsaddblast=()=>{
   currentrow1.value=false;
   wasi.value.blastdata={};
   vtkmodel.clearJgAddMode() ;
-  vtkmodel.selectPipes();
+  // vtkmodel.selectPipes();
   dialogtrue.value.jgSelect();
 }
 const wsbalastadd=()=>{
@@ -2484,7 +2488,7 @@ const wsxiugai2=()=>{
   firepid.value =wasi.value.blastdata.pid;
   Gassdialog.value.wsaddarea= true;
   vtkmodel.clearJgAddMode() ;
-  vtkmodel.selectPipes();
+  // vtkmodel.selectPipes();
   dialogtrue.value.jgSelect();
 }
 }
@@ -2699,7 +2703,7 @@ const addpumdfun=(e)=>{
   source.site=null;
   selectstr.value=null;
   vtkmodel.clearJgAddMode() ;
-  vtkmodel.selectPipes();
+  // vtkmodel.selectPipes();
   dialogtrue.value.jgSelect();
   vtkmodel.removepump();
 }
@@ -2713,7 +2717,7 @@ const pumpxiugai=(val)=>{
   } else {
      sdialog.value.addpump = true;
     vtkmodel.clearJgAddMode() ;
-    vtkmodel.selectPipes();
+    // vtkmodel.selectPipes();
     dialogtrue.value.jgSelect();
     pumpobj.value.pumpid=pumpobj.value.xzobj.pumpid;
     pumpobj.value.pumpname=pumpobj.value.xzobj.pumpname;
@@ -2990,7 +2994,7 @@ const yiweiadd=()=>{
   yiweiobj.value.nreobj={};
   yiweiobj.value.gid='';
   vtkmodel.clearJgAddMode() ;
-  vtkmodel.selectPipes();
+  // vtkmodel.selectPipes();
   dialogtrue.value.jgSelect();
 }
 // 修改
@@ -3009,7 +3013,7 @@ const yiweixiugai=()=>{
   firepid.value=yiweiobj.value.nreobj.pid;
   yiweiobj.value.gid=yiweiobj.value.nreobj.pid;
   vtkmodel.clearJgAddMode() ;
-  vtkmodel.selectPipes();
+  // vtkmodel.selectPipes();
   dialogtrue.value.jgSelect();
 
   }

+ 2 - 2
src/view/components/SetPipe.vue

@@ -133,7 +133,7 @@ function jgSelenum(){
   if(selectObj.value==null){
 }else{
  msg.value=selectObj.value;
- vtkmodel.addpipsite(selectObj.value,props.site);
+ vtkmodel.addpipsite(selectObj.value.id,props.site);
 }
 
 }
@@ -153,7 +153,7 @@ function jgSelect(){
                     };
                     });
    msg.value=arrobj[0];
-   vtkmodel.addpipsite(selectObj.value,props.site);
+   vtkmodel.addpipsite(selectObj.value.id,props.site);
 }
    }, 1200);
 }