5.12

src/views/index/HCFDLab/addtabs.vue

@@ -10,12 +10,10 @@
                         <el-checkbox
                           label="Solid"
                           v-model="ruleForm.solid_state"
-                          @change="ContourvalVolume()"
                         ></el-checkbox>
                         <el-checkbox
                           label="Sectional plane"
                            v-model="ruleForm.sectional_pLane_state"
-                          @change="ContourvalVolume()"
                         ></el-checkbox>
                </div>
                     </div>  
@@ -69,7 +67,7 @@
           <el-form-item label="标量" :label-width="formLabelWidth2">
               <el-select  v-model="ruleForm.variableName"  placeholder="请选择">
           <el-option
-            v-for="item in conlist"
+            v-for="item in variableNamearr1"
             :key="item.value"
             :label="item.name"
             :value="item.value"
@@ -104,6 +102,14 @@ export default {
           default () {
             return {}
           }
+          
+        },
+  variableNamearr:{
+          type: Array,
+          default () {
+            return {}
+          }
+          
         },
   },
         data(){
@@ -122,6 +128,7 @@ export default {
                 // secheck:'',
                 
                 // },
+                variableNamearr1:[],
                   formLabelWidth: '60px',
                     formLabelWidth2:'73px',
                     formLabelWidth4:'37px',
@@ -134,7 +141,15 @@ export default {
           ],
           con:'0',
             }
+        },
+        methods:{
+          getarrs(arr){
+              this.variableNamearr1=arr;
+       
+            //
+          }
         }
+       
 }
 </script>
 

src/views/index/HCFDLab/index.vue

@@ -2177,7 +2177,7 @@
     :name="item.name"
   >
     <!-- {{item.content}}:is=item.content   -->
-     <Addtabs ref="addtab"  :ruleForm="item.ruleForm"></Addtabs>
+     <Addtabs ref="addtabs" :variableNamearr="variableNamearr"  :ruleForm="item.ruleForm"></Addtabs>
   </el-tab-pane>
 </el-tabs>
 
@@ -2836,6 +2836,7 @@ export default {
       showHideState:'1',
       transparency:'',
     },
+    variableNamearr:[],
      vectorobj:{
        dataU:'r',
        dataV:'r',
@@ -3140,8 +3141,8 @@ export default {
              {value:'0',name:'平动'},
             {value:'1',name:'转动'},
           ],
-          directionlist:['both','forward','backward'],
-          direval:"both",
+          directionlist:['Both','Forward','Backward'],
+          direval:"Both",
           streamstylelist:['Line','Ribbon','Tube'],
           strsval:"line",
           ydval2:'0',
@@ -3611,9 +3612,10 @@ pointclick(){
  addTab(targetName) {
    this.target= targetName;
         let newTabName = ++this.tabIndex + '';
-        console.log(newTabName);
-      this.bStepok('',"SliceDisplayAdd '",newTabName)
-
+      //   console.log(newTabName);
+       this.bStepok('',"SliceDisplayAdd",newTabName)
+  let dataslicedisplay=JSON.parse(sessionStorage.getItem("dataslicedisplay"));
+   let data=JSON.parse(dataslicedisplay);
         this.editableTabs.push({
           title:newTabName,
           name: newTabName,
@@ -3621,18 +3623,18 @@ pointclick(){
             ruleForm:{
                 index:1,
                 type:"line", 
-                variableName:'1',
+                variableName:'r',
                 level:'',
                 normal_x:'',
                 normal_y :'',
                 normal_z:'',
-                position_x:'',
+                position_x:'1',
                 position_y:'',
                 position_z:'',
-                scalar_value_state:'',
-                solid_state:'',
-                sectional_pLane_state:'',
-                sectional_contour_state:'',
+                scalar_value_state:false,
+                solid_state:true,
+                sectional_pLane_state:true,
+                sectional_contour_state:true,
                 xrange:'0.0',
                 yrange:'0.0',
                 zrange:'0.0',
@@ -3640,12 +3642,39 @@ pointclick(){
                 },
 
         });
+         
+   this.variableNamearr=data.variableName.split(",");
+   let that=this;
+   that.$nextTick(()=>{
+      //  setTimeout(function(){  
+     that.$refs.addtabs.variableNamearr1=this.variableNamearr;
+      //  },1000)
+      // 
+      //  console.log(this.$refs.addtabs.variableNamearr1);
+   })
+  
+     let arr=this.editableTabs;
+    for(var i = 0; i < arr.length; i++){
+      arr[i].ruleForm.xrange=data.xrange;
+      arr[i].ruleForm.yrange=data.yrange;
+      arr[i].ruleForm.zrange=data.zrange;
+      arr[i].ruleForm.position_x=data.position_x;
+      arr[i].ruleForm.position_y=data.position_y;
+      arr[i].ruleForm.position_z=data.position_z;
+      arr[i].ruleForm.areaRange=data.areaRange;
+   
+
+    }
         this.editableTabsValue = newTabName;
       
       },
+      // 参数的编辑
+   
        //删除新增的tab
       removeclear(val){
-        console.log(val)
+       
+        this.tabIndex=--this.tabIndex 
+         console.log(this.tabIndex);
          let tabs = this.editableTabs;
         let activeName = this.editableTabsValue;
         if (activeName === val) {
@@ -3663,7 +3692,8 @@ pointclick(){
 
       },
       removeTab(targetName) {
-        
+         
+        this.tabIndex=--this.tabIndex 
          console.log(targetName);
         let tabs = this.editableTabs;
         let activeName = this.editableTabsValue;

src/views/index/index.vue

@@ -719,6 +719,18 @@ let params = {
           }else if(redata.action=='LineDisplay'){
             console.log(redata)
                        this.ytdata=redata;
+          }else if(redata.action=='SliceDisplayAdd'){
+            let dataslicedisplay=JSON.parse(redata.paramJson);
+            if(dataslicedisplay==null||JSON.stringify(dataslicedisplay)=='{}'){
+              
+            }else{
+              if(dataslicedisplay.msgType=='addPage_slice_param'){
+                  sessionStorage.setItem("dataslicedisplay",JSON.stringify(redata.paramJson));
+              }
+            
+              
+            }
+            
           }
          
         return true;