Merge branch 'master' of http://192.168.0.130:13000/huangxingxing/disaster_web3

src/view/components/InfoBoundary.vue

@@ -339,7 +339,7 @@
         <div class="dialog-footer footer_div l_btn">
           <div class="footerbtn flex1">
             <div class="borderimg">
-              <el-button @click="dialog.dialogVisible = false">取消</el-button>
+              <el-button @click="bquxiao(); dialog.dialogVisible = false">取消</el-button>
             </div>
           </div>
           <div class="footerbtn flex1">
@@ -487,6 +487,7 @@ const  changeClass= (i)=>  {
   console.log(i);
  isActive.value = i;
 }
+let state=ref();
 // let showmassflow=ref(false);
 // let showpressure=ref(true);
 let tishi=ref('');
@@ -682,6 +683,7 @@ const bounadd = () => {
     bformInline.value.type = "边界出口";
   } else {
   }
+  vtkmodel.clearJgAddMode() 
 };
 const xiudelete = () => {
   if (JSON.stringify(xiugaiobj.value) == "{}") {
@@ -716,7 +718,7 @@ const xiugai = () => {
     bformInline.value.temperature = xiugaiobj.value.temperature;
     bformInline.value.polcon1 = xiugaiobj.value.polcon1;
     bformInline.value.polcon2 = xiugaiobj.value.polcon2;
-
+    vtkmodel.clearJgAddMode() ;
      //选中指定管道
     vtkmodel.selectByNodeId(nid.value); 
   }
@@ -742,7 +744,9 @@ const accidentboun = () => {
         message: tishi.value+"边界设置成功",
         type: "success",
       });
+      bquxiao();
       dialog.value.dialogVisible=false;
+
       addboundary(aid.value);
     })
     .catch((err) => {
@@ -751,6 +755,15 @@ const accidentboun = () => {
          ElMessage.error(Msg)
     });
 };
+//取消
+const bquxiao=()=>{
+  state.value=sessionStorage.getItem("state");
+        if(state.value=='1'){
+          vtkmodel.clearModeAddJg();
+        }else{
+          vtkmodel.selectNoting();
+        }
+}
 // 边界数据的查询
 const addboundary = (valaid) => {
   aid.value = valaid;

src/view/components/InfoDisaster.vue

@@ -1877,7 +1877,7 @@ const Dclick = () => {
   // vtkmodel.clearJgAddMode() ;
    vtkmodel.selectPipes();
    vtkmodel.clearpipsite();
-  // dialogtrue.value.jgSelect();
+  dialogtrue.value.jgSelect();
 };
 //灾情源查询列表
 const handledisaster = (aidval) => {
@@ -1948,6 +1948,8 @@ const handleChangecollapse = (val) => {
 const inputnuberChange = (number) => {
   dsite.value=number;
   dialogtrue.value.jgSelenum();
+//   vtkmodel.addpipsite( wasi.value.pid, wasi.value.ssite);
+//   vtkmodel.addpipsite2( wasi.value.pid, wasi.value.esite);
 
 }
 // 3D关闭弹窗
@@ -2086,7 +2088,7 @@ const newtable = (e) => {
   zhtext.value = "添加";
   vtkmodel.clearJgAddMode() ;
   // vtkmodel.selectPipes();
-  dialogtrue.value.jgSelect();
+  // dialogtrue.value.jgSelect();
  // dialogtrue.value.initmsg();
 
 
@@ -2111,7 +2113,7 @@ const xiugaitable = () => {
     vtkmodel.selectByPipeId(tableobj.value.pid); 
     vtkmodel.addpipsite(tableobj.value.pid, tableobj.value.site);
     // vtkmodel.selectPipes();
-    dialogtrue.value.jgSelect();
+    // dialogtrue.value.jgSelect();
     vtkmodel.addpipsite( firepid.value,source.site )
   }
 };
@@ -2296,7 +2298,7 @@ const wanewadd=()=>{
   zhtext.value = "添加";
  currentrow.value=false;
  tableobj.value={};
- dialogtrue.value.jgSelect();
+//  dialogtrue.value.jgSelect();
  vtkmodel.clearJgAddMode() ;
 //  vtkmodel.selectPipes();
 
@@ -2445,7 +2447,8 @@ const wsaddblast=()=>{
   wasi.value.blastdata={};
   vtkmodel.clearJgAddMode() ;
   // vtkmodel.selectPipes();
-  dialogtrue.value.jgSelect();
+
+  // dialogtrue.value.jgSelect();
 }
 const wsbalastadd=()=>{
   wasi.value.pid=firepid.value;
@@ -2495,7 +2498,10 @@ const wsxiugai2=()=>{
   Gassdialog.value.wsaddarea= true;
   vtkmodel.clearJgAddMode() ;
   // vtkmodel.selectPipes();
-  dialogtrue.value.jgSelect();
+  vtkmodel.selectByPipeId(tableobj.value.pid);
+  vtkmodel.addpipsite( wasi.value.pid, wasi.value.ssite);
+  vtkmodel.addpipsite2( wasi.value.pid, wasi.value.esite);
+  // dialogtrue.value.jgSelect();
 }
 }
 const handleblastxg=(data)=>{
@@ -2710,7 +2716,7 @@ const addpumdfun=(e)=>{
   selectstr.value=null;
   vtkmodel.clearJgAddMode() ;
   // vtkmodel.selectPipes();
-  dialogtrue.value.jgSelect();
+  // dialogtrue.value.jgSelect();
   vtkmodel.removepump();
 }
 //修改
@@ -2724,7 +2730,7 @@ const pumpxiugai=(val)=>{
      sdialog.value.addpump = true;
     vtkmodel.clearJgAddMode() ;
     // vtkmodel.selectPipes();
-    dialogtrue.value.jgSelect();
+    // dialogtrue.value.jgSelect();
     pumpobj.value.pumpid=pumpobj.value.xzobj.pumpid;
     pumpobj.value.pumpname=pumpobj.value.xzobj.pumpname;
     pumpobj.value.openhig=pumpobj.value.xzobj.openhig;
@@ -3001,7 +3007,7 @@ const yiweiadd=()=>{
   yiweiobj.value.gid='';
   vtkmodel.clearJgAddMode() ;
   // vtkmodel.selectPipes();
-  dialogtrue.value.jgSelect();
+  // dialogtrue.value.jgSelect();
 }
 // 修改
 const yiweixiugai=()=>{
@@ -3020,7 +3026,7 @@ const yiweixiugai=()=>{
   yiweiobj.value.gid=yiweiobj.value.nreobj.pid;
   vtkmodel.clearJgAddMode() ;
   // vtkmodel.selectPipes();
-  dialogtrue.value.jgSelect();
+  // dialogtrue.value.jgSelect();
 
   }
 }

src/view/components/SetNode.vue

@@ -10,7 +10,7 @@
       :fullscreen="false"
       :modal-append-to-body="false"
       modal-class="summary-dlg"
-      @close='closeDialog'
+      :show-close="false"
       class="right log_class bgcolor tianjia asideg asidegbg leftbgimg"
     >
       <template #header="{ titleId, titleClass }">
@@ -70,22 +70,24 @@ let selectObj =  ref(null);
 const textclick=()=>{
   emit('Dtext',selectObj.value);
   state.value=sessionStorage.getItem("state");
-  if(state.value=='1'){
-    vtkmodel.clearModeAddJg();
-  }else{
-    vtkmodel.selectNoting();
-  }
+  vtkmodel.selectNoting();
+  // if(state.value=='1'){
+  //   vtkmodel.clearModeAddJg();
+  // }else{
+  //   vtkmodel.selectNoting();
+  // }
   vtkmodel.selectByNodeId(selectObj.value.id); 
   clearInterval(timing.value);
 }
 const closeDialog=()=>{
   state.value=sessionStorage.getItem("state");
   console.log( state.value);
-  if(state.value=='1'){
-    vtkmodel.clearModeAddJg();
-  }else{
-    vtkmodel.selectNoting();
-  }
+  vtkmodel.selectNoting();
+  // if(state.value=='1'){
+  //   vtkmodel.clearModeAddJg();
+  // }else{
+  //   vtkmodel.selectNoting();
+  // }
 
   clearInterval(timing.value);
 }

src/view/components/SetPipe.vue

@@ -11,8 +11,9 @@
       :modal-append-to-body="false"
       modal-class="summary-dlg"
       class="right log_class bgcolor tianjia asideg asidegbg leftbgimg"
-      @close='closeDialog'
+      :show-close="false"
     >
+    <!-- @close='closeDialog'  -->
       <template #header="{ titleId, titleClass }">
         <div class="my-header">
           <el-image :src="icon" fit="contain"></el-image>
@@ -106,8 +107,8 @@ let selectObj =  ref(null);
 const textclick=()=>{
   // state.value=sessionStorage.getItem("state");
   emit('Dtext',selectObj.value);
-  vtkmodel.selectByPipeId(selectObj.value.id);
   vtkmodel.selectNoting();
+  vtkmodel.selectByPipeId(selectObj.value.id);
   //vtkmodel.addpipsite(selectObj.value.id,props.site);
   // vtkmodel.selectByPipeId(selectObj.value.pid); 
   // vtkmodel.addpipsite(selectObj.value.id,props.site);
@@ -116,10 +117,12 @@ const textclick=()=>{
   // }else{
   //   vtkmodel.selectNoting();
   // }
- //clearInterval(timing.value);
+ clearInterval(timing.value);
 }
 const closeDialog=()=>{
-  //clearInterval(timing.value);
+console.log(3467899);
+  clearInterval(timing.value);
+  vtkmodel.selectNoting();
   // state.value=sessionStorage.getItem("state");
   // if(state.value=='1'){
   //   vtkmodel.clearModeAddJg();
@@ -128,7 +131,7 @@ const closeDialog=()=>{
   // }//节点图形
   // console.log(01111)
   // vtkmodel.clearJgAddMode();
-  vtkmodel.selectNoting();
+ // vtkmodel.selectNoting();
 
 }
 function timintclaer(){