Parcourir la source

页面初始化bug修改

tangjunhao il y a 6 mois
Parent
commit
ceb5b9ac6e

+ 41 - 11
src/views/home.vue

@@ -1100,7 +1100,7 @@
             </template>
             <div class="numberinput lefttext ">
               <el-form>
-                <el-tabs tab-position="left" class="demo-tabs" v-model="activeadf" @tab-click="adfhandleClick">
+                <el-tabs tab-position="left" class="demo-tabs" v-model="activeadf" @tab-click="adfhandleClick3">
               <el-tab-pane label="Xfoil" name="Xfoil">
                 <Xfoil ref="Xfoilref"/>
               </el-tab-pane>
@@ -2574,10 +2574,13 @@ const initoptimize = () => {
     console.log('2:', res2.checked);
     console.log('3:', res3.checked);
 
-    Joptimizeref.value.getoptimizeAssign(res1);
-    Doptimizeref.value.getDoptimizeAssign(res2);
-    Toptimizeref.value.getToptimizeAssign(res3);
-
+    if(res1.hasOwnProperty('eid')){
+      Joptimizeref.value.getoptimizeAssign(res1);
+    }else if(res3.hasOwnProperty('grid')){
+      Toptimizeref.value.getToptimizeAssign(res3);
+    }else if(res2.hasOwnProperty('suid')){
+      Doptimizeref.value.getDoptimizeAssign(res2);
+    }
     
     // 根据返回值来设置 activeadf
     if (res1.checked === 1) {
@@ -2610,8 +2613,11 @@ const initcstffds = () => {
     console.log('1:', res1.checked);
     console.log('2:', res2.checked);
 
-    Cstref.value.getcstAssign(res1);
-    Ffdref.value.getffdsAssign(res2);
+    if(res1.hasOwnProperty('cstid')){
+      Cstref.value.getcstAssign(res1);
+    }else if(res2.hasOwnProperty("ffdid")){
+      Ffdref.value.getffdsAssign(res2);
+    }
     
     // 根据返回值来设置 activeadf
     if (res1.checked === 1) {
@@ -2642,8 +2648,11 @@ const intxfoiladflow = () => {
     console.log('1:', res1.checked);
     console.log('2:', res2.checked);
 
-    Xfoilref.value.getxfoilAssign(res1);
-    ADflowref.value.getadflowAssign(res2);
+    if(res.hasOwnProperty("xfid")){
+      Xfoilref.value.getxfoilAssign(res1);
+    }else if(res.hasOwnProperty("adid")){
+      ADflowref.value.getadflowAssign(res2);
+    }
     
     // 根据返回值来设置 activeadf
     if (res1.checked === 1) {
@@ -3849,6 +3858,27 @@ const getCstFfdsave = (activeadf) => {
   }
 }
 
+const adfhandleClick3=(tab,event)=>{
+  console.log('表单切换',tab.props.label);
+  activeadf.value=tab.props.label;
+
+  if(tab.props.name === 'Xfoil'){
+    nextTick(() => {
+      // 确保 ref 已经初始化
+      if (Xfoilref.value) {
+        console.log('pid-0:',pid.value)
+        Xfoilref.value.getxfoil(pid.value);
+      }
+    });
+  }else if(tab.props.name === 'ADflow'){
+    nextTick(() => {
+      // 确保 ref 已经初始化
+      if (ADflowref.value) {
+        ADflowref.value.getadflow(pid.value);
+      }
+    });
+  }
+}
 
 // xfoil保存
 const xfoilok=()=>{
@@ -3866,9 +3896,9 @@ const adflowok=()=>{
 
 // xfoiladflow保存
 const getXfoilAdflowsave = (activeadf) => {
-  if (activeadf == 'XFOIL') {
+  if (activeadf == 'Xfoil') {
     xfoilok();
-  } else if (activeadf == 'ADFLOW') {
+  } else if (activeadf == 'ADflow') {
     adflowok();
   }
 }

+ 1 - 0
src/views/titlecomponent/ADflow.vue

@@ -436,6 +436,7 @@ const getadflow = (id) => {
 }
 
 const getadflowAssign = (data) => {
+  pid.value = data.pid
   adflowvalue.value.gridfile = data.gridfile
   adflowvalue.value.proname = data.proname
   adflowvalue.value.isairfoil = data.isairfoil

+ 1 - 0
src/views/titlecomponent/Doptimize.vue

@@ -277,6 +277,7 @@ const getDoptimize = (id) => {
 }
 
 const getDoptimizeAssign = (data) => {
+  pid.value = data.pid
   suid.value = data.suid;
   youhua.value.algorithm = data.algorithm;
   youhua.value.iout = data.iout;

+ 1 - 0
src/views/titlecomponent/Joptimize.vue

@@ -142,6 +142,7 @@ const getoptimize = (id) => {
 }
 
 const getoptimizeAssign = (data) => {
+  pid.value = data.pid
   eid.value = data.eid;
   youhua.value.algorithm = data.algorithm
   youhua.value.popsize = Number(data.popsize); // 将id属性转换为数字

+ 7 - 3
src/views/titlecomponent/Xfoil.vue

@@ -53,7 +53,7 @@
           </el-table-column>
           <el-table-column prop="value" label="参数值">
             <template #default="{ row }">
-              <el-input v-model.number="row.value" @change="handleEdit(row)" />
+              <el-input v-model="row.value" type="number" />
             </template>
           </el-table-column>
           <el-table-column prop="flag" label="启用" width="100">
@@ -74,8 +74,8 @@
       <div class="eldesign classtable" style="margin-top: 10px">
         <el-form-item label="计算完成:" :label-width="formLabelWidth1">
           <el-radio-group v-model="analyzed">
-            <el-radio label="1">是</el-radio>
-            <el-radio label="0">否</el-radio>
+            <el-radio label="1" value=1>是</el-radio>
+            <el-radio label="0" value=0>否</el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item label="迭代次数:" :label-width="formLabelWidth1">
@@ -278,6 +278,7 @@ const convertToStringArray = (result, Data) => {
 
 const getxfoil = (id) => {
   pid.value = id;
+  console.log('pid-1:',pid.value)
   const params = {
     transCode: "MDO0046",
     pid: pid.value,
@@ -293,6 +294,8 @@ const getxfoil = (id) => {
 }
 
 const getxfoilAssign = (data) => {
+  // console.log('getxfoilAssign-data:', data);
+  pid.value = data.pid;
   xfid.value = data.xfid;
   xfoilvalue.value.iter = data.iter;
   xfoilvalue.value.ppar = data.ppar;
@@ -305,6 +308,7 @@ const getxfoilAssign = (data) => {
 }
 
 const getxfoilsave = () => {
+  console.log("pid:",pid.value);
   const params = {
     transCode: "MDO0047",
     pid: pid.value,

+ 1 - 0
src/views/titlecomponent/csts.vue

@@ -203,6 +203,7 @@ const getcst = (id) => {
 }
 
 const getcstAssign = (data) => {
+  pid.value = data.pid
   cstid.value = data.cstid;
   cstn.value = data.cstn;
   cstvalue.value.uppern1 = data.uppern1;

+ 1 - 0
src/views/titlecomponent/ffds.vue

@@ -222,6 +222,7 @@ const getffds = (id) => {
 };
 
 const getffdsAssign = (data) => {
+  pid.value = data.pid
   ffdid.value = data.ffdid;
   ffdvalue.value.fname = data.fname;
   ffdvalue.value.nx = data.nx;