liuqiao il y a 9 mois
Parent
commit
dd7c8e2e44
2 fichiers modifiés avec 13 ajouts et 8 suppressions
  1. 11 5
      src/view/components/InfoDisaster.vue
  2. 2 3
      src/view/components/SetPipe.vue

+ 11 - 5
src/view/components/InfoDisaster.vue

@@ -1237,7 +1237,6 @@ const Dtext=(val)=>{
 // 3D弹屏
 const Dclick = () => {
   dialogtrue.value.dialoglog = true;
-
   // vtkmodel.clearJgAddMode() ;
   // vtkmodel.selectPipes();
   // dialogtrue.value.jgSelect();
@@ -1305,8 +1304,8 @@ const inputnuberChange = (number) => {
 }
 // 3D关闭弹窗
 const fun3D = () => {
- // state.value=sessionStorage.getItem("state");
- // console.log()
+ state.value=sessionStorage.getItem("state");
+  //console.log(state.value);
   if(state.value=='1'){
     vtkmodel.clearModeAddJg();
   }else{
@@ -1316,11 +1315,14 @@ const fun3D = () => {
   vtkmodel.clearpipsite();//清除选择巷道的位置
 }
 const closeDialog=()=>{
- // state.value=sessionStorage.getItem("state");
+  console.log(state.value);
+state.value=sessionStorage.getItem("state");
   if(state.value=='1'){
     vtkmodel.clearModeAddJg();
+    console.log(11111);
   }else{
     vtkmodel.selectNoting();
+    console.log(22222);
   }//节点图形
   vtkmodel.clearpipsite();//清除选择巷道的位置
   dialogtrue.value.timintclaer();
@@ -1344,6 +1346,7 @@ const handleEditfire = () => {
 //灾情源删除
 const handleDelete = (val) => {
   console.log("我执行了")
+  
   zqname.value = val.pname;
  tableobj.value=val;
   currentrow.value=true;
@@ -1614,9 +1617,12 @@ const wanewadd=()=>{
   selectstr.value = "";
   firepid.value = "";
   zhtext.value = "添加";
-
  currentrow.value=false;
  tableobj.value={};
+ dialogtrue.value.jgSelect();
+ vtkmodel.clearJgAddMode() ;
+ vtkmodel.selectPipes();
+
 
 
 }

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

@@ -76,7 +76,7 @@ const props= defineProps({
   },
   
 });
-defineExpose({ dialoglog,jgSelect,timintclaer,jgSelenum });
+defineExpose({ dialoglog,jgSelect,timintclaer,jgSelenum,msg });
 let timing = ref(null);
 //管道节点选择对象
 let selectObj =  ref(null);
@@ -122,7 +122,6 @@ function jgSelenum(){
 }
 //选择结果定时器
 function jgSelect(){
-  
     timing.value = setInterval(() => {//定时器
       console.log(111111)
     selectObj.value=vtkmodel.selectObj;
@@ -134,7 +133,7 @@ function jgSelect(){
    msg.value=selectObj.value;
    vtkmodel.addpipsite(selectObj.value,props.site);
 }
-   }, 1200);
+   }, 12000000);
 }
 
 </script>