Merge branch 'master' of http://192.168.0.130:13000/CQ_ADI/airoptweb

src/components/header.vue

@@ -22,7 +22,7 @@ let title=ref("民用飞机多学科联合优化设计软件");
 <style lang="scss" scoped>
 .ve_menu_logo {
     width: 100%;
-    height: 40px;
+    height: 32px;
     background-color:#2267B1 ;
       overflow: hidden;
     padding: 0 10px;

src/style/index.css

@@ -69,7 +69,7 @@ img{
 }
 .heder_tabs .el-tabs__item{
     width: 150px;
-    height: 50px;
+    height: 31px;
     font-family: 'Source Sans-Regular';
 }
 body{
@@ -88,7 +88,7 @@ body{
 
 .el-tabs__item{
     color: rgba(51, 51, 51,1);
-    font-size:18px;
+    font-size:16px;
 }
 .imgzong {
     display: -webkit-box;
@@ -103,7 +103,7 @@ body{
 .imgzong .listitem {
     width: auto;
     height: 92px;
-    margin: 5px;
+    /* margin: 5px; */
     padding: 2px 6px 2px 2px;
   
 }
@@ -131,7 +131,7 @@ body{
 }
 
 .imgzong .listitem span {
-    font-size: 16px;
+    font-size: 14px;
     font-family: 'Source Sans-Regular';
     color: rgba(51, 51, 51, 0.8);
 }
@@ -312,7 +312,7 @@ position: relative;
   }
   .left_main_content{
     width: 195px;
-    height: calc(100vh - 193px);
+    height: calc(100vh - 155px);
 background: #FFFFFF;
 box-shadow: 2px 0px 11px 0px rgba(0,0,0,0.12);
 border: 1px solid rgba(179, 179, 179, 1);
@@ -453,7 +453,7 @@ margin-top: -6px;
 }
 .footerText .el-textarea__inner{
   width: 100%;
-  height: 178px!important;
+  height: 130px!important;
   border: 0;
   font-size: 12px;
   color: #333;
@@ -462,7 +462,7 @@ margin-top: -6px;
 }
 .main_model{
   width: 100%;
-  /* height: 80vh; */
+  height: 78vh;
   display: flex;
   flex-direction: column;
 
@@ -678,12 +678,12 @@ width: 200px;
   padding-right: 10px;
 }
 .dlheight{
-  height: 440px;
+  height: 400px;
   overflow-y: auto;
 
 }
 .heder_tabs .el-tabs{
-  --el-tabs-header-height: 50px;
+  --el-tabs-header-height: 30px;
 }
 .el-image__inner {
   vertical-align: middle;

src/views/home.vue

@@ -1378,7 +1378,7 @@
             <template #footer>
               <div class="dialog-footer">
                 <el-button @click="dialog.optgroup = false">取消</el-button>
-                <el-button type="primary">
+                <el-button type="primary" class="custom-button">
                   确定
                 </el-button>
               </div>
@@ -3531,7 +3531,7 @@ const adfhandleClick=(tab,event)=>{
   justify-content: space-between;
   padding: 5px 0px;
   font-size: 20px;
-  height: 40px !important;
+  height: 32px !important;
   z-index: 99;;
   // border-radius: 5px 5px 0px 0px;
   // overflow: hidden;
@@ -3560,11 +3560,11 @@ const adfhandleClick=(tab,event)=>{
 
 .footerTitle .span {
  width: 150px;
-  height: 40px;
+  height: 32px;
   line-height: 40px;
   cursor: default;
   position: relative;
-  font-size: 16px;
+  font-size: 14px;
   color: #333333;
   font-family: 'Source Sans-Regular';
 }
@@ -3581,6 +3581,12 @@ const adfhandleClick=(tab,event)=>{
   box-shadow:none;
 }
 
+.custom-button{
+  color: #333333;
+  background-color: #DCEAFF;
+  border: 1px solid #2267B1 ;
+}
+
 //没有子节点
 </style>
 <style>
@@ -3604,7 +3610,7 @@ const adfhandleClick=(tab,event)=>{
 
 .el-tree .el-tree-node__children .custom-text {
   font-family: 'Source Sans-Regular';
-  font-size: 16px;
+  font-size: 14px;
   /* 这里设置为20px，你可以根据需求调整大小 */
 color: rgba(51, 51, 51, 0.8);
 
@@ -3676,9 +3682,9 @@ color: #2267B1;
   font-family: 'Source Sans-Regular';
   flex: 1;
   border-left: 1px solid #B3B3B3;
-  font-size: 16px;
-  height: 40px;
-  line-height: 40px;
+  font-size: 14px;
+  height: 32px;
+  /* line-height: 40px; */
   width: 168px;
     display: flex;
     justify-content: center;
@@ -3811,6 +3817,6 @@ color: #2267B1;
    
 }
 .XFpdding{
-  height: 400px;
+  height: 425px;
 }
 </style>

src/views/home/newfile.vue

@@ -10,7 +10,27 @@
         </div>
     
       </el-collapse-item>
-      <el-collapse-item title="工程模板" name="2">
+      <el-collapse-item title="函数优化模板" name="2">
+        <div class="collapse-list">
+         <div v-for="(item, index) in collapselist" :key="index"  @click="clickimg(item,'2',index)">
+            <div class="list"   >
+                <el-image :src="item.image" fit="contain"  ></el-image>  
+            </div>
+            <p style="text-align: center;">{{item.name}}</p>
+          </div>
+        </div>
+      </el-collapse-item>
+      <el-collapse-item title="翼型优化模板" name="3">
+        <div class="collapse-list">
+         <div v-for="(item, index) in collapselist" :key="index"  @click="clickimg(item,'2',index)">
+            <div class="list"   >
+                <el-image :src="item.image" fit="contain"  ></el-image>  
+            </div>
+            <p style="text-align: center;">{{item.name}}</p>
+          </div>
+        </div>
+      </el-collapse-item>
+      <el-collapse-item title="机翼优化模板" name="4">
         <div class="collapse-list">
          <div v-for="(item, index) in collapselist" :key="index"  @click="clickimg(item,'2',index)">
             <div class="list"   >
@@ -192,8 +212,8 @@ eldialog.value=true;
 .collapse-list{
     display: flex;
     .list{
-        width: 240px;
-        height: 240px;
+        width: 140px;
+        height: 140px;
         border: 2px solid #71AAFF;
         display: flex;
         justify-content: center;
@@ -217,6 +237,8 @@ text-transform: none;
 .custom-collapse .el-collapse-item__header {
   align-items: center;
   border: none;
+  height: 20px;
+  margin: 4px;
 }
  
 .custom-collapse .el-collapse-item__arrow {
@@ -228,5 +250,9 @@ text-transform: none;
     border: none;
 }
 
+.custom-collapse .el-collapse-item__content{
+  padding-bottom: 10px;
+}
+
 </style>
 

src/views/openpage.vue

@@ -71,12 +71,12 @@ const activeIndex=computed(()=>{
   text-align: left;
   color: #FFD153;
   font-weight: 600;
-font-size: 18px;
+font-size: 16px;
 span{
   margin-right: 12px;
 }
 .el-image{
-  margin-top: 8px;
+  margin-bottom: 5px;
 
 }
 }
@@ -120,7 +120,7 @@ span{
   .el-menu-item{
     color: #fff;
     padding: 0 45px !important;
-    font-family: 'Source Sans-Black';
+    font-family: 'Source Sans-Regular';
     font-size: 16px;
   }
 }
@@ -129,7 +129,7 @@ span{
     width: calc(100% - 190px);
     height: 100%;
     background: #Fff;
-    padding: 30px;
+    padding: 10px;
 }
 .user .container{
     display: -webkit-box;
@@ -148,7 +148,7 @@ span{
   color: #333;
     background: #ecf5ff;
 }
-.el-menu-item:hover{
+.user-slider .el-menu-item:hover{
   color: #FFD153;
 }
 </style>

src/views/vuetree/Sidebar.vue

@@ -313,7 +313,7 @@ onUnmounted(() => {
   padding-left: 0 !important;
 }
 .custom-tree1{
-  height: 554px;
+  height: 358px;
     overflow: auto;  
 }
 </style>