9.26

src/views/index/FEMLab/fem.vue

@@ -58,7 +58,7 @@
           </el-tab-pane>
            <!-- 求解控制 -->
                  <el-tab-pane label="求解控制" name="five">
-              <div class="imgzong" v-if="femnum=='FEM'">
+              <div class="imgzong" v-if="femnum=='FEMLab（结构力学）'">
              <div class="item1"  v-for="(item,index) in fexkz"  :key="'five-'+ index" :class="{activeOrange:active=='five-'+ index}" @click="clickgeometry($event,index,'five-'+ index)">
                 <el-tooltip class="item" effect="dark" :content="item.titlie" placement="bottom">
                         <el-image :src="item.icon" fit="cover" />   
@@ -94,7 +94,7 @@
              </div>
                </div>
             </div>
-             <div class="imgzong" v-if="femnum=='FEMLab2.0'">
+             <div class="imgzong" v-if="femnum=='FEMLab（结构力学）版本2'">
              <div class="item1"  v-for="(item,index) in fexkz6"  :key="'five11-'+ index" :class="{activeOrange:active=='five11-'+ index}" @click="clickgeometry($event,index,'five11-'+ index)">
                 <el-tooltip class="item" effect="dark" :content="item.titlie" placement="bottom">
                         <el-image :src="item.icon" fit="cover" />   
@@ -910,7 +910,7 @@
   <div class="selecr">
       <el-form>
        <el-form-item label="算法控制" :label-width="formLabelWidth5">
-      <el-select  @change="changest" v-model="parameterObj.solution.solver"  placeholder="请选择">
+      <el-select  @change="changest" v-model="parameterObj.solver.value"  placeholder="请选择">
     <el-option
       v-for="item in jlialist1"
       :key="item.value"
@@ -921,9 +921,9 @@
   </el-select>
    </el-form-item>
      <el-form-item label="非线性开关" :label-width="formLabelWidth5">
-       <el-radio-group v-model="parameterObj.solution.nlgeom">
-          <el-radio :label="0">开</el-radio>
-          <el-radio :label="1">关</el-radio>
+       <el-radio-group v-model="parameterObj.nlgeom.value">
+          <el-radio label="0">开</el-radio>
+          <el-radio label="1">关</el-radio>
         </el-radio-group>
    </el-form-item>
     <div class="line">
@@ -932,8 +932,8 @@
             <el-form-item label="结果文件名称" :label-width="formLabelWidth5">
       <el-input v-model="form.name" autocomplete="off"></el-input>
     </el-form-item>
-    <el-checkbox  v-model="parameterObj.static.dump_stiff">刚度矩阵</el-checkbox>
-    <el-checkbox    v-model="parameterObj.static.strain_o">节点应变</el-checkbox>
+    <el-checkbox  v-model="parameterObj.dump_stiff.value"   true-label="true" false-label="false">刚度矩阵</el-checkbox>
+    <el-checkbox    v-model="parameterObj.strain_o.value"   true-label="true" false-label="false">节点应变</el-checkbox>
       </el-form>
   </div>
       <div slot="footer" class="dialog-footer">
@@ -976,12 +976,12 @@
   </el-select>
    </el-form-item>
        <el-form-item label="特征值个数" :label-width="formLabelWidth6">
-      <el-input   v-model="parameterObj.solution.num_eigv" autocomplete="off"></el-input>
+      <el-input   v-model="parameterObj.num_eigv.value" autocomplete="off"></el-input>
     </el-form-item>
      <el-form-item label="质量耦合开关" :label-width="formLabelWidth6">
-       <el-radio-group    v-model="parameterObj.modes.coupled">
-          <el-radio :label="0">开</el-radio>
-          <el-radio :label="1">关</el-radio>
+       <el-radio-group    v-model="parameterObj.coupled.value">
+          <el-radio label="0">开</el-radio>
+          <el-radio label="1">关</el-radio>
         </el-radio-group>
    </el-form-item>
     <div class="line">
@@ -990,8 +990,8 @@
             <el-form-item label="结果文件名称" :label-width="formLabelWidth5">
       <el-input v-model="form.name" autocomplete="off"></el-input>
     </el-form-item>
-    <el-checkbox v-model="parameterObj.modes.dump_stiff">刚度矩阵</el-checkbox>
-    <el-checkbox v-model="parameterObj.modes.dump_mass">节点应变</el-checkbox>
+    <el-checkbox v-model="parameterObj.modes.dump_stiff.value"  true-label="true" false-label="false">刚度矩阵</el-checkbox>
+    <el-checkbox v-model="parameterObj.modes.dump_mass.value"  true-label="true" false-label="false" >节点应变</el-checkbox>
       </el-form>
   </div>
       <div slot="footer" class="dialog-footer">
@@ -1064,25 +1064,25 @@
   </el-select>
    </el-form-item>
    <el-form-item label="输入δβN" :label-width="formLabelWidth5">
-      <el-input   v-model="parameterObj.solution.alphad" autocomplete="off"></el-input>
+      <el-input   v-model="parameterObj.betad.value" autocomplete="off"></el-input>
     </el-form-item>
 <el-form-item label="输入αN" :label-width="formLabelWidth5">
-      <el-input    v-model="parameterObj.solution.betad" autocomplete="off"></el-input>
+      <el-input    v-model="parameterObj.alphad.value" autocomplete="off"></el-input>
     </el-form-item>
          <div class="line">
       <div class="linetext">分析步控制</div>
     </div> 
     <el-form-item label="总时间" :label-width="formLabelWidth5">
-      <el-input v-model="parameterObj.solution.num_steps" autocomplete="off"></el-input>
+      <el-input v-model="parameterObj.num_steps.value" autocomplete="off"></el-input>
     </el-form-item>
        <el-form-item label="时间步增量" :label-width="formLabelWidth5">
-      <el-input v-model="parameterObj.solution.dt_str" autocomplete="off"></el-input>
+      <el-input v-model="parameterObj.dt_str.value" autocomplete="off"></el-input>
     </el-form-item>
        <el-form-item label="写出频率" :label-width="formLabelWidth5">
-      <el-input  v-model="parameterObj.solution.freq" autocomplete="off"></el-input>
+      <el-input  v-model="parameterObj.freq.value" autocomplete="off"></el-input>
     </el-form-item>
       <el-form-item label="写出格式" :label-width="formLabelWidth5">
-      <el-select  @change="changest" v-model="parameterObj.solution.sort"  placeholder="请选择">
+      <el-select  @change="changest" v-model="parameterObj.sort.value"  placeholder="请选择">
     <el-option
       v-for="item in jlialist4"
       :key="item.value"
@@ -1096,11 +1096,11 @@
       <div class="linetext">输出控制</div>
     </div> 
             <el-form-item label="结果文件名称" :label-width="formLabelWidth5">
-      <el-input v-model="form.name" autocomplete="off"></el-input>
+      <el-input v-model="parameterObj.result_file.value" autocomplete="off"></el-input>
     </el-form-item>
-    <el-checkbox  v-model="parameterObj.transient.dump_stiff">刚度矩阵</el-checkbox>
-    <el-checkbox  v-model="parameterObj.transient.strain_o">节点应变</el-checkbox>
-        <el-checkbox v-model="parameterObj.transient.dump_mass">质量矩阵</el-checkbox>
+    <el-checkbox  v-model="parameterObj.dump_stiff.value"  true-label="true" false-label="false">刚度矩阵</el-checkbox>
+    <el-checkbox  v-model="parameterObj.strain_o.value"  true-label="true" false-label="false">节点应变</el-checkbox>
+        <el-checkbox v-model="parameterObj.dump_mass.value"  true-label="true" false-label="false">质量矩阵</el-checkbox>
       </el-form>
   </div>
       <div slot="footer" class="dialog-footer">
@@ -1290,24 +1290,46 @@ export default {
         left:''
       },
          parameterObj: {
-        solution: {
-          f_static: "true",
-          solver: "",
-          eigenv: "false",
-          num_eigv: "",
-          nlgeom: "",
-          eigv_method: "",
-          f_transient: "",
-          alphad: "",
-          betad: "",
-          gam_newmark: "",
-          bet_newmark: "",
-          sid: "",
-          num_steps: "",
-          dt_str: "",
-          freq: "",
-          sort: "",
-        },
+           alphad: {key: 'alphad', order: '2', value: '0.0'},
+          bet_newmark: {key: 'bet_newmark', order: '2', value: null},
+          betad: {key: 'betad', order: '2', value: ''},
+          coupled: {key: 'coupled', order: '1', value: '0'},
+          dt_str: {key: 'dt_str', order: '2', value: '0.0'},
+          dump_mass: {key: 'dump_mass', order: '1', value: 'true'},
+          dump_stiff: {key: 'dump_stiff', order: '1', value: 'true'},
+          eigenv: {key: 'eigenv', order: '3', value: 'false'},
+          eigv_method: {key: 'eigv_method', order: '1', value: null},
+          f_static: {key: 'static', order: '3', value: 'false'},
+          f_transient: {key: 'transient', order: '1', value: ''},
+          freq: {key: 'freq', order: '1', value: ''},
+          gam_newmark: {key: 'gam_newmark', order: '2', value: null},
+          mesh_inp: {key: 'mesh_inp', order: '3', value: null},
+          nlgeom: {key: 'nlgeom', order: '1', value: ''},
+          num_eigv: {key: 'num_eigv', order: '1', value: null},
+          num_steps: {key: 'num_steps', order: '1', value: ''},
+          result_file: {key: 'result_file', order: '3', value: null},
+          sid: {key: 'SID', order: '1', value: ''},
+          solver: {key: 'solver', order: '1', value: ''},
+          sort: {key: 'sort', order: '1', value: ''},
+          strain_o: {key: 'strain_o', order: '1', value: 'false'},
+        // solution: {
+        //   f_static: "true",
+        //   solver: "",
+        //   eigenv: "false",
+        //   num_eigv: "",
+        //   nlgeom: "",
+        //   eigv_method: "",
+        //   f_transient: "",
+        //   alphad: "",
+        //   betad: "",
+        //   gam_newmark: "",
+        //   bet_newmark: "",
+        //   sid: "",
+        //   num_steps: "",
+        //   dt_str: "",
+        //   freq: "",
+        //   sort: "",
+        // },
         static: {
           dump_stiff: false,
           strain_o: false,
@@ -1540,9 +1562,33 @@ export default {
     }
   },
   mounted(){
+
   console.log(this.femnum)
   },
   methods:{
+    //数据加载参数配置obj
+    femchange(obj,solverConfigid){
+       this.parameterObj = JSON.parse(obj);//JSON.parse(obj);
+      sessionStorage.setItem("res", obj);
+      this.solverConfigid=solverConfigid;
+    },
+    //更新参数配置
+femparam(){
+  const params = {
+        transCode: 'C00004', 
+        solverConfigid: this.solverConfigid,
+        parameterObj: JSON.stringify(this.parameterObj),
+        }
+        request(params)
+          .then((res) => { 
+          Message({
+                  type: "success",
+                  message: "参数上传，成功",
+                });
+         })
+          .catch((err) => {
+          })
+},
       //  
       changest(){
 

src/views/index/index.vue

@@ -9,7 +9,7 @@
         <div v-if="value2=='HCFDLab'">
         <hcfd ref="hcfd" :objopp="objopp" ></hcfd>
         </div>
-          <div v-else-if="value2=='FEM'||value2=='FEMLab2.0'">
+          <div v-else-if="value2=='FEMLab（结构力学）'||value2=='FEMLab（结构力学）版本2'">
         <fem ref="fem" :femnum="femnum" ></fem>
         </div>
            <!-- <div v-else-if="value2=='FEMLab2.0'">
@@ -173,8 +173,8 @@ export default {
       value0:'ADI.SimWork', 
     options2:[
     {value: 'HCFDLab',label: 'HCFDLab'},
-     { value: 'FEM',label: 'FEMLab(结构力学)'},
-    { value: 'FEMLab2.0',label: 'FEMLab(结构力学)2.0'},
+     { value: 'FEMLab（结构力学）',label: 'FEMLab（结构力学）'},
+    { value: 'FEMLab（结构力学）版本2',label: 'FEMLab（结构力学）版本2'},
     { value: 'adi',label: 'adi'},
         ],
       value2:'HCFDLab',
@@ -214,10 +214,17 @@ methods:{
           .then((res) => { 
         this.objopp=res.parameterObj;
         if(val=='HCFDLab'){
-          console.log(5555);
            this.$nextTick(()=>{
           this.$refs.hcfd.hcfdchange(this.objopp,res.solverConfigid);
            })   
+        }else if(val=='FEMLab（结构力学）'){
+             this.$nextTick(()=>{
+               this.$refs.fem.femchange(res.parameterObj,res.solverConfigid);
+           })   
+         
+
+        }else{
+          
         }
           })
           .catch((err) => {