1.7修改bug

src/view/InfoDialoges.vue

@@ -1188,9 +1188,11 @@ function getthislog(val) {
                 let num=parseFloat(nums);
                 percentage.value=num;  
             }        
-    }else if(val.includes("成功")){
+    }else if(val.includes("求解——————————————————成功")){
         percentage.value=100;  
-    }else{}
+    }else if(val.includes("求解——————————————————失败")){
+        percentage.value=0;  
+    }
         newlog.value = newlog.value + "\n" + val;
         rizhi.value.logs = newlog.value;
       

src/view/components/InfoDisaster.vue

@@ -725,7 +725,7 @@
           >
         </div>
         <div class="btn2" style="padding-left: 10px">
-          <el-button type="primary" @click="Dclick()">3D巷道选择</el-button>
+          <el-button type="primary" @click="Dclick('ws')">3D巷道选择</el-button>
         </div>
       </div>
       <div class="input">
@@ -901,7 +901,7 @@
           >
         </div>
         <div class="btn2" style="padding-left: 10px">
-          <el-button type="primary" @click="Dclick()">3D巷道选择</el-button>
+          <el-button type="primary" @click="Dclick('ws')">3D巷道选择</el-button>
         </div>
       </div>
       <div class="input">
@@ -1591,7 +1591,7 @@
       </div>
     </el-dialog>
   </div>
-  <selfdialogs ref="dialogtrue" :site="dsite"  @Dtext="Dtext"></selfdialogs>
+  <selfdialogs ref="dialogtrue" :site="dsite"  @Dtext="Dtext" :ssite="ssite" :esite="esite"></selfdialogs>
   <!-- <filesload
       ref="filesload"
       :fileurls="fileurls"
@@ -1670,6 +1670,8 @@ let currentrow1 = ref(false);
 let currentrow2 = ref(false);
 let tableline=ref();
 let formLabelWidth2=ref(80);
+let ssite=ref();
+let esite=ref();
 let wasi=ref({
   ssite:0.0,
   esite:0.0,
@@ -1823,6 +1825,7 @@ sdialog.value.linetable= false;
 sdialog.value.deletedata= false;
 sdialog.value.yiweidialog=false;
 dialogtrue.value.dialoglog = false;
+Gassdialog.value.wsaddshow=false;
 Fengmenref.value.initisshow();
 closeDialog();
 
@@ -1876,12 +1879,20 @@ const Dtext=(val)=>{
   firepid.value=val.id;
 }
 // 3D弹屏
-const Dclick = () => {
+const Dclick = (val) => {
+  let ws=val;
+  console.log(ws);
   dialogtrue.value.dialoglog = true;
   // vtkmodel.clearJgAddMode() ;
    vtkmodel.selectPipes();
    vtkmodel.clearpipsite();
+   console.log(zhtext.value);
+  //dialogtrue.value.jgSelect();
+if(ws=='ws'){
+  dialogtrue.value.jgSelect2();
+}else{
   dialogtrue.value.jgSelect();
+}
 };
 //灾情源查询列表
 const handledisaster = (aidval) => {
@@ -2499,11 +2510,14 @@ const wsxiugai2=()=>{
   selectstr.value =wasi.value.blastdata.pname;
   firepid.value =wasi.value.blastdata.pid;
   Gassdialog.value.wsaddarea= true;
+  ssite.value= wasi.value.ssite;
+  esite.value=wasi.value.esite;
+
   vtkmodel.clearJgAddMode() ;
   // vtkmodel.selectPipes();
-  vtkmodel.selectByPipeId(tableobj.value.pid);
-  vtkmodel.addpipsite( wasi.value.pid, wasi.value.ssite);
-  vtkmodel.addpipsite2( wasi.value.pid, wasi.value.esite);
+  vtkmodel.selectByPipeId( wasi.value.pid);
+  vtkmodel.addpipsite(wasi.value.pid, wasi.value.ssite);
+  vtkmodel.addpipsite2(wasi.value.pid, wasi.value.esite);
   // dialogtrue.value.jgSelect();
 }
 }
@@ -3031,6 +3045,9 @@ const yiweixiugai=()=>{
   yiweiobj.value.gid=yiweiobj.value.nreobj.pid;
   vtkmodel.clearJgAddMode() ;
   vtkmodel.selectByPipeId(yiweiobj.value.nreobj.pid);
+  ssite.value= yiweiobj.value.ssite;
+  esite.value= yiweiobj.value.esite;
+
   vtkmodel.addpipsite( yiweiobj.value.nreobj.pid, yiweiobj.value.ssite);
   vtkmodel.addpipsite2(yiweiobj.value.nreobj.pid, yiweiobj.value.esite);
   // vtkmodel.selectPipes();
@@ -3103,6 +3120,8 @@ console.log(yiweiobj.value.nreobj);
 //瓦斯爆炸的
 const gessanum1=(val)=>{
   wasi.value.ssite=val;
+  ssite.value= wasi.value.ssite;
+  esite.value=wasi.value.esite;
   console.log(vtkmodel.selectObj);
   vtkmodel.addpipsite(vtkmodel.selectObj.id, wasi.value.ssite);
   vtkmodel.addpipsite2(vtkmodel.selectObj.id, wasi.value.esite);
@@ -3111,6 +3130,8 @@ const gessanum1=(val)=>{
 }
 const gessanum2=(val)=>{
   wasi.value.esite=val;
+  ssite.value= wasi.value.ssite;
+  esite.value=wasi.value.esite;
   vtkmodel.addpipsite(vtkmodel.selectObj.id, wasi.value.ssite);
  vtkmodel.addpipsite2(vtkmodel.selectObj.id, wasi.value.esite);
 
@@ -3118,7 +3139,8 @@ const gessanum2=(val)=>{
 // 一维瓦斯的位置变化
 const ywgess=(val)=>{
   yiweiobj.value.ssite=val;
-  console.log(vtkmodel.selectObj);
+  ssite.value= yiweiobj.value.ssite;
+  esite.value= yiweiobj.value.esite;
   vtkmodel.addpipsite(vtkmodel.selectObj.id, yiweiobj.value.ssite);
  vtkmodel.addpipsite2(vtkmodel.selectObj.id, yiweiobj.value.esite);
 
@@ -3126,6 +3148,8 @@ const ywgess=(val)=>{
 }
 const ywgess2=(val)=>{
   yiweiobj.value.esite=val;
+  ssite.value= yiweiobj.value.ssite;
+  esite.value= yiweiobj.value.esite;
   vtkmodel.addpipsite(vtkmodel.selectObj.id, yiweiobj.value.ssite);
  vtkmodel.addpipsite2(vtkmodel.selectObj.id, yiweiobj.value.esite);
 

src/view/components/MenuCheck.vue

@@ -41,13 +41,13 @@
                                 <div class="borderimg"><el-button @click="addsg();sdialog.dianadddialog=true">添加</el-button></div>
                             </div>
                             <div class="footerbtn flex1">
-                                <div class="borderimg"><el-button @click="shanchu()">
-                                        删除
+                                <div class="borderimg"><el-button @click="amend()">
+                                        修改
                                     </el-button></div>
                             </div>
                             <div class="footerbtn flex1">
-                                <div class="borderimg"><el-button @click="amend()">
-                                        修改
+                                <div class="borderimg"><el-button @click="shanchu()">
+                                        删除
                                     </el-button></div>
                             </div>
                           

src/view/components/MenuMine.vue

@@ -70,13 +70,13 @@
                                         <div class="borderimg"><el-button @click="addsg();">添加</el-button></div>
                                     </div>
                                     <div class="footerbtn flex1">
-                                        <div class="borderimg"><el-button @click="nodedelete()">
-                                                删除
+                                        <div class="borderimg"><el-button @click="accident()">
+                                                修改
                                             </el-button></div>
                                     </div>
                                     <div class="footerbtn flex1">
-                                        <div class="borderimg"><el-button @click="accident()">
-                                                修改
+                                        <div class="borderimg"><el-button @click="nodedelete()">
+                                                删除
                                             </el-button></div>
                                     </div>
                                    
@@ -126,13 +126,13 @@
                                         <div class="borderimg"><el-button @click="guandaoadd();">添加</el-button></div>
                                     </div>
                                     <div class="footerbtn flex1">
-                                        <div class="borderimg"><el-button @click="nodedelete2();">
-                                                删除
+                                        <div class="borderimg"><el-button @click="accident2()">
+                                                修改
                                             </el-button></div>
                                     </div>
                                     <div class="footerbtn flex1">
-                                        <div class="borderimg"><el-button @click="accident2()">
-                                                修改
+                                        <div class="borderimg"><el-button @click="nodedelete2();">
+                                                删除
                                             </el-button></div>
                                     </div>
                                    

src/view/components/MenuPhysics.vue

@@ -56,15 +56,16 @@
                                 <div class="borderimg"><el-button @click="addsg();">添加</el-button></div>
                             </div>
                             <div class="footerbtn flex1">
-                                <div class="borderimg"><el-button @click="shanchu()">
-                                        删除
+                                <div class="borderimg"><el-button @click="amend()">
+                                        修改
                                     </el-button></div>
                             </div>
                             <div class="footerbtn flex1">
-                                <div class="borderimg"><el-button @click="amend()">
-                                        修改
+                                <div class="borderimg"><el-button @click="shanchu()">
+                                        删除
                                     </el-button></div>
                             </div>
+                        
                            
                         </div>
                     </div>

src/view/components/MenuSensor.vue

@@ -43,16 +43,17 @@
                             <!-- <div class="footerbtn flex1"><div class="borderimg"><el-button  @click="addsg('2')">
                               修改
                                   </el-button></div></div> -->
-                            <div class="footerbtn flex1">
-                                <div class="borderimg"><el-button @click="shanchu()">
-                                        删除
+                                  <div class="footerbtn flex1">
+                                <div class="borderimg"><el-button @click="amend()">
+                                        修改
                                     </el-button></div>
                             </div>
                             <div class="footerbtn flex1">
-                                <div class="borderimg"><el-button @click="amend()">
-                                        修改
+                                <div class="borderimg"><el-button @click="shanchu()">
+                                        删除
                                     </el-button></div>
                             </div>
+                         
                            
                         </div>
                     </div>

src/view/components/Menupath.vue

@@ -47,15 +47,16 @@
                                  <div class="borderimg"><el-button @click="addsg();">添加</el-button></div>
                              </div>
                              <div class="footerbtn flex1">
-                                 <div class="borderimg"><el-button @click="shanchu('1')">
-                                         删除
+                                 <div class="borderimg"><el-button @click="amend()">
+                                         修改
                                      </el-button></div>
                              </div>
                              <div class="footerbtn flex1">
-                                 <div class="borderimg"><el-button @click="amend()">
-                                         修改
+                                 <div class="borderimg"><el-button @click="shanchu('1')">
+                                         删除
                                      </el-button></div>
                              </div>
+                           
                             
                          </div>
                      </div>

src/view/components/SetPipe.vue

@@ -98,9 +98,17 @@ const props= defineProps({
     type: Number,
     // default: '',activeIndex
   },
+  ssite: {
+    type: Number,
+    // default: '',activeIndex
+  },
+  esite: {
+    type: Number,
+    // default: '',activeIndex
+  },
   
 });
-defineExpose({ dialoglog,jgSelect,timintclaer,jgSelenum,initmsg });
+defineExpose({ dialoglog,jgSelect,jgSelect2,timintclaer,jgSelenum,initmsg });
 let timing = ref(null);
 //管道节点选择对象
 let selectObj =  ref(null);
@@ -173,9 +181,31 @@ function jgSelect(){
    msg.value=arrobj[0];
    vtkmodel.addpipsite(selectObj.value.id,props.site);
 }
-   }, 1200);
+   }, 800);
 }
+//选择结果定时器
+
 //两个点
+function jgSelect2(){
+    timing.value = setInterval(() => {//定时器
+    selectObj.value=vtkmodel.selectObj;
+    console.log(selectObj.value);
+    if(selectObj.value==null){
+}else{
+  let arr=[];
+  arr.push(selectObj.value);
+ let arrobj= arr.map(item => {
+                   return {
+                        ...item,
+                        sectionType: statusMap[item.sectionType] || '未知' // 如果状态不存在，默认设置为'未知'
+                    };
+                    });
+   msg.value=arrobj[0];
+    vtkmodel.addpipsite(selectObj.value.id,props.ssite);
+    vtkmodel.addpipsite2(selectObj.value.id,props.esite);
+}
+   }, 800);
+}
 //选择结果定时器
 </script>
 <style lang="scss" scoped>

src/view/index/tow-right.vue

@@ -11,10 +11,10 @@
             </template>
             <div class="rg_content">
               <div class="rg-padding">
-                <div class="zongji">
+                <!-- <div class="zongji">
                   <div class="zongjili img1">1<span>个</span></div>
                   <div class="zongjili img2">12<span>个</span></div>
-                </div>
+                </div> -->
                 <div v-for="(item, index) in listArray" :key="index">
                   <el-image style="height: 100%" :src="item.img" fit="contain"></el-image>
                   <!-- <span  :class="'span'+item.id">{{ item.name }}</span> -->