12.23 0.3

src/control/vtkModel.js

@@ -188,7 +188,7 @@ export class VtkModel {
     });
 
 
-
+    this.pmpActors=[];
     this.cgqActors=[];
     this.cgqreader = vtkPLYReader.newInstance();
     fetchJSFileAsArrayBuffer('static//3d/jiancd.ply').then(arrayBuffer => {
@@ -292,7 +292,51 @@ delSoures(){
   this.removeSoure();
   this.soureActors=[];
 }
+//水泵/风门、风机添加
+addpump(pid,site){
 
+  let pipe =this.pipeByPid(pid,site);
+  let point1 = this.pointByPipeNodeId(pipe.snId);
+  let point2 = this.pointByPipeNodeId(pipe.enId);
+  let py = site/(1-site);
+  let pipsite_point=[
+    (point1[0]+py*point2[0])/(1+py),
+    (point1[1]+py*point2[1])/(1+py),
+    (point1[2]+py*point2[2])/(1+py),
+    ] 
+    console.log(pipsite_point)
+    const mapper = vtkMapper.newInstance();
+    mapper.setInputConnection(this.cgqreader.getOutputPort());
+    const actor = vtkActor.newInstance();
+    actor.setPosition(pipsite_point[0],pipsite_point[1],pipsite_point[2]);
+    actor.getProperty().setColor(SOURECOLOR);
+    actor.setMapper(mapper);
+    actor.setScale(5,5,5);//放大
+      // 旋转actor
+    actor.rotateY(90);// 绕y轴旋转
+    this.pmpActors.push(actor);
+    this.pmpActors.forEach((actor)=>{
+      this.renderer.addActor(actor);
+    });
+    this.renderWindow.render();
+}
+showpump(){ 
+  this.pmpActors.forEach((actor)=>{
+    this.renderer.addActor(actor);
+  });
+  this.renderWindow.render();
+
+}
+removepump(){
+  this.pmpActors.forEach((actor)=>{
+    this.renderer.removeActor(actor);
+  });
+  this.renderWindow.render();
+}
+delpump(){
+  this.removepump();
+  this.pmpActors=[];
+}
 addSensor(pid,site){
   let pipe =this.pipeByPid(pid,site);
   let point1 = this.pointByPipeNodeId(pipe.snId);
@@ -493,14 +537,14 @@ safetypath(rows){
       this.renderer.addActor(wayAcotor);
     });
     // vtkmodel.renderer.resetCamera();
-    vtkmodel.renderWindow.render();
+    this.renderWindow.render();
 }
 // 清空安全路径
 safetypathremove(){
     this.wayspathActors.forEach(actor => {
       this.renderer.removeActor(actor);
     });
-    vtkmodel.renderWindow.render();
+  this.renderWindow.render();
 }
   waysInit(ways) {
     this.renderWindowWith.resize();

src/style/style.css

@@ -92,6 +92,24 @@ display: flex;
   .maopading .jisuan{
     margin-bottom: 5px ;
   }
+  .radiotext{
+    font-size: 16px;
+    color: #fff;
+  }
+  .jisuan1 .tishi{
+text-align: right;
+  }
+  .divshuzhi{
+    max-height: 400px;
+    overflow-y: scroll;
+  }
+  .jisuan1 .elimage{
+  margin-top: 8px;
+  }
+  .jisuan1 .elimage .el-image{
+    width: 100%;
+    height: 100%;
+  }
   .treeselect .el-tree{
 background-color: none !important;
   }
@@ -1963,7 +1981,7 @@ justify-content: space-between;
 .je_right{
   width: 0.9167rem;
   position: relative;
-  padding: 0 0.1875rem;
+  /* padding: 0 0.1875rem; */
   height:0.5938rem;
   overflow: hidden;
 

src/view/components/Fengmen.vue

@@ -167,7 +167,7 @@
       </template>
       <el-form >
         <el-form-item label="编码" :label-width="formLabelWidth6">
-            <el-input v-model="fjobj.fancode"  maxlength="18" oninput ="value=value.replace(/[^a-zA-Z]/g, '');"  class="w-50 m-2" placeholder="请输入" />
+            <el-input v-model="fjobj.fancode"  maxlength="18"  oninput ="value=value.replace(/[^\w\\/]/ig,'')"    class="w-50 m-2" placeholder="请输入" />
         </el-form-item>
       <el-form-item label="风机名称" :label-width="formLabelWidth6">
             <el-input v-model="fjobj.fanname"  maxlength="18" oninput ="value=value.replace(/[^\a-\z\A-\Z0-9\u4E00-\u9FA5]/g,'')"  class="w-50 m-2" placeholder="请输入" />
@@ -266,8 +266,9 @@
         </div>
       </template>
       <el-form >
+        <!--  只能输入引文oninput ="value=value.replace(/[^a-zA-Z]/g, '');" -->
         <el-form-item label="编码" :label-width="formLabelWidth6">
-            <el-input v-model="fmobj.doorcode"  maxlength="18" oninput ="value=value.replace(/[^a-zA-Z]/g, '');"  class="w-50 m-2" placeholder="请输入" />
+            <el-input v-model="fmobj.doorcode"  maxlength="18"  oninput ="value=value.replace(/[^\w\\/]/ig,'')"   class="w-50 m-2" placeholder="请输入" />
         </el-form-item>
       <el-form-item label="风门名称" :label-width="formLabelWidth6">
             <el-input v-model="fmobj.doorname"  maxlength="18" oninput ="value=value.replace(/[^\a-\z\A-\Z0-9\u4E00-\u9FA5]/g,'')"  class="w-50 m-2" placeholder="请输入" />
@@ -453,13 +454,18 @@ const props = defineProps({
   let fjtableData=ref([]);
   let fmtableData=ref([]);
   const handlerow = (val) => {
+    vtkmodel.delpump();
     currentrow.value=true; 
     handobj.value=val;
     console.log(val);
+    vtkmodel.addpump(val.pid,val.site);
 };
 const handlerow2 = (val) => {
+  vtkmodel.delpump();
     currentrow.value=true; 
     handobjfm.value=val;
+    vtkmodel.addpump(val.pid,val.site);
+
 };
 let coolactiveName1 = ref(["1", "2"]);
 // 表格变色
@@ -619,6 +625,7 @@ const getrequest=()=>{
   request(params)
     .then((res) => {
         console.log(res)
+        vtkmodel.delpump();
         fjtableData.value=res.rows;
         currentrow.value=false;
         console.log( currentrow.value);
@@ -670,7 +677,7 @@ const fmrequest=()=>{
   };
   request(params)
     .then((res) => {
-        console.log(res)
+      vtkmodel.delpump();
         fmtableData.value=res.rows;
         currentrow.value=false;
     })
@@ -695,6 +702,7 @@ const fmrequest=()=>{
     vtkmodel.clearJgAddMode() ;
   vtkmodel.selectPipes();
   dialogtrue.value.jgSelect();
+
   }
   //风门的修改
   const  fmxiugai=()=>{

src/view/components/InfoDisaster.vue

@@ -909,8 +909,8 @@
           <el-input-number
             v-model="wasi.ssite"
             :min="0"
-            :max="10000"
-            :step="100"
+            :max="1"
+            :step="0.1"
             controls-position="right"
             class="w-50 m-2"
             placeholder="位置"
@@ -921,8 +921,8 @@
           <el-input-number
             v-model="wasi.esite"
             :min="0"
-            :max="10000"
-            :step="100"
+            :max="1"
+            :step="0.1"
             controls-position="right"
             class="w-50 m-2"
             placeholder="位置"
@@ -1115,7 +1115,7 @@
       </template>
       <el-form >
         <el-form-item label="编码" :label-width="formLabelWidth6">
-            <el-input v-model="pumpobj.pumpcode"    maxlength="10" oninput ="value=value.replace(/[^a-zA-Z]/g, '');" class="w-50 m-2" placeholder="请输入" />
+            <el-input v-model="pumpobj.pumpcode"    maxlength="10"  oninput ="value=value.replace(/[^\w\\/]/ig,'')"   class="w-50 m-2" placeholder="请输入" />
         </el-form-item>
       <el-form-item label="水泵名称" :label-width="formLabelWidth6">
             <el-input v-model="pumpobj.pumpname"    maxlength="18" oninput ="value=value.replace(/[^\a-\z\A-\Z0-9\u4E00-\u9FA5]/g,'')"  class="w-50 m-2" placeholder="请输入" />
@@ -2365,17 +2365,15 @@ const wsblastget=()=>{
   };
   request(params)
     .then((res) => {
-      if(res.row!=[]){
+      gtableData.value=res.rows;
+      wasi.value.blastdata={};
+      if(res.rows!=[]){
       res.rows.forEach((item,index)=>{
-        let ssite=Number(item.ssite)/1000;
-        let esite=Number(item.esite)/1000;
-        vtkmodel.addSoures(item.pid,ssite)
-        vtkmodel.addSoures(item.pid,esite)
-     
+        vtkmodel.addSoures(item.pid,item.ssite)
+        vtkmodel.addSoures(item.pid,item.esite)
       })
     }
-      gtableData.value=res.rows;
-      wasi.value.blastdata={}
+ 
     
     })
     .catch((err) => {
@@ -2662,6 +2660,7 @@ const addpumdfun=(e)=>{
   vtkmodel.clearJgAddMode() ;
   vtkmodel.selectPipes();
   dialogtrue.value.jgSelect();
+  vtkmodel.removepump();
 }
 //修改
 
@@ -2726,7 +2725,7 @@ const getrequest=()=>{
   };
   request(params)
     .then((res) => {
-        console.log(res)
+        vtkmodel.removepump();
         tableDatpump.value=res.rows;
     })
     .catch((err) => {
@@ -2736,7 +2735,7 @@ const getrequest=()=>{
   // 列表选中
  
 const  pumpxz=(val)=>{
-  console.log(val)
+  vtkmodel.delpump();
   currentrow.value=true;
   pumpobj.value.xzobj=val;
   firepid.value=val.pid;
@@ -2744,6 +2743,8 @@ const  pumpxz=(val)=>{
   source.site=val.site;
   selectstr.value=val.pname;
   pumpobj.value.onoff=val.onoff;
+  vtkmodel.addpump(val.pid,source.site);
+  //vtkmodel.showpump();
   lookpump(val)
 }
 //查看
@@ -2800,7 +2801,6 @@ const xngetdata=()=>{
   };
   request(params)
     .then((res) => {
-console.log(res)
 tableline.value=res.rows;
     })
     .catch((err) => {
@@ -2843,6 +2843,7 @@ const xiugailine=()=>{
         type: "success",
       });
       sdialog.value.linetable=false;
+      vtkmodel.delpump();
       getrequest();
     })
     .catch((err) => {

src/view/components/MenuMine.vue

@@ -404,6 +404,7 @@
 </div>
 </el-radio-group>
 <!--毛壁面  -->
+<div class="divshuzhi">
 <div v-if="radio1=='1'">
 <div class="xizhi yi" v-if="guandaoobj.roughCoeName=='毛壁面'">
     <el-radio-group v-model="resource" class="ml-4" @change="resourcechange">
@@ -456,7 +457,7 @@
     <div  class='jisuan'>
             <div class='radio'>
       <el-radio label="0" v-model="qxmradio">1.阻力因子ɑ×10⁴:</el-radio></div>
-      <el-input-number v-model="qxmobj.val1"  :min="29.4" :max="39.2"   :precision="1" :step="0.1"  @change="handleChange">
+      <el-input-number v-model="qxmobj.val1"  :disabled="resource!='0'"  :min="29.4" :max="39.2"   :precision="1" :step="0.1"  @change="handleChange">
       </el-input-number>
    
 </div>
@@ -466,7 +467,7 @@
     <div  class='jisuan'>
             <div class='radio'>
       <el-radio label="1" v-model="qxmradio">2.阻力因子ɑ×10⁴：</el-radio></div>
-      <el-input-number v-model="qxmobj.val2" :min="49.0" :max="68.6"  :precision="1" :step="0.1"  @change="handleChange">
+      <el-input-number v-model="qxmobj.val2"  :disabled="resource!='1'"  :min="49.0" :max="68.6"  :precision="1" :step="0.1"  @change="handleChange">
       </el-input-number>
    
 </div>
@@ -476,7 +477,7 @@
     <div  class='jisuan'>
             <div class='radio'>
       <el-radio label="2" v-model="qxmradio">3.阻力因子ɑ×10⁴：</el-radio></div>
-      <el-input-number v-model="qxmobj.val3" :min="24.5" :max="29.4"  :precision="1" :step="0.1"  @change="handleChange">
+      <el-input-number v-model="qxmobj.val3" :disabled="resource!='2'"   :min="24.5" :max="29.4"  :precision="1" :step="0.1"  @change="handleChange">
         <template #decrease-icon>
             <el-icon><ArrowLeft /></el-icon>
         </template>
@@ -492,7 +493,7 @@
     <div  class='jisuan'>
             <div class='radio'>
       <el-radio label="3" v-model="qxmradio">4.阻力因子ɑ×10⁴：</el-radio></div>
-      <el-input-number v-model="qxmobj.val4" :min="29.4" :max="39.2"   :precision="1" :step="0.1"  @change="handleChange">
+      <el-input-number v-model="qxmobj.val4" :disabled="resource!='3'" :min="29.4" :max="39.2"   :precision="1" :step="0.1"  @change="handleChange">
       
       </el-input-number>
    
@@ -503,7 +504,7 @@
     <div  class='jisuan'>
             <div class='radio'>
       <el-radio label="4" v-model="qxmradio">5.阻力因子ɑ×10⁴：</el-radio></div>
-      <el-input-number v-model="qxmobj.val5"  :min="39.2" :max="49.0" :precision="1" :step="0.1"  @change="handleChange">
+      <el-input-number v-model="qxmobj.val5" :disabled="resource!='4'"  :min="39.2" :max="49.0" :precision="1" :step="0.1"  @change="handleChange">
       </el-input-number>
    
 </div>
@@ -511,13 +512,137 @@
 </div>
 </el-radio-group>
 </div>
+<!-- 圆木棚式支护3-1 -->
+<div v-if="guandaoobj.roughCoeName=='圆木棚式支护'">
+<div class="xizhi san_1" >
+    <div class="list">
+    <div  class='jisuan1'>
+            <div class='radiotext'>支护间距L（cm）：</div>
+      <el-input-number v-model="ympszh.val1"  :precision="1" :step="0.1"  @change="handleChange">
+      </el-input-number>
+   
+</div>
+</div>
+<div class="list">
+    <div  class='jisuan1'>
+            <div class='radiotext'>支护圆木直径/方木厚度d（cm）：</div>
+      <el-input-number v-model="ympszh.val2"  :precision="1" :step="0.1"  @change="handleChange">
+      </el-input-number>
+   
+</div>
+</div>
+<div class="list">
+    <div  class='jisuan1'>
+            <div class='radiotext'>巷道横截面积S（m2）：</div>
+      <el-input-number v-model="ympszh.val2"  :precision="1" :step="0.1"  @change="handleChange">
+      </el-input-number>
+   
+</div>
+</div>
+</div>
+<div class="list">
+    <div  class='jisuan1'>
+            <div class='elimage'>
+                <el-image :src="js" fit="contain"></el-image>
+            </div>
+</div>
+</div>
+<div class="list">
+    <div  class='jisuan1'>
+            <div class='radiotext tishi'>∆=L/d</div>
+</div>
+</div>
+</div>
+<!-- 工字梁拱形和梯形支护3-2 -->
+
+<div v-if="guandaoobj.roughCoeName=='工字梁拱形和梯形支护'">
+<div class="xizhi san_2" >
+    <div class="list">
+    <div  class='jisuan1'>
+            <div class='radiotext'>支护间距L（cm）：</div>
+      <el-input-number v-model="gzlg.val1"  :precision="1" :step="0.1"  @change="handleChange">
+      </el-input-number>
+   
+</div>
+</div>
+<div class="list">
+    <div  class='jisuan1'>
+            <div class='radiotext'>支护圆木直径/方木厚度d（cm）：</div>
+      <el-input-number v-model="gzlg.val2"  :precision="1" :step="0.1"  @change="handleChange">
+      </el-input-number>
+   
+</div>
+</div>
+<div class="list">
+    <div  class='jisuan1'>
+            <div class='radiotext'>巷道横截面积S（m2）：</div>
+      <el-input-number v-model="gzlg.val2"  :precision="1" :step="0.1"  @change="handleChange">
+      </el-input-number>
+   
+</div>
+</div>
+</div>
+<div class="list">
+    <div  class='jisuan1'>
+            <div class='elimage'>
+                <el-image :src="js2" fit="contain"></el-image>
+            </div>
+</div>
+</div>
+<div class="list">
+    <div  class='jisuan1'>
+            <div class='radiotext tishi'>∆=L/d</div>
+</div>
+</div>
+</div>
+<div v-if="guandaoobj.roughCoeName=='金属梁与柱支护'">
+<div class="xizhi san_3" >
+    <div class="list">
+    <div  class='jisuan1'>
+            <div class='radiotext'>支护间距L（cm）：</div>
+      <el-input-number v-model="jsl.val1"  :precision="1" :step="0.1"  @change="handleChange">
+      </el-input-number>
+   
+</div>
+</div>
+<div class="list">
+    <div  class='jisuan1'>
+            <div class='radiotext'>支护圆木直径/方木厚度d（cm）：</div>
+      <el-input-number v-model="jsl.val2"  :precision="1" :step="0.1"  @change="handleChange">
+      </el-input-number>
+   
+</div>
+</div>
+<div class="list">
+    <div  class='jisuan1'>
+            <div class='radiotext'>巷道横截面积S（m2）：</div>
+      <el-input-number v-model="jsl.val2"  :precision="1" :step="0.1"  @change="handleChange">
+      </el-input-number>
+   
+</div>
+</div>
+</div>
+<div class="list">
+    <div  class='jisuan1'>
+            <div class='elimage'>
+                <el-image :src="js3" fit="contain"></el-image>
+            </div>
+</div>
+</div>
+<div class="list">
+    <div  class='jisuan1'>
+            <div class='radiotext tishi'>∆=L/d</div>
+</div>
+</div>
+</div>
 <!--其它支护 3-4  -->
 <div class="xizhi san_4" v-if="guandaoobj.roughCoeName=='其它支护'">
+    <el-radio-group v-model="qitaval" class="ml-4" @change="qtzhobjchange">
     <div class="list">
     <div  class='jisuan'>
             <div class='radio'>
       <el-radio label="0" v-model="resource">1.阻力因子ɑ×10⁴:</el-radio></div>
-      <el-input-number v-model="qtzhobj.val1" :min="88.2" :max="168.2"  :precision="1" :step="0.1"  @change="handleChange">
+      <el-input-number v-model="qtzhobj.val1" :disabled="resource!='0'"  :min="88.2" :max="168.2"  :precision="1" :step="0.1"  @change="handleChange">
       </el-input-number>
    
 </div>
@@ -526,14 +651,120 @@
 <div class="list">
     <div  class='jisuan'>
             <div class='radio'>
-      <el-radio label="1" v-model="resource">2.阻力因子ɑ×10⁴：</el-radio></div>
-      <el-input-number v-model="qtzhobj.val2" :min="78.4" :max="117.6"  :precision="1" :step="0.1"  @change="handleChange">
+      <el-radio :label="1" v-model="resource">2.阻力因子ɑ×10⁴：</el-radio></div>
+      <el-input-number v-model="qtzhobj.val2" :disabled="resource!='1'" :min="78.4" :max="117.6"  :precision="1" :step="0.1"  @change="handleChange">
       </el-input-number>
    
 </div>
 <span class="text">锚杆和喷浆巷道（78.4~117.6）</span>
 </div>
+</el-radio-group>
+</div>
+<!--工作面4-->
+<div class="xizhi san_4" v-if="guandaoobj.roughCoeName=='工作面'">
+    <el-radio label="0" v-model="faterradio" @change="handleRadioChange">A.炮开采面因子ɑ×10⁴：</el-radio>
+    <!-- <el-radio-group v-model="gzmobj.gzm" :disabled="faterradio!='0'" @change="handleRadioChange">
+        <div class="list">
+                        <div  class='jisuan'>
+                                <div class='radio'>
+                        <el-radio label="0" >摩擦式金属支柱：</el-radio></div>
+                        <el-input-number v-model="gzmobj.val1" :disabled="faterradio!='0'" :precision="1" :step="0.1"  @change="handleChange">
+                        </el-input-number>
+                    
+                    </div>
+                    <span class="text">推荐值（270~350）</span>
+                    </div>
+                    <div class="list">
+                        <div  class='jisuan'>
+                                <div class='radio'>
+                        <el-radio label="1" >采用木支柱：</el-radio></div>
+                        <el-input-number v-model="gzmobj.val2" :disabled="faterradio!='0'" :precision="1" :step="0.1"  @change="handleChange">
+                        </el-input-number>
+                    
+                    </div>
+                    <span class="text">推荐值（300~350）</span>
+                    </div> 
+    </el-radio-group> -->
+    <el-radio-group v-model="gzmobj.gzm" :disabled="faterradio!='0'" >
+        <div class="list">
+                        <div  class='jisuan'>
+                                <div class='radio'>
+                        <el-radio label="0" > 摩擦式金属支柱：</el-radio></div>
+                        <el-input-number v-model="gzmobj1.val1" :disabled="faterradio!='0'" :precision="1" :step="0.1"  @change="handleChange">
+                        </el-input-number>
+                    
+                    </div>
+                    <span class="text">推荐值（270~350）</span>
+                    </div>
+                    <div class="list">
+                        <div  class='jisuan'>
+                                <div class='radio'>
+                        <el-radio label="1" >采用木支柱：</el-radio></div>
+                        <el-input-number v-model="gzmobj1.val2" :disabled="faterradio!='0'" :precision="1" :step="0.1"  @change="handleChange">
+                        </el-input-number>
+                    
+                    </div>
+                    <span class="text">推荐值（300~350）</span>
+                    </div>
+    </el-radio-group>
+    <el-radio label="1"  v-model="faterradio" @change="handleRadioChange">B.普通采面阻力因子ɑ×10⁴：</el-radio>
+    <el-radio-group v-model="gzmobj1.gzm" :disabled="faterradio!='1'" >
+        <div class="list">
+                        <div  class='jisuan'>
+                                <div class='radio'>
+                        <el-radio label="0" >   采用单体液压支柱：</el-radio></div>
+                        <el-input-number v-model="gzmobj1.val1" :disabled="faterradio!='1'" :precision="1" :step="0.1"  @change="handleChange">
+                        </el-input-number>
+                    
+                    </div>
+                    <span class="text">推荐值（420~500）</span>
+                    </div>
+                    <div class="list">
+                        <div  class='jisuan'>
+                                <div class='radio'>
+                        <el-radio label="1" >采用摩擦式金属支柱：</el-radio></div>
+                        <el-input-number v-model="gzmobj1.val2" :disabled="faterradio!='1'" :precision="1" :step="0.1"  @change="handleChange">
+                        </el-input-number>
+                    
+                    </div>
+                    <span class="text">推荐值（450~500）</span>
+                    </div>
+    </el-radio-group>
+    <el-radio label="2" v-model="faterradio" @change="handleRadioChange">C.综合采面阻力因子ɑ×10⁴：</el-radio>
+    <el-radio-group v-model="gzmobj2.gzm"  :disabled="faterradio!='2'"  >
+        <div class="list">
+                        <div  class='jisuan'>
+                                <div class='radio'>
+                        <el-radio label="0" > 采用支撑式液压支架：</el-radio></div>
+                        <el-input-number v-model="gzmobj2.val1" :disabled="faterradio!='2'" :precision="1" :step="0.1"  @change="handleChange">
+                        </el-input-number>
+                    
+                    </div>
+                    <span class="text">推荐值（300~420）</span>
+                    </div>
+                    <div class="list">
+                        <div  class='jisuan'>
+                                <div class='radio'>
+                        <el-radio label="1" >采用掩护式液压支架：</el-radio></div>
+                        <el-input-number v-model="gzmobj2.val2" :disabled="faterradio!='2'" :precision="1" :step="0.1"  @change="handleChange">
+                        </el-input-number>
+                    
+                    </div>
+                    <span class="text">推荐值（220~330）</span>
+                    </div>
+                    <div class="list">
+                        <div  class='jisuan'>
+                                <div class='radio'>
+                        <el-radio label="2" >采用支撑掩护式支架：</el-radio></div>
+                        <el-input-number v-model="gzmobj2.val3" :disabled="faterradio!='2'" :precision="1" :step="0.1"  @change="handleChange">
+                        </el-input-number>
+                    
+                    </div>
+                    <span class="text">推荐值（320~350）</span>
+                    </div>
+    </el-radio-group>
 </div>
+<!-- 巷道有障碍物阻力修正 -->
 <el-form-item label=" 巷道有障碍物阻力修正：">
                  <el-radio-group v-model="zairadio"  @change="zairadiochage1">
                   <el-radio label="1">是</el-radio>
@@ -573,6 +804,7 @@
         </div>
       <!-- </el-radio-group>  -->
     </div>
+    </div>
 </div>
 </div>
 <div class="dialog-footer footer_div l_btn">
@@ -623,6 +855,9 @@
   import m11 from "@/assets/img/m11.png";
   import m12 from "@/assets/img/m12.png";
   import m13 from "@/assets/img/m13.png";
+  import js from "@/assets/img/js.png";
+  import js2 from "@/assets/img/js2.png";
+  import js3 from "@/assets/img/js3.png";
   import { timestampToTime } from '@/js/lindex.js';
   import NodeSelect from "./NodeLine.vue";
   import vueUploader from "./fileuploads.vue";
@@ -674,6 +909,21 @@ let qtzhobj=ref({
     val2:78.4,
    
 })
+let ympszh=ref({
+    val1:29.4,
+    val2:49.0,
+    val3:49.0,
+})
+let gzlg=ref({
+    val1:29.4,
+    val2:49.0,
+    val3:49.0,
+})
+let jsl=ref({
+    val1:29.4,
+    val2:49.0,
+    val3:49.0,
+})
 let zairadio=ref('1');
 let zaires=ref("0")
 let zaiobj=ref({
@@ -681,6 +931,23 @@ let zaiobj=ref({
     val2:98,
     val3:29.4,
 })
+let gzmobj=ref({
+    gzm:0,
+    val1:98.0,
+    val2:47.7
+})
+let gzmobj1=ref({
+    gzm:0,
+    val1:98.0,
+    val2:47.7
+})
+let gzmobj2=ref({
+    gzm:0,
+    val1:98.0,
+    val2:47.7,
+    val3:47.7
+})
+let faterradio=ref("0")
 // 文件上传参数
 const radio1 = ref('0');
 const gfx=ref();
@@ -692,6 +959,7 @@ let bfid=ref("");
 let gfname=ref("");
 let bfname=ref("");
 let resource=ref('0')
+let qitaval=ref('0')
 let num=ref();
 const value = ref()
 const dataselct = ref([
@@ -1437,19 +1705,19 @@ calculatefun()
 // 计算
 const falsecalculatefun=()=>{
     let zonghe= parseFloat( jsuanval.value);
- 
     zuli.value.jsuan=zonghe/ 10000;
 }
 
 // 计算
 const calculatefun=()=>{
     let zonghe= parseFloat( jsuanval.value)+parseFloat( zuaival.value);
-    zuli.value.jsuan=(zonghe/ 10000).toFixed(7);
+    zuli.value.jsuan=(zonghe/ 10000).toFixed(6);
 }
 // 清空
 const zairadiochage1=()=>{
     if(radio1.value=="0"){
-        zuli.value.jsuan='';
+        zuli.value.jsuan=null;
+        jsuanval.value=0;
         zuli.value.zidiny=guandaoobj.value.roughCoe;
         console.log('jis'+zuli.value.jsuan);
      
@@ -1493,11 +1761,57 @@ if(val=='毛壁面'){
     zulitext.value='砌碹巷道'
     sdialog.value.resistance=true;
    // calculatefun();
-}else if(val=='其它支护'){
+}else if(val=='圆木棚式支护'){
+    zulitext.value='圆木棚式支护'
+    sdialog.value.resistance=true;
+}else if(val=='工字梁拱形和梯形支护'){
+    zulitext.value='工字梁拱形和梯形支护'
+    sdialog.value.resistance=true;
+}else if(val=='金属梁与柱支护'){
+    zulitext.value='金属梁与柱支护'
+    sdialog.value.resistance=true;
+}
+else if(val=='其它支护'){
     zulitext.value='其它支护'
     sdialog.value.resistance=true;
+}else if(val=='工作面'){
+    zulitext.value='工作面'
+    sdialog.value.resistance=true;
+}else{
+
+}
 }
+//其它支护的计算
+const qtzhobjchange=(val)=>{
+if(val=='0'){
+    jsuanval.value=qtzhobj.value.val1;
+}else if(val=='1'){
+    jsuanval.value=qtzhobj.value.val2;
+}
+let zonghe= parseFloat( jsuanval.value);
+    zuli.value.jsuan=zonghe/ 10000;
+}
+//工作面
+const handleRadioChange=(val)=>{
+    if(val=='0'){
+        gzmobj1.value.gzm=null;
+        gzmobj2.value.gzm=null;
+    }else if(val=='1'){
+        gzmobj.value.gzm=null;
+        gzmobj2.value.gzm=null;
+    }else if(val=='2'){
+        gzmobj.value.gzm=null;
+        gzmobj1.value.gzm=null;
+    }
 }
   defineExpose({ dialogVisible, });
   </script>
+  <style scoped>
+  .maopading .jisuan1 .el-input-number{
+    width: 40%;
+  }
+  .maoconent{
+
+  }
+  </style>
   

src/view/components/SetPipe.vue

@@ -69,6 +69,23 @@ let msg=ref({
     sectionPara4: '',
     sectionPara5: '',
 })
+const statusMap = {
+  'CIRCULAR': '圆形',
+  'RECTANGLE': '矩形',
+  'SEMICIRCULAR': '半椭圆形',
+  'SEMIELLIPTICAL': '半圆形',
+  'EGG': '蛋形',
+  'GOTHIC': '哥特形',
+  'MODBASKETHANDLE': '更正蓝形',
+  'ARCH': '拱形',
+  'RECT_ROUND': '弧底矩形',
+  'BASKETHANDLE': '蓝形',
+  'HORSESHOE': '马蹄形',
+  'RECT_TRIANGULAR': '三角底矩形',
+  'VERT_ELLIPSE': '竖向椭圆',
+  'HORZI_ELLIPSE': '水平椭圆',
+  'CATENARY': '悬链式',
+};
 const props= defineProps({ 
   site: {
     type: Number,
@@ -114,7 +131,7 @@ onUnmounted(() => {
 function jgSelenum(){
   selectObj.value=vtkmodel.selectObj;
   if(selectObj.value==null){
-}else{;
+}else{
  msg.value=selectObj.value;
  vtkmodel.addpipsite(selectObj.value,props.site);
 }
@@ -127,7 +144,15 @@ function jgSelect(){
     console.log(selectObj.value);
     if(selectObj.value==null){
 }else{
-   msg.value=selectObj.value;
+  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,props.site);
 }
    }, 1200);

src/view/index/index.vue

@@ -92,8 +92,6 @@ const indexchange=(key)=>{
   //console.log('当前我的状态'+props.state);
   if(key==0){
     towrightref.value.towshow=false;
-   console.log('当前我的状态'+props.state);
-   console.log('当前我的状态'+sessionStorage.getItem("state"));
     if(sessionStorage.getItem("state")=='1'){
       //  firstleftref.value.firstshow=true;
 

src/view/result.vue

@@ -147,7 +147,7 @@ const props = defineProps({
     type: String,
   },
 });
-let newcount = ref(60);
+let newcount = ref(5);
 let activeNames=ref(['1'])
 let wdisasterref = ref();
 let wdisasterref2 = ref();

src/view/result/Wdisaster.vue

@@ -298,6 +298,7 @@ request(params)
      warnin.value=warning.length;
    
       tableData2.value=res.vals;
+      console.log( tableData2.value);
     }
   }) .catch((err) => {
     ElMessage.error(err.returnMsg);