1.7修改1.6bug

src/view/InfoDialoges.vue

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

src/view/components/Fengmen.vue

@@ -8,7 +8,7 @@
 
         >
           <div class="demo-collapse">
-            <el-collapse v-model="coolactiveName1" accordion>
+            <el-collapse v-model="coolactiveName1">
                 <el-collapse-item name="1" class="imgneon">
                 <template #title>
                   <el-icon class="iconimg Frame3" fit="contain"></el-icon>
@@ -75,9 +75,9 @@
                     </div>
                   </div>
                 </div>
-              </el-collapse-item>
+              </el-collapse-item> 
             </el-collapse>
-            <el-collapse v-model="coolactiveName1" accordion>
+            <el-collapse v-model="coolactiveName1"  style="margin-top: 10px;">
                 <el-collapse-item name="2" class="imgneon">
                 <template #title>
                   <el-icon class="iconimg Frame3" fit="contain"></el-icon>
@@ -468,6 +468,7 @@ const handlerow2 = (val) => {
 
 };
 let coolactiveName1 = ref(["1", "2"]);
+let coolactiveName2 = ref( "2");
 // 表格变色
 const tableRowClassName = ({ row, rowIndex }) => {
   if (rowIndex % 2 != 0) {

src/view/components/InfoDisaster.vue

@@ -264,7 +264,7 @@
           </el-collapse>
         <!-- 突水灾害源结束-->
         <!-- 水泵 -->
-        <el-collapse v-model="coolactiveName1" >
+        <el-collapse v-model="coolactiveName1"  style="margin-top: 10px;">
             <el-collapse-item name="2" class="imgneon">
               <template #title>
                 <el-icon class="iconimg Frame3" fit="contain"></el-icon>
@@ -420,7 +420,7 @@
       </el-aside>
     </div>
     <!-- 瓦斯爆炸 -->
-     <div class="common-layout " style="margin: 0" v-show="sour.Gass">
+     <div class="common-layout " style="margin: 0;margin-top: 10px;" v-show="sour.Gass">
       <el-aside     width="2.125rem" class="L_aside L_aside1 asideg asidegbg leftbgimg1">
         <div class="demo-collapse">
           <el-collapse v-model="coolactiveName1" accordion>
@@ -739,7 +739,7 @@
             controls-position="right"
             class="w-50 m-2"
             placeholder="开始位置"
-            @change="inputnuberChange"
+            @change="ywgess"
           />
         </el-form-item>
       </div>
@@ -754,7 +754,7 @@
             controls-position="right"
             class="w-50 m-2"
             placeholder="结束位置"
-            @change="inputnuberChange"
+            @change="ywgess2"
           />
         </el-form-item>
       </div>
@@ -905,6 +905,7 @@
         </div>
       </div>
       <div class="input">
+        <!--          @change="gessanum1" -->
         <el-form-item label="开始位置" :label-width="formLabelWidth5">
           <el-input-number
             v-model="wasi.ssite"
@@ -914,9 +915,11 @@
             controls-position="right"
             class="w-50 m-2"
             placeholder="位置"
+            @change="gessanum1"
          
           />
         </el-form-item>
+        <!--    @change="gessanum2" -->
         <el-form-item label="结束位置" :label-width="formLabelWidth5">
           <el-input-number
             v-model="wasi.esite"
@@ -926,6 +929,7 @@
             controls-position="right"
             class="w-50 m-2"
             placeholder="位置"
+            @change="gessanum2"
           />
         </el-form-item>
       </div>
@@ -1446,7 +1450,7 @@
       <template #header="{ titleId, titleClass }">
         <div class="my-header">
           <el-image :src="icon" fit="contain"></el-image>
-          <h4 :id="titleId" :class="titleClass">添加</h4>
+          <h4 :id="titleId" :class="titleClass">{{  zhtext  }}</h4>
         </div>
       </template>
       <div>
@@ -2447,7 +2451,6 @@ const wsaddblast=()=>{
   wasi.value.blastdata={};
   vtkmodel.clearJgAddMode() ;
   // vtkmodel.selectPipes();
-
   // dialogtrue.value.jgSelect();
 }
 const wsbalastadd=()=>{
@@ -2646,14 +2649,14 @@ const handleDelete2 = (val) => {
   console.log(val);
   jiancobj.value = val;
   firesid.value = val.sid;
-  zqname.value = "监测表的一条信息";
+  zqname.value = "灾害源表的一条信息";
   svid.value = val.svid;
 };
 const handleDelete3 = (val) => {
   currentrow1.value=true;
   jiancobj.value = val;
   firesid.value = val.sid;
-  zqname.value = "监测表的一条信息";
+  zqname.value = "灾害表的一条信息";
   svid.value = val.svid;
 };
 const fundeledata3 = () => {
@@ -2916,8 +2919,9 @@ const xiugailine=()=>{
   } else {
     sdialog.value.deletedata = true;
     deltext.value='水泵';
-    zqname.value=pumpobj.value.pumpname;
- 
+      zqname.value=pumpobj.value.xzobj.pumpname;
+
+   
   }
   }
 
@@ -2955,6 +2959,7 @@ const delline=()=>{
     ElMessage.error("你还没有选中删除的项目");
   } else {
     deltext.value='性能';
+    zqname.value= '性能曲线信息';
     sdialog.value.deletedata = true;
   
   }
@@ -3025,6 +3030,9 @@ const yiweixiugai=()=>{
   firepid.value=yiweiobj.value.nreobj.pid;
   yiweiobj.value.gid=yiweiobj.value.nreobj.pid;
   vtkmodel.clearJgAddMode() ;
+  vtkmodel.selectByPipeId(yiweiobj.value.nreobj.pid);
+  vtkmodel.addpipsite( yiweiobj.value.nreobj.pid, yiweiobj.value.ssite);
+  vtkmodel.addpipsite2(yiweiobj.value.nreobj.pid, yiweiobj.value.esite);
   // vtkmodel.selectPipes();
   // dialogtrue.value.jgSelect();
 
@@ -3092,7 +3100,36 @@ console.log(yiweiobj.value.nreobj);
     });
   }
 }
+//瓦斯爆炸的
+const gessanum1=(val)=>{
+  wasi.value.ssite=val;
+  console.log(vtkmodel.selectObj);
+  vtkmodel.addpipsite(vtkmodel.selectObj.id, wasi.value.ssite);
+  vtkmodel.addpipsite2(vtkmodel.selectObj.id, wasi.value.esite);
+
+
+}
+const gessanum2=(val)=>{
+  wasi.value.esite=val;
+  vtkmodel.addpipsite(vtkmodel.selectObj.id, wasi.value.ssite);
+ vtkmodel.addpipsite2(vtkmodel.selectObj.id, wasi.value.esite);
+
+}
+// 一维瓦斯的位置变化
+const ywgess=(val)=>{
+  yiweiobj.value.ssite=val;
+  console.log(vtkmodel.selectObj);
+  vtkmodel.addpipsite(vtkmodel.selectObj.id, yiweiobj.value.ssite);
+ vtkmodel.addpipsite2(vtkmodel.selectObj.id, yiweiobj.value.esite);
+
 
+}
+const ywgess2=(val)=>{
+  yiweiobj.value.esite=val;
+  vtkmodel.addpipsite(vtkmodel.selectObj.id, yiweiobj.value.ssite);
+ vtkmodel.addpipsite2(vtkmodel.selectObj.id, yiweiobj.value.esite);
+
+}
 onMounted(() => {
   
 });

src/view/components/SetPipe.vue

@@ -175,7 +175,8 @@ function jgSelect(){
 }
    }, 1200);
 }
-
+//两个点
+//选择结果定时器
 </script>
 <style lang="scss" scoped>
 .vtk {