liuqiao 2 жил өмнө
parent
commit
89175e4aba

+ 1 - 2
src/views/index/FEMLab/addtabs.vue

@@ -112,8 +112,7 @@ export default {
                 yrange:'0.0',
                 zrange:'0.0',
                 },
-                variableNamearr1:['r','u','ma'
-              ],
+                variableNamearr1:[],
                   formLabelWidth: '60px',
                     formLabelWidth2:'73px',
                     formLabelWidth4:'37px',

+ 11 - 7
src/views/index/FEMLab/fem.vue

@@ -2449,6 +2449,7 @@ this.init();
       // this.loadObjs[1].state=1
     },
     changestleixing(val){
+      console.log(val);
      if(val=='0'){
        this.parameterObj.f_static.value=true;
      }else{
@@ -2459,12 +2460,13 @@ this.init();
      }else{
         this.parameterObj.eigenv.value=false;
      }
-     if(val=='2'){
+     if(val=='3'){
        this.parameterObj.dynamic.value=true; 
      }else{
-        this.parameterObj.dynamic.value=false;
+       this.parameterObj.dynamic.value=false;
      }
     },
+
       //load状态回调
     fileLoadeState(files) {
       files.forEach((file) => {
@@ -2618,8 +2620,9 @@ vchangeblur(){
  this.bStepok("LineDisplay",'')
 },
 // 获取轮廓数据
-outlinedata(){
-  let ytdata= JSON.parse(sessionStorage.getItem("ytdata"));
+outlinedata(val){
+  //let ytdata= JSON.parse(sessionStorage.getItem("ytdata"));
+  let ytdata= JSON.parse(val);
   this.outlineobj.scalarName=ytdata.scalarName;
   this.vSalar=ytdata.scalarName;
    this.outlineobj.range0=ytdata.range0;
@@ -2668,7 +2671,7 @@ vectorOK(){
         this.editableTabs.push({
                 index:newTabName,
                 type:"line", 
-                variableName:'r',
+                variableName:'',
                 level:'',
                 normal_x:'',
                 normal_y :'',
@@ -2971,11 +2974,9 @@ this.styX.left=e.clientX+'px';
           this.dialog.create_analysis=true;
       break;
          case 'six2-0':
-           this.outlinedata()
           this.dialog.contour_visiable=true;
       break;
   case 'six2-1':
-        this.outlinedata();
           this.dialog.Line_visiable=true;
       break;
      case 'six2-2':
@@ -3204,4 +3205,7 @@ line-height: 30px;
   }
      }
 }
+.classfelx{
+ flex:1;
+}
 </style>

+ 1 - 1
src/views/index/HCFDLab/fileupload.vue

@@ -63,7 +63,7 @@ export default {
          created(){
      this.getUUID()
    this.uuid= this.getUUID()
- 
+ console.log(this.uuid);
       
 },
     methods:{

+ 7 - 4
src/views/index/index.vue

@@ -762,12 +762,15 @@ let params = {
               if(rdata.action=='ResultImport'){
                     let data=JSON.parse(rdata.paramJson);
                       if(data.msgType=="contour_param"){
-                        sessionStorage.setItem("ytdata",JSON.stringify(data));
-                          this.ytdata=rdata;
+                        // sessionStorage.setItem("ytdata",JSON.stringify(data));
+                        //   this.ytdata=rdata;
+                        //   outlinedata
+                           this.$refs.fem.outlinedata(JSON.stringify(data))
                       }
                       if(data.msgType=='line_param'){
-                          sessionStorage.setItem("ytdata",JSON.stringify(data));
-                            this.ytdata=rdata;
+                          // sessionStorage.setItem("ytdata",JSON.stringify(data));
+                          //   this.ytdata=rdata;
+                           this.$refs.fem.outlinedata(JSON.stringify(data))
                       }
                       if(data.msgType=='vector_param'){
                         sessionStorage.setItem("vectorparam",JSON.stringify(data));