|
@@ -721,7 +721,7 @@
|
|
|
<!-- Xfiol改版后的 -->
|
|
|
<el-dialog v-model="dialog.Xfiol" align-center :modal="false" :close-on-click-modal="false"
|
|
|
:append-to-body="true" draggable :fullscreen="false" :modal-append-to-body="false"
|
|
|
- modal-class="summary-dlg2 summary-dlg" :before-close="handleClose" width="675"
|
|
|
+ modal-class="summary-dlg2 summary-dlg" :before-close="handleClose" width="540"
|
|
|
class="dialog_class bgcolor tianjia colortext sel">
|
|
|
|
|
|
<template #header="{ titleId, titleClass }">
|
|
@@ -867,7 +867,7 @@
|
|
|
<!-- 云图/等值线图 -->
|
|
|
<el-dialog v-model="dialog.clouddialog" align-center :modal="false" :close-on-click-modal="false"
|
|
|
:append-to-body="true" draggable :fullscreen="false" :modal-append-to-body="false" modal-class="summary-dlg"
|
|
|
- :before-close="handleClose" width="800" class="dialog_style bgcolor tianjia sel cloudChart" style="height: 72%;">
|
|
|
+ :before-close="handleClose" width="700" class="dialog_style bgcolor tianjia sel cloudChart" style="height: 500px;overflow: auto;">
|
|
|
<template #header="{ titleId, titleClass }">
|
|
|
<div class="my-header ">
|
|
|
<h4 :id="titleId" :class="titleClass">云图/等值线显示</h4>
|
|
@@ -885,7 +885,10 @@
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
</div>
|
|
|
- <cloudChart/>
|
|
|
+ <div style="height: 400px;overflow: auto;">
|
|
|
+ <cloudChart/>
|
|
|
+ </div>
|
|
|
+
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
<!-- 云图二级弹窗 -->
|
|
@@ -899,8 +902,8 @@
|
|
|
:modal-append-to-body="false"
|
|
|
modal-class="summary-dlg"
|
|
|
:before-close="handleClose"
|
|
|
- width="600"
|
|
|
- class="dialog_class bgcolor tianjia"
|
|
|
+ width="500"
|
|
|
+ class="dialog_class bgcolor tianjia "
|
|
|
|
|
|
>
|
|
|
<template #header="{ titleId, titleClass }">
|
|
@@ -967,7 +970,7 @@
|
|
|
<!-- 气动分析Xfoil、ADflow -->
|
|
|
<el-dialog v-model="dialog.XfAD" align-center :modal="false" :close-on-click-modal="false"
|
|
|
:append-to-body="true" draggable :fullscreen="false" :modal-append-to-body="false" modal-class="summary-dlg"
|
|
|
- :before-close="handleClose" width="860" class="dialog_class bgcolor tianjia sel colortext">
|
|
|
+ :before-close="handleClose" width="700" class="dialog_class bgcolor tianjia sel colortext">
|
|
|
|
|
|
<template #header="{ titleId, titleClass }">
|
|
|
<div class="my-header ">
|
|
@@ -1000,7 +1003,7 @@
|
|
|
<!-- CST -->
|
|
|
<el-dialog v-model="dialog.CSTt" align-center :modal="false" :close-on-click-modal="false"
|
|
|
:append-to-body="true" draggable :fullscreen="false" :modal-append-to-body="false" modal-class="summary-dlg"
|
|
|
- :before-close="handleClose" width="840" class="dialog_class bgcolor colortext tianjia sel">
|
|
|
+ :before-close="handleClose" width="730" class="dialog_class bgcolor colortext tianjia sel">
|
|
|
|
|
|
<template #header="{ titleId, titleClass }">
|
|
|
<div class="my-header ">
|
|
@@ -1042,7 +1045,7 @@
|
|
|
<!-- 气动分析CST、FFD -->
|
|
|
<el-dialog v-model="dialog.cstffd" align-center :modal="false" :close-on-click-modal="false"
|
|
|
:append-to-body="true" draggable :fullscreen="false" :modal-append-to-body="false" modal-class="summary-dlg"
|
|
|
- :before-close="handleClose" width="1000" class="dialog_class bgcolor tianjia sel colortext">
|
|
|
+ :before-close="handleClose" width="900" class="dialog_class bgcolor tianjia sel colortext">
|
|
|
|
|
|
<template #header="{ titleId, titleClass }">
|
|
|
<div class="my-header ">
|
|
@@ -1196,7 +1199,7 @@
|
|
|
<!-- 单独的ADflow -->
|
|
|
<el-dialog v-model="dialog.isADflow" align-center :modal="false" :close-on-click-modal="false"
|
|
|
:append-to-body="true" draggable :fullscreen="false" :modal-append-to-body="false" modal-class="summary-dlg"
|
|
|
- :before-close="handleClose" width="630" class="dialog_class bgcolor tianjia sel colortext">
|
|
|
+ :before-close="handleClose" width="540" class="dialog_class bgcolor tianjia sel colortext">
|
|
|
|
|
|
<template #header="{ titleId, titleClass }">
|
|
|
<div class="my-header ">
|
|
@@ -1319,8 +1322,7 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="main_model" v-show='flowshow'>
|
|
|
- <vuefindex ref="vuefval" :Xfiol="dialog.Xfiol" :jboptimizer="dialog.jboptimizer"
|
|
|
- :optimizer="dialog.optimizer" @optimizerfalse="optimizerfalse($event)"></vuefindex>
|
|
|
+ <vuefindex ref="vuefval" @optimizerfalse="optimizerfalse($event)"></vuefindex>
|
|
|
</div>
|
|
|
<div class="maxh221">
|
|
|
<!-- 中间部分 -->
|
|
@@ -1776,6 +1778,10 @@ let input3=ref()
|
|
|
let eid = ref('');//进步优化器的eid
|
|
|
let logs = ref("");
|
|
|
let pid = ref("");
|
|
|
+let pythonwid = ref();
|
|
|
+let youhuaqiwid = ref();
|
|
|
+let canshuhuawid = ref();
|
|
|
+let qidongyouhuawid = ref();
|
|
|
let fid = ref('');
|
|
|
let conid = ref('');
|
|
|
let tableval = ref();
|
|
@@ -2243,6 +2249,7 @@ const handleClick = (tab, event) => {
|
|
|
|
|
|
tabactive.value = tab.props.name;
|
|
|
if (tabactive.value == 'User') {
|
|
|
+ vuefval.value.logToObject1();
|
|
|
router.replace({ path: '/' })
|
|
|
} else {
|
|
|
|
|
@@ -2316,37 +2323,39 @@ const handleNodeClick = (data) => {
|
|
|
|
|
|
const optimizerfalse = (val) => {
|
|
|
console.log('双击',val);
|
|
|
- if (val == '优化器') {
|
|
|
+ const name = val.name;
|
|
|
+ const wid = val.wid;
|
|
|
+ if (name == '优化器') {
|
|
|
// dialog.value.optimizer = true;
|
|
|
activeadf.value='代理优化器';
|
|
|
- initoptimize();
|
|
|
+ initoptimize(wid);
|
|
|
dialog.value.optgroup = true;
|
|
|
- } else if (val == '参数化') {
|
|
|
+ } else if (name == '参数化') {
|
|
|
activeadf.value='CST';
|
|
|
- initcstffds();
|
|
|
+ initcstffds(wid);
|
|
|
dialog.value.cstffd = true;
|
|
|
- }else if (val == '气动分析') {
|
|
|
+ }else if (name == '气动分析') {
|
|
|
activeadf.value='Xfoil'
|
|
|
- intxfoiladflow();
|
|
|
+ intxfoiladflow(wid);
|
|
|
dialog.value.XfAD = true;
|
|
|
- } else if (val == '进化优化器') {
|
|
|
+ } else if (name == '进化优化器') {
|
|
|
activeadf.value='进化优化器';
|
|
|
dialog.value.jboptimizer = true;
|
|
|
nextTick(() => {
|
|
|
// 确保 ref 已经初始化
|
|
|
if (Joptimizeref.value) {
|
|
|
// 调用 Joptimize 的 getoptimize 方法
|
|
|
- Joptimizeref.value.getoptimize(pid.value);
|
|
|
+ Joptimizeref.value.getoptimize(pid.value,wid);
|
|
|
}
|
|
|
});
|
|
|
- } else if (val == '代理优化器') {
|
|
|
+ } else if (name == '代理优化器') {
|
|
|
activeadf.value='代理优化器';
|
|
|
// dialog.value.optgroup = true;
|
|
|
dialog.value.dboptimizer = true;
|
|
|
nextTick(() => {
|
|
|
// 确保 ref 已经初始化
|
|
|
if (Doptimizeref.value) {
|
|
|
- Doptimizeref.value.getDoptimize(pid.value);
|
|
|
+ Doptimizeref.value.getDoptimize(pid.value,wid);
|
|
|
}
|
|
|
});
|
|
|
}
|
|
@@ -2355,67 +2364,67 @@ const optimizerfalse = (val) => {
|
|
|
// dialog.value.Xfiol = true;
|
|
|
|
|
|
// }
|
|
|
- else if(val == '梯度优化器'){
|
|
|
+ else if(name == '梯度优化器'){
|
|
|
activeadf.value='梯度优化器';
|
|
|
dialog.value.tboptimizer = true;
|
|
|
nextTick(() => {
|
|
|
// 确保 ref 已经初始化
|
|
|
if (Toptimizeref.value) {
|
|
|
- Toptimizeref.value.getToptimize(pid.value);
|
|
|
+ Toptimizeref.value.getToptimize(pid.value,wid);
|
|
|
}
|
|
|
});
|
|
|
- }else if(val == 'CST'){
|
|
|
+ }else if(name == 'CST'){
|
|
|
/// dialog.value.CSTt = true;
|
|
|
activeadf.value='CST';
|
|
|
dialog.value.CSTt = true;
|
|
|
nextTick(() => {
|
|
|
// 确保 ref 已经初始化
|
|
|
if (Cstref.value) {
|
|
|
- Cstref.value.getcst(pid.value);
|
|
|
+ Cstref.value.getcst(pid.value,wid);
|
|
|
}
|
|
|
});
|
|
|
- }else if(val == 'FFD'){
|
|
|
+ }else if(name == 'FFD'){
|
|
|
/// dialog.value.CSTt = true;
|
|
|
activeadf.value='FFD';
|
|
|
dialog.value.ffdt = true;
|
|
|
nextTick(() => {
|
|
|
// 确保 ref 已经初始化
|
|
|
if (Ffdref.value) {
|
|
|
- Ffdref.value.getffds(pid.value);
|
|
|
+ Ffdref.value.getffds(pid.value,wid);
|
|
|
}
|
|
|
});
|
|
|
}
|
|
|
- else if(val == 'ADflow'){
|
|
|
+ else if(name == 'ADflow'){
|
|
|
// adfhandleClick();
|
|
|
activeadf.value='ADflow';
|
|
|
dialog.value.isADflow = true;
|
|
|
nextTick(() => {
|
|
|
// 确保 ref 已经初始化
|
|
|
if (ADflowref.value) {
|
|
|
- ADflowref.value.getadflow(pid.value);
|
|
|
+ ADflowref.value.getadflow(pid.value,wid);
|
|
|
}
|
|
|
});
|
|
|
- }else if(val == 'Xfoil'){
|
|
|
+ }else if(name == 'Xfoil'){
|
|
|
// activeadf.value='Xfiol';
|
|
|
dialog.value.Xfiol = true;
|
|
|
nextTick(() => {
|
|
|
// 确保 ref 已经初始化
|
|
|
if (Xfoilref.value) {
|
|
|
- Xfoilref.value.getxfoil(pid.value);
|
|
|
+ Xfoilref.value.getxfoil(pid.value,wid);
|
|
|
}
|
|
|
});
|
|
|
- }else if(val == 'TACS'){
|
|
|
+ }else if(name == 'TACS'){
|
|
|
dialog.value.Taxs = true;
|
|
|
- }else if(val == '模版'){
|
|
|
+ }else if(name == '模版'){
|
|
|
dialog.value.optgroup = true;
|
|
|
activeadf.value='代理优化器';
|
|
|
- }else if(val == 'Python'){
|
|
|
+ }else if(name == 'Python'){
|
|
|
dialog.value.Pythonshow = true;
|
|
|
- initPython();
|
|
|
- }else if(val == 'FUM to FEM'){
|
|
|
+ initPython(wid);
|
|
|
+ }else if(name == 'FUM to FEM'){
|
|
|
dialog.value.fsidialog = true;
|
|
|
|
|
|
- }else if(val == 'Flight'){
|
|
|
+ }else if(name == 'Flight'){
|
|
|
dialog.value.flightdialog = true;
|
|
|
|
|
|
}
|
|
@@ -2436,18 +2445,22 @@ const optimizerfalse = (val) => {
|
|
|
}
|
|
|
|
|
|
// 优化器窗口初始化
|
|
|
-const initoptimize = () => {
|
|
|
+const initoptimize = (nowid) => {
|
|
|
+ youhuaqiwid.value = nowid;
|
|
|
const params1 = {
|
|
|
transCode:'MDO0018',
|
|
|
pid: pid.value,
|
|
|
+ wid: youhuaqiwid.value
|
|
|
}
|
|
|
const params2 = {
|
|
|
transCode:'MDO0031',
|
|
|
pid: pid.value,
|
|
|
+ wid: youhuaqiwid.value
|
|
|
}
|
|
|
const params3 = {
|
|
|
transCode:'MDO0033',
|
|
|
pid: pid.value,
|
|
|
+ wid: youhuaqiwid.value
|
|
|
}
|
|
|
Promise.all([
|
|
|
request(params1),
|
|
@@ -2486,14 +2499,17 @@ const initoptimize = () => {
|
|
|
}
|
|
|
|
|
|
// CST/FFD窗口初始化
|
|
|
-const initcstffds = () => {
|
|
|
+const initcstffds = (nowid) => {
|
|
|
+ canshuhuawid.value = nowid;
|
|
|
const params1 = {
|
|
|
transCode:'MDO0040',
|
|
|
pid: pid.value,
|
|
|
+ wid: canshuhuawid.value
|
|
|
}
|
|
|
const params2 = {
|
|
|
transCode:'MDO0043',
|
|
|
pid: pid.value,
|
|
|
+ wid: canshuhuawid.value
|
|
|
}
|
|
|
Promise.all([
|
|
|
request(params1),
|
|
@@ -2521,14 +2537,17 @@ const initcstffds = () => {
|
|
|
}
|
|
|
|
|
|
// Xfoil/ADflow窗口初始化
|
|
|
-const intxfoiladflow = () => {
|
|
|
+const intxfoiladflow = (nowid) => {
|
|
|
+ qidongyouhuawid.value = nowid;
|
|
|
const params1 = {
|
|
|
transCode:'MDO0046',
|
|
|
pid: pid.value,
|
|
|
+ wid: qidongyouhuawid.value
|
|
|
}
|
|
|
const params2 = {
|
|
|
transCode:'MDO0049',
|
|
|
pid: pid.value,
|
|
|
+ wid: qidongyouhuawid.value
|
|
|
}
|
|
|
Promise.all([
|
|
|
request(params1),
|
|
@@ -2556,11 +2575,13 @@ const intxfoiladflow = () => {
|
|
|
}
|
|
|
|
|
|
// Python窗口初始化
|
|
|
-const initPython = () => {
|
|
|
+const initPython = (nowid) => {
|
|
|
console.log('Pythonchushihua');
|
|
|
+ pythonwid.value = nowid;
|
|
|
const param = {
|
|
|
transCode: 'MDO0036',
|
|
|
pid: pid.value,
|
|
|
+ wid: pythonwid.value
|
|
|
};
|
|
|
|
|
|
request(param).then((res) => {
|
|
@@ -2571,7 +2592,7 @@ const initPython = () => {
|
|
|
textarea1.value = res.ptython;
|
|
|
}
|
|
|
}).catch((err) => {
|
|
|
- console.error('请求失败:', err);
|
|
|
+ console.error('Python内容初始化失败');
|
|
|
});
|
|
|
};
|
|
|
|
|
@@ -2581,12 +2602,16 @@ const pythonSubmit = () => {
|
|
|
const param = {
|
|
|
transCode:'MDO0037',
|
|
|
pid: pid.value,
|
|
|
+ wid: pythonwid.value,
|
|
|
python: textarea1.value,
|
|
|
}
|
|
|
request(param).then((res) => {
|
|
|
- console.log('Python确认按钮提交:', res);
|
|
|
+ ElMessage({
|
|
|
+ message: '保存成功',
|
|
|
+ type: 'success',
|
|
|
+ })
|
|
|
}).catch((err) => {
|
|
|
- console.error('请求失败:', err);
|
|
|
+ ElMessage.error('保存失败')
|
|
|
});
|
|
|
}
|
|
|
|
|
@@ -2979,9 +3004,11 @@ const curveLine2 = () => {
|
|
|
}
|
|
|
request(params)
|
|
|
.then((res) => {
|
|
|
- curvedata.value = JSON.stringify(res.rows);
|
|
|
- // console.log(curvedata.value);
|
|
|
- processMonitor1ref.value.getshuju(curvedata.value);
|
|
|
+ if (res.rows && res.rows.length > 0) {
|
|
|
+ curvedata.value = JSON.stringify(res.rows);
|
|
|
+ // console.log(curvedata.value);
|
|
|
+ processMonitor1ref.value.getshuju(curvedata.value);
|
|
|
+ }
|
|
|
})
|
|
|
.catch((err) => {
|
|
|
ElMessage.error(err.returnMsg)
|
|
@@ -2995,12 +3022,16 @@ const curveLine3 = () => {
|
|
|
}
|
|
|
request(params)
|
|
|
.then((res) => {
|
|
|
- curvedata.value = JSON.stringify(res.rows);
|
|
|
- // console.log(curvedata.value);
|
|
|
- processMonitor2ref.value.getshuju(curvedata.value);
|
|
|
+ // 检查返回的数据是否为空
|
|
|
+ if (res.rows && res.rows.length > 0) {
|
|
|
+ curvedata.value = JSON.stringify(res.rows);
|
|
|
+ // console.log(curvedata.value);
|
|
|
+ processMonitor2ref.value.getshuju(curvedata.value);
|
|
|
+ }
|
|
|
})
|
|
|
.catch((err) => {
|
|
|
- ElMessage.error(err.returnMsg)
|
|
|
+ // 错误处理
|
|
|
+ ElMessage.error(err.returnMsg);
|
|
|
})
|
|
|
}
|
|
|
|
|
@@ -3390,13 +3421,13 @@ const devise = () => {
|
|
|
request(params)
|
|
|
.then((res) => {
|
|
|
ElMessage({
|
|
|
- message: res.returnMsg,
|
|
|
+ message: '设计变量保存成功',
|
|
|
type: 'success',
|
|
|
})
|
|
|
getissue();
|
|
|
})
|
|
|
.catch((err) => {
|
|
|
- ElMessage.error(err.returnMsg)
|
|
|
+ ElMessage.error('设计变量保存失败')
|
|
|
})
|
|
|
}
|
|
|
//约束的添加restrain
|
|
@@ -3409,13 +3440,13 @@ const restrain = () => {
|
|
|
request(params)
|
|
|
.then((res) => {
|
|
|
ElMessage({
|
|
|
- message: res.returnMsg,
|
|
|
+ message: '约束条件保存成功',
|
|
|
type: 'success',
|
|
|
})
|
|
|
getyueshu();
|
|
|
})
|
|
|
.catch((err) => {
|
|
|
- ElMessage.error(err.returnMsg)
|
|
|
+ ElMessage.error('约束条件保存失败')
|
|
|
})
|
|
|
}
|
|
|
//优化目标接口
|
|
@@ -3428,13 +3459,13 @@ const funlistaa = () => {
|
|
|
request(params)
|
|
|
.then((res) => {
|
|
|
ElMessage({
|
|
|
- message: res.returnMsg,
|
|
|
+ message: '优化目标保存成功',
|
|
|
type: 'success',
|
|
|
})
|
|
|
getmub();
|
|
|
})
|
|
|
.catch((err) => {
|
|
|
- ElMessage.error(err.returnMsg)
|
|
|
+ ElMessage.error('优化目标保存失败')
|
|
|
})
|
|
|
}
|
|
|
//初始化
|
|
@@ -3890,52 +3921,65 @@ const adfhandleClick=(tab,event)=>{
|
|
|
// 确保 ref 已经初始化
|
|
|
if (Joptimizeref.value) {
|
|
|
// 调用 Joptimize 的 getoptimize 方法
|
|
|
- Joptimizeref.value.getoptimize(pid.value);
|
|
|
+ Joptimizeref.value.getoptimize(pid.value,youhuaqiwid.value);
|
|
|
}
|
|
|
});
|
|
|
}else if(tab.props.name === '代理优化器'){
|
|
|
nextTick(() => {
|
|
|
// 确保 ref 已经初始化
|
|
|
if (Doptimizeref.value) {
|
|
|
- Doptimizeref.value.getDoptimize(pid.value);
|
|
|
+ Doptimizeref.value.getDoptimize(pid.value,youhuaqiwid.value);
|
|
|
}
|
|
|
});
|
|
|
}else if(tab.props.name === '梯度优化器'){
|
|
|
nextTick(() => {
|
|
|
// 确保 ref 已经初始化
|
|
|
if (Toptimizeref.value) {
|
|
|
- Toptimizeref.value.getToptimize(pid.value);
|
|
|
+ Toptimizeref.value.getToptimize(pid.value,youhuaqiwid.value);
|
|
|
}
|
|
|
});
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-const getaddsave = () => {
|
|
|
+const getaddsave = (nowid) => {
|
|
|
if (Joptimizeref.value && typeof Joptimizeref.value.getaddsave === 'function') {
|
|
|
- Joptimizeref.value.getaddsave();
|
|
|
+ if(nowid){
|
|
|
+ Joptimizeref.value.getaddsave(pid.value,nowid);
|
|
|
+ }else{
|
|
|
+ Joptimizeref.value.getaddsave(pid.value);
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-const getDaddsave = () => {
|
|
|
+const getDaddsave = (nowid) => {
|
|
|
if (Doptimizeref.value && typeof Doptimizeref.value.getaddDsave === 'function') {
|
|
|
- Doptimizeref.value.getaddDsave();
|
|
|
+ if(nowid){
|
|
|
+ Doptimizeref.value.getaddDsave(pid.value,nowid);
|
|
|
+ }else{
|
|
|
+ Doptimizeref.value.getaddDsave(pid.value);
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-const getTaddsave = () => {
|
|
|
+const getTaddsave = (nowid) => {
|
|
|
if (Toptimizeref.value && typeof Toptimizeref.value.getaddTsave === 'function') {
|
|
|
- Toptimizeref.value.getaddTsave();
|
|
|
+ if(nowid){
|
|
|
+ Toptimizeref.value.getaddTsave(pid.value,nowid);
|
|
|
+ }else{
|
|
|
+ Toptimizeref.value.getaddTsave(pid.value);
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|
|
|
|
|
|
const getSave = (ref) => {
|
|
|
if (ref == '进化优化器'){
|
|
|
- getaddsave();
|
|
|
+ getaddsave(youhuaqiwid.value);
|
|
|
}else if(ref == '代理优化器'){
|
|
|
- getDaddsave();
|
|
|
+ getDaddsave(youhuaqiwid.value);
|
|
|
}else if(ref == '梯度优化器'){
|
|
|
- getTaddsave();
|
|
|
+ getTaddsave(youhuaqiwid.value);
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -3948,14 +3992,14 @@ const adfhandleClick2=(tab,event)=>{
|
|
|
nextTick(() => {
|
|
|
// 确保 ref 已经初始化
|
|
|
if (Cstref.value) {
|
|
|
- Cstref.value.getcst(pid.value);
|
|
|
+ Cstref.value.getcst(pid.value,canshuhuawid.value);
|
|
|
}
|
|
|
});
|
|
|
}else if(tab.props.name === 'FFD'){
|
|
|
nextTick(() => {
|
|
|
// 确保 ref 已经初始化
|
|
|
if (Ffdref.value) {
|
|
|
- Ffdref.value.getffds(pid.value);
|
|
|
+ Ffdref.value.getffds(pid.value,canshuhuawid.value);
|
|
|
}
|
|
|
});
|
|
|
}
|
|
@@ -3963,19 +4007,27 @@ const adfhandleClick2=(tab,event)=>{
|
|
|
|
|
|
|
|
|
// 单独cst保存
|
|
|
-const cstok=()=>{
|
|
|
- // cstnum.value='';
|
|
|
- if(Cstref.value){
|
|
|
- Cstref.value.getcstsave();
|
|
|
+const cstok=(nowid)=>{
|
|
|
+ // cstnum.value='';
|
|
|
+ if(Cstref.value){
|
|
|
+ if(nowid){
|
|
|
+ Cstref.value.getcstsave(pid.value,nowid);
|
|
|
+ }else{
|
|
|
+ Cstref.value.getcstsave(pid.value);
|
|
|
+ }
|
|
|
}
|
|
|
dialog.value.CSTt = false;
|
|
|
|
|
|
}
|
|
|
// 单独ffd保存
|
|
|
-const ffdok=()=>{
|
|
|
+const ffdok=(nowid)=>{
|
|
|
|
|
|
if(Ffdref.value){
|
|
|
- Ffdref.value.getffdsave();
|
|
|
+ if(nowid){
|
|
|
+ Ffdref.value.getffdsave(pid.value,nowid);
|
|
|
+ }else{
|
|
|
+ Ffdref.value.getffdsave(pid.value);
|
|
|
+ }
|
|
|
}
|
|
|
dialog.value.ffdt = false;
|
|
|
|
|
@@ -3983,9 +4035,9 @@ const ffdok=()=>{
|
|
|
// cstffd保存
|
|
|
const getCstFfdsave = (activeadf) => {
|
|
|
if (activeadf == 'CST') {
|
|
|
- cstok();
|
|
|
+ cstok(canshuhuawid.value);
|
|
|
} else if (activeadf == 'FFD') {
|
|
|
- ffdok();
|
|
|
+ ffdok(canshuhuawid.value);
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -3997,40 +4049,47 @@ const adfhandleClick3=(tab,event)=>{
|
|
|
nextTick(() => {
|
|
|
// 确保 ref 已经初始化
|
|
|
if (Xfoilref.value) {
|
|
|
- console.log('pid-0:',pid.value)
|
|
|
- Xfoilref.value.getxfoil(pid.value);
|
|
|
+ Xfoilref.value.getxfoil(pid.value,qidongyouhuawid.value);
|
|
|
}
|
|
|
});
|
|
|
}else if(tab.props.name === 'ADflow'){
|
|
|
nextTick(() => {
|
|
|
// 确保 ref 已经初始化
|
|
|
if (ADflowref.value) {
|
|
|
- ADflowref.value.getadflow(pid.value);
|
|
|
+ ADflowref.value.getadflow(pid.value,qidongyouhuawid.value);
|
|
|
}
|
|
|
});
|
|
|
}
|
|
|
}
|
|
|
|
|
|
// xfoil保存
|
|
|
-const xfoilok=()=>{
|
|
|
+const xfoilok=(nowid)=>{
|
|
|
if(Xfoilref.value){
|
|
|
- Xfoilref.value.getxfoilsave();
|
|
|
+ if(nowid){
|
|
|
+ Xfoilref.value.getxfoilsave(pid.value,nowid);
|
|
|
+ }else{
|
|
|
+ Xfoilref.value.getxfoilsave(pid.value);
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|
|
|
// adflow保存
|
|
|
-const adflowok=()=>{
|
|
|
+const adflowok=(nowid)=>{
|
|
|
if(ADflowref.value){
|
|
|
- ADflowref.value.getadflowsave();
|
|
|
+ if(nowid){
|
|
|
+ ADflowref.value.getadflowsave(pid.value,nowid);
|
|
|
+ }else{
|
|
|
+ ADflowref.value.getadflowsave(pid.value);
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|
|
|
// xfoiladflow保存
|
|
|
const getXfoilAdflowsave = (activeadf) => {
|
|
|
if (activeadf == 'Xfoil') {
|
|
|
- xfoilok();
|
|
|
+ xfoilok(qidongyouhuawid.value);
|
|
|
} else if (activeadf == 'ADflow') {
|
|
|
- adflowok();
|
|
|
+ adflowok(qidongyouhuawid.value);
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -4146,19 +4205,24 @@ const lbjkheaderCellClassName = ({ columnIndex }) => {
|
|
|
}
|
|
|
|
|
|
.footerTitle .span {
|
|
|
- width: 150px;
|
|
|
+ width: 130px;
|
|
|
height: 32px;
|
|
|
line-height: 40px;
|
|
|
- padding: 0 20px;
|
|
|
+ padding: 0 10px;
|
|
|
box-sizing: border-box;
|
|
|
cursor: default;
|
|
|
position: relative;
|
|
|
font-size: 14px;
|
|
|
color: #333333;
|
|
|
- font-family: 'Source Sans-Regular';
|
|
|
+ font-family: 'Microsoft YaHei';
|
|
|
+}
|
|
|
+
|
|
|
+.footerTitle .span .el-image {
|
|
|
+ margin-left: 10px;
|
|
|
}
|
|
|
+
|
|
|
.footerTitle .span span{
|
|
|
- padding-left:20px;
|
|
|
+ padding-left:10px;
|
|
|
}
|
|
|
.footerText .el-textarea__inner {
|
|
|
width: 100%;
|
|
@@ -4187,7 +4251,7 @@ const lbjkheaderCellClassName = ({ columnIndex }) => {
|
|
|
display: none !important;
|
|
|
} */
|
|
|
.custom-text {
|
|
|
- font-family: 'Source Sans-Regular';
|
|
|
+ font-family: 'Microsoft YaHei';
|
|
|
font-size: 16px;
|
|
|
color: rgba(51, 51, 51, 1);
|
|
|
line-height: 24px;
|
|
@@ -4198,7 +4262,7 @@ const lbjkheaderCellClassName = ({ columnIndex }) => {
|
|
|
}
|
|
|
|
|
|
.el-tree .el-tree-node__children .custom-text {
|
|
|
- font-family: 'Source Sans-Regular';
|
|
|
+ font-family: 'Microsoft YaHei';
|
|
|
font-size: 14px;
|
|
|
/* 这里设置为20px,你可以根据需求调整大小 */
|
|
|
color: rgba(51, 51, 51, 0.8);
|
|
@@ -4271,21 +4335,22 @@ color: #2267B1;
|
|
|
align-items: center;
|
|
|
}
|
|
|
.youhualog ul li {
|
|
|
- font-family: 'Source Sans-Regular';
|
|
|
+ font-family: 'Microsoft YaHei';
|
|
|
/* flex: 1; */
|
|
|
/* border-left: 1px solid #B3B3B3; */
|
|
|
font-size: 14px;
|
|
|
height: 32px;
|
|
|
/* line-height: 40px; */
|
|
|
- width: 140px;
|
|
|
+ width: 120px;
|
|
|
display: flex;
|
|
|
/* justify-content: center; */
|
|
|
align-items: center;
|
|
|
padding:0 10px;
|
|
|
+ cursor: default;
|
|
|
}
|
|
|
|
|
|
.youhualog ul li span {
|
|
|
- margin-left: 20px;
|
|
|
+ margin-left: 10px;
|
|
|
}
|
|
|
|
|
|
.footer-content {
|
|
@@ -4319,7 +4384,7 @@ color: #2267B1;
|
|
|
.dibu .el-form-item_label {
|
|
|
color: #333333;
|
|
|
font-size: 14px;
|
|
|
- font-family: 'Source Sans Pro-Regular';
|
|
|
+ font-family: 'Microsoft YaHei';
|
|
|
}
|
|
|
|
|
|
.dibu .btncolor {
|
|
@@ -4353,21 +4418,22 @@ color: #2267B1;
|
|
|
|
|
|
.classtable .el-table td.el-table__cell, .classtable .el-table th.el-table__cell{
|
|
|
color: #333333;
|
|
|
- font-size: 16px;
|
|
|
- font-family: 'Source Sans Pro-Regular';
|
|
|
+ font-size: 14px;
|
|
|
+ font-family: 'Microsoft YaHei';
|
|
|
}
|
|
|
|
|
|
.footer-content .classtable .el-table td.el-table__cell,.footer-content .classtable .el-table th.el-table__cell {
|
|
|
color: #333333;
|
|
|
font-size: 14px;
|
|
|
- font-family: 'Source Sans Pro-Regular';
|
|
|
+ font-family: 'Microsoft YaHei';
|
|
|
}
|
|
|
|
|
|
.classtable .el-table td.el-table__cell div {
|
|
|
height: 31px;
|
|
|
overflow: hidden;
|
|
|
- /* display: flex; */
|
|
|
+ display: flex;
|
|
|
align-items: center; /* 垂直居中 */
|
|
|
+ justify-content: center; /* 水平居中 */
|
|
|
}
|
|
|
|
|
|
.classtable .el-table td.el-table__cell,
|
|
@@ -4433,7 +4499,7 @@ color: #2267B1;
|
|
|
.jindutiao .percentage-value {
|
|
|
font-size: 13px;
|
|
|
color: #333333;
|
|
|
- font-family: 'Source Sans Pro-Regular';
|
|
|
+ font-family: 'Microsoft YaHei';
|
|
|
}
|
|
|
.cstleft{
|
|
|
width:50%;
|
|
@@ -4447,7 +4513,7 @@ color: #2267B1;
|
|
|
.dialog_class {
|
|
|
color: #333333;
|
|
|
font-size: 16px;
|
|
|
- font-family: 'Source Sans Pro-Regular';
|
|
|
+ font-family: 'Microsoft YaHei';
|
|
|
}
|
|
|
|
|
|
</style>
|