5.16stream

src/views/index/HCFDLab/index.vue

@@ -2140,7 +2140,7 @@
         <el-button   @click="dialog.Solid_Surface= false"
           >{{ $t("HCFD.file.cancel")}}</el-button
         >
-        <el-button type="primary" @click="colorsolid(); "
+        <el-button type="primary" @click="colorsolid();dialog.Solid_Surface= false "
           >{{ $t("HCFD.file.ok")}}</el-button
         >
         <!-- <el-button type="primary" @click="dialog.Solid_Surface = false"
@@ -2220,11 +2220,11 @@
           <el-form-item label="u" :label-width="formLabelWidth4">
       <el-select 
                   size="mini"
-                  v-model="vectorobj.dataU"
+                  v-model="streamobj.dataU"
                   placeholder="select boundary"
                 >
                    <el-option
-                            v-for="scalar in vectorobj.dataUarr"
+                            v-for="scalar in streamobj.dataUarr"
                             :key="scalar"
                             :label="scalar"
                             :value="scalar"
@@ -2235,11 +2235,11 @@
         <el-form-item label="v" :label-width="formLabelWidth4">
       <el-select 
                   size="mini"
-                  v-model="vectorobj.dataV"
+                  v-model="streamobj.dataV"
                   placeholder="select boundary"
                 >
                    <el-option
-                            v-for="scalar in vectorobj.dataVarr"
+                            v-for="scalar in streamobj.dataVarr"
                             :key="scalar"
                             :label="scalar"
                             :value="scalar"
@@ -2250,11 +2250,11 @@
             <el-form-item label="w" :label-width="formLabelWidth4">
       <el-select 
                   size="mini"
-                  v-model="vectorobj.dataW"
+                  v-model="streamobj.dataW"
                   placeholder="select boundary"
                 >
                    <el-option
-                            v-for="scalar in vectorobj.dataWarr"
+                            v-for="scalar in streamobj.dataWarr"
                             :key="scalar"
                             :label="scalar"
                             :value="scalar"
@@ -2264,7 +2264,7 @@
         </el-form-item>
     </div>
     <div class="listbtn"> 
-       <el-button plain class="anniu">创建</el-button>
+       <el-button plain class="anniu" @click="CreateStream()">创建</el-button>
       </div>
       </div>
         <div class='selecttype'>
@@ -2280,7 +2280,7 @@
           <el-form-item label="方向" :label-width="formLabelWidth5">
       <el-select 
                   size="mini"
-                  v-model="direval"
+                  v-model="streamres.direction"
                   placeholder="select boundary"
                 >
                    <el-option
@@ -2298,7 +2298,7 @@
           <el-form-item label="StreamStyle" :label-width="formLabelWidth5">
       <el-select 
                   size="mini"
-                  v-model="strsval"
+                  v-model="streamres.streamstyle"
                   placeholder="select boundary"
                 >
                    <el-option
@@ -2314,21 +2314,21 @@
       <div class="linetext"> intergration</div>
     </div> 
         <el-form-item label="InitialStep" :label-width="formLabelWidth6" >
-      <el-input value="PingYi" autocomplete="off"></el-input>
+      <el-input v-model="streamres.initialstep" autocomplete="off"></el-input>
       </el-form-item>
           <el-form-item label="MaxPropagation" :label-width="formLabelWidth6" >
-      <el-input value="PingYi" autocomplete="off"></el-input>
+      <el-input v-model="streamres.maxpropagation" autocomplete="off"></el-input>
       </el-form-item>
           <el-form-item label="MinimumStep" :label-width="formLabelWidth6" >
-      <el-input value="PingYi" autocomplete="off"></el-input>
+      <el-input v-model="streamres.minimumstep" autocomplete="off"></el-input>
       </el-form-item> 
     <div class="radio_text text_color liangf">
               <div class="classfelx" style="text-align: center;">
-               <el-checkbox v-model="colorobj.showHideState" label="show"></el-checkbox>
+               <el-checkbox v-model="streamres.showstate" label="show"></el-checkbox>
    
                   </div>
                     <div class="classfelx">
-                       <el-checkbox v-model="colorobj.showHideState" label="tool"></el-checkbox>
+                       <el-checkbox v-model="streamres.toolstate" label="tool"></el-checkbox>
                  
                     </div>
                     </div>
@@ -2341,7 +2341,7 @@
         <el-button   @click="dialog.Stream_Surface= false"
           >{{ $t("HCFD.file.cancel")}}</el-button
         >
-        <el-button type="primary" @click="dialog.Stream_Surface= false"
+        <el-button type="primary" @click="streamOK();dialog.Stream_Surface= false"
           >{{ $t("HCFD.file.ok")}}</el-button
         >
   
@@ -2838,6 +2838,12 @@ export default {
       transparency:'',
     },
     variableNamearr:[],
+    vector:{
+      u:'r',
+      v:'r',
+      w:'r',
+    },
+     
      vectorobj:{
        dataU:'r',
        dataV:'r',
@@ -2846,6 +2852,14 @@ export default {
        dataVarr:[],
        dataWarr:[],
        scaleFactor:''
+     },
+      streamobj:{
+       dataU:'r',
+       dataV:'r',
+       dataW:'r',
+       dataUarr:[],
+       dataVarr:[],
+       dataWarr:[],
      },
       // 折线图的参数
       zobj:{
@@ -3142,10 +3156,18 @@ export default {
              {value:'0',name:'平动'},
             {value:'1',name:'转动'},
           ],
+
           directionlist:['Both','Forward','Backward'],
-          direval:"Both",
           streamstylelist:['Line','Ribbon','Tube'],
-          strsval:"line",
+          streamres:{
+            direction:"Both",
+            streamstyle:"Line",
+            initialstep:0.2,
+            maxpropagation:1.2,
+            minimumstep:0.3,
+            showstate:true,
+            toolstate:true,
+            },
           ydval2:'0',
             ydlist3:[
              {value:'0',name:'匀速'},
@@ -3941,9 +3963,7 @@ setpnum(){
           };
            request(params)
         .then((res) => {
-          console.log(res)
         let steps= res.steps.split(',');
-        console.log(steps);
         this.boundaryStep=steps;
         this.volumStep=steps;
 
@@ -3968,9 +3988,12 @@ bStepok(num,action,index,paramJson){
         range0:this.outlineobj.range0,
         range1:this.outlineobj.range1,
         isVolume:this.isVolume,
-        dataU:this.vectorobj.dataU,
-        dataV:this.vectorobj.dataV,
-        dataW:this.vectorobj.dataW,
+        // dataU:this.vectorobj.dataU,
+        // dataV:this.vectorobj.dataV,
+        // dataW:this.vectorobj.dataW,
+        dataU:this.vector.u,
+        dataV:this.vector.v,
+        dataW:this.vector.w,
         scaleFactor:this.vectorobj.scaleFactor,
         index:index,
 
@@ -3989,10 +4012,6 @@ changeblur(){
 vchangeblur(){
  this.bStepok(this.outlineobj.level,"LineDisplay",'','')
 },
-// 矢量的OK按钮
-vectorOK(){
- this.bStepok('',"VectorDisplay",'','')
-},
 // 获取轮廓数据
 outlinedata(){
   let ytdata= JSON.parse(sessionStorage.getItem("ytdata"));
@@ -4016,17 +4035,55 @@ if(ress==undefined){
 },
 //矢量数据
 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;
+    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(this.outlineobj.level,'StreamDisplayCreate','','')
+    }
 
+},
+//stream提交数据
+streamOK(){
+console.log(this.streamres);
+let parae=JSON.stringify(this.streamres);
+ this.bStepok(this.outlineobj.level,'StreamDisplayApply','',parae)
+},
 // 字符串的裁剪
 strnumchange(val){
     let strnum=val;

src/views/index/index.vue

@@ -685,12 +685,13 @@ let params = {
               this.websock.close() 
       },
       websocketonmessage(e){ //数据接收
-      // setInterval(function(){
+     
         this.loadingopen();
-      // },3000)
-      //  clearInterval(test2);
-
-          //  this.$refs.monitor.container_show=true;
+    console.log(e);
+        // setTimeout(() => {
+        //    this.loadingend(this.loadingopen());
+        //  // loading.close();
+        // }, 30000);
 
         try{
             const redata = JSON.parse(e.data);   
@@ -703,20 +704,25 @@ let params = {
           // 云图的参数返回 存储
           console.log(redata);
           if(redata.action=='ResultImport'){
-             
-                  if(redata.msgType=="contour_param"){
-                     sessionStorage.setItem("ytdata",JSON.stringify(redata));
+                let data=JSON.parse(redata.paramJson);
+                  if(data.msgType=="contour_param"){
+                     sessionStorage.setItem("ytdata",JSON.stringify(data));
                        this.ytdata=redata;
                   }
-                   if(redata.msgType=='line_param'){
-                      sessionStorage.setItem("ytdata",JSON.stringify(redata));
+                   if(data.msgType=='line_param'){
+                      sessionStorage.setItem("ytdata",JSON.stringify(data));
                         this.ytdata=redata;
                   }
-                  if(redata.msgType=='vector_param'){
-                     sessionStorage.setItem("vectorparam",JSON.stringify(redata));
+                  if(data.msgType=='vector_param'){
+                     sessionStorage.setItem("vectorparam",JSON.stringify(data));
                     this.vectorparam=redata;
 
-                  }else{
+                  }
+                  if(data.msgType=='stream_param'){
+                    // sessionStorage.setItem("streamparam",JSON.stringify(data));
+                   // this.vectorparam=redata;
+                      this.$refs.hcfd.streamdata(JSON.stringify(data))
+                  } else{
 
                   }
 
@@ -745,11 +751,19 @@ let params = {
                   this.$refs.hcfd.updataparam(); 
             }
             
+          }else if(redata.action=='StreamDisplayCreate'){
+            let streamError=JSON.parse(redata.paramJson)
+             if(streamError.hasOwnProperty('Error')){
+                   this.loadingend(this.loadingopen());
+                  }
+               
           }
          
         return true;       
         }catch(error){
+          this.loadingend(this.loadingopen());
           return false;
+
         }