12.19 修改bug完

src/main.ts

@@ -18,7 +18,6 @@ import '@/js/lindex.js'
 //4、引入echarts
 import * as echarts from 'echarts'
 import './style/style.css'
- import  Plugin  from 'v-fit-columns';
 const app = createApp(App)
 
 //1、route
@@ -27,9 +26,7 @@ app.use(router)
 app.use(pinia)
 //3、element-plus
 app.use(ElementPlus)
-app.use(Plugin)
 //4、放入全局
-app.directive('fit-columns', Plugin);
 app.config.globalProperties.$echarts = echarts
 app.mount('#app')
 app.config.errorHandler = function (err, vm, info) {

src/view/InfoDialoges.vue

@@ -110,7 +110,7 @@
                         
 
                             <el-form-item label="事故名称">
-                                <el-input v-model="formull.name"   class="w-50 m-2"   maxlength="15"   :placeholder="placeholder" />
+                                <el-input v-model="formull.name"   class="w-50 m-2"   maxlength="13"   :placeholder="placeholder" />
                             </el-form-item>
                    
                             <div class="l_btn class_btn" style="width: auto;">
@@ -236,7 +236,7 @@
                                         <div class="btn"  :class="{chuactive: isActive === 2}" @click="changeClass(2)"><span class="spantext" @click="calculate();">开始计算</span></div>
                                     </div>
 
-                                    <div class=" logs">
+                                    <div class=" logs" >
                                         <div class="logs_pading">
                                             <h4>模拟日志</h4>
                                             <div class="footerTextBox">
@@ -548,7 +548,7 @@ let tuiyanobj2 = ref({
 
 })
 let tuiyanobj3 = ref({
-    // value: ['SO2'],
+   //  value: ['SO2'],
     pickertime: '',
     acctime: '2024-03-06 00:00:00',
     dt: '5',
@@ -572,6 +572,19 @@ let tuiyanobj4 = ref({
     coids: '1',
      cocodes: 'CO2'
 
+})
+let tuiyanobj5 = ref({
+    value: ['SO2'],
+    pickertime: '',
+    acctime: '2024-03-06 00:00:00',
+    dt: '0.2',
+    dx: '10',
+    reportstep: '60',
+    interactionstep: '3600',
+    totaltime: '3600',
+    coids: '1',
+    cocodes: 'CO2'
+
 })
 let tableobj = ref({});
 let coolactiveName = ref(["1", "2"]);
@@ -579,6 +592,8 @@ let newlog = ref("");
 let rizhi = ref({
     top: "50px",
     logs: '',
+    wlogs:'',
+    flogs:'',
     left: "90px"
 });
 let formLabelWidth5 = ref('130px');
@@ -673,11 +688,11 @@ const accident = () => {
                 }
                 else if(res.state=='-1'){
                     ElMessage({
-                        message: " 求解失败",
+                        message: "项目求解失败，只能求解成功，才能进行项目对比",
                         type: 'error',
                     });
                     }else if(res.state=='0'){
-                    ElMessage({ message: "求解未完成",  type: 'error',
+                    ElMessage({ message: "当前项目未完成求解任务，只能求解成功，才能进行项目对比",  type: 'error',
                     });
                     }
             
@@ -699,7 +714,10 @@ const accident = () => {
         
          initWebSocket();
         rizhi.value.logs='';
+        rizhi.value.flogs= rizhi.value.logs;
+        rizhi.value.wlogs= rizhi.value.logs;
         newlog.value =''; 
+      
         emit('headerclick', sgdata.value);
         emit('childfun');
         emit('moxingclick', true);
@@ -707,7 +725,7 @@ const accident = () => {
         //  emit('handleSelect', '1');
         fetchFileContent();
         accident2(props.activeIndex)
-       rewu();
+        rewu();
         // if(state.value=="1"){
         //      emit('websockfrist');
         //     }
@@ -870,6 +888,7 @@ const pollute = () => {
         .then((res) => {
             options.value = res.rows;
            value.value.push(res.rows[0]);
+           console.log( value.value);
      
 
         })
@@ -880,7 +899,7 @@ const pollute = () => {
 //任务求解任务信息
 //state 完成1  失败是-1
 const rewu=()=>{
-  
+  console.log(999999)
      arrvalue.value=[];
     const params = {
         transCode: 'D10017',
@@ -888,15 +907,19 @@ const rewu=()=>{
     }
     request(params)
         .then((res) => {
-          
             state.value=res.state;
+            emit('resulysucss',res.state);
             if(state.value=="1"){
                 emit('websockfrist');
-                emit('resulysucss',res.state);
                 if(res.hasOwnProperty("cocodes")){
                     arrvalue.value=res.cocodes.split(',');
                 }
                 sessionStorage.setItem("acctime",res.acctime);
+                }else{
+                    if(res.hasOwnProperty("cocodes")){
+                    arrvalue.value=res.cocodes.split(',');
+                    console.log( arrvalue.value);
+                }
                 }
             
            
@@ -920,7 +943,6 @@ const rewu=()=>{
            // ElMessage.error(err.returnMsg)
            //state.value='0';
            sessionStorage.setItem("state",'0');
-           console.log(1111113333)
            emit('resulysucss');
            addinitial();
         })
@@ -960,24 +982,25 @@ const addinitial=()=>{
         tuiyanobj2.value.acctime = inititimeDefaultal();
         tuiyanobj2.value.cocodes = options.value[0].code;
         tuiyanobj2.value.coids=options.value[0].coid;
-        // tuiyanobj.value = { ...tuiyanobj2.value }
-        tuiyanobj.value.acctime="2024-12-14 17:27:57";
-        tuiyanobj.value.cocodes= "CH4";
-        tuiyanobj.value.coids= 15;
-        tuiyanobj.value.dt= "0.1";
-        tuiyanobj.value.dx= "10";
-        tuiyanobj.value.interactionstep="3600";
-        tuiyanobj.value.pickertime="2024-12-14 17:27:57";
-        tuiyanobj.value.reportstep= "60";
-        tuiyanobj.value.totaltime="3600";
+        tuiyanobj.value = { ...tuiyanobj2.value }
     } else if(classradio.value == "Water"){
+        tuiyanobj3.value.pickertime = inititimeDefaultal();
         tuiyanobj.value ={ ...tuiyanobj3.value };
-        console.log(tuiyanobj.value);
     }
       else if(classradio.value == "Gass"){
+        tuiyanobj4.value.pickertime = inititimeDefaultal();
+        tuiyanobj4.value.acctime = inititimeDefaultal();
         tuiyanobj.value ={ ...tuiyanobj4.value }
-        console.log( tuiyanobj.value);
-    }else{
+    }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;
+        console.log(  tuiyanobj5.value);
+        tuiyanobj.value ={ ...tuiyanobj5.value }
+   
+    }
+    else{
         tuiyanobj3.value.pickertime = inititimeDefaultal();
         tuiyanobj3.value.acctime = inititimeDefaultal();
         tuiyanobj.value = { ...tuiyanobj3.value };
@@ -1009,6 +1032,8 @@ const selectchange = (val) => {
 const calculate = () => {
 
     rizhi.value.logs='';
+    rizhi.value.flogs= rizhi.value.logs;
+    rizhi.value.wlogs= rizhi.value.logs;
     emit('funcfirst');
     newlog.value ='';
     const params = {
@@ -1035,11 +1060,13 @@ const projectsSelectionSelect = () => {
 }
 // 日志获取
 function getthislog(val) {
-
     if (val.includes("msg=heartCheck")) {
     } else {
         newlog.value = newlog.value + "\n" + val;
         rizhi.value.logs = newlog.value;
+      
+      
+
     }
         let textarea = document.getElementById("textarea_id");
         textarea.scrollTop = textarea.scrollHeight;
@@ -1128,13 +1155,11 @@ const start = () => {
     times.value.serverTimeoutObj && clearTimeout(times.value.serverTimeoutObj);
     times.value.timeoutObj = setTimeout(function () {
         //这里发送一个心跳，后端收到后，返回一个心跳消息
-        console.log(websock.readyState)
         if (websock.readyState == 1) {
             //如果连接正常
             websock.send("heartCheck");
         } else {
             //否则重连
-            console.log(111111)
             reconnect();
         }
         times.value.serverTimeoutObj = setTimeout(function () {

src/view/appmian.vue

@@ -180,6 +180,8 @@ const resulysucss=(val)=>{
   // 求解成功
   if(  state.value=='1'){
     indexref.value.changeColor(0);
+  }else{
+    indexref.value.changeColor(0);
   }
 }
 // 开始计算调用的func

src/view/components/InfoBoundary.vue

@@ -59,19 +59,23 @@
                                                 //     </el-table-column> -->
                         <!-- <el-table-column prop="flow" label="流量(m³/s)" /> -->
                         
-                          <el-table-column prop="flow" label="流量">
+                          <el-table-column    prop="flow" label="流量">
                             <!-- <template  #default="{ row }">
                               {{ row.flow }} <br> (m³/s)
                             </template> -->
                             <template v-slot:header>
+                              <div >
                             <span >流量</span><br>
                             <span >(m³/s)</span>
+                          </div>
                           </template>
                           </el-table-column>
-                          <el-table-column prop="pressure" label="压强">
-                            <template v-slot:header>
+                          <el-table-column  prop="pressure" label="压强"  >
+                            <template v-slot:header >
+                            <div >
                             <span>压强</span><br>
                             <span >(pa)</span>
+                            </div>
                           </template>
                           </el-table-column>
                           <el-table-column prop="temperature" label="温度">
@@ -343,7 +347,6 @@
               <el-button
                 @click="
                   accidentboun();
-                  dialog.dialogVisible = false;
                 "
               >
                 确定
@@ -394,7 +397,7 @@
           <el-table-column type="selection" width="55" />
           <el-table-column property="id" label="节点编号" />
           <el-table-column property="name" label="名称" />
-          <el-table-column property="ntype" label="类型" />
+          <!-- <el-table-column property="ntype" label="类型" /> -->
           <el-table-column property="x" label="x" />
           <el-table-column property="y" label="y" />
           <el-table-column property="z" label="z" />
@@ -483,6 +486,8 @@ const  changeClass= (i)=>  {
   console.log(i);
  isActive.value = i;
 }
+// let showmassflow=ref(false);
+// let showpressure=ref(true);
 let tishi=ref('');
 let currentrow=ref();
 const changeModel = () => {
@@ -716,6 +721,7 @@ const accidentboun = () => {
         message: tishi.value+"边界设置成功",
         type: "success",
       });
+      dialog.value.dialogVisible=false;
       addboundary(aid.value);
     })
     .catch((err) => {

src/view/components/InfoDisaster.vue

@@ -448,7 +448,7 @@
                       <el-table-column type="index" label="序号" width="100"/>
                         <el-table-column prop="gfname" label="网格文件"  />
                         <el-table-column prop="bfname" label="边界文件"  />
-                        <el-table-column label="操作" >
+                        <!-- <el-table-column label="操作" > -->
                           <!-- <template #default="scope">
                             <el-button
                               size="small"
@@ -457,7 +457,7 @@
                               >查看</el-button
                             >
                           </template> -->
-                        </el-table-column>
+                        <!-- </el-table-column> -->
                       </el-table>
                       <div class="asdis_btn">
                         <div
@@ -648,7 +648,7 @@
                         <el-table-column prop="pname" label="选择巷道" />
                         <el-table-column prop="ssite" label="开始位置" />
                         <el-table-column prop="esite" label="结束位置" />
-                        <el-table-column prop="gasdensity" label="瓦斯爆炸区浓度" />
+                        <el-table-column prop="gasdensity" label="瓦斯爆炸区浓度"  />
                       </el-table>
                       <div class="asdis_btn">
                         <div
@@ -1211,7 +1211,7 @@
       </template>
       <div class="demo-input-suffix firsttitle leftbgimg2">
         <div class="guand_1">
-          <el-form-item label="节点选择" :label-width="formLabelWidth5">
+          <el-form-item label="巷道选择" :label-width="formLabelWidth5">
             <el-input
               v-model="searchtaggd"
               class="w-50 m-2"
@@ -1241,7 +1241,7 @@
           <!-- <el-table-column property="snId" label="开始节点" />
           <el-table-column property="enId" label="结束节点" /> -->
           <el-table-column property="id" label="编号" width="70" />
-          <el-table-column property="name" label="名称" width="70" />
+          <el-table-column property="name" label="名称" />
           <el-table-column property="sectionType" label="截面类型" width="120" />
           <el-table-column property="roughCoe" label="粗糙系数" />
           <!-- <el-table-column property="sectionPara1" label="截面参数1" width="90" />
@@ -2829,7 +2829,7 @@ const xiugailine=()=>{
  }
  const pumpdel=()=>{
     if (JSON.stringify( pumpobj.value.xzobj) == "{}") {
-    ElMessage.error("你还没有选中修改的项目");
+    ElMessage.error("你还没有选中删除的项目");
   } else {
     sdialog.value.deletedata = true;
     deltext.value='水泵';
@@ -2869,7 +2869,7 @@ else{
 const delline=()=>{
  
   if (JSON.stringify(pumpxc.value.xnobj) == "{}") {
-    ElMessage.error("你还没有选中修改的项目");
+    ElMessage.error("你还没有选中删除的项目");
   } else {
     deltext.value='性能';
     sdialog.value.deletedata = true;

src/view/components/MenuCheck.vue

@@ -142,7 +142,7 @@
           </template>
    <div class="demo-input-suffix firsttitle leftbgimg2 my_content1">
       <div class="guand_1">
-         <el-form-item label="节点选择" :label-width="formLabelWidth5">
+         <el-form-item label="巷道选择" :label-width="formLabelWidth5">
        <el-input  v-model="searchtaggd"
          class="w-50 m-2"
          placeholder="巷道"

src/view/components/MenuMine.vue

@@ -250,7 +250,7 @@
     </div>
     <!-- <el-form-item label="粗糙系数" :label-width="formLabelWidth7">
         <el-input v-model="guandaoobj.roughCoe" maxlength="15" oninput ="value=value.replace(/[^0-9.]/g,'')"  class="w-50 m-2" placeholder="请输入" />
-    </el-form-item> -->
+    </el-form-item>  //@change='seltree($event)'-->  
     <div  class='treeselect'>
     <el-form-item label="阻力系数" :label-width="formLabelWidth7" >
         <el-tree-select
@@ -259,7 +259,7 @@
             placeholder="请选择"
             :render-after-expand="false"
             style="width: 240px"
-            @change='seltree($event)'
+            @node-click="seltree"
         />
     </el-form-item>
 </div>
@@ -1113,7 +1113,7 @@ console.log(val);
       guandaoobj.value.name = '';
       guandaoobj.value.snId = '';
       guandaoobj.value.enId = '';
-      guandaoobj.value.roughCoe = '';
+      guandaoobj.value.roughCoe = 1.0;
       guandaoobj.value.sectionType = 'CIRCULAR';
       guandaoobj.value.sectionPara1 = '';
       guandaoobj.value.sectionPara2 = '';
@@ -1437,14 +1437,14 @@ calculatefun()
 // 计算
 const falsecalculatefun=()=>{
     let zonghe= parseFloat( jsuanval.value);
-    console.log(zonghe);
+ 
     zuli.value.jsuan=zonghe/ 10000;
 }
 
 // 计算
 const calculatefun=()=>{
     let zonghe= parseFloat( jsuanval.value)+parseFloat( zuaival.value);
-    zuli.value.jsuan=zonghe/ 10000;
+    zuli.value.jsuan=(zonghe/ 10000).toFixed(7);
 }
 // 清空
 const zairadiochage1=()=>{
@@ -1477,7 +1477,8 @@ const maoqueding=()=>{
               })
 sdialog.value.resistance = false;
 }
-const seltree=(val)=>{
+const seltree=(data)=>{
+    let val=data.value;
     zairadiochage1();
     radio1.value='0';
     zuli.value.jsuan='';

src/view/components/NodeLine.vue

@@ -33,7 +33,7 @@
                     <el-table-column type="selection" width="55" />
                     <el-table-column property="id" label='节点编号' />
                     <el-table-column property="name" label="名称" />
-                    <el-table-column property="ntype" label="类型" />
+                    <!-- <el-table-column property="ntype" label="类型" /> -->
                     <el-table-column property="x" label="x" />
                     <el-table-column property="y" label="y" />
                     <el-table-column property="z" label="z" />

src/view/components/PipeIine.vue

@@ -15,7 +15,7 @@
           </template>
    <div class="demo-input-suffix firsttitle leftbgimg2 my_content1">
       <div class="guand_1" >
-         <el-form-item label="节点选择" :label-width="formLabelWidth5">
+         <el-form-item label="巷道选择" :label-width="formLabelWidth5">
        <el-input  v-model="searchtaggd"
          class="w-50 m-2"
          placeholder="巷道"

src/view/evolutionView.vue

@@ -150,7 +150,7 @@
        width="50%"
      >
      <div class="demo-input-suffix firsttitle">
-           <el-form-item label="节点选择" :label-width="formLabelWidth5">
+           <el-form-item label="管道名称" :label-width="formLabelWidth5">
          <el-input  v-model="searchtaggd"
            class="w-50 m-2"
            placeholder="管道名称"

src/view/index/first-left.vue

@@ -26,7 +26,7 @@
               />
             </div>
                 <div class="he_pading color1  wusele">
-              <el-form-item label="物理量:" v-if="props.classradio == 'Fire'||props.classradio == 'Gass'">
+              <el-form-item label="物理量:" v-if="props.classradio == 'Fire'||props.classradio == 'Gass'||props.classradio == 'Gass1'">
                 <el-select 
                 
                  :disabled="disabledshow"
@@ -67,7 +67,6 @@
                         :highlight-current-row="currentrow1" 
                         :max-height="tableHeight"
                         :fit="true"
-                        v-fit-columns
                       >
                       <template v-slot:empty>
                           <p>暂无数据</p>

src/view/index/index.vue

@@ -51,6 +51,7 @@ let listArray = ref([
 let currentIndex=ref(0);
 let btnlistshow=ref(false);
 const changeColor=(index)=>{
+  console.log('是不是点击我了');
     btnindex.value=index;
      emit("vtkshowfuc", index);
     currentIndex.value = btnindex.value;

src/view/result.vue

@@ -61,11 +61,13 @@
   <!-- 物理量 -->
   <div class="heigjie">
         <div class="he_pading1 color1">
-          <el-form-item label="物理量:" v-if="props.classradio == 'Fire'||props.classradio == 'Gass'">
+          <el-form-item label="物理量:" v-if="props.classradio == 'Fire'||props.classradio == 'Gass'||props.classradio == 'Gass1'">
+            <el-config-provider :locale="zhCn">
             <el-select v-model="formInline.region" @change="regionchange($event)" placeholder="请选择">
               <el-option v-for="item in strResultFormatlist" :key="item.id" :label="item.name"
                 :value="item.value"></el-option>
             </el-select>
+          </el-config-provider>
           </el-form-item>
           <div class="wotermn" v-else>
             <span>物理量：</span>
@@ -126,6 +128,7 @@ import { ElMessage, ElButton, ElDialog, ElSelect } from "element-plus";
 import resultLeft from "./result/resultLeft.vue";
 import resultRight from "./result/resultRight.vue";
 import wdisaster from "./result/Wdisaster.vue";
+import zhCn from 'element-plus/es/locale/lang/zh-cn'
 import wdisaster2 from "./result/Wdisaster2.vue";
 import { timestampToTime, timescount } from "@/js/lindex.js";
 import { vtkmodel } from "@/control/vtkModel.js";