liuqiao 2 gadi atpakaļ
vecāks
revīzija
3275604850

+ 187 - 1
src/views/index/FEMLab/fem.vue

@@ -2010,6 +2010,8 @@ export default {
         bmScalars:[],
         nameTypes:''
      },
+    vSalar: "",
+    velementCheckeds: ["Contour"],
     colorobj:{
       R:'0',
       G:'0',
@@ -2017,6 +2019,12 @@ export default {
       showHideState:'1',
       transparency:'',
     },
+     vector:{
+      u:'r',
+      v:'r',
+      w:'r',
+    },
+     streamparae:'',
      vectorobj:{
        dataU:'r',
        dataV:'r',
@@ -2421,7 +2429,6 @@ this.init();
       // this.loadObjs[1].state=1
     },
     changestleixing(val){
-      console.log(val);
      if(val=='0'){
        this.parameterObj.f_static.value=true;
      }else{
@@ -2458,6 +2465,7 @@ this.init();
   
       this.femstate=data.state;
        this.parameterObj = JSON.parse(obj);//JSON.parse(obj);
+       console.log( this.parameterObj);
       sessionStorage.setItem("res", obj);
       this.femsolverConfigid=solverConfigid;
         if(this.femstate==0){//求解状态(0-求解中,1-求解成功,-1-没有求解)
@@ -2555,7 +2563,184 @@ femparam(){
       changest(){
 
       },
+  // 获取轮廓数据
+bStepok(action,index){
+  const params = {
+        transCode: 'AFT001',
+        pid:this.project.projectId,
+        solverConfigId:this.femsolverConfigid,
+        action:action,
+        paramJson:this.streamparae,
+        step:this.bStep,
+        scalarName:this.outlineobj.scalarName,
+        level:this.outlineobj.level,
+        range0:this.outlineobj.range0,
+        range1:this.outlineobj.range1,
+        isVolume:this.isVolume,
+        dataU:this.vector.u,
+        dataV:this.vector.v,
+        dataW:this.vector.w,
+        scaleFactor:this.vectorobj.scaleFactor,
+        index:index,
+        }
+        request(params)
+          .then((res) => { 
+             console.log(res);
+         })
+          .catch((err) => {
+          })
+},
+//level颜色的数据
+changeblur(){
+ this.bStepok('ContourDisplay','')
+},
+vchangeblur(){
+ this.bStepok("LineDisplay",'')
+},
+// 获取轮廓数据
+outlinedata(){
+  let ytdata= JSON.parse(sessionStorage.getItem("ytdata"));
+  this.outlineobj.scalarName=ytdata.scalarName;
+  this.vSalar=ytdata.scalarName;
+   this.outlineobj.range0=ytdata.range0;
+   this.outlineobj.range1=ytdata.range1;
+  let ress=ytdata.scalarNames;
+if(ress==undefined){
+    Message({
+            type: "info",
+            message: "请择物面数据",
+          });
+}else{
+ this.outlineobj.bmScalars=Array.from(ress.split(","));
+ this.outlineobj.nameTypes=ytdata.nameTypes
+   this.strnumchange(ytdata.nameTypes);
+
+}
+ 
+},
+//矢量数据
+vectordata(){
+    let vectorparam= JSON.parse(sessionStorage.getItem("vectorparam"));
+    let datau=vectorparam.dataU;
+    let datav=vectorparam.dataV;
+    let dataw=vectorparam.dataW;
+    this.vectorobj.dataUarr=datau.split(",");
+    this.vectorobj.dataVarr=datav.split(",");
+    this.vectorobj.dataWarr=dataw.split(",");
+    this.vectorobj.scaleFactor=vectorparam.scaleFactor;
+
+},
+// 矢量的OK按钮
+vectorOK(){
+    this.vector.u=this.vectorobj.dataU,
+    this.vector.v=this.vectorobj.dataV,
+    this.vector.w=this.vectorobj.dataW,
+ this.bStepok("VectorDisplay",'')
+},
+//stream 数据
+streamdata(data){
+  console.log(data);
+    let streamparam= JSON.parse(data);
+    let datau=streamparam.dataU;
+    let datav=streamparam.dataV;
+    let dataw=streamparam.dataW;
+    this.streamobj.dataUarr=datau.split(",");
+    this.streamobj.dataVarr=datav.split(",");
+    this.streamobj.dataWarr=dataw.split(",");
+},
+// stream创建数据
+CreateStream(){
+    this.vector.u=this.streamobj.dataU;
+    this.vector.v=this.streamobj.dataV;
+    this.vector.w=this.streamobj.dataW;
+    if( this.vector.u==this.vector.v||this.vector.u== this.vector.w||this.vector.v==this.vector.w){
+        Message({
+            type: "warning",
+            message: "矢量值,各不相同才能创建!",
+          });
+    }else{
+       this.bStepok('StreamDisplayCreate','')
+    }
+
+},
+//stream提交数据
+streamOK(){
+console.log(this.streamres);
+this.streamparae=JSON.stringify(this.streamres);
+ this.bStepok('StreamDisplayApply','')
+},
+// 字符串的裁剪
+strnumchange(val){
+    let strnum=val;
+ let num_caj=strnum.split(","); 
+ for(var i=0;i<num_caj.length;i++){
+  if(num_caj[i].includes(this.vSalar)){
+    let ster= num_caj[i];
+  let str= ster.charAt(ster.length - 1)
+      if(str=='0'){
+           this.outlineobj.leixing='point scalar';
+      }else{
+         this.outlineobj.leixing='cell scalar';
+      }
+  }
+ }
+},
+// 标量选择名称跟着边
+bmScalarschange(val){
+    this.outlineobj.scalarName=this.vSalar;
+    this.strnumchange(this.outlineobj.nameTypes);
+
+},
+//实体的颜色的控制
+colorchange(val){
+if(this.lineColor!=null){
+ let str=this.lineColor.slice(5,-1)
+  let colorstr=str.split(",");
+  this.colorobj.R=colorstr[0];
+  this.colorobj.G=colorstr[1];
+  this.colorobj.B=colorstr[2];
+  this.colorobj.transparency=colorstr[3];
+  console.log(colorstr);
+}
+},
+colorsolid(){
+let r=(Number(this.colorobj.R)/255).toFixed(4);
+let g=(Number(this.colorobj.G)/255).toFixed(4);
+let b=(Number(this.colorobj.B)/255).toFixed(4);
+ const params = {
+        transCode: 'AFT001',
+        pid:this.project.projectId,
+        solverConfigId:this.femsolverConfigid,
+        action:'SolidSurfaceDisplay',
+        paramJson:'',
+        step:this.bStep,
+        scalarName:this.outlineobj.scalarName,
+        level:'',
+        range0:this.outlineobj.range0,
+        range1:this.outlineobj.range1,
+        isVolume:this.isVolume,
+        dataU:this.vectorobj.dataU,
+        dataV:this.vectorobj.dataV,
+        dataW:this.vectorobj.dataW,
+        scaleFactor:this.vectorobj.scaleFactor,
+        r:r,
+        g:g,
+        b:b,
+        transparency: this.colorobj.transparency,
+        showHideState:this.colorobj.showHideState,
+        }
+        request(params)
+          .then((res) => { 
+            console.log(res)
+         })
+          .catch((err) => {
+          })
+},
    handleClick(tab, event) {
+     let tabindex=tab.index;
+if(tabindex=='2'){
+  this.bStepok('ResultImport','');
+}
    this.activecleer();
         },
         activecleer(){
@@ -2632,6 +2817,7 @@ 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':

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

@@ -18,7 +18,7 @@ import { request } from "@/utils/request";
 export default {
   data() {
     return {
-       container_show:true,
+       container_show:false,
       chart: null,
       convergeDate: { title: "hcfd", VARIABLES: [], value: [] },
     numlist:[],

+ 29 - 36
src/views/index/index.vue

@@ -666,9 +666,9 @@ let params = {
       request(params)
         .then((res) => {
          setTimeout(() => {
-        // this.loadingend(this.loadingopen());
+         this.loadingend(this.loadingopen());
         console.log(1111);
-        }, 30000);
+        }, 90000);
 
         })
         .catch((err) => {
@@ -694,71 +694,63 @@ let params = {
               this.websock.close() 
       },
       websocketonmessage(e){ //数据接收
-     
-    
-        //       setTimeout(() => {
-        // this.loadingend(this.loadingopen());
-        //  // loading.close();
-        // }, 3000);
-    console.log(e);
+  //  console.log(e);
+        this.loadingopen();
         try{
-            const redata = JSON.parse(e.data);   
-         
-           if(redata.hasOwnProperty("img")){
-                this.loadingopen();
-                if(redata.img=''||redata.img==null||redata.img==undefined||redata.img==false){
-      
-
-                }else{
-                 
-            }
+    
+             let eadata=e.data
+             var rdata=JSON.parse(e.data)
+             console.log(rdata);
+           if(rdata.hasOwnProperty("img")){
+             this.loadingend(this.loadingopen());
            this.$refs.TFileStream.imgtupian=true;
-          this.$refs.TFileStream.fetchData(redata);
+          this.$refs.TFileStream.fetchData(rdata);
           this.$refs.monitor.container_show=false;
            }
          
           // HCFD云图的参数返回 存储
-          console.log(redata);
-          if(redata.action=='ResultImport'){
-                let data=JSON.parse(redata.paramJson);
+          console.log(rdata);
+          if(rdata.action=='ResultImport'){
+       
+                let data=JSON.parse(rdata.paramJson);
                   if(data.msgType=="contour_param"){
                      sessionStorage.setItem("ytdata",JSON.stringify(data));
-                       this.ytdata=redata;
+                       this.ytdata=rdata;
                   }
                    if(data.msgType=='line_param'){
                       sessionStorage.setItem("ytdata",JSON.stringify(data));
-                        this.ytdata=redata;
+                        this.ytdata=rdata;
                   }
                   if(data.msgType=='vector_param'){
                      sessionStorage.setItem("vectorparam",JSON.stringify(data));
-                    this.vectorparam=redata;
+                    this.vectorparam=rdata;
                   }
                   if(data.msgType=='stream_param'){
                       this.$refs.hcfd.streamdata(JSON.stringify(data))
                   }
 
-          }else if(redata.action=='LineDisplay'){
-                       this.ytdata=redata;
-          }else if(redata.action=='SliceDisplayAdd'){
-            let dataslicedisplay=JSON.parse(redata.paramJson);
+          }else if(rdata.action=='LineDisplay'){
+                       this.ytdata=rdata;
+          }else if(rdata.action=='SliceDisplayAdd'){
+            let dataslicedisplay=JSON.parse(rdata.paramJson);
             if(dataslicedisplay==null||JSON.stringify(dataslicedisplay)=='{}'){
               
             }else{
               if(dataslicedisplay.msgType=='addPage_slice_param'){
-                  sessionStorage.setItem("dataslicedisplay",JSON.stringify(redata.paramJson));
+                  sessionStorage.setItem("dataslicedisplay",JSON.stringify(rdata.paramJson));
                    this.$refs.hcfd.addparam();
               }
             }
-          }else if(redata.action=='SliceDisplayUpdate'){
-            let datadisplayupdate=JSON.parse(redata.paramJson);
+          }else if(rdata.action=='SliceDisplayUpdate'){
+            let datadisplayupdate=JSON.parse(rdata.paramJson);
             console.log(datadisplayupdate)
             if(datadisplayupdate==null||JSON.stringify(datadisplayupdate)=='{}'){
             }else{
-                  sessionStorage.setItem("updateparam",JSON.stringify(redata.paramJson));
+                  sessionStorage.setItem("updateparam",JSON.stringify(rdata.paramJson));
                   this.$refs.hcfd.updataparam(); 
             }
-          }else if(redata.action=='StreamDisplayCreate'){
-            let streamError=JSON.parse(redata.paramJson)
+          }else if(rdata.action=='StreamDisplayCreate'){
+            let streamError=JSON.parse(rdata.paramJson)
              if(streamError.hasOwnProperty('Error')){
                    this.loadingend(this.loadingopen());
                   } 
@@ -774,6 +766,7 @@ let params = {
         this.websock.send(Data);
       },
       websocketclose(e){  //关闭
+      this.websock.close();
         Message({
             type: "error",
             message: "websock断开连接",