liuqiao há 1 ano atrás
pai
commit
1e61660b67

+ 6 - 7
src/view/InfoDialoges.vue

@@ -796,6 +796,7 @@ const pollute = () => {
 //任务求解任务信息
 //state 完成1  失败是-1
 const rewu=()=>{
+  
      arrvalue.value=[];
     const params = {
         transCode: 'D10017',
@@ -804,16 +805,13 @@ const rewu=()=>{
     request(params)
         .then((res) => {
             emit('resulysucss',res.state);
+            state.value=res.state;
+            if(state.value=="1"){
+                emit('websockfrist');
+                }
             arrvalue.value=res.cocodes.split(',');
             tuiyanobj.value=res;
-            state.value=res.state;
-              if(state.value=="1"){
-           
-             emit('websockfrist');
-            }
             sessionStorage.setItem("state",state.value);
-           // console.log("状态"+state.value);
-           // emit('resulysucss'); 
             tuiyanobj.value.pickertime=res.acctime;
             value.value=arrvalue.value;   
             value.value=[];
@@ -831,6 +829,7 @@ const rewu=()=>{
            // ElMessage.error(err.returnMsg)
            //state.value='0';
            sessionStorage.setItem("state",'0');
+        console.log("我是错误的state")
            emit('resulysucss');
            addinitial();
         })

+ 0 - 4
src/view/appmian.vue

@@ -203,8 +203,6 @@ const leftsimulation = (res,data) => {
     resultbidui.value.mntext1=data.name;
     resultbidui.value.wdiclick(resultleft.value.aid,'1');
   } else {
-    console.log(22222)
-    console.log(resultbidui.value.mntext2)
     resultright.value.coids = res.coids;
     resultright.value.totaltime = res.totaltime;
     resultright.value.reportstep = res.reportstep;
@@ -287,9 +285,7 @@ resultbidui.value.accident6(key,aid.value);
 // 获取子组件的方法
 const childfun = () => {
   bgk2false.value=false;
-  console.log( bgk2false.value);
   indexref.value.showhadend();
-  
   indexchange(indexref.value.btnindex);
   if(classradio.value=='Gass'){
     sourcedis.value.Gassgetdata(aid.value);

+ 5 - 18
src/view/index/first-left.vue

@@ -13,7 +13,7 @@
             <div class="rg_content">
               <div class="rg-padding">
                 <div class="he_pading color1  wusele">
-              <el-form-item label="物理量:" v-if="props.classradio == 'Fire'">
+              <el-form-item label="物理量:" v-if="props.classradio == 'Fire'||props.classradio == 'Gass'">
                 <el-select
                   v-model="formInline.region"
                   @change="regionchange($event)"
@@ -293,9 +293,6 @@ myChart.clear();
  readJob();
 }
 function regionchange(val) {
-  console.log(val)
-  console.log(11111)
-   console.log(strResultFormatlist.value)
   let newMap = new Map([
             ["Temperature", "(℃)"],
             ["Pressure", "(Pa)"],
@@ -331,7 +328,7 @@ await request(params)
       if(res.state=='1'){
       //  vtkmodel.clearModeAddJg(); //隐藏模版显示结果
       job.value = res;
-     getMonitor();
+       getMonitor();
       vtkmodel.clearModeAddJg();
       reddate(new Date());
       vtkGridRead();
@@ -396,13 +393,6 @@ async  function getMonitor() {
         for (let i = 0; i < res.codes.length; i++) {
            cocode = res.codes[i];
           let num=i+1
-          console.log(cocode);
-          //   strResultFormatlist.value.push({
-          //   // id: i,
-          //   // name: res.codes[i].code,
-          //   value: cocode.code,
-          
-          // });
           let newMap = new Map([
             ["Temperature", "(℃)"],
             ["Pressure", "(Pa)"],
@@ -443,23 +433,19 @@ async  function getMonitor() {
               }
              // res.codes[i].code = key+value;
              name =  key+'\n'+value
-             console.log(name)
+            
             }
           });
-          console.log(cocode);
           strResultFormatlist.value.push({
             id: i,
             name: name,
             value: cocode.code,
           
           });
-          console.log(res.codes)
           headertable.push(
             { prop:'v'+num, label:name},
           )
         }
-          
-        // strResultFormatlist.value=res.codes;
          dynamicHeaders.value=headertable;
         let warning=[];//一级警告
         let warning2=[];//二级警告
@@ -486,6 +472,7 @@ async  function getMonitor() {
         tableData.value=res.vals;
       }
     }) .catch((err) => {
+      tableData.value=[];
       ElMessage.error(err.returnMsg);
     });
   }
@@ -811,7 +798,7 @@ function vtkScalarRead() {
 watch(
   newcount,
   (newVal, oldVal) => {
-console.log("值改变了", newVal, oldVal);
+    console.log("值改变了", newVal, oldVal);
     fcon.step = newVal;
     getMonitor();
     vtkScalarRead();

+ 3 - 1
src/view/index/index.vue

@@ -81,11 +81,13 @@ const firstshowfuc=()=>{
   firstleftref.value.isshow=false;
 }
 const indexchange=(key)=>{
+  console.log(111111235677)
   if(key==0){
-    
     towrightref.value.towshow=false;
+    console.log(props.state);
     if(props.state=='1'){
       firstleftref.value.firstshow=true;
+      console.log( firstleftref.value.firstshow);
     firstleftref.value.indexinit(props.aid);
     }
   }else if(key==1){