liuqiao 2 yıl önce
ebeveyn
işleme
b5ee277d1c

+ 2 - 4
src/views/index/HCFDLab/echartsHFCD.vue

@@ -43,7 +43,6 @@ export default {
     });
     let _this = this;
    // this.getwebsocket();
-  this.timedata('2022-10-27 15:59:50', '2022-10-27 16:00:15',53)
   },
   methods: {
       hiden(){
@@ -55,12 +54,12 @@ export default {
 
   // 时间换算
   timedata(d1, d2,s1){
-    
+    console.log(this.nmlsteps);
  var date1 = new Date(d1);   //开始时间  
             var date2 = new Date(d2);    //结束时间  
              var cydata=(date2.getTime() - new Date(date1).getTime())/s1*(Number(this.nmlsteps)-s1);
            //var Milliseconds = date2.getTime() - new Date(date1).getTime();   //时间差的毫秒数       
-               console.log(Milliseconds)
+          
             var Milliseconds = cydata;
             //计算出相差天数  
             var days = Math.floor(Milliseconds / (24 * 3600 * 1000))
@@ -85,7 +84,6 @@ export default {
             }; 
           //console.log(ResultJson)
             let year=ResultJson.days.days+'天'+ this.p(ResultJson.days.hours)+':'+ this.p(ResultJson.days.minutes)+':'+ this.p(ResultJson.days.seconds)
-            console.log(year);
            this.$emit('restimeyear',year);
             return year;
 

+ 2 - 6
src/views/index/HCFDLab/index.vue

@@ -1875,6 +1875,7 @@ export default {
     props:{
       objopp:String,
       pid:String,
+      femnum:String,
       elodingfalse:{
           type:Boolean,
           default(){
@@ -2503,8 +2504,6 @@ methods:{
   //数据加载参数配置obj
     hcfdchange(obj,solverConfigid){
        this.parameterObj = JSON.parse(obj);
-       console.log(  this.parameterObj),
-        console.log( this.parameterObj.hcfdBoundarys);
       sessionStorage.setItem("res", obj);
       this.solverConfigid=solverConfigid;
     },
@@ -2517,10 +2516,7 @@ hcfdparam(){
         }
         request(params)
           .then((res) => { 
-          // Message({
-          //         type: "success",
-          //         message: "参数上传,成功",
-          //       });
+          this.$parent.solverchange(this.femnum);
          })
           .catch((err) => {
           })

+ 8 - 3
src/views/index/index.vue

@@ -7,7 +7,7 @@
                     
              </div> -->
         <div v-if="value2=='HCFDLab'">
-        <hcfd ref="hcfd" :objopp="objopp" :pid="pid" @fun="fun()" :elodingfalse="elodingfalse" @exlodingfalse="exlodingfalse"></hcfd>
+        <hcfd ref="hcfd" :objopp="objopp" :pid="pid" @fun="fun()" :elodingfalse="elodingfalse" @exlodingfalse="exlodingfalse" :femnum="femnum"></hcfd>
         </div>
           <div v-else-if="value2=='FEMLab(结构力学)'||value2=='FEMLab(结构力学)版本2'">
         <fem ref="fem" :femnum="femnum" ></fem>
@@ -104,7 +104,7 @@
   <el-container class="beij-container">
 <el-container>
    <el-main ref="main3d" :class="headMenu_2Show?'maxh400':'maxh221'" style="padding:0">
-    <echartsHFCD ref="monitor"  @getthislog='getthislog' @restimeyear='restimeyear'  :projectId='pid'></echartsHFCD>
+    <echartsHFCD ref="monitor"  @getthislog='getthislog' @restimeyear='restimeyear'  :projectId='pid' :nmlsteps="Number(numsteps)"></echartsHFCD>
    </el-main>
     <div class="footerTitle">
             <div>{{ $t("FEM.other.console") }}
@@ -163,6 +163,7 @@ import caozuo from './caozuo/index.vue'
 import hcfd from './HCFDLab/index.vue'
 import fem from './FEMLab/fem.vue'
 import echartsHFCD from "./HCFDLab/echartsHFCD.vue";
+import { number } from 'echarts/lib/export'
 export default {
   components:{geometry,meshindex,Geometryandclass,Materials,touch,initial,boundary,Meshauto,loadcase,zuoye,echartsHFCD,result,caozuo,toolindex,hcfd,fem},
   data() {
@@ -171,6 +172,7 @@ export default {
         footerShow:true,
         headMenu_2Show:false,
          elodingfalse:false,
+        numsteps:'',
         logs: "欢迎来到HCFD",
          newlog:'',
       data: [{
@@ -329,7 +331,6 @@ mounted(){
 },
 methods:{
   exlodingfalse(res){
-    console.log(res);
     this.elodingfalse=res;
   },
     handleNodeClick(data) {
@@ -367,6 +368,10 @@ methods:{
         if(val=='HCFDLab'){
            this.$nextTick(()=>{
           this.$refs.hcfd.hcfdchange(this.objopp,res.solverConfigid);
+         let data= JSON.parse(this.objopp);
+         
+          this.numsteps=data.nmlParam.steps;
+         console.log(this.numsteps);
            })   
         }else if(val=='FEMLab(结构力学)'){
              this.$nextTick(()=>{