Sfoglia il codice sorgente

打开界面新增创建人字段;字体统一;优化器组件下拉选项增加icon;cst字体样式

lichunyang 7 mesi fa
parent
commit
5c16c25f77

+ 9 - 4
src/style/index.css

@@ -176,9 +176,9 @@ body{
     height: 40px !important;
     top: 3px;
 }
-/* .el-button+.el-button{
+.el-button+.el-button{
     background-color:#2267B1; 
-} */
+}
 .summary-dlg {
     pointer-events: none;
 }
@@ -650,6 +650,9 @@ height: 30px;
 .colortext  .classtable .el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf, .eldesign,.colortext  .classtable .el-table td.el-table__cell div{
    /* background-color: rgba(238, 238, 238, 1);  */
    background-color:#fafafa; 
+   color: #4D4D4D;
+   font-weight: 400;
+   font-family: 'Source Sans Pro-Regular';
 }
 .el-table .el-table__row, .el-table .el-table__header-wrapper {
   /* border:1px solid #eee !important;  */
@@ -657,9 +660,9 @@ height: 30px;
 }
 .colortext  .el-form-item__label{
   text-align: right !important;
-  color: #333;
+  color: #333333;
   font-size: 16px;
-  font-family: 'Source Sans-Regular';
+  font-family: 'Source Sans Pro-Regular';
 }
 .colortext .el-tabs--left .el-tabs__header.is-left{
   margin: 0;
@@ -669,6 +672,8 @@ width: 200px;
 }
 .colortext .el-tabs--left .el-tabs__item.is-left, .el-tabs--right .el-tabs__item.is-left {
   justify-content: flex-start;
+  font-size: 16px;
+  font-family: 'Source Sans Pro-Regular';
 }
 .colortext  .el-tabs__nav-wrap::after{
   background-color: #fff;

+ 12 - 5
src/views/home.vue

@@ -57,6 +57,10 @@
                       <span>{{ undmodel }}</span>
                       <el-select v-model="undmodel" class="no-border headersele" :suffix-icon="CaretBottom">
                         <el-option v-for="item in options4" :key="item.value" :label="item.label" :value="item.value">
+                          <div style="display: flex; align-items: center;">
+                            <img :src="item.icon" style="width: 20px; height: 20px; margin-right: 10px;" />
+                            <span>{{ item.label }}</span>
+                          </div>
                         </el-option>
                       </el-select>
                     </div>
@@ -897,7 +901,7 @@
             <template #header="{ titleId, titleClass }">
               <div class="my-header ">
                 <el-image :src="getImgPath('xuek9.png')" fit="contain"></el-image>
-                <h4 :id="titleId" :class="titleClass">Xfiol</h4>
+                <h4 :id="titleId" :class="titleClass">Xfoil</h4>
               </div>
             </template>
             <Xfoil/>
@@ -1789,6 +1793,9 @@ import y2 from "@/assets/img/y2.png"
 import nos from "@/assets/img/nos.png"
 import zy from "@/assets/img/zy.png"
 import zy2 from "@/assets/img/zy2.png"
+import xuek10 from '@/assets/flowimg/xuek10.png'
+import xuek11 from '@/assets/flowimg/xuek11.png'
+import xuek12 from '@/assets/flowimg/xuek12.png'
 import optmonitor from './echart/optimize_monitor.vue'
 import echartindex from './echart/index.vue'
 import sixtop from './echart/six_top.vue'
@@ -1841,9 +1848,9 @@ let optiongroup1 = ref([
   { label: '优化问题', value: '优化问题' }
 ])
 let options4 = ref([
-  { label: '进化优化器', value: '进化优化器' },
-  { label: '代理优化器', value: '代理优化器' },
-  { label: '梯度优化器', value: '梯度优化器' },
+  { label: '进化优化器', value: '进化优化器', icon:xuek10 },
+  { label: '代理优化器', value: '代理优化器', icon:xuek11 },
+  { label: '梯度优化器', value: '梯度优化器', icon:xuek12 },
 ])
 let formLabelWidth3=ref(100)
 let formLabelWidth200=ref(200)
@@ -2504,7 +2511,7 @@ const optimizerfalse = (val) => {
    activeadf.value='ADflow';
    dialog.value.isADflow = true;
     // dialog.value. = true;
-  }else if(val == 'Xfiol'){
+  }else if(val == 'Xfoil'){
   //  activeadf.value='Xfiol';
    dialog.value.Xfiol = true;
   }else if(val == 'TACS'){

+ 3 - 3
src/views/home/newfile.vue

@@ -295,7 +295,7 @@ eldialog.value=true;
   position: relative; /* 确保 .hoveredImageContainer 相对于 .showImgDiv 定位 */
 }
 .modelStyle{
-  font-family: 'Source Sans-Regular';
+  font-family: 'Source Sans Pro-Regular';
   font-size: 12px;
   color: #333333;
   text-align: center;
@@ -303,10 +303,10 @@ eldialog.value=true;
 </style>
 <style>
 .custom-collapse .el-collapse-item__header {
-  font-family: 'Source Sans-Regular';
+  font-family: 'Source Sans Pro-Regular';
   font-weight: 500;
   font-size: 14px;
-  color: #383838;
+  color: #1A1A1A ;
   line-height: 24px;
   text-align: left;
   font-style: normal;

+ 12 - 6
src/views/home/querylist.vue

@@ -13,17 +13,19 @@
         </div>
         <el-table :data="tableData" 
             @row-click="handlerow($event)" 
-            :row-style="{ height: '100px'}"
-            style="width: 100%">
-            <el-table-column prop="image" label="图片" >
+            :row-style="{ height: '100px', fontSize: '14px', color: '#1A1A1A', fontWeight: '500',fontFamily: 'Source Sans Pro-Regular'}"
+            style="width: 100%"
+            :header-cell-style="headerCellStyle">
+            <el-table-column prop="image" label="模板" width="230">
                 <template #default="scope">
                     <div class="elimagetab">
                         <el-image :src="scope.row.image" fit="contain" style="height: 100%; width: auto;"></el-image>
                     </div>     
                 </template>
             </el-table-column>
-            <el-table-column prop="name" label="名称" />
-            <el-table-column prop="remark" label="描述" />
+            <el-table-column prop="name" label="名称" width="220"/>
+            <el-table-column prop="remark" label="描述" width="160"/>
+            <el-table-column prop="creator" label="创建人" width="160"/>
             <el-table-column prop="createtime" label="创建时间">
                 <template #default="scope">
                     {{ formatDate(scope.row.createtime) }}
@@ -40,7 +42,7 @@
                 </template>
               </el-table-column>
         </el-table>
-        <div class="demo-pagination-block pagination" style="margin-top: 20px;">
+        <div class="demo-pagination-block pagination" style="margin-top: 14px;">
             <el-pagination
                 v-model:current-page="gd.currentPage4"
                 v-model:page-size="gd.pageSize4"
@@ -130,6 +132,10 @@ sessionStorage.setItem("objlist",JSON.stringify(val));
 }
 
 const formatDate = datetime => !datetime ? '' : moment(datetime).format('YYYY-MM-DD HH:mm:ss');
+
+const headerCellStyle = () => {
+    return {color: '#1A1A1A', fontFamily: 'Source Sans Pro-Regular', fontWeight: '500'}
+}
 </script>
 <style lang="scss" scoped>
 .search-container {

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

@@ -78,7 +78,7 @@
         </div>
         <div class="classtable">
           <el-table :data="tableDatacst" style="width: 100%" border="true">
-            <el-table-column prop="date" label="表格" width="180" />
+            <el-table-column prop="date" label="" width="180" />
             <el-table-column
               v-for="(item, index) in tablecstHeaders"
               :key="index"

+ 3 - 3
src/views/vuetree/index.vue

@@ -133,7 +133,7 @@ const props = defineProps({
   jboptimizer: {
     type: Boolean,
   },
-  Xfiol: {
+  Xfoil: {
     type: Boolean,
   },
   // color1: {
@@ -306,8 +306,8 @@ function onNodeDoubleClick(e) {
   }else if(e.node.data.name=="代理优化器"){
     emit('optimizerfalse','代理优化器');
 
-  }else if(e.node.data.name=="Xfiol"){
-    emit('optimizerfalse','Xfiol');
+  }else if(e.node.data.name=="Xfoil"){
+    emit('optimizerfalse','Xfoil');
   }else if(e.node.data.name=="梯度优化器"){
     emit('optimizerfalse','梯度优化器');
   }else if(e.node.data.name=="CST"){