3.14

src/assets/css/theme/00a598/index.css

@@ -28,6 +28,7 @@ background-color: #757070;
    .custom-00a598  .el-input__icon{
      line-height:25px;
    }
+
 /* 表格 */
 .custom-00a598 .el-table td, .el-table th.is-leaf{
     color: #d5d5d5;
@@ -58,7 +59,7 @@ background-color: #757070;
  .custom-00a598 .el-button:focus, .el-button:hover{
   color: #ffffff;
   border-color: #535353;
-  /* background-color: #535353; */
+   /* background-color: #535353; */
  }
  .custom-00a598 .part-panel-collapse-handle{
   border-color: transparent transparent #6f6f6f;
@@ -73,12 +74,15 @@ background-color: #757070;
     border-top:1px solid #666;
     border-bottom: 1px solid #666;
   }
-  .custom-00a598 .scal .item1:hover{
+  /* .custom-00a598 .scal .item1:hover{
     transform: scale(1.3);
     background-color: rgba(255, 255, 255, 0.3);
     
-    }
+    } */
     /* dialog其他没有设置颜色 */
+    .custom-00a598 .color_1{
+      background-color: rgba(255,255,255,0.1);
+    }
     .custom-00a598   .dialog_color{
       background-color: #535353;
     }
@@ -91,7 +95,22 @@ background-color: #757070;
     .custom-00a598 .dialog_color .el-form-item__label{
       color: #d5d5d5;
     }
-    .custom-00a598 .dialog_color .el-radio__label,.el-checkbox__label{
+    /* .custom-00a598 .dialog_color .el-radio__label,.el-checkbox__label{
+      color: #d5d5d5;
+    } */
+    .custom-00a598 .el-dialog__header{
+      background-color: #6d6d6d;
+    }
+    .custom-00a598 .el-radio{
+      color: #d5d5d5;
+    }
+    .custom-00a598 .el-dialog__body{
+      color: #d5d5d5;
+    }
+    .custome-00a598{
+      color: #d5d5d5;
+    }
+    .custom-00a598 .el-checkbox{
       color: #d5d5d5;
     }
     .custom-00a598 .dialog_color .el-button {
@@ -104,9 +123,9 @@ background-color: #757070;
       border-radius: 5px;
       box-sizing: border-box;
     }
-    .custom-00a598 .text_color,.liitem .formLabelWidth8,.formLabelWidth15{
+    /* .custom-00a598 .text_color,.liitem .formLabelWidth8,.formLabelWidth15{
       color: #d5d5d5;
-    }
+    } */
     .custom-00a598  .el-tabs--card>.el-tabs__header .el-tabs__item.is-active{
       color: #fff;
     }

src/views/home/myproject/index.vue

@@ -13,7 +13,7 @@
     </div>
     <div class="scher">
       <span></span>
-      <span class="xuanzhogn">1个已选中</span>|
+      <span class="xuanzhogn">1个已选中</span><span style="padding: 0 5px;">|</span>
       <div class="input">
       <el-select v-model="value" placeholder="请选择">
         <el-option
@@ -78,7 +78,7 @@
   :visible.sync="dialogVisible"
   width="30%"
 >
-       <el-form>
+       <el-form class="newfile">
         <el-form-item  label="项目名称：" :label-width="formLabelWidth5">
             <!-- <span class="sblock">项目类型</span> -->
                 <el-radio  v-model="newobj.isshare" label="0"
@@ -254,6 +254,9 @@ this.init();
      color: #b6b6b6;
 
 }
+/deep/.el-dialog__title{
+  color: #fff;
+}
 .btn{
   padding: 10px;
   display: flex;
@@ -270,6 +273,17 @@ this.init();
   display: inline-block;
   
 }
+// .newfile .el-form-item__label {
+//     text-align: right;
+//     vertical-align: middle;
+//     float: left;
+//     font-size: 14px;
+//     color: #606266;
+//     line-height: 40px;
+//     padding: 12px 12px 0 0;
+//     -webkit-box-sizing: border-box;
+//     box-sizing: border-box;
+// }
 .xuanzhogn{
   font-size: 16px;
      color: #b6b6b6;

src/views/index/HCFDLab/index.vue

@@ -12,10 +12,68 @@
           <!-- 通用设置 -->
           <el-tab-pane :label="$t('HCFD.geneal.geneal')" name="two">
               <div class="imgzong">
+              <div class="listitem lbg_color3 ">
              <div class="item1"  v-for="(itemcj,index) in twolist"  :key="'two-'+ index" :class="{activeOrange:active=='two-'+ index}" @click="clickgeometry($event,index,'two-'+ index)">
-                <el-tooltip class="item" effect="dark" :content="itemcj.titlie" placement="bottom">
+                <!-- <el-tooltip class="item" effect="dark" :content="itemcj.titlie" placement="bottom"> -->
                              <el-image :src="itemcj.icon" fit="cover" /> 
-            </el-tooltip>
+                            <span >{{itemcj.titlie}}</span>
+            <!-- </el-tooltip> -->
+            </div>
+            </div>
+            <!--分析类型  -->
+              <div class="listitem lbg_color3 radiocontent">
+             <div class="item1"  >
+               <el-form>
+        <div class="radio_text text_color">
+          <div class="classfelx">
+               <el-tooltip class="item" effect="dark" content="分析类型" placement="bottom">
+                <el-radio
+                  v-model="parameterObj.nmlParam.analysis_Type"
+                  label="Steady"
+                  >{{ $t("HCFD.geneal.steady") }}</el-radio
+                >
+                  </el-tooltip>
+            </div>
+            <div class="classfelx">
+                  <el-tooltip class="item" effect="dark" content="分析类型" placement="bottom">
+                <el-radio
+                  v-model="parameterObj.nmlParam.analysis_Type"
+                  label="Unsteady"
+                  >{{ $t("HCFD.geneal.unsteady") }}</el-radio
+                >
+                    </el-tooltip>
+              </div>
+        </div>
+      </el-form>
+            </div>
+            </div>
+            <!-- 并行类型 -->
+             <div class="listitem lbg_color3 radiocontent">
+             <div class="item1"  >
+                 <el-form>
+             <div class="radio_text text_color">
+                <el-radio-group
+                  v-model="parameterObj.nmlParam.parallel_Optional"
+                  @input="leixingchange($event)"
+                >
+                <div>
+                   <el-tooltip class="item" effect="dark" content="并行类型" placement="bottom">
+                  <el-radio label="Serial">
+                    {{ $t("HCFD.geneal.serial") }}</el-radio
+                  >
+                   </el-tooltip>
+                   </div>
+                      <div>
+                     <el-tooltip class="item" effect="dark" content="并行类型" placement="bottom">
+                  <el-radio label="MPI Parallel">{{
+                    $t("HCFD.geneal.mpi")
+                  }}</el-radio>
+                   </el-tooltip>
+                     </div>
+                </el-radio-group>
+                </div>
+      </el-form>
+            </div>
             </div>
            </div>
           </el-tab-pane>
@@ -73,15 +131,28 @@
              </div> -->
               
             </div>
-            <!-- 结果 -->
+        
           </el-tab-pane>
+          
            <el-tab-pane :label=" $t('HCFD.results.results')" name="five">
               <div class="imgzong" v-if="lsolverState=='2'">
-                        <div class="item1 "    v-for="(item,index) in  resultslist"  :key="'five-'+ index" :class="{activeOrange:active=='five-'+ index}" @click="clickgeometry($event,index,'five-'+ index)">
+                        <!-- <div class="item1 "    v-for="(item,index) in  resultslist"  :key="'five-'+ index" :class="{activeOrange:active=='five-'+ index}" @click="clickgeometry($event,index,'five-'+ index)">
                 <el-tooltip class="item" effect="dark" :content="item.titlie" placement="bottom">
                        <el-image :src="item.icon" fit="cover" /> 
             </el-tooltip>
-             </div>
+             </div> -->
+               <div class="listitem lbg_color3 " v-for="(item,index) in  resultslist"  :key="'five-'+ index" :class="{activeOrange:active=='five-'+ index}" @click="clickgeometry($event,index,'five-'+ index)" >
+             <div class="item2 "   >
+                 <el-image :src="item.icon" fit="cover" />  
+                   <span >{{item.titlie}}</span>
+            </div>
+            </div>
+             <!-- <div class="listitem lbg_color3 ">
+             <div class="item2 ">
+                 <el-image :src="j2" fit="cover" />  
+                   <span >流场数据</span>
+            </div>
+            </div> -->
                </div>
            </el-tab-pane>
            <!-- 工具 -->
@@ -128,7 +199,7 @@
       </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="info"  @click="dialog.scale_visiable = false">{{ $t("HCFD.file.cancel")}}</el-button>
+        <el-button  @click="dialog.scale_visiable = false">{{ $t("HCFD.file.cancel")}}</el-button>
         <el-button type="primary" @click="hcfdparam(); dialog.scale_visiable = false"
           >{{ $t("HCFD.file.ok")}}</el-button
         >
@@ -181,7 +252,7 @@
         </div>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="info"  @click="dialog.translation_visiable = false"
+        <el-button   @click="dialog.translation_visiable = false"
           > {{ $t("HCFD.file.cancel")}} </el-button
         >
         <el-button type="primary" @click="hcfdparam(); dialog.translation_visiable = false"
@@ -237,14 +308,14 @@
       </el-form-item>  
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="info"  @click="dialog.rotation_visiable = false">{{ $t("HCFD.file.cancel")}}</el-button>
+        <el-button   @click="dialog.rotation_visiable = false">{{ $t("HCFD.file.cancel")}}</el-button>
         <el-button type="primary" @click="hcfdparam(); dialog.rotation_visiable = false"
           >{{ $t("HCFD.file.ok")}} </el-button
         >
       </div>
     </el-dialog>
     <!-- 分析类型 -->
-     <el-dialog
+     <!-- <el-dialog
       class="lg-y-z"
       :visible.sync="dialog.type_visiable "
       :close-on-click-modal="false"
@@ -283,7 +354,6 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button
-           type="info" 
           @click="referencevisiable((dialog.type_visiable  = false))"
           >{{ $t("HCFD.file.cancel")}} </el-button
         >
@@ -291,14 +361,13 @@
           >{{ $t("HCFD.file.ok")}}</el-button
         >
       </div>
-    </el-dialog>
+    </el-dialog> -->
     <!-- 并行类型 -->
      <el-dialog
       class="lg-y-z"
       :visible.sync="dialog.parallel_visiable "
       :close-on-click-modal="false"
       @close='activecleer()'
-     v-if="active=='two-4'"
     :modal='false'
     custom-class='dialoglocation dialog_color'
      width="385px"
@@ -310,24 +379,6 @@
   </div>
       <el-form>
              <div class="radio_text text_color">
-                <el-radio-group
-                  v-model="parameterObj.nmlParam.parallel_Optional"
-                >
-                <div>
-                   <el-tooltip class="item" effect="dark" content="并行类型" placement="bottom">
-                  <el-radio label="Serial">
-                    {{ $t("HCFD.geneal.serial") }}</el-radio
-                  >
-                   </el-tooltip>
-                   </div>
-                      <div>
-                     <el-tooltip class="item" effect="dark" content="并行类型" placement="bottom">
-                  <el-radio label="MPI Parallel">{{
-                    $t("HCFD.geneal.mpi")
-                  }}</el-radio>
-                   </el-tooltip>
-                     </div>
-                </el-radio-group>
                    <el-form-item :label="$t('HCFD.geneal.number')" :label-width="formLabelWidth2"    v-if="
                     parameterObj.nmlParam.parallel_Optional == 'MPI Parallel'
                   ">
@@ -337,7 +388,6 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button
-           type="info" 
           @click="referencevisiable((dialog.parallel_visiable  = false))"
           >{{ $t("HCFD.file.cancel")}} </el-button
         >
@@ -384,7 +434,7 @@
         </div>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="info"  @click="dialog. equation_visiable = false"> {{ $t("HCFD.file.cancel")}}  </el-button>
+        <el-button  @click="dialog. equation_visiable = false"> {{ $t("HCFD.file.cancel")}}  </el-button>
         <el-button type="primary" @click="hcfdparam(); dialog.equation_visiable = false"
           >{{ $t("HCFD.file.ok")}} </el-button
         >
@@ -451,7 +501,6 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button
-           type="info" 
           @click="dialog.inviscid_visiable= false"
           >{{ $t("HCFD.file.cancel")}} </el-button
         >
@@ -643,7 +692,6 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button
-           type="info" 
           @click="dialog.dynamic_visiable  = false"
           >{{ $t("HCFD.file.cancel")}} </el-button
         >
@@ -713,7 +761,6 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button
-           type="info" 
           @click="dialog.nonitertial_visiable  = false"
           >{{ $t("HCFD.file.cancel")}} </el-button
         >
@@ -785,7 +832,7 @@
     </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="info"  @click="referencevisiable((dialog.fluxrc_visiable = false))"
+        <el-button  @click="referencevisiable((dialog.fluxrc_visiable = false))"
           > {{ $t("HCFD.file.cancel")}} </el-button
         >
         <el-button type="primary" @click="hcfdparam(); dialog.fluxrc_visiable = false"
@@ -867,7 +914,7 @@
       </el-form>
     
       <div slot="footer" class="dialog-footer">
-        <el-button type="info"  @click="referencevisiable((dialog.time_visiable = false))"
+        <el-button  @click="referencevisiable((dialog.time_visiable = false))"
           >{{ $t("HCFD.file.cancel")}}  </el-button
         >
         <el-button type="primary" @click="hcfdparam(); dialog.time_visiable = false"
@@ -959,7 +1006,6 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button
-           type="info" 
          @click="dialog.border_visiable = false"
           >{{ $t("HCFD.file.cancel")}} </el-button
         >
@@ -1055,7 +1101,6 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button
-           type="info" 
          @click="dialog.reference_visiable = false"
           >{{ $t("HCFD.file.cancel")}} </el-button
         >
@@ -1109,7 +1154,7 @@
               </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="info"  @click="referencevisiable((dialog.xian_visiable = false))"
+        <el-button   @click="referencevisiable((dialog.xian_visiable = false))"
           >{{ $t("HCFD.file.cancel")}} </el-button
         >
         <el-button type="primary" @click="hcfdparam(); dialog.xian_visiable = false"
@@ -1228,7 +1273,6 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button
-           type="info" 
           @click="dialog.initialization_visiable = false"
           >{{ $t("HCFD.file.cancel")}} </el-button
         >
@@ -1275,7 +1319,7 @@
     <el-button type="info"  @click="hcfdparam()"> 运行</el-button>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="info"  @click="runcvisiable()"> {{ $t("HCFD.file.cancel")}} </el-button>
+        <el-button   @click="runcvisiable()"> {{ $t("HCFD.file.cancel")}} </el-button>
         <el-button type="primary" @click="Runsolve()"
           >{{ $t("HCFD.file.ok")}}</el-button
         >
@@ -1405,7 +1449,6 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button
-           type="info" 
           @click="referencevisiable(dialog.boundaryo_visiable = false)"
           >{{ $t("HCFD.file.cancel")}} </el-button
         >
@@ -1414,7 +1457,7 @@
         >
       </div>
     </el-dialog>
-
+<!-- 流场输出 -->
     <el-dialog
       class="lg-y-z"
       :title="$t('HCFD.solution.specialPara')"
@@ -1435,7 +1478,6 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button
-           type="info" 
           @click="referencevisiable((dialog.specialp_visiable = false))"
           >{{ $t("HCFD.file.cancel")}} </el-button
         >
@@ -1463,7 +1505,7 @@
         </el-radio-group>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="info"  @click="referencevisiable((dialog.swap_visiable = false))"
+        <el-button  @click="referencevisiable((dialog.swap_visiable = false))"
           > {{ $t("HCFD.file.cancel")}} </el-button
         >
         <el-button type="primary" @click="dialog.swap_visiable = false"
@@ -1508,7 +1550,7 @@
       ></Pagination>
     </div>
       <div slot="footer" class="dialog-footer">
-        <el-button type="info"  @click="dialog.ziyuan = false"> {{ $t("HCFD.file.cancel")}} </el-button>
+        <el-button  @click="dialog.ziyuan = false"> {{ $t("HCFD.file.cancel")}} </el-button>
         <el-button type="primary"  @click='resourceOK()'>{{ $t("HCFD.file.ok")}} </el-button>
       </div>
     </el-dialog>
@@ -1586,7 +1628,7 @@
       </div>
           </div>
       <div slot="footer" class="dialog-footer">
-        <el-button type="info"  @click="referencevisiable((dialog.SurfaceGrid_visiable = false))"
+        <el-button   @click="referencevisiable((dialog.SurfaceGrid_visiable = false))"
           >{{ $t("HCFD.file.cancel")}}  </el-button
         >
         <el-button type="primary" @click="dialog.SurfaceGrid_visiable = false"
@@ -1672,7 +1714,7 @@
       </el-form>
       </div>
       <div slot="footer" class="dialog-footer">
-        <el-button type="info"  @click="referencevisiable((dialog.VolumeGrid_visiable = false))"
+        <el-button   @click="referencevisiable((dialog.VolumeGrid_visiable = false))"
           >{{ $t("HCFD.file.cancel")}}</el-button
         >
         <el-button type="primary" @click="dialog.VolumeGrid_visiable = false"
@@ -1978,8 +2020,8 @@ export default {
             { icon:t1, titlie:'缩放'},
             {icon:t2, titlie:'平移'},  
             {icon:t3, titlie:'旋转'}, 
-            {icon:t4, titlie:'分析类型'},  
-            {icon:t5, titlie:'并行类型'}, 
+            // {icon:t4, titlie:'分析类型'},  
+            // {icon:t5, titlie:'并行类型'}, 
         ],
         physicslist:[
             { icon:w1, titlie:'控制方程'},
@@ -2501,6 +2543,14 @@ export default {
   //     this.websock.close() //离开路由之后断开websocket连接
   //   },
 methods:{
+  leixingchange(val){
+    if(val=='MPI Parallel'){
+      this.dialog.parallel_visiable=true;
+    }else{
+        this.dialog.parallel_visiable=false;
+    }
+console.log(val)
+  },
   //数据加载参数配置obj
     hcfdchange(obj,solverConfigid){
        this.parameterObj = JSON.parse(obj);
@@ -2675,7 +2725,7 @@ hcfdparam(){
 var e=e||window.Event
 this.styX.left=e.clientX+'px';
     this.active=key;
-   console.log(key);
+   console.log(this.styX.left);
   switch(key){
     case 'info1-0':
       this.name="New"
@@ -3652,15 +3702,20 @@ html,body{
 }
 
 .imgzong{
-    display: flex;
+     display: flex;
     padding-top: 4px;
-      flex-wrap:wrap;
+     flex-wrap:wrap;
+   
   .el-image{
-      width: 30px;
+      width:30px;
+      vertical-align: middle;
 
   }  
+    
+}
+.item1,.item2{
+  cursor: pointer;
 }
-
 .imgzong .item1{
     padding-right: 4px;
     padding: 4px 4px ;
@@ -3681,6 +3736,45 @@ html,body{
     margin-top: -28px;
 }
 </style>
+<style lang="scss" scoped>
+.imgzong{
+    padding-top: 4px;
+    .radiocontent{
+          display: flex;
+    justify-content: center;
+    align-items: center;
+    }
+      .listitem{
+            width: 100px;
+            height:92px;
+            margin: 5px;
+            padding: 2px;
+            overflow: hidden;
+   
+  .el-image{
+      width:18px;
+      vertical-align: middle;
+
+  }  
+  span{
+    font-size: 14px;
+  }
+     }
+     .item2 {
+         .el-image{
+      margin: 0 19px;
+      width:60px;
+      vertical-align: middle;
+      padding: 9px;
+
+  }  
+  span{
+    display: block;
+    text-align: center;
+  }
+     }
+}
+</style>
 <style>
 .el-input-number__decrease, .el-input-number__increase{
   position: absolute;
@@ -3744,6 +3838,9 @@ html,body{
 </style>
 // 样式大全
 <style lang="scss" scoped>
+  .el-dialog__wrapper{
+          top: 20vh;
+  }
 .diyi i{
   font-size: 14px;
   color: #C0C4CC;
@@ -3770,6 +3867,7 @@ html,body{
 <style lang="scss">
 @import '@/styles/variables.scss';
 @import '@/styles/mixin.scss';
+
 .heigeinput 
 {
  .el-form-item{
@@ -3811,6 +3909,7 @@ html,body{
 
 .liitem{
   margin-bottom: 5px;
+
 }
 .inputwithd  .el-input__inner{
   width: 74px;
@@ -3852,7 +3951,7 @@ html,body{
       padding-left: 10px;
    }
      .el-button{
-    padding: 5px 28px;
+    padding: 8px 28px;
     font-size: 12px;
     }
     .el-button+.el-button{
@@ -3968,6 +4067,17 @@ display:flex;
       line-height: 30px;
         font-size: 12px;
 }
+ /deep/ .el-input-number__decrease{
+  width: 30px;
+    line-height: 28px;
+}
+/deep/ .el-input-number__increase{
+  width: 30px;
+    line-height: 28px;
+}
+/deep/ .el-dialog__headerbtn:hover .el-dialog__close{
+  color: #fff !important;
+} 
 .el-form-item{
       margin-bottom: 5px;
 }

src/views/index/geometry/index.vue

@@ -3046,6 +3046,23 @@ export default {
 methods:{
   handleCommand(command){
  this.i = command
+  },
+     meshclick(e,index,key){
+    var e=e||window.Event;
+    let  that=this;
+that.styX.left=e.clientX+'px';
+console.log(that.styX.left);
+     that.active=key;
+    console.log(key);
+  switch(key){
+     case 'w-0':
+       //this.clickreze()   
+    that.dialog.dialogVisible = true;
+    break;
+  
+       
+  }
+
   },
   // 转换的select的操作
   chansel(val){

src/views/index/index.vue

@@ -678,4 +678,17 @@ html,body{
  /deep/.left .is-scrollable {
   padding:0;
 }
+ /deep/ .left .el-tabs__nav-next,.left .el-tabs__nav-prev{
+display: none;
+}
+ /deep/ .left .el-tabs__nav-prev{
+display: none;
+}
+//  /deep/ .el-radio+.el-radio{
+//   margin: 0;
+// }
+//  /deep/ .el-checkbox+.el-checkbox{
+//   margin: 0;
+// }
+
 </style>

src/views/index/meshindex/index.vue

@@ -3195,4 +3195,10 @@ color:#333;
     width: 100%;
     margin-bottom: 10px;
 }
+.dialog_header {
+    align-items: center;
+    display: -webkit-box;
+    display: -ms-flexbox;
+    display: flex;
+}
 </style>