12.9 0.3

src/style/style.css

@@ -2,7 +2,7 @@
 color: #fff;
 }
 body,html{
-  background: radial-gradient(closest-side, #0B338B , #1C253D);
+  /* background: radial-gradient(closest-side, #0B338B , #1C253D); */
   font-family: 'Lucida Sans', 'Lucida Sans Regular', 'Lucida Grande', 'Lucida Sans Unicode', Geneva, Verdana, sans-serif;
 }
 .jc_padding {
@@ -1911,7 +1911,7 @@ background-color: #52C6FF  !important;
 /* background-image: linear-gradient(to top, #41c0ff,#1D86E5, #00ABFF,#52C6FF) ; */
 }
 .jcshijian{
-  margin-top: .1094rem;
+  margin-top: 20px;
 }
 .zongji .img4{
   line-height: 1.5;

src/view/InfoDialoges.vue

@@ -843,7 +843,7 @@ const rewu=()=>{
            
             tuiyanobj.value=res;
             sessionStorage.setItem("state",state.value);
-          
+            //fun3D();
             tuiyanobj.value.pickertime=res.acctime;
             value.value=arrvalue.value;   
             value.value=[];

src/view/components/InfoDisaster.vue

@@ -454,6 +454,7 @@
       :fullscreen="false"
       :modal-append-to-body="false"
       modal-class="summary-dlg"
+       @close='closeDialog'
       class="dialog_class bgcolor tianjia"
     >
       <template #header="{ titleId, titleClass }">
@@ -488,7 +489,7 @@
       <div class="dialog-footer footer_div l_btn">
         <div class="footerbtn flex1">
           <div class="borderimg">
-            <el-button @click="Gassdialog.wsaddshow=false">取消</el-button>
+            <el-button @click="closeDialog(); Gassdialog.wsaddshow=false">取消</el-button>
           </div>
         </div>
         <div class="footerbtn flex1">
@@ -515,6 +516,7 @@
       :modal-append-to-body="false"
       modal-class="summary-dlg"
       class="dialog_class bgcolor tianjia"
+      @close='closeDialog'
     >
       <template #header="{ titleId, titleClass }">
         <div class="my-header">
@@ -559,6 +561,7 @@
             controls-position="right"
             class="w-50 m-2"
             placeholder="位置"
+         
           />
         </el-form-item>
         <el-form-item label="结束位置" :label-width="formLabelWidth5">
@@ -576,7 +579,7 @@
       <div class="dialog-footer footer_div l_btn">
         <div class="footerbtn flex1">
           <div class="borderimg">
-            <el-button @click="Gassdialog.wsaddarea= false">取消</el-button>
+            <el-button @click="closeDialog();Gassdialog.wsaddarea= false">取消</el-button>
           </div>
         </div>
         <div class="footerbtn flex1">
@@ -669,7 +672,7 @@
       modal-class="summary-dlg"
       class="dialog_class bgcolor tianjia"
       draggable
- 
+      @close='closeDialog'
     >
       <template #header="{ titleId, titleClass }">
         <div class="my-header">
@@ -711,13 +714,14 @@
             controls-position="right"
             class="w-50 m-2"
             placeholder="位置"
+            @change="inputnuberChange"
           />
         </el-form-item>
       </div>
       <div class="dialog-footer footer_div l_btn">
         <div class="footerbtn flex1">
           <div class="borderimg">
-            <el-button @click="sdialog.dianadddialog = false">取消</el-button>
+            <el-button @click="closeDialog(); sdialog.dianadddialog = false">取消</el-button>
           </div>
         </div>
         <div class="footerbtn flex1">
@@ -1041,7 +1045,7 @@
       </div>
     </el-dialog>
   </div>
-  <selfdialogs ref="dialogtrue" @Dtext="Dtext"></selfdialogs>
+  <selfdialogs ref="dialogtrue" :site="dsite"  @Dtext="Dtext"></selfdialogs>
   <!-- <filesload
       ref="filesload"
       :fileurls="fileurls"
@@ -1077,10 +1081,13 @@ let isActive=ref(0)
 const  changeClass= (i)=>  {
  isActive.value = i;
 }
+let dsite=ref();
+let state=ref();
 const changeModel= ()=>  {
   vtkmodel.clearJgAddMode();
   vtkmodel.renderWindow.render();
 }
+let timing = ref(null);
 let styX=ref({left: ""})
 let vueupshow=ref(false);
 const gfx=ref();
@@ -1230,9 +1237,10 @@ const Dtext=(val)=>{
 // 3D弹屏
 const Dclick = () => {
   dialogtrue.value.dialoglog = true;
-  vtkmodel.clearJgAddMode() ;
-  vtkmodel.selectPipes();
-  dialogtrue.value.jgSelect();
+
+  // vtkmodel.clearJgAddMode() ;
+  // vtkmodel.selectPipes();
+  // dialogtrue.value.jgSelect();
   console.log(dialogtrue.value.dialoglog);
 };
 //灾情源查询列表
@@ -1276,6 +1284,7 @@ const fireadd = () => {
         type: "success",
       });
       handledisaster(aid.value);
+      fun3D();
     })
     .catch((err) => {
       ElMessage.error(err.returnMsg);
@@ -1288,7 +1297,34 @@ const handleChangecollapse = (val) => {
   coolactiveName1.value=val;
   
 }
+// 加减input事件
+const inputnuberChange = (number) => {
+  dsite.value=number;
+  dialogtrue.value.jgSelenum();
 
+}
+// 3D关闭弹窗
+const fun3D = () => {
+ // state.value=sessionStorage.getItem("state");
+ // console.log()
+  if(state.value=='1'){
+    vtkmodel.clearModeAddJg();
+  }else{
+    vtkmodel.selectNoting();
+  }
+  dialogtrue.value.timintclaer();
+  vtkmodel.clearpipsite();//清除选择巷道的位置
+}
+const closeDialog=()=>{
+ // state.value=sessionStorage.getItem("state");
+  if(state.value=='1'){
+    vtkmodel.clearModeAddJg();
+  }else{
+    vtkmodel.selectNoting();
+  }//节点图形
+  vtkmodel.clearpipsite();//清除选择巷道的位置
+  dialogtrue.value.timintclaer();
+}
 //添加保存
 const handleEditfire = () => {
   if (gdadd.value == "1") {
@@ -1392,6 +1428,9 @@ const newtable = (e) => {
   newtable.value = "1";
   gdadd.value = "1";
   zhtext.value = "添加";
+  vtkmodel.clearJgAddMode() ;
+  vtkmodel.selectPipes();
+  dialogtrue.value.jgSelect();
 };
 //  修改
 const xiugaitable = () => {
@@ -1400,7 +1439,9 @@ const xiugaitable = () => {
   if (JSON.stringify(tableobj.value) == "{}") {
     ElMessage.error("你还没有选中修改的项目");
   } else {
-    console.log(tableobj.value)
+    vtkmodel.clearJgAddMode() ;
+    vtkmodel.selectPipes();
+    dialogtrue.value.jgSelect();
     sdialog.value.dianadddialog = true;
     aid.value = tableobj.value.aid;
     firepid.value = tableobj.value.pid;
@@ -1597,6 +1638,7 @@ console.log(params);
       });
       Gassdialog.value.wsaddflie= false;
       Gassgetdata(aid.value);
+      fun3D();
     })
     .catch((err) => {
       ElMessage.error(err.returnMsg);
@@ -1723,6 +1765,7 @@ const wsbalastadd=()=>{
       });
       Gassdialog.value.wsaddarea= false;
       wsblastget();
+      fun3D();
 
     
     })

src/view/components/SetPipe.vue

@@ -10,7 +10,6 @@
       :fullscreen="false"
       :modal-append-to-body="false"
       modal-class="summary-dlg"
-      @close='closeDialog'
       class="right log_class bgcolor tianjia asideg asidegbg leftbgimg"
     >
       <template #header="{ titleId, titleClass }">
@@ -56,7 +55,7 @@ import { vtkmodel } from "@/control/vtkModel.js";
 let emit = defineEmits(['Dtext',])
 let state=ref();
 let dialoglog = ref(false);
-let texttitle = ref("管道信息");
+let texttitle = ref("巷道信息");
 // let msg = ref("内容");
 let msg=ref({
     name: '',
@@ -70,51 +69,72 @@ let msg=ref({
     sectionPara4: '',
     sectionPara5: '',
 })
-defineExpose({ dialoglog,jgSelect });
+const props= defineProps({ 
+  site: {
+    type: Number,
+    // default: '',activeIndex
+  },
+  
+});
+defineExpose({ dialoglog,jgSelect,timintclaer,jgSelenum });
 let timing = ref(null);
 //管道节点选择对象
 let selectObj =  ref(null);
 const textclick=()=>{
-  state.value=sessionStorage.getItem("state");
+  // state.value=sessionStorage.getItem("state");
   emit('Dtext',selectObj.value);
-  if(state.value=='1'){
-    vtkmodel.clearModeAddJg();
-  }else{
-    vtkmodel.selectNoting();
-  }
-  clearInterval(timing.value);
+  // if(state.value=='1'){
+  //   vtkmodel.clearModeAddJg();
+  // }else{
+  //   vtkmodel.selectNoting();
+  // }
+ //clearInterval(timing.value);
 }
 const closeDialog=()=>{
-  state.value=sessionStorage.getItem("state");
-  if(state.value=='1'){
-    vtkmodel.clearModeAddJg();
-  }else{
-    vtkmodel.selectNoting();
-  }//节点图形
+  //clearInterval(timing.value);
+  // state.value=sessionStorage.getItem("state");
+  // if(state.value=='1'){
+  //   vtkmodel.clearModeAddJg();
+  // }else{
+  //   vtkmodel.selectNoting();
+  // }//节点图形
+}
+function timintclaer(){
   clearInterval(timing.value);
 }
-
 onBeforeUnmount(() => {
-  clearInterval(timing.value);
+
 });
 onMounted(() => {
    // jgSelect();
 });
 onUnmounted(() => {
-    clearInterval(timing.value);
 })
+//
+function jgSelenum(){
+  selectObj.value=vtkmodel.selectObj;
+  if(selectObj.value==null){
+}else{;
+ msg.value=selectObj.value;
+ vtkmodel.addpipsite(selectObj.value,props.site);
+}
+
+}
 //选择结果定时器
 function jgSelect(){
+  
     timing.value = setInterval(() => {//定时器
+      console.log(111111)
     selectObj.value=vtkmodel.selectObj;
+   // console.log(selectObj.value);
     if(selectObj.value==null){
-    console.log(selectObj.value);
+   // console.log(selectObj.value);
 }else{
-   console.log(selectObj.value);
+  // console.log(selectObj.value);
    msg.value=selectObj.value;
-   vtkmodel.addpipsite(selectObj.value,0.2);
+   vtkmodel.addpipsite(selectObj.value,props.site);
 }
-  }, 200);
+   }, 1200);
 }
 
 </script>