侧栏增加内容，云图相关弹窗样式修改，TACS弹窗制作

src/style/index.css

@@ -674,6 +674,46 @@ height: 30px;
   font-size: 16px;
   font-family: 'Source Sans Pro-Regular';
 }
+
+.colortext .classtable .el-collapse-item {
+  
+  color: #333333;
+  font-size: 16px;
+  font-family: 'Source Sans Pro-Regular';
+}
+
+.colortext .classtable .el-collapse-item__header{
+  padding-left: 20px;
+  font-size: 16px;
+  font-family: 'Source Sans Pro-Regular';
+}
+
+.colortext .classtable .el-radio__label{
+  color: #333333;
+  font-size: 16px;
+  font-family: 'Source Sans Pro-Regular';
+}
+
+.dialog_style {
+  color: #333333;
+  font-size: 16px;
+  font-family: 'Source Sans Pro-Regular';
+}
+
+.dialog_style .el-form-item__label,.dialog_style .el-checkbox__label{
+  color: #333333;
+  font-size: 14px;
+  font-family: 'Source Sans Pro-Regular';
+}
+
+.dialog_style .el-button{
+  color: #333333;
+}
+
+.el-collapse-item__content {
+  padding-bottom: 0;
+}
+
 .colortext .el-tabs--left .el-tabs__header.is-left{
   margin: 0;
 }

src/views/echart/process-monitor1.vue

@@ -4,7 +4,7 @@
     <div class="echartitem" style="width: 100%; height: 100%">
       <!-- <h3 class="selcal">{{ props.selval }}</h3> -->
       <div
-        id="line"
+        id="line-left"
         ref="chartContainer"
         style="width: 100%; height: 100%"
       ></div>
@@ -44,6 +44,10 @@ onMounted(() => {
   myChart = echarts.init(chartContainer.value)
   linechart()
   myChart.resize()
+
+  window.addEventListener('resize', () => {
+    myChart.resize()
+  })
 })
 //初始化
 const echatinit = () => {
@@ -128,6 +132,16 @@ const linechart = () => {
   //  let chartDom = document.getElementById('line');
   //  let  myChart= echarts.init(chartDom);
   option.value = {
+    title: {
+      text: "几何外形",
+      left: "13%",
+      top: "5%",
+      textStyle: {
+        color: "#333333",
+        fontSize: 16,
+        fontWeight: "normal"
+      },
+    },
     tooltip: {
       trigger: "axis", //item
       backgroundColor: "rgba(0,0,0,.6)",
@@ -154,6 +168,8 @@ const linechart = () => {
     xAxis: {
       type: "category",
       boundaryGap: false,
+      name: "x/c",
+      nameLocation: 'middle',
       data: xdata.value,
       axisLine: {
         //X轴线
@@ -170,6 +186,8 @@ const linechart = () => {
     },
     yAxis: {
       type: "value",
+      name: "y/c",
+      nameLocation: 'middle',
       axisLine: {
         //Y轴线
         show: true,

src/views/echart/process-monitor2.vue

@@ -4,7 +4,7 @@
     <div class="echartitem" style="width: 100%; height: 100%">
       <!-- <h3 class="selcal">{{ props.selval }}</h3> -->
       <div
-        id="line"
+        id="line-right"
         ref="chartContainer"
         style="width: 100%; height: 100%"
       ></div>
@@ -44,6 +44,10 @@ onMounted(() => {
   myChart = echarts.init(chartContainer.value)
   linechart()
   myChart.resize()
+
+  window.addEventListener('resize', () => {
+    myChart.resize()
+  })
 })
 //初始化
 const echatinit = () => {
@@ -128,6 +132,16 @@ const linechart = () => {
   //  let chartDom = document.getElementById('line');
   //  let  myChart= echarts.init(chartDom);
   option.value = {
+    title: {
+      text: "压力分布",
+      left: "13%",
+      top: "5%",
+      textStyle: {
+        color: "#333333",
+        fontSize: 16,
+        fontWeight: "normal"
+      },
+    },
     tooltip: {
       trigger: "axis", //item
       backgroundColor: "rgba(0,0,0,.6)",
@@ -154,6 +168,8 @@ const linechart = () => {
     xAxis: {
       type: "category",
       boundaryGap: false,
+      name: "x/c",
+      nameLocation: "middle",
       data: xdata.value,
       axisLine: {
         //X轴线
@@ -170,6 +186,8 @@ const linechart = () => {
     },
     yAxis: {
       type: "value",
+      name: "cp",
+      nameLocation: "middle",
       axisLine: {
         //Y轴线
         show: true,

src/views/home.vue

@@ -1029,7 +1029,7 @@
           <!-- 列表 -->
           <el-dialog v-model="dialog.listdialog" 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="500" class="dialog_class bgcolor tianjia sel" style="max-height: 70%;">
+            :before-close="handleClose" width="500" class="dialog_style sel" style="max-height: 70%;">
 
             <template #header="{ titleId, titleClass }">
               <div class="my-header ">
@@ -1070,7 +1070,7 @@
           <!-- 散点图 -->
           <el-dialog v-model="dialog.scatterdialog" 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="500" class="dialog_class bgcolor tianjia sel" style="max-height: 70%;">
+            :before-close="handleClose" width="500" class="dialog_style bgcolor tianjia sel" style="max-height: 70%;">
 
             <template #header="{ titleId, titleClass }">
               <div class="my-header ">
@@ -1107,7 +1107,7 @@
           <!-- 折线图 -->
           <el-dialog v-model="dialog.echartLinedialog" 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="500" class="dialog_class bgcolor tianjia sel" style="max-height: 70%;">
+            :before-close="handleClose" width="500" class="dialog_style bgcolor tianjia sel" style="max-height: 70%;">
 
             <template #header="{ titleId, titleClass }">
               <div class="my-header ">
@@ -1144,7 +1144,7 @@
           <!-- 帕雷托图 -->
           <el-dialog v-model="dialog.paretodialog" 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="500" class="dialog_class bgcolor tianjia sel" style="max-height: 70%;">
+            :before-close="handleClose" width="500" class="dialog_style bgcolor tianjia sel" style="max-height: 70%;">
 
             <template #header="{ titleId, titleClass }">
               <div class="my-header ">
@@ -1182,7 +1182,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_class bgcolor tianjia sel" style="max-height: 70%;">
+            :before-close="handleClose" width="800" class="dialog_style bgcolor tianjia sel" style="max-height: 70%;">
 
             <template #header="{ titleId, titleClass }">
               <div class="my-header ">
@@ -1218,7 +1218,7 @@
           modal-class="summary-dlg"
           :before-close="handleClose"
           width="500"
-          class="dialog_class bgcolor tianjia sel"
+          class="dialog_class bgcolor tianjia"
           
           >
             <template #header="{ titleId, titleClass }">
@@ -1386,64 +1386,97 @@
                     </ul>
                     <!-- 网格文件 -->
                       <!-- 执行 -->
-                    <div class="eldesign classtable" style="margin-top: 10px;" v-if="currentTab2 == '0'">
-                      <div style="display: flex;">
-                        <el-form-item label="选择路径"  :label-width="formLabelWidth3" style="    width: 100%;"> 
-                          <el-input v-model="input3" placeholder="请选择">
-                            <!-- <template #suffix>
-                              <el-image  :src="getImgPath('xuek0.png')" style="    width: 10px" fit="contain"></el-image>
-                            </template> -->
+                    <div class=" classtable" style="margin-top: 10px;" v-if="currentTab2 == '0'">
+                      <el-form label-position="left">
+                        <el-form-item label="网格文件：" :label-width="formLabelWidth1">
+                          <el-input  >
+                            <template #append>
+                              <fileUploads  
+                              :projectId="125"
+                              solverType="exampleSolver"
+                              accept=""
+                              upId="uniqueId1"
+                              :imgSrc="tacsfileSrc"  
+                              name="点击选择文件"
+                              />
+                            </template>
                           </el-input>
                         </el-form-item>
-                        <el-button type="primary" style="margin-left: 10px;">选择路径</el-button>
-                      </div>
+                      </el-form>
                     </div>
                       <!-- 设置参数 -->
-                <div class="eldesign classtable" style="margin-top: 10px;"  v-show="currentTab2=='1'">
-                  <el-form-item label="工况条件：" :label-width="formLabelWidth1">
-                  <el-select v-model="youhua.algorithm" :suffix-icon="CaretBottom" placeholder="请选择">
-                    <el-option v-for="item in yslist" :key="item.value" :label="item.label" :value="item.value">
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-                <el-form-item label="材料密度："  :label-width="formLabelWidth1">
-                <el-input v-model="youhua.popsize" :step="100" :min="0" :max="1000" controls-position="right" />
-                </el-form-item>
-                <el-form-item label="杨氏模量："  :label-width="formLabelWidth1">
-                <el-input v-model="youhua.popsize" :step="100" :min="0" :max="1000" controls-position="right" />
-                </el-form-item>
-                <el-form-item label="泊松比："  :label-width="formLabelWidth1">
-                <el-input v-model="youhua.popsize" :step="100" :min="0" :max="1000" controls-position="right" />
-                </el-form-item>
-                <el-form-item label="屈服应力："  :label-width="formLabelWidth1">
-                <el-input v-model="youhua.popsize" :step="100" :min="0" :max="1000" controls-position="right" />
-                </el-form-item>
-             
+                <div class=" classtable" style="margin-top: 10px;"  v-show="currentTab2=='1'">
+                  <el-form-item label="分析对象名称：" :label-width="formLabelWidth1">
+                    <el-input v-model="youhua.popsize" :step="100" :min="0" :max="1000" controls-position="right" />
+                  </el-form-item>
+                  <el-collapse v-model="TACSactiveNames" >
+                    <el-collapse-item title="材料属性" name="1">
+                      <el-form-item label="材料密度：" :label-width="formLabelWidth1">
+                        <el-input v-model="youhua.popsize" :step="100" :min="0" :max="1000" controls-position="right" />
+                      </el-form-item>
+                      <el-form-item label="杨氏模量：" :label-width="formLabelWidth1">
+                        <el-input v-model="youhua.popsize" :step="100" :min="0" :max="1000" controls-position="right" />
+                      </el-form-item>
+                      <el-form-item label="泊松比：" :label-width="formLabelWidth1">
+                        <el-input v-model="youhua.popsize" :step="100" :min="0" :max="1000" controls-position="right" />
+                      </el-form-item>
+                      <el-form-item label="屈服应力：" :label-width="formLabelWidth1">
+                        <el-input v-model="youhua.popsize" :step="100" :min="0" :max="1000" controls-position="right" />
+                      </el-form-item>
+                      <el-form-item label="启用FFD参数化：" :label-width="formLabelWidth1">
+                        <el-radio-group v-model="radio" >
+                          <el-radio label="1">是</el-radio>
+                          <el-radio label="0">否</el-radio>
+                        </el-radio-group>
+                      </el-form-item>
+                    </el-collapse-item>
+                    <el-collapse-item title="收敛选项" name="2">
+                      <el-form-item label="绝对收敛参数：" :label-width="formLabelWidth1">
+                        <el-input v-model="youhua.popsize" :step="100" :min="0" :max="1000" controls-position="right" />
+                      </el-form-item>
+                      <el-form-item label="相对收敛参数：" :label-width="formLabelWidth1">
+                        <el-input v-model="youhua.popsize" :step="100" :min="0" :max="1000" controls-position="right" />
+                      </el-form-item>
+                    </el-collapse-item>
+                  </el-collapse>
               
                 </div>
                         <!-- 结构参数 v-show="currentTab=='0'"-->
-                        <div  v-show="currentTab2=='2'">
-                      <div class="eldesign classtable" style="margin-top: 10px;">
-                   <el-table :data="lailiutable"  border style="width: 100%;height:400px" >
-                    <el-table-column type="index" width="70"  label="编号"/>
-                  <el-table-column prop="data" label="厚度分布">
-                    <template #default="{ row }">
-                      <el-input v-model.number="row.data" @change="handleEdit(row)" />
-                    </template>
-                  </el-table-column>
-                 <el-table-column prop="con" label="启用" width="100">
-                    <template v-slot="scope">
-                      <el-checkbox :false-label="'-1'" :true-label="'1'" :label="false" v-model="scope.row.enable"  @change="changecheck($event,scope.row)"/>
-                    </template>
-                  </el-table-column> 
-              
+                <div  v-show="currentTab2=='2'">
+                  <div class="eldesign classtable" style="margin-top: 10px;">
+                   <el-table :data="TACSlailiutable"  border style="width: 100%;height:400px" >
+                    <el-table-column label="启用">
+                      <el-table-column type="index" width="70"  label="编号">
+                      </el-table-column> 
+                    </el-table-column>
+                    <el-table-column>
+                      <template v-slot:header>
+                      <!-- 表头显示复选框 -->
+                      <el-checkbox 
+                      :false-label="'-1'" 
+                      :true-label="'1'" 
+                      :label="false" 
+                      />
+                      </template>
+                      <el-table-column prop="data" label="厚度分布" width="100">
+                        <template #default="{ row }">
+                          <el-input v-model.number="row.data"  />
+                        </template>
+                      </el-table-column>
+                    </el-table-column>
+                    <el-table-column>
+
+                      <el-table-column prop="con" label="" >
+                    
+                      </el-table-column> 
+                    </el-table-column>
                 </el-table>
               </div>
                     </div>
                     <!-- 分析参数 v-show="currentTab=='0'"-->
                     <div  v-show="currentTab2=='3'">
                       <div class="eldesign classtable" style="margin-top: 10px;">
-                   <el-table :data="lailiutable"  border style="width: 100%;height:400px" >
+                   <el-table :data="TACSfenxitable"  border style="width: 100%;height:400px" >
                     <el-table-column type="index" width="70"  label="编号"/>
                   <el-table-column prop="name" label="参数名称">
                     <template #default="{ row }">
@@ -1647,6 +1680,10 @@
               </div>
             </template>
           </el-dialog>
+          <!-- FSI -->
+           <el-dialog>
+            
+           </el-dialog>
           <!-- 内容区 -->
           <div class="main  mianflex">
             <!--left菜单栏  -->
@@ -2001,6 +2038,9 @@ import csts from './titlecomponent/csts.vue'
 import ffds from './titlecomponent/ffds.vue'
 import cloudsecond from "./titlecomponent/Cloudsecond.vue";
 
+
+import fileUploads from './components/fileuploads.vue'
+
 let Sidebarref = ref();
 let resource=ref(0);
 let cstnum=ref('');
@@ -2188,6 +2228,72 @@ let tabslist2= ref([
   { id: '3', name: '分析参数' },
 
 ])
+
+const tacsfileSrc = new URL('@/assets/flowimg/ffdFileSave.png', import.meta.url).href;
+
+let TACSactiveNames = ref(['1','2']);
+
+let TACSlailiutable=ref([
+  {
+    data: 0.995208,
+    con: ''
+  },
+  {
+    data: 0.995208,
+    con: ''
+  },
+  {
+    data: 0.995208,
+    con: ''
+  },
+  {
+    data: 0.995208,
+    con: ''
+  },
+  {
+    data: 0.995208,
+    con: ''
+  },
+  {
+    data: 0.995208,
+    con: ''
+  },
+  {
+    data: 0.995208,
+    con: ''
+  },
+  {
+    data: 0.995208,
+    con: ''
+  },
+  {
+    data: 0.995208,
+    con: ''
+  },
+  {
+    data: 0.995208,
+    con: ''
+  },
+])
+
+let TACSfenxitable=ref([
+  {
+    data: 13972.2123,
+    name: '结构质量',
+    con:-1
+  },
+  {
+    data: 0.3337,
+    name: 'KS聚合应力',
+    con:1
+  },
+  {
+    data: 0.0,
+    name: '最大变形',
+    con: -1
+  }
+])
+
 let lailiutable=ref([
 {
      data: 1,
@@ -2286,14 +2392,15 @@ let canshu = ref();
 let question = ref([
   { url: 'kk1.png', titlie: "列表" },
   { url: 'kk2.png', titlie: "散点图" },
-  { url: 'kk3.png', titlie: "面积图" },
   { url: 'kk4.png', titlie: "折线图" },
+  { url: 'kk8.png', titlie: "帕雷托图" },
+  { url: 'kk3.png', titlie: "面积图" },
   { url: 'kk5.png', titlie: "柱状图" },
   // { url: 'k3.png', titlie: "饼状图" },
  
   { url: 'kk6.png', titlie: "横条图" },
   { url: 'kk7.png', titlie: "雷达图" },
-  { url: 'kk8.png', titlie: "帕雷托图" },
+  
   { url: 'kk9.png', titlie: "云图/等值线" },
   { url: 'kk10.png', titlie: "查看报告" },
   { url: 'kk11.png', titlie: "导出报告" },
@@ -2342,7 +2449,7 @@ let Sevenlist = ref([
   { url: 'rr3.png', titlie: '备份' },
 ])
 let eightlist = ref([
-  { url: 'e1.png', titlie: '快速入门' },
+  { url: 'e1.png', titlie: '用户手册' },
   { url: 'e2.png', titlie: '帮助文档' },
   { url: 'e3.png', titlie: '关于软件' },
 ])
@@ -4496,4 +4603,10 @@ color: #2267B1;
 .XFpdding{
   height: 425px;
 }
+
+.dialog_class {
+  color: #333333;
+  font-size: 16px;
+  font-family: 'Source Sans Pro-Regular';
+}
 </style>

src/views/titlecomponent/ADflow.vue

@@ -35,7 +35,7 @@
             <!-- 文件上传按钮部分 -->
             <el-col :span="1" style="display: flex; align-items: center; margin-left: -35px">
               <fileUploads
-                :projectId="123" 
+                :projectId="124" 
                 solverType="exampleSolver" 
                 accept=".cgns" 
                 upId="uniqueId1" 

src/views/titlecomponent/Cloudsecond.vue

@@ -246,7 +246,7 @@
         </el-form-item>
 
         <el-form-item label="" :label-width="formLabelWidth1">
-          <el-checkbox label="显示标题："></el-checkbox>
+          <el-checkbox label="显示标题"></el-checkbox>
         </el-form-item>
 
         <el-form-item label="标题文本：" :label-width="formLabelWidth1">
@@ -439,8 +439,9 @@ let activeNames2 = ref(['1','2','3'])
 
 <style>
 .cloudsecond {
+  color: #333333;
   font-size: 16px;
-  font-family: 'Source Sans-Regular';
+  font-family: 'Source Sans Pro-Regular';
 }
 
 .tabledomain {
@@ -448,10 +449,18 @@ let activeNames2 = ref(['1','2','3'])
   
 }
 
+.cloudsecond .el-button {
+  color: #333333;
+}
+
+.cloudsecond .el-select {
+  width: 100%;
+}
+
 .cloudsecond .el-form-item__label {
   font-size: 14px;
   color: #333333;
-  font-family: 'Source Sans-Regular' !important;
+  font-family: 'Source Sans Pro-Regular' !important;
 }
 
 .el-collapse-item__header {

src/views/titlecomponent/FSI.vue

@@ -0,0 +1,69 @@
+<template>
+  <div>
+    <ul>
+      <li
+        class="item"
+        v-for="(tab, index) in tabslist1"
+        :key="index"
+        :class="{ active: currentTab1 === index }"
+        @click="selectTab1(index)"
+      >
+        <img :src="tab.imgSrc"/>
+        {{ tab.name }}
+      </li>
+    </ul>
+    <div v-if="currentTab1 == '0'">
+      <el-form>
+        <el-form-item label="最大耦合迭代步：" :label-width="formLabelWidth1">
+          <el-input v-model="fsi.maxIter"></el-input>
+        </el-form-item>
+        <el-form-item label="输出每轮迭代结果：" :label-width="formLabelWidth1">
+          <el-input v-model="fsi.result"></el-input>
+        </el-form-item>
+        <el-form-item label="插值方法：" :label-width="formLabelWidth1">
+          <el-select v-model="fsi.interpolation">
+            <el-option label="MELD" value="MELD"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="耦合区域" :label-width="formLabelWidth1">
+        </el-form-item>
+        <el-form-item label="气动区域：" :label-width="formLabelWidth1">
+          <el-select v-model="fsi.aeroRegion">
+            <el-option label="wall" value="wall"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="结构区域" :label-width="formLabelWidth1">
+          <el-checkbox label="Skin"></el-checkbox>
+          <el-checkbox label="Spar"></el-checkbox>
+        </el-form-item>
+      </el-form>
+    </div>
+  </div>
+</template>
+
+<script  setup>
+import { ref, onMounted, reactive, provide, nextTick } from "vue"
+import { ElMessage, ElButton, ElDialog, ElSelect } from "element-plus"
+import { request, uploadFile } from "@/utils/request"
+
+import configParams from "@/assets/img/configParams.png";
+let currentTab1 = ref(0)
+let formLabelWidth1 = ref(170)
+
+let fsi = ref({
+  maxIter: 2,
+  result: 1,
+  interpolation: "MELD",
+  aeroRegion: "wall",
+  
+})
+
+let tabslist1 = ref([
+  { id: "0", name: "设置参数", imgSrc: configParams },
+])
+
+const selectTab1 = (index) => {
+  currentTab1.value = index
+}
+
+</script>

src/views/vuetree/Sidebar.vue

@@ -166,7 +166,24 @@ const datatree = ref([
           label: 'Nastran',
           img:'xuek7.png',
           name:'Nastran'
-         
+        },
+        {
+          id:'3-13',
+          label: 'FUM to FEM',
+          img:'fsi.png',
+          name:'FSI'
+        },
+        {
+          id:'3-14',
+          label: 'CATIA',
+          img:'catia.png',
+          name:'CATIA'
+        },
+        {
+          id:'3-15',
+          label: 'Flight',
+          img:'flight.png',
+          name:'Flight'
         },
       ],
     },

src/views/vuetree/index.vue

@@ -326,6 +326,12 @@ function onNodeDoubleClick(e) {
     emit('optimizerfalse','气动分析');
   }else if(onPythonlist.value.some(item => e.node.data.name.includes(item))){
     emit('optimizerfalse','Python');
+  }else if(e.node.data.name=="CATIA"){
+    emit('optimizerfalse','CATIA');
+  }else if(e.node.data.name=="FSI"){
+    emit('optimizerfalse','FUM to FEM');
+  }else if(e.node.data.name=="Flight"){
+    emit('optimizerfalse','Flight');
   }
 
 }

src/views/vuetree/useDnD.js

@@ -24,6 +24,9 @@ import csh from '@/assets/flowimg/csh.png'
 import ffd from '@/assets/flowimg/ffd.png'
 import ADflow from '@/assets/flowimg/ADflow.png'
 import tacs from '@/assets/flowimg/TACS.png'
+import fsi from '@/assets/flowimg/fsi.png'
+import catia from '@/assets/flowimg/catia.png'
+import flight from '@/assets/flowimg/flight.png'
 let nid = 0;
 let id=0
 let treeobj=ref([]);
@@ -57,6 +60,12 @@ function imagefun(){
       return datas = {label:'ADflow', image:ADflow,name:'ADflow'}
     }else if(nid=='3-12'){
       return datas = {label:'TACS', image:tacs,name:'TACS'}
+    }else if(nid=='3-13'){
+      return datas = {label:'FUM to FEM', image:fsi,name:'FSI'}
+    }else if(nid=='3-14'){
+      return datas = {label:'CATIA', image:catia,name:'CATIA'}
+    }else if(nid=='3-15'){
+      return datas = {label:'Flight', image:flight,name:'Flight'}
     }
      else if(nid=='3-2'){
       return datas = {label:'Excel', image:xuek2,name:'Excel'}