3.20 对比修改状态

src/control/vtkModel.js

@@ -329,6 +329,7 @@ export class VtkModel {
     this.renderer.removeActor(this.jgActor);
     this.renderer.removeActor(this.scalarBarActor);
     this.modelClearShow();
+    this.renderWindow.render();
   }
   //选中指定点
   selectByNodeId(nid){

src/view/InfoDialoges.vue

@@ -510,10 +510,29 @@ const accident = () => {
         }
         request(params)
             .then((res) => {
-                emit("leftsimulation",res,sgdata.value);
+                if(res.state=='1'){
+                    emit("leftsimulation",res,sgdata.value);
+                }
+                else if(res.state=='-1'){
+                    ElMessage({
+                        message: " 求解失败",
+                        type: 'error',
+                    });
+                    }else if(res.state=='0'){
+                    ElMessage({ message: "求解未完成",  type: 'error',
+                    });
+                    }
+            
             })
             .catch((err) => {
-            ElMessage.error(err.returnMsg)
+                if(err.returnMsg=="任务不存在！"){
+   
+                    ElMessage({
+                    message: "未求解",
+                    type: 'error',
+                    });
+                    }
+            //ElMessage.error(err.returnMsg)
             
             })
 
@@ -667,6 +686,7 @@ const pollute = () => {
         })
 }
 //任务求解任务信息
+//state 完成1  失败是-1
 const rewu=()=>{
   
      arrvalue.value=[];

src/view/appmian.vue

@@ -116,6 +116,7 @@ onMounted(() => {});
 // 跳转页面,{ aid:aid.value}
 const tiaozhuan = () => {
   activeIndex.value = "1";
+  handleSelect( activeIndex.value);
   const key = activeIndex.value;
   sourcedis.value.changeModel();
   sourcedis.value.accident3(key);
@@ -178,7 +179,7 @@ const leftsimulation = (res,data) => {
   }
     
 //TODO 获取物理量
-console.log(resultleft.value.aid,resultright.value.aid);
+resultbidui.value.endtime= Number(resultleft.value.totaltime)/Number(resultleft.value.reportstep);
 resultbidui.value.initAid(resultleft.value.aid,resultright.value.aid);
 resultbidui.value.clickflat=true;
     }

src/view/components/InfoAnimation.vue

@@ -382,16 +382,9 @@ const accident5 = (val, key) => {
   aid.value = val;
   resultactiveName.value = "first";
   if (key == "4") {
-    timehandclick();
-    if (props.classradio == "Fire") {
-      monitor.value = true;
-    } else if (props.classradio == "Water") {
-      monitor.value = true;
-    }
     cocodeIsInit.value = false;
     //获取任务信息
     readJob();
-    console.log(resultactiveName.value);
   } else {
     clearInterval(timing.value);
   }
@@ -487,7 +480,8 @@ function jgSelect() {
 }
 //获取任务信息
 async function readJob() {
-  vtkmodel.clearModeAddJg(); //隐藏模版显示结果
+
+
   const params = {
     transCode: "D10017",
     aid: aid.value,
@@ -496,11 +490,26 @@ async function readJob() {
     .then((res) => {
       if (res.returnCode == "000000000") {
         //成功
+        if(res.state=='1'){
+          vtkmodel.clearModeAddJg(); //隐藏模版显示结果
+        monitor.value = true;
         job.value = res;
         reddate(new Date());
         getMonitor();
         vtkGridRead();
         jgSelect();
+          timehandclick();
+        endtime.value= Number(res.totaltime)/Number(res.reportstep);
+        console.log( endtime.value);
+      }else if(res.state=='-1'){
+        ElMessage({
+          message: " 求解失败",
+          type: 'error',
+        });
+      }else if(res.state=='0'){
+        ElMessage({ message: "求解未完成",  type: 'error',
+        });
+      }
       } else {
         ElMessage({
           message: res.returnMsg,
@@ -508,7 +517,16 @@ async function readJob() {
         });
       }
     })
-    .catch((err) => {});
+    .catch((err) => {
+      if(err.returnMsg=="任务不存在！"){
+        monitor.value=false;
+        console.log(1111)
+        ElMessage({
+          message: "未求解",
+          type: 'error',
+        });
+           }
+    });
 }
 //获取当前时间最近的步数 读取文件
 //当前时间=开始时间+输出步长*输出次数

src/view/result.vue

@@ -66,7 +66,7 @@
         <el-image :src="t5" fit="contain"></el-image>
         <div class="mntext" :title="mntext1" >{{ mntext1 }}</div>
       </div>
-      <div class="mnclose"><el-image :src="t6" fit="contain"></el-image></div>
+      <!-- <div class="mnclose"><el-image :src="t6" fit="contain"></el-image></div> -->
       </div>
       <resultLeft
         ref="setleftAid"
@@ -80,7 +80,7 @@
         <el-image :src="t5" fit="contain"></el-image>
         <div class="mntext" :title="mntext2" >{{ mntext2 }}</div>
       </div>
-      <div class="mnclose"><el-image :src="t6" fit="contain"></el-image></div>
+      <!-- <div class="mnclose"><el-image :src="t6" fit="contain"></el-image></div> -->
       </div>
       <resultRight  ref="setrightAid" :region="formInline.region" :count="formInline.count" />
     </div>
@@ -94,6 +94,7 @@ import { ElMessage, ElButton, ElDialog, ElSelect } from "element-plus";
 import resultLeft from "./result/resultLeft.vue";
 import resultRight from "./result/resultRight.vue";
 import { timestampToTime } from "@/js/lindex.js";
+import { vtkmodel } from "@/control/vtkModel.js";
 import t1 from "@/assets/img/t1.png";
 import t2 from "@/assets/img/t2.png";
 import t3 from "@/assets/img/t3.png";
@@ -130,6 +131,7 @@ const accident6 = (key, id) => {
   aid.value = id;
 
   if (key == "5") {
+    vtkmodel.clearAll(); 
     resultyem.value = true;
   } else {
     resultyem.value = false;
@@ -266,7 +268,7 @@ onUnmounted(() => {
     clearInterval(timing.value);
   }
 });
-defineExpose({ accident6, initAid,mntext1,mntext2,clickflat });
+defineExpose({ accident6, initAid,mntext1,mntext2,clickflat,endtime });
 </script>
 <style scoped lang="scss">
 .heigjie {