liuqiao 2 лет назад
Родитель
Сommit
dd516e56e0
2 измененных файлов с 72 добавлено и 12 удалено
  1. 60 11
      src/views/index/HCFDLab/index.vue
  2. 12 1
      src/views/index/index.vue

+ 60 - 11
src/views/index/HCFDLab/index.vue

@@ -1760,7 +1760,7 @@
         <el-button   @click="referencevisiable((dialog.SurfaceGrid_visiable = false))"
           >{{ $t("HCFD.file.cancel")}}  </el-button
         >
-        <el-button type="primary" @click="dialog.SurfaceGrid_visiable = false"
+        <el-button type="primary" @click="bStepok();dialog.SurfaceGrid_visiable = false"
           >{{ $t("HCFD.file.ok")}}</el-button
         >
       </div>
@@ -1847,7 +1847,7 @@
         <el-button   @click="referencevisiable((dialog.VolumeGrid_visiable = false))"
           >{{ $t("HCFD.file.cancel")}}</el-button
         >
-        <el-button type="primary" @click="dialog.VolumeGrid_visiable = false"
+        <el-button type="primary" @click=" dialog.VolumeGrid_visiable = false"
           >{{ $t("HCFD.file.ok")}}</el-button
         >
       </div>
@@ -1872,10 +1872,10 @@
     </div> 
     <div class="Squareline  selecr">
          <el-form-item label="名称" :label-width="formLabelWidth2" >
-      <el-input value="PingYi" autocomplete="off"></el-input>
+      <el-input  v-model="outlineobj.scalarName" autocomplete="off"></el-input>
       </el-form-item>
          <el-form-item label="类型" :label-width="formLabelWidth2" >
-      <el-input value="PingYi" autocomplete="off"></el-input>
+      <el-input v-model="outlineobj.leixing" autocomplete="off"></el-input>
       </el-form-item>
             <el-form-item :label="$t('HCFD.results.scalar') " :label-width="formLabelWidth2">
       <el-select 
@@ -1884,7 +1884,7 @@
                   placeholder="select boundary"
                 >
                    <el-option
-                            v-for="scalar in volumScalars"
+                            v-for="scalar in bmScalars"
                             :key="scalar"
                             :label="scalar"
                             :value="scalar"
@@ -1896,7 +1896,7 @@
           <div class="line">
       <div class="linetext"> 标量集</div>
     </div> 
-       <el-form-item label="水平" :label-width="formLabelWidth2" >
+       <el-form-item label="颜色控制" :label-width="formLabelWidth2" >
       <el-input value="" autocomplete="off"></el-input>
       </el-form-item>
       <div class="disflex lheig34 liitem">
@@ -1915,10 +1915,10 @@
       <div class="linetext"> 范围</div>
     </div>
     <el-form-item label="最大范围" :label-width="formLabelWidth2" >
-      <el-input value="0" autocomplete="off"></el-input>
+      <el-input v-model="outlineobj.range1" autocomplete="off"></el-input>
       </el-form-item>
     <el-form-item label="最小范围" :label-width="formLabelWidth2" >
-      <el-input value="0" autocomplete="off"></el-input>
+      <el-input v-model="outlineobj.range0" autocomplete="off"></el-input>
       </el-form-item> 
   </el-form>
   <div slot="footer" class="dialog-footer">
@@ -2639,11 +2639,25 @@ export default {
           default(){
             return false
           }
+        },
+      ytdata: {
+          type: Object,
+          default () {
+            return {}
+          }
         }
     },
 
   data() {
     return {
+      // 云图参数
+        outlineobj:{
+       scalarName:'',
+        range0:'',
+        range1:'',
+        leixing:'',
+        bmScalars:[],
+     },
       // 折线图的参数
       zobj:{
       lineType: "Line",
@@ -3648,11 +3662,10 @@ hcfdparam(){
 setpnum(){
   let steplist=this.boundaryStep
   let len=steplist.length;
-  console.log(len);
   if(len==0){
      let params = {
             transCode: "AFT002",
-            pid: this.projectId,
+            pid:this.project.projectId,
             solverConfigId:this.solverConfigid,
           };
            request(params)
@@ -3668,7 +3681,42 @@ setpnum(){
   }
 
 },
-
+// 获取轮廓数据
+bStepok(){
+  console.log( this.project.projectId);
+  const params = {
+        transCode: 'AFT001',
+        pid:this.project.projectId,
+        solverConfigId:this.solverConfigid,
+        action:"ResultImport",
+        paramJson:'',
+        step:this.bStep,
+        scalarName:'',
+        level:'',
+        range0:'',
+        range1:'',
+        }
+        request(params)
+          .then((res) => { 
+         })
+          .catch((err) => {
+          })
+},
+// 获取轮廓数据
+outlinedata(){
+  sessionStorage.setItem("data",this.ytdata);
+  this.ytdata=sessionStorage.getItem("data")
+  console.log(this.ytdata)
+  this.outlineobj.scalarName=this.ytdata.scalarName;
+   this.outlineobj.range0=this.ytdata.range0;
+   this.outlineobj.range1=this.ytdata.range1;
+  let ress=this.ytdata.scalarNames;
+  this.outlineobj.bmScalars=ress.split(",");
+  console.log(this.outlineobj.bmScalars);
+  console.log('1111')
+   let types=this.ytdata.nameTypes;
+     console.log( types.split("#"));
+},
  //模块选择
   clickgeometry(e,index,key){
   
@@ -3763,6 +3811,7 @@ this.styX.left=e.clientX+'px';
         this.dialog.VolumeGrid_visiable = true;
        break;
       case 'five7-0':
+        this.outlinedata();
         this.dialog.contour_visiable = true;
        break;
         case 'five7-1':

+ 12 - 1
src/views/index/index.vue

@@ -7,7 +7,7 @@
                     
              </div> -->
         <div v-if="value2=='HCFDLab'">
-        <hcfd ref="hcfd" :objopp="objopp" :pid="pid" @fun="fun()" @changelines="changelines()" @linezhexian="linezhexian()" :elodingfalse="elodingfalse" @exlodingfalse="exlodingfalse" :femnum="femnum"></hcfd>
+        <hcfd ref="hcfd" :objopp="objopp" :ytdata="ytdata" :pid="pid" @fun="fun()" @changelines="changelines()" @linezhexian="linezhexian()" :elodingfalse="elodingfalse" @exlodingfalse="exlodingfalse" :femnum="femnum"></hcfd>
         </div>
           <div v-else-if="value2=='FEMLab(结构力学)'||value2=='FEMLab(结构力学)版本2'">
         <fem ref="fem" :femnum="femnum" :logs='logs' :pid="pid"></fem>
@@ -195,6 +195,7 @@ export default {
     return {
       tl1,tl2,tl3,tl4,tl5,tl6,tl7,tl8,tl9,tl10,
      tl11,tl12,tl13,tl14,tl15,tl16,
+     ytdata:{},
       active:'',
          restime:'',
          monitorHCFD:false,
@@ -668,6 +669,14 @@ let params = {
           this.$refs.TFileStream.imgtupian=true;
           this.$refs.TFileStream.fetchData(redata);
           this.$refs.monitor.container_show=false;
+          // 云图的参数返回 存储
+          if(redata.action=='ResultImport'){
+                 
+                  if(redata.msgType=="contour_param"){
+                       this.ytdata=redata;
+                  }
+
+          }
          
         return true;       
         }catch(error){
@@ -855,12 +864,14 @@ html,body{
   padding: 5px 20px;
   font-size: 20px;
   height: 30px !important;
+  z-index: 99;
 }
 .footerTitle div {
 
   display: flex;
   justify-content: space-around;
   align-items: center;
+
 }
 .footerTitle p {
   margin: 0;