|
@@ -1100,7 +1100,7 @@
|
|
</template>
|
|
</template>
|
|
<div class="numberinput lefttext ">
|
|
<div class="numberinput lefttext ">
|
|
<el-form>
|
|
<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">
|
|
<el-tab-pane label="Xfoil" name="Xfoil">
|
|
<Xfoil ref="Xfoilref"/>
|
|
<Xfoil ref="Xfoilref"/>
|
|
</el-tab-pane>
|
|
</el-tab-pane>
|
|
@@ -2574,10 +2574,13 @@ const initoptimize = () => {
|
|
console.log('2:', res2.checked);
|
|
console.log('2:', res2.checked);
|
|
console.log('3:', res3.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
|
|
// 根据返回值来设置 activeadf
|
|
if (res1.checked === 1) {
|
|
if (res1.checked === 1) {
|
|
@@ -2610,8 +2613,11 @@ const initcstffds = () => {
|
|
console.log('1:', res1.checked);
|
|
console.log('1:', res1.checked);
|
|
console.log('2:', res2.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
|
|
// 根据返回值来设置 activeadf
|
|
if (res1.checked === 1) {
|
|
if (res1.checked === 1) {
|
|
@@ -2642,8 +2648,11 @@ const intxfoiladflow = () => {
|
|
console.log('1:', res1.checked);
|
|
console.log('1:', res1.checked);
|
|
console.log('2:', res2.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
|
|
// 根据返回值来设置 activeadf
|
|
if (res1.checked === 1) {
|
|
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保存
|
|
// xfoil保存
|
|
const xfoilok=()=>{
|
|
const xfoilok=()=>{
|
|
@@ -3866,9 +3896,9 @@ const adflowok=()=>{
|
|
|
|
|
|
// xfoiladflow保存
|
|
// xfoiladflow保存
|
|
const getXfoilAdflowsave = (activeadf) => {
|
|
const getXfoilAdflowsave = (activeadf) => {
|
|
- if (activeadf == 'XFOIL') {
|
|
|
|
|
|
+ if (activeadf == 'Xfoil') {
|
|
xfoilok();
|
|
xfoilok();
|
|
- } else if (activeadf == 'ADFLOW') {
|
|
|
|
|
|
+ } else if (activeadf == 'ADflow') {
|
|
adflowok();
|
|
adflowok();
|
|
}
|
|
}
|
|
}
|
|
}
|