12.31

src/control/vtkModel.js

@@ -466,7 +466,8 @@ removejc(){
 
   //显示所选择巷道位置
   addpipsite(pid,site){
-    let pipe =this.pipeByPid(checkNode.pid);
+    console.log(1111)
+    let pipe =this.pipeByPid(pid);
     if(this.actorpipsites.length==0){
       const  actorpipsite= vtkActor.newInstance();
       //管道位置数据
@@ -496,7 +497,7 @@ removejc(){
   
   //显示所选择巷道位置
   addpipsite2(pid,site){
-    let pipe =this.pipeByPid(checkNode.pid);
+    let pipe =this.pipeByPid(pid);
     if(this.actorpipsites.length==0){
       addpipsite(pid,site);
     }

src/style/style.css

@@ -1662,7 +1662,7 @@ z-index: 1;
   text-align: left;
 }
 .lookrz{
-  /* position: absolute; */
+  position: absolute;
   right: 0px;
   top: 10px;
   color: #00FFF0;

src/view/InfoDialoges.vue

@@ -250,11 +250,8 @@
                                     </div>
                                     <div class=" logs">
                                         <div class="logs_pading">
-                                            <h4>模拟日志
-                                               
-                                            </h4>
-                                            <div class="lookdiv"><span class="lookrz" @click="lookclick()">{{looktxt }}</span></div>
                                             <el-progress :percentage="percentage" />
+                                            <h4>模拟日志<span class="lookrz" @click="lookclick()">{{looktxt }}</span></h4>
                                             <div class="footerTextBox" v-show="rizhishow" >
                                                 <el-input class="footerText" type="textarea" id="textarea_id"
                                                     v-model="rizhi.logs"></el-input>
@@ -359,7 +356,17 @@
                                         <div class="btn" :class="{chuactive: isActive === 3}" @click="changeClass(3)" ><span class="spantext" >停止计算</span></div>
                                         <div class="btn" :class="{chuactive: isActive === 2}" @click="changeClass(2)" ><span class="spantext" >开始计算</span></div>
                                     </div>
-
+                                    <div class=" logs">
+                                        <div class="logs_pading">
+                                            <el-progress :percentage="percentage" />
+                                            <h4>模拟日志<span class="lookrz" @click="lookclick()">{{looktxt }}</span></h4>
+                                            <div class="footerTextBox" v-show="rizhishow" >
+                                                <el-input class="footerText" type="textarea" id="textarea_id"
+                                                    v-model="rizhi.logs"></el-input>
+                                            </div>
+                                        </div>
+                                    </div>
+<!-- 
                                     <div class=" logs">
                                         <div class="logs_pading">
                                             <h4>模拟日志
@@ -372,7 +379,7 @@
                                                     v-model="rizhi.logs"></el-input>
                                             </div>
                                         </div>
-                                    </div>
+                                    </div> -->
                                 </el-form>
 
                             </div>
@@ -685,6 +692,23 @@ const tableData2 = [
     },
 
 ]
+//关闭所有弹窗
+const initisshow=()=>{
+ dialog.value.dialogVisible_fire=false;
+ dialog.value.jianced=false;
+ dialog.value.monitor=false;
+ dialog.value.dialogForm=false;
+ dialog.value.dialogsgdelect= false;
+leftcoll.value.collfire=false;
+leftcoll.value.collwater=false,
+leftcoll.value.Gass=false;
+
+}
+emitter.on('handleSelect',(data)=>{
+
+    initisshow();
+});
+//
 //显示更多
 const showMore= ()=>{
     // iskeynum.value=true;
@@ -776,7 +800,6 @@ const accident = () => {
        
         emit('moxingclick', true);
         pollute();
-        //  emit('handleSelect', '1');
         fetchFileContent();
         console.log(props.activeIndex);
        // accident2(props.activeIndex)
@@ -1202,8 +1225,8 @@ async function fetchFileContent() {
                 }  
                 if(res.logs.includes('求解——————————————————成功')){
                         percentage.value=100;
-                    }else{
-                      
+                    }else if(res.logs.includes('求解——————————————————失败')){
+                        percentage.value=0;
                     }
                     newlog.value = newlog.value + "\n" + res.logs;
                     rizhi.value.logs = newlog.value;
@@ -1392,21 +1415,14 @@ onMounted(() => {
    
     // });
     }
-  
-
-
-        
-
-
-
-
 });
 const change2=(val)=>{
     formull.value.name.forceUpdate();
 }
 onUnmounted(() =>{
 
-emitter.off('accident')
+emitter.off('accident');
+emitter.off('handleSelect')
 })
 defineExpose({ monitor, accident2, leftcoll, classradio, aid, dialogVisible ,changeModel,classclick,state,dialog});
 </script>

src/view/appmian.vue

@@ -315,9 +315,9 @@ const childfun = () => {
     sourcedis.value.yiweiget(aid.value);
   } else{
     sourcedis.value.getrequest(aid.value);
-   setTimeout(() => {
+  //  setTimeout(() => {
     sourcedis.value.handledisaster(aid.value);
-   }, 3000);
+  //  }, 3000);
 
 
   }
@@ -361,7 +361,6 @@ const imgonclock=()=>{
   activeIndeximg.value=null;
 }
 const handleSelect = (key) => {
-   console.log('执行吗')
  emitter.emit('handleSelect',(key));
   // window.location.reload();
  //indexref.value.changeColor("0")
@@ -373,6 +372,7 @@ const handleSelect = (key) => {
 //     console.log(data);
 
 //   });
+
  titleclick();
   activeIndeximg.value=key;
   bgk2false.value=true;
@@ -380,6 +380,8 @@ const handleSelect = (key) => {
   if( bgk2false.value==true){
     activeIndex.value='11'
     bkmodel.value=false;
+    sourcedis.value.initisshow();
+    boundary.value.initisshow();
   sourcedis.value.accident3(activeIndex.value);
   boundary.value.accident4(activeIndex.value);
   lliudialog.value.accident2( activeIndex.value);

src/view/components/Fengmen.vue

@@ -475,6 +475,17 @@ const tableRowClassName = ({ row, rowIndex }) => {
   }
   return "oddRow";
 };
+//
+const initisshow=()=>{
+  sdialog.value.dialogsgdelect=false;
+  sdialog.value.dialogVisiblenode=false;
+  sdialog.value.fjdialog=false;
+  sdialog.value.fmdialog=false;
+  dialogtrue.value.dialoglog = false;
+  pipeline.value.dialogVisiblenode = false;
+  closeDialog();
+}
+
 // 3D弹屏
 const Dclick = () => {
   dialogtrue.value.dialoglog = true;
@@ -793,5 +804,5 @@ const Dtext=(val)=>{
   source.value.selectstr=val.name;
   pid.value=val.id;
 }
-defineExpose({getquery});
+defineExpose({getquery,initisshow});
 </script>

src/view/components/InfoBoundary.vue

@@ -481,6 +481,7 @@ import zhCn from 'element-plus/es/locale/lang/zh-cn'
 import { Calendar, Search } from "@element-plus/icons-vue";
 import selfdialogs from "./SetNode.vue";
 import { vtkmodel } from "@/control/vtkModel.js";
+import emitter from "@/utils/emitter";
 let isActive=ref(0)
 const  changeClass= (i)=>  {
   console.log(i);
@@ -586,6 +587,23 @@ const boun = ref({
   collwater: false,
   collGass:false,
 });
+const initisshow=()=>{
+  dialogtrue.value.dialoglog=false; 
+  sdialog.value.dialogVisiblenode=false;
+  sdialog.value.dialogsgdelect=false;
+ boun.value.collfire=false;
+ boun.value.collwater=false;
+ boun.value.collGass=false;
+ dialog.value.dialogVisible =false;
+
+
+}
+// emitter.on('handleSelect',(data)=>{
+//     initisshow();
+// });
+// onUnmounted(() =>{
+// emitter.off('handleSelect')
+// })
 // 节点选择
 const fireclick = () => {
   pipelinedata("");
@@ -647,7 +665,6 @@ const projectsSelectionSelect = (selection, row) => {
 };
 //边界添加前清空
 const bounadd = () => {
-  console.log(22233444)
   currentrow.value=false;
   bid.value = "";
   bformInline.value.nname = "";
@@ -807,7 +824,7 @@ const accident4 = (key) => {
   }
 };
 onMounted(() => {});
-defineExpose({ boun, accident4, addboundary, changeModel });
+defineExpose({ boun, accident4, addboundary, changeModel,initisshow });
 </script>
 
 

src/view/components/InfoDisaster.vue

@@ -1617,6 +1617,7 @@ import { vtkmodel } from "@/control/vtkModel.js";;
 import selfdialogs from "./SetPipe.vue";
 import vueUploader from "./fileuploads.vue";
 import { NULL } from "sass";
+import emitter from "@/utils/emitter";
 // import filesload from "./filesloads.vue";
 const statusMap = {
   'CIRCULAR': '圆形',
@@ -1797,6 +1798,35 @@ const tableRowClassName = ({ row, rowIndex }) => {
 const tableData = ref([]);
 const tableDatay = ref([]);
 const tableData4 = ref([]);
+const initisshow=()=>{
+Gassdialog.value.wsaddflie=false;
+Gassdialog.value.wsaddflie=false;
+Gassdialog.value.wsaddarea=false;
+Gassdialog.value.wsdelete=false;
+Gassdialog.value.blast=false;
+Gassdialog.value.gather=false;
+Gassdialog.value.wsaddgather=false;
+sdialog.value.adddialog=false;
+sdialog.value.dialogsgdelect=  false;
+sdialog.value.dianadddialog=  false;
+sdialog.value.addpump= false;
+sdialog.value.dialogVisiblenode=false;
+sdialog.value.isDisasterfire=  false;
+sdialog.value.isDisasterwter=  false;
+sdialog.value.adddwater=  false;
+sdialog.value.addline= false;
+sdialog.value.linetable= false;
+sdialog.value.deletedata= false;
+sdialog.value.yiweidialog=false;
+dialogtrue.value.dialoglog = false;
+Fengmenref.value.initisshow();
+closeDialog();
+
+}
+// emitter.on('handleSelect',(data)=>{
+
+//     initisshow();
+// });
 
 const accident3 = (key) => {
   console.log(key);
@@ -1851,7 +1881,9 @@ const Dclick = () => {
 };
 //灾情源查询列表
 const handledisaster = (aidval) => {
- vtkmodel.delSoures();
+
+    vtkmodel.delSoures();
+
   aid.value = aidval;
   const params = {
     transCode: "D00005",
@@ -1862,7 +1894,7 @@ const handledisaster = (aidval) => {
       console.log(res);
       //vtkmodel.delSoures();
       res.rows.forEach((item,index)=>{
-        vtkmodel.addSoures(item.pid,item.site)
+          vtkmodel.addSoures(item.pid,item.site)
       })
       if (props.classradio == "Fire") {
         tableDatay.value = res.rows;
@@ -2065,14 +2097,18 @@ const xiugaitable = () => {
   if (JSON.stringify(tableobj.value) == "{}") {
     ElMessage.error("你还没有选中修改的项目");
   } else {
-    vtkmodel.clearJgAddMode() ;
-    vtkmodel.selectPipes();
-    dialogtrue.value.jgSelect();
+
     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();
+    dialogtrue.value.jgSelect();
+    vtkmodel.addpipsite( firepid.value,source.site )
   }
 };
 // 修改接口
@@ -3044,7 +3080,7 @@ console.log(yiweiobj.value.nreobj);
 onMounted(() => {
   
 });
-defineExpose({ sour, accident3, handledisaster,changeModel,Gassgetdata,getrequest,yiweiget});
+defineExpose({ sour, accident3, handledisaster,changeModel,Gassgetdata,getrequest,yiweiget,initisshow});
 </script>