12.27

src/style/style.css

@@ -1658,7 +1658,10 @@ z-index: 1;
     width: 102px;
     height: 40px;
     line-height: 1.2;
-
+    word-wrap: break-word;
+    word-break: break-all;
+    white-space: pre-wrap !important;
+    overflow: hidden;
 }
 .headertime{
   position: absolute;

src/view/InfoDialoges.vue

@@ -61,7 +61,7 @@
                     <el-table-column type="index" label="序号" width="70" />
                     <el-table-column prop="name" label="名称" />
                     <!-- <el-table-column prop="name" label="来源" /> -->
-                    <el-table-column prop="time" label="时间" width="150" />
+                    <el-table-column prop="time" label="时间"  />
                 </el-table>
                 <div class="demo-pagination-block pagination">
                     <el-config-provider :locale="zhCn">
@@ -555,7 +555,7 @@ let tuiyanobj = ref({
 
 })
 let tuiyanobj2 = ref({
-    value: ['SO2'],
+    value: ['CO2','CH4'],
     pickertime: '',
     acctime: '2024-03-06 00:00:00',
     dt: '0.1',
@@ -563,8 +563,8 @@ let tuiyanobj2 = ref({
     reportstep: '60',
     interactionstep: '3600',
     totaltime: '3600',
-    coids: '1',
-    cocodes: 'CO2'
+    coids: "15,2",
+    cocodes: "CH4,CO2"
 
 })
 let tuiyanobj3 = ref({
@@ -581,20 +581,20 @@ let tuiyanobj3 = ref({
 
 })
 let tuiyanobj4 = ref({
-    value: ['SO2'],
+    value: ['CO2','CH4'],
     pickertime: '',
     acctime: '2024-03-06 00:00:00',
     dt: '1',
     dx: '20',
     reportstep: '60',
-    interactionstep: '1',
+    interactionstep: '60',
     totaltime: '1',
-    coids: '1',
-     cocodes: 'CO2'
+    coids: "15,2",
+     cocodes: "CH4,CO2"
 
 })
 let tuiyanobj5 = ref({
-    value: ['SO2'],
+    value: ['CO2','CH4'],
     pickertime: '',
     acctime: '2024-03-06 00:00:00',
     dt: '0.2',
@@ -602,8 +602,8 @@ let tuiyanobj5 = ref({
     reportstep: '60',
     interactionstep: '3600',
     totaltime: '3600',
-    coids: '1',
-    cocodes: 'CO2'
+    coids: "15,2",
+     cocodes: "CH4,CO2"
 
 })
 let tableobj = ref({});
@@ -678,6 +678,7 @@ const classclick1 = (val) => {
     stype.value=val;
     console.log( classradio1.value);
     scoperadio.value="";
+    currentPage4.value=1;
     dialog.value.dialogVisible_fire = true;
     props.addselect();
     getdata();
@@ -688,6 +689,7 @@ const classclick = (val) => {
     stype.value=val;
     console.log(classradio.value);
     scoperadio.value="";
+    currentPage4.value=1;
     dialog.value.dialogVisible_fire = true;
     props.addselect();
     getdata();
@@ -1028,6 +1030,17 @@ const addinitial=()=>{
         tuiyanobj2.value.cocodes = options.value[0].code;
         tuiyanobj2.value.coids=options.value[0].coid;
         tuiyanobj.value = { ...tuiyanobj2.value }
+        console.log( tuiyanobj.value)
+        arrvalue.value=tuiyanobj.value.cocodes.split(',');
+        value.value=arrvalue.value; 
+            value.value=[];
+            for (let i = 0; i <options.value.length; i++){
+              for (let j = 0; j < arrvalue.value.length; j++){
+            if(options.value[i].code==arrvalue.value[j]){
+                value.value.push(options.value[i]);
+            }
+              }
+           }
     } else if(classradio.value == "Water"){
         tuiyanobj3.value.pickertime = inititimeDefaultal();
         tuiyanobj.value ={ ...tuiyanobj3.value };
@@ -1036,13 +1049,34 @@ const addinitial=()=>{
         tuiyanobj4.value.pickertime = inititimeDefaultal();
         tuiyanobj4.value.acctime = inititimeDefaultal();
         tuiyanobj.value ={ ...tuiyanobj4.value }
+        arrvalue.value=tuiyanobj.value.cocodes.split(',');
+        value.value=arrvalue.value; 
+            value.value=[];
+            for (let i = 0; i <options.value.length; i++){
+              for (let j = 0; j < arrvalue.value.length; j++){
+            if(options.value[i].code==arrvalue.value[j]){
+                value.value.push(options.value[i]);
+            }
+              }
+           }
+    
     }else if(classradio.value == "Gass1"){
         tuiyanobj5.value.pickertime = inititimeDefaultal();
         tuiyanobj5.value.acctime = inititimeDefaultal();
         tuiyanobj5.value.cocodes = options.value[0].code;
         tuiyanobj5.value.coids=options.value[0].coid;
         tuiyanobj.value ={ ...tuiyanobj5.value }
-   
+        console.log( tuiyanobj.value);
+        arrvalue.value=tuiyanobj.value.cocodes.split(',');
+        value.value=arrvalue.value; 
+            value.value=[];
+            for (let i = 0; i <options.value.length; i++){
+              for (let j = 0; j < arrvalue.value.length; j++){
+            if(options.value[i].code==arrvalue.value[j]){
+                value.value.push(options.value[i]);
+            }
+              }
+           }
     }
     else{
         tuiyanobj3.value.pickertime = inititimeDefaultal();
@@ -1264,7 +1298,7 @@ const getmoun=()=>{
 onMounted(() => {
     //const paramValue =window.location.href;//.paramNamehttp://localhost:5173/#/
     const paramValue =window.location.href;
-    //const paramValue ='http://localhost:5173/#/aid=7';
+   // const paramValue ='http://localhost:5173/#/aid=7';
     const parts = paramValue.split('=');
     console.log(parts);
     aid.value=parts[1];

src/view/components/InfoDisaster.vue

@@ -2367,7 +2367,7 @@ const handlook=(data)=>{
 }
 // // 瓦斯爆炸区域查询
 const wsblastget=()=>{
-  vtkmodel.delSoures();
+
   const params = {
     transCode: "D10023",
     gid: wasi.value.gid,
@@ -2378,6 +2378,7 @@ const wsblastget=()=>{
       gtableData.value=res.rows;
       wasi.value.blastdata={};
       if(res.rows!=[]){
+       // vtkmodel.delSoures();
       res.rows.forEach((item,index)=>{
         vtkmodel.addSoures(item.pid,item.ssite)
         vtkmodel.addSoures(item.pid,item.esite)
@@ -2915,7 +2916,7 @@ const delline=()=>{
 //一维查询
 
 const yiweiget=()=>{
-  vtkmodel.delSoures();
+
   const params = {
     transCode:"D30001",
     aid: aid.value,
@@ -2924,7 +2925,9 @@ const yiweiget=()=>{
   request(params)
     .then((res) => {
       console.log( res.row)
+
       if(res.row!=[]){
+       // vtkmodel.delSoures();
         res.row.forEach((item,index)=>{
         vtkmodel.addSoures(item.pid,item.ssite)
         vtkmodel.addSoures(item.pid,item.esite)

src/view/components/MenuMine.vue

@@ -104,7 +104,7 @@
                                             <el-table-column property="code" label="编号" /> -->
                                             <el-table-column property="name" label="名称"/>
                                             <el-table-column property="sectionType" label="截面类型" width="120" />
-                                            <el-table-column property="roughCoe" label="粗糙系数" width="120"/>
+                                            <el-table-column property="roughCoe" label="阻力系数" width="120"/>
                                             <!-- <el-table-column property="sectionPara1" label="截面参数1" width="90" />
                                             <el-table-column property="sectionPara2" label="截面参数2" width="90" />
                                             <el-table-column property="sectionPara3" label="截面参数3" width="90" />
@@ -534,7 +534,7 @@
 <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 v-model="ympszh.val3"  :precision="1" :step="0.1"  @change="handleChange">
       </el-input-number>
    
 </div>
@@ -576,7 +576,7 @@
 <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 v-model="gzlg.val3"  :precision="1" :step="0.1"  @change="handleChange">
       </el-input-number>
    
 </div>
@@ -616,7 +616,7 @@
 <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 v-model="jsl.val3"  :precision="1" :step="0.1"  @change="handleChange">
       </el-input-number>
    
 </div>
@@ -663,57 +663,33 @@
 <!--工作面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'" >
+    <el-radio-group v-model="gzmobj.gzm" :disabled="faterradio!='0'" @change="gzchange" >
         <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">
+                         <div class='radio'>
+                        <el-radio label="1" > 摩擦式金属支柱：</el-radio></div>
+                        <el-input-number v-model="gzmobj.val1" :disabled="faterradio!='0'||gzmobj.gzm!='1'" :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-radio label="2" >采用木支柱：</el-radio></div>
+                        <el-input-number v-model="gzmobj.val2" :disabled="faterradio!='0'||gzmobj.gzm!='2'" :precision="1" :step="0.1"  @change="handleChange">
                         </el-input-number>
-                    
                     </div>
                     <span class="text">推荐值（300~350）</span>
-                    </div>
+        </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'" >
+    <el-radio-group v-model="gzmobj1.gzm" :disabled="faterradio!='1'" @change="gzchange">
         <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-radio label="3" >   采用单体液压支柱：</el-radio></div>
+                        <el-input-number v-model="gzmobj1.val1" :disabled="faterradio!='1'||gzmobj1.gzm!='3'" :precision="1" :step="0.1"  @change="handleChange">
                         </el-input-number>
                     
                     </div>
@@ -722,8 +698,8 @@
                     <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-radio label="4" >采用摩擦式金属支柱：</el-radio></div>
+                        <el-input-number v-model="gzmobj1.val2" :disabled="faterradio!='1'||gzmobj1.gzm!='4'" :precision="1" :step="0.1"  @change="handleChange">
                         </el-input-number>
                     
                     </div>
@@ -731,12 +707,12 @@
                     </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'"  >
+    <el-radio-group v-model="gzmobj2.gzm"  :disabled="faterradio!='2'" @change="gzchange" >
         <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-radio label="5" > 采用支撑式液压支架：</el-radio></div>
+                        <el-input-number v-model="gzmobj2.val1" :disabled="faterradio!='2'||gzmobj2.gzm!='5'" :precision="1" :step="0.1"  @change="handleChange">
                         </el-input-number>
                     
                     </div>
@@ -745,8 +721,8 @@
                     <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-radio label="6" >采用掩护式液压支架：</el-radio></div>
+                        <el-input-number v-model="gzmobj2.val2" :disabled="faterradio!='2'||gzmobj2.gzm!='6'" :precision="1" :step="0.1"  @change="handleChange">
                         </el-input-number>
                     
                     </div>
@@ -755,8 +731,8 @@
                     <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-radio label="7" >采用支撑掩护式支架：</el-radio></div>
+                        <el-input-number v-model="gzmobj2.val3" :disabled="faterradio!='2'||gzmobj2.gzm!='7'" :precision="1" :step="0.1"  @change="handleChange">
                         </el-input-number>
                     
                     </div>
@@ -1106,7 +1082,7 @@ let tishi=ref('');
       snId: Number,
       enId:Number ,
       roughCoe: '',
-      roughCoeName:'',
+      roughCoeName:'毛壁面',
       sectionType: 'CIRCULAR',
       sectionPara1: '',
       sectionPara2: '',
@@ -1622,18 +1598,27 @@ const fileboolen=(val)=>{
 const handleChange=(val)=>{
     //resourcechange();
   jsuanval.value=val;
-  console.log(val);
   if(zairadio.value=='0'){
+  if(zulitext.value=='圆木棚式支护'){
+    logcompute();
+}else if(zulitext.value=='工字梁拱形和梯形支护'){
+    gzicompute();
+
+}else if(zulitext.value=='金属梁与柱支护'){
+    metalcompute();
+}else{
     falsecalculatefun();
-  }else{
-    calculatefun();
-  }
+}
+}else{
+    addzhangai();
+}
 
 }
 // 阻碍
 const zaihandleChange=(val)=>{
     zuaival.value=val;
-    calculatefun();
+    addzhangai();
+   
 }
 
 // 选中计算
@@ -1701,38 +1686,47 @@ switch(zaires.value){
     break;
  
 }
-console.log(  zuaival.value);
-calculatefun()
+addzhangai();
 }
 // 障碍为否是
 // 计算
 const falsecalculatefun=()=>{
     let zonghe= parseFloat( jsuanval.value);
+    console.log(zonghe);
+    console.log(44567788);
     zuli.value.jsuan=zonghe/ 10000;
 }
 
 // 计算
 const calculatefun=()=>{
     let zonghe= parseFloat( jsuanval.value)+parseFloat( zuaival.value);
+    console.log(zonghe);
     zuli.value.jsuan=(zonghe/ 10000).toFixed(6);
 }
 // 清空
 const zairadiochage1=()=>{
+    console.log(radio1.value);
     if(radio1.value=="0"){
         zuli.value.jsuan=null;
         jsuanval.value=0;
         zuli.value.zidiny=guandaoobj.value.roughCoe;
-        console.log('jis'+zuli.value.jsuan);
-     
+
     }else if(radio1.value=="1"&&zairadio.value=='1'){
         zuli.value.zidiny=null;
-        calculatefun();
-
+        addzhangai();
     }else if(zairadio.value=='0'){
-        falsecalculatefun();
-    }
-    else{
-       calculatefun();
+        if(zulitext.value=='毛壁面'||zulitext.value=='砌碹面'||zulitext.value=='其它支护'||zulitext.value=='工作面'){
+            falsecalculatefun();
+        }else if(zulitext.value=='圆木棚式支护'){
+            logcompute();
+        }else if(zulitext.value=='工字梁拱形和梯形支护'){
+            gzicompute();
+        }else if(zulitext.value=='金属梁与柱支护'){
+            metalcompute();
+        }
+        
+    } else{
+      // calculatefun();
     }
   
 }
@@ -1755,13 +1749,13 @@ const seltree=(data)=>{
     zuli.value.jsuan='';
     zuli.value.zidiny=  guandaoobj.value.roughCoe;
 if(val=='毛壁面'){
-    jsuanval.value=58.8;
+    jsuanval.value=jisuanobj.value.val1;
     zulitext.value='毛壁面'
     sdialog.value.resistance=true;
    // calculatefun();
 }else if(val=='砌碹面'){
-    jsuanval.value=29.4;
-    zulitext.value='砌碹巷道'
+    jsuanval.value=qxmobj.value.val1;
+    zulitext.value='砌碹面'
     sdialog.value.resistance=true;
    // calculatefun();
 }else if(val=='圆木棚式支护'){
@@ -1775,6 +1769,7 @@ if(val=='毛壁面'){
     sdialog.value.resistance=true;
 }
 else if(val=='其它支护'){
+    jsuanval.value=qtzhobj.value.val1;
     zulitext.value='其它支护'
     sdialog.value.resistance=true;
 }else if(val=='工作面'){
@@ -1783,6 +1778,67 @@ else if(val=='其它支护'){
 }else{
 
 }
+}
+//判断当前是否加障碍物
+const addzhangai=()=>{
+    let zuaival1=zuaival.value/10000;
+    if(zulitext.value=='圆木棚式支护'){
+            logcompute();
+            zuli.value.jsuan= (Number(zuli.value.jsuan)+ zuaival1).toFixed(6);
+        } else if(zulitext.value=='工字梁拱形和梯形支护'){
+            gzicompute();
+            zuli.value.jsuan= (Number(zuli.value.jsuan)+zuaival1).toFixed(6);
+        }else if(zulitext.value=='金属梁与柱支护'){
+            metalcompute ();
+            zuli.value.jsuan= (Number(zuli.value.jsuan)+ zuaival1).toFixed(6);
+        }else{
+            calculatefun();
+        }
+}
+// 圆木棚式支护的计算
+const  logcompute=()=>{
+let ldC= (ympszh.value.val1)/(ympszh.value.val2);
+let LD=Math.pow(ldC,2) 
+let lDhe=-5.21994*LD;//第一个
+let d2=0.0136272*Math.pow((ympszh.value.val2),2);
+let ldji=0.124129*(ldC*ympszh.value.val2);//第三个
+let d4=5.21133*ldC+1.89758*ympszh.value.val2;
+let a1=lDhe+d2+ldji+d4-0.42746;
+
+let a2=(0.00605857*Math.pow((ympszh.value.val3),2)+0.1104174*ympszh.value.val3+1.29266783);
+let a=0.0001*(a1*a2);
+zuli.value.jsuan=(a).toFixed(6);
+
+}
+// 工字梁拱形和梯形支护的计算
+const  gzicompute=()=>{
+let ldC= (gzlg.value.val1)/(gzlg.value.val2);
+let LD=Math.pow(ldC,2) 
+let lDhe=-4.65195*LD;//第一个
+let d2=0.209286*Math.pow((gzlg.value.val2),2);
+let ldji=3.01*(ldC*gzlg.value.val2);//第三个
+let d4=39.13845*ldC-4.21*gzlg.value.val2;
+let a1=lDhe+d2+ldji+d4+4.006596;
+
+let a2=(0.00470063*Math.pow((gzlg.value.val3),2)-0.09314235*gzlg.value.val3+1.307954);
+let a=0.0001*(a1*a2);
+zuli.value.jsuan=(a).toFixed(6);
+
+}
+// 金属梁与柱支护的计算
+const  metalcompute=()=>{
+let ldC= (jsl.value.val1)/(jsl.value.val2);
+let LD=Math.pow(ldC,2) 
+let lDhe=-1.05*LD;//第一个
+let d2=41.9947*Math.pow((jsl.value.val2),2);
+let ldji=0.49*(ldC*jsl.value.val2);//第三个
+let d4=8.4*ldC-3779.52543*jsl.value.val2;
+let a1=lDhe+d2+ldji+d4-83884.594;
+
+let a2=(0.00470063*Math.pow((jsl.value.val3),2)-0.09314235*jsl.value.val3+1.307954);
+let a=0.0001*(a1*a2);
+zuli.value.jsuan=(a).toFixed(6);
+
 }
 //其它支护的计算
 const qtzhobjchange=(val)=>{
@@ -1792,13 +1848,21 @@ if(val=='0'){
     jsuanval.value=qtzhobj.value.val2;
 }
 let zonghe= parseFloat( jsuanval.value);
-    zuli.value.jsuan=zonghe/ 10000;
+zuli.value.jsuan=zonghe/ 10000;
+console.log(zairadio.value);
+if(zairadio.value=='0'){
+    falsecalculatefun();
+  }else{
+    calculatefun();
+  }
 }
 //工作面
 const handleRadioChange=(val)=>{
+    jsuanval.value=0;
     if(val=='0'){
         gzmobj1.value.gzm=null;
         gzmobj2.value.gzm=null;
+        console.log( jsuanval.value);
     }else if(val=='1'){
         gzmobj.value.gzm=null;
         gzmobj2.value.gzm=null;
@@ -1806,6 +1870,34 @@ const handleRadioChange=(val)=>{
         gzmobj.value.gzm=null;
         gzmobj1.value.gzm=null;
     }
+    if(zairadio.value=='0'){
+    falsecalculatefun();
+  }else{
+    calculatefun();
+  }
+}
+//gzchange
+const gzchange=(val)=>{
+if(val=='1'){
+    jsuanval.value=(gzmobj.value.val1).toFixed(6);
+}else if(val=='2'){
+    jsuanval.value=(gzmobj.value.val2).toFixed(6);
+}else if(val=='3'){
+    jsuanval.value=(gzmobj1.value.val1).toFixed(6);
+}else if(val=='4'){
+    jsuanval.value=(gzmobj1.value.val2).toFixed(6);
+}else if(val=='5'){
+    jsuanval.value=(gzmobj2.value.val1).toFixed(6);
+}else if(val=='6'){
+    jsuanval.value=(gzmobj2.value.val2).toFixed(6);
+}else if(val=='7'){
+    jsuanval.value=(gzmobj2.value.val3).toFixed(6);
+}
+if(zairadio.value=='0'){
+    falsecalculatefun();
+  }else{
+    calculatefun();
+  }
 }
   defineExpose({ dialogVisible, });
   </script>

src/view/components/tool.vue

@@ -102,12 +102,12 @@
   }
   const changecheckbox2=(val)=>{
     vtkmodel.delpump();//清除风机风门
-    vtkmodel.delpump();
     if(checked2.value){
       vtkmodel.showSoure();
     }else{
       vtkmodel.removeSoure();
     }
+    console.log(checked2.value);
   }
   const changecheckbox3=(val)=>{
     vtkmodel.delpump();//清除风机风门

src/view/index/first-left.vue

@@ -430,8 +430,9 @@ await request(params)
       jgSelect1();
       firstshow.value=true;
       endtime.value= Number(res.totaltime)/Number(res.reportstep);
-      oldtime.value=acctime;
-      console.log( oldtime.value)
+      sessionStorage.setItem(res.acctime);
+      // oldtime.value=res.acctime;
+       console.log(res.acctime)
     }else if(res.state=='-1'){
       firstshow.value=false;
       // ElMessage({
@@ -834,7 +835,10 @@ const handleDelete=(event)=>{
                 res.rows[i].code= '二氧化硫'
               }else if(res.rows[i].code=='H2S'){
                 res.rows[i].code= '硫化氢'
-              }else if(res.rows[i].code=='Height'){
+              }else if(res.rows[i].code=='CH4'){
+                res.rows[i].code= '甲烷'
+              }
+              else if(res.rows[i].code=='Height'){
                 res.rows[i].code= '水位'
               }else if(res.rows[i].code=='Flow'){
                 res.rows[i].code= '流量'

src/view/result/Wdisaster.vue

@@ -170,7 +170,10 @@ const handleDelete=(event)=>{
                 res.rows[i].code= '二氧化硫'
               }else if(res.rows[i].code=='H2S'){
                 res.rows[i].code= '硫化氢'
-              }else if(res.rows[i].code=='Height'){
+              }else if(res.rows[i].code=='CH4'){
+                res.rows[i].code= '甲烷'
+              }
+              else if(res.rows[i].code=='Height'){
                 res.rows[i].code= '水位'
               }else if(res.rows[i].code=='Flow'){
                 res.rows[i].code= '流量'

src/view/result/Wdisaster2.vue

@@ -167,7 +167,10 @@ const handleDelete=(event)=>{
                 res.rows[i].code= '二氧化硫'
               }else if(res.rows[i].code=='H2S'){
                 res.rows[i].code= '硫化氢'
-              }else if(res.rows[i].code=='Height'){
+              }else if(res.rows[i].code=='CH4'){
+                res.rows[i].code= '甲烷'
+              }
+              else if(res.rows[i].code=='Height'){
                 res.rows[i].code= '水位'
               }else if(res.rows[i].code=='Flow'){
                 res.rows[i].code= '流量'