4.12 0.1添加了工具栏

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

@@ -144,3 +144,6 @@ background-color: #757070;
     .custom-00a598 .left{
       border: none;
     }
+    /* .el-tabs{
+    border-bottom: 1px solid #666;
+    } */

src/views/index/HCFDLab/fileupload.vue

@@ -116,9 +116,7 @@ export default {
           .then((res) => { 
                let data = JSON.parse(res.parameterObj);
               this.hcfdBoundarys= data.hcfdBoundarys
-                console.log(this.hcfdBoundarys)
             this.$emit("changedesc",JSON.stringify(this.hcfdBoundarys));
-            console.log('3333');
 
           })
           .catch((err) => {

src/views/index/HCFDLab/index.vue

@@ -5,7 +5,7 @@
       <div class="toolbar-part-detail lbg_color1 ">
          <!-- 工具栏 -->
       <!-- <transformtool ref="transform" :servertype="servertype" :projectId='project.projectId'  :wstep='wstep' :bStep='bStep' :vStep='vStep'></transformtool> -->
-          <el-tabs   v-model="activeName" type="card" @tab-click="handleClick">
+          <el-tabs   v-model="activeName" type="card" @tab-click="handleClick" style="border-bottom:1px solid">
 
             <el-tab-pane label="几何建模" name="one"><geometry></geometry></el-tab-pane>
             <!-- 网格划分 -->
@@ -1073,11 +1073,8 @@
                @changedesc="changedesc1($event)"
             ></vue-uploader>
              </div>
-                <!-- <el-form-item >
-            <el-input type="textarea" v-model="desc" style="min-height: 131px;"></el-input>
-          </el-form-item> -->
-            <div class="desc">{{desc}}
-              
+            <div class="desc">
+            <li class="descitem" v-for="(item,index) in desclist" :key="index" >{{item.id}}--{{item.conditionsCode}}--{{item.name}}</li>
             </div>
            <el-form-item label=" 边界类型" :label-width="formLabelWidth2">
       <el-select 
@@ -1490,9 +1487,16 @@
   </el-select>
  </el-form-item>
  </div>
+ <div v-if="objectplaneval=='0'">
  <el-form-item :label=" $t('HCFD.solution.outputfreq')" :label-width="formLabelWidth2">
       <el-input  v-model="parameterObj.nmlParam.animation_freq" autocomplete="off"></el-input>
     </el-form-item>
+    </div>
+     <div v-else>
+       <el-form-item :label=" $t('HCFD.solution.outputfreq')" :label-width="formLabelWidth2">
+      <el-input   v-model="parameterObj.nmlParam.volume_animation_freq" autocomplete="off"></el-input>
+    </el-form-item>
+      </div>
    <div class="line">
       <div class="linetext">{{ $t("HCFD.solution.Variables")}}</div>
     </div> 
@@ -2080,6 +2084,8 @@ export default {
 
   data() {
     return {
+      desclist:[],
+      boundaryid:'',
           desc:'' ,
       checked:false,
       solverConfigid:'',
@@ -2625,11 +2631,11 @@ export default {
       parameterObjclone: [],
       parameterObj: {
         hcfdBoundarys: [
-          {
-            name: "WING1",
-            id: 1,
-            conditionsCode: 3000,
-          },
+          // {
+          //   name: "WING1",
+          //   id: 1,
+          //   conditionsCode: 3000,
+          // },
         ],
         nmlParam: {
           a_vort_mag: "false",
@@ -2731,9 +2737,8 @@ export default {
   //   },
 methods:{
   changedesc1(val){
-    this.desc=val;
-    console.log(1111);
-    console.log(val);
+    this.desclist=JSON.parse(val);
+     this.parameterObj.hcfdBoundarys= this.desclist;
   },
   leixingchange(val){
     if(val=='MPI Parallel'){
@@ -2746,6 +2751,8 @@ console.log(val)
   //数据加载参数配置obj
     hcfdchange(obj,solverConfigid){
        this.parameterObj = JSON.parse(obj);
+       this.desclist=this.parameterObj.hcfdBoundarys;
+       console.log( this.desclist);
       sessionStorage.setItem("res", obj);
       this.solverConfigid=solverConfigid;
       sessionStorage.setItem("solverConfigid", solverConfigid);
@@ -2923,8 +2930,6 @@ hcfdparam(){
 var e=e||window.Event
 this.styX.left=e.clientX+'px';
     this.active=key;
-   console.log(this.styX.left);
-    console.log( this.active)
   switch(key){
     case 'info1-0':
       this.name="New"
@@ -3414,6 +3419,7 @@ VolumenumChange(value){// 选择色条个数
     },
 
     boundaryChange(boundaryid) {
+      this.boundaryid=boundaryid;
       this.parameterObj.hcfdBoundarys.forEach((hcfdBoundary) => {
         if (hcfdBoundary.id === boundaryid) {
           this.Physics.hcfdBoundaryquery = hcfdBoundary;
@@ -3423,7 +3429,15 @@ VolumenumChange(value){// 选择色条个数
       });
     },
     conditionsChange(conditionsCode) {
+   
       this.Physics.hcfdBoundaryquery.conditionsCode = conditionsCode;
+      this.parameterObj.hcfdBoundarys.forEach((hcfdBoundary) => {
+        if (hcfdBoundary.id === this.boundaryid) {
+          this.Physics.hcfdBoundaryquery = hcfdBoundary;
+          this.Physics.Boundary.cquery = hcfdBoundary.conditionsCode;
+          return;
+        }
+      });
     },
  
      solutionbCheckAllChange(val) {
@@ -4418,7 +4432,9 @@ body {
 .desc{
   width: 100%;
   height: 130px;
-  border:1px solid #000
+  border:1px solid #000;
+  padding: 20px;
+  overflow: auto;
 }
 .radiogroup{
   display:flex;

src/views/index/index.vue

@@ -104,6 +104,33 @@
   <el-container class="beij-container">
 <el-container>
    <el-main ref="main3d" :class="headMenu_2Show?'maxh400':'maxh221'" style="padding:0">
+     <div class="toolmain  lbg_color3 el-menu">
+       <div class="imgzong itemimg1">
+                      <div class="item1"  v-for="(item,index) in toollist"  :key="'tl1-'+ index" :class="{activeOrange1:active=='tl1-'+ index}" @click="meshclick($event,index,'tl1-'+ index)">
+                     <el-tooltip class="item" effect="dark" :content="item.titlie" placement="bottom">
+                         <el-image :src="item.icon" fit="cover" /> 
+                    </el-tooltip>
+                 </div>
+                  <span class="shu">|</span>
+                      <div class="item1"  v-for="(item,index) in toollist2"  :key="'tl2-'+ index" :class="{activeOrange1:active=='tl2-'+ index}" @click="meshclick($event,index,'tl2-'+ index)">
+                     <el-tooltip class="item" effect="dark" :content="item.titlie" placement="bottom">
+                         <el-image :src="item.icon" fit="cover" /> 
+                    </el-tooltip>
+                 </div>
+                  <span class="shu">|</span>
+                        <div class="item1"  v-for="(item,index) in toollist3"  :key="'tl3-'+ index"  :class="{activeOrange1:active=='tl3-'+ index}" @click="meshclick($event,index,'tl3-'+ index)">
+                     <el-tooltip class="item" effect="dark" :content="item.titlie" placement="bottom">
+                         <el-image :src="item.icon" fit="cover" /> 
+                    </el-tooltip>
+                 </div>
+                  <span class="shu">|</span>
+                           <div class="item1"  v-for="(item,index) in toollist4"  :key="'tl4-'+ index"  :class="{activeOrange1:active=='tl4-'+ index}" @click="meshclick($event,index,'tl4-'+ index)">
+                     <el-tooltip class="item" effect="dark" :content="item.titlie" placement="bottom">
+                         <el-image :src="item.icon" fit="cover" /> 
+                    </el-tooltip>
+                 </div>
+                 </div>
+     </div>
     <echartsHFCD ref="monitor" v-if="femnum=='HCFDLab'"  @getthislog='getthislog' @restimeyear='restimeyear'  :projectId='pid' :nmlsteps="Number(numsteps)"></echartsHFCD>
    </el-main>
     <div class="footerTitle   el-tag--primary">
@@ -143,7 +170,25 @@
 
 
 
+//图片引入
+import tl1 from '@/assets/icon/axislegend.png'
+import tl2 from '@/assets/icon/zoomtowindow.png'
+import tl3 from '@/assets/icon/defaultmousecontrol.png'
+import tl4 from '@/assets/icon/u3884.png'
+import tl5 from '@/assets/icon/16.png'
+import tl6 from '@/assets/icon/pan.png'
+import tl7 from '@/assets/icon/u3871.png'
 
+import tl8 from '@/assets/icon/u3879.png'
+import tl9 from '@/assets/icon/u9872.png'
+
+import tl10 from '@/assets/icon/view_front.png'
+import tl11 from '@/assets/icon/view_back.png'
+import tl12 from '@/assets/icon/view_top.png'
+import tl13 from '@/assets/icon/view_bottom.png'
+import tl14 from '@/assets/icon/view_left.png'
+import tl15 from '@/assets/icon/view_right.png'
+import tl16 from '@/assets/icon/view_isometric.png'
 
 // 引入组件
 import { request, getImage } from '@/utils/request'
@@ -168,6 +213,9 @@ export default {
   components:{geometry,meshindex,Geometryandclass,Materials,touch,initial,boundary,Meshauto,loadcase,zuoye,echartsHFCD,result,caozuo,toolindex,hcfd,fem},
   data() {
     return {
+      tl1,tl2,tl3,tl4,tl5,tl6,tl7,tl8,tl9,tl10,
+     tl11,tl12,tl13,tl14,tl15,tl16,
+      active:'',
          restime:'',
         footerShow:true,
         headMenu_2Show:false,
@@ -175,6 +223,30 @@ export default {
         numsteps:'',
         logs: "欢迎来到adi平台",
          newlog:'',
+         toollist:[
+             { icon:tl1, titlie:'坐标轴'},
+             { icon:tl2, titlie:'缩放'},
+           ],
+            toollist2:[
+             { icon:tl3, titlie:'默认鼠标控制'},
+             { icon:tl4, titlie:'缩小到窗口'},
+             { icon:tl5, titlie:'轨道'},
+             { icon:tl6, titlie:'pan'},
+             { icon:tl7, titlie:'zoom'},
+           ],
+            toollist3:[
+             { icon:tl8, titlie:'点击选择'},
+             { icon:tl9, titlie:'点击选择窗口'},
+           ],
+            toollist4:[
+             { icon:tl10, titlie:'前'},
+             { icon:tl11, titlie:'后'},
+             { icon:tl12, titlie:'上'},
+             { icon:tl13, titlie:'底'},
+             { icon:tl14, titlie:'左'},
+             { icon:tl15, titlie:'右'},
+             { icon:tl16, titlie:'等角'},
+           ],
       data: [{
           label: '几何（33）',
           children: [{
@@ -331,6 +403,47 @@ mounted(){
       this.classH2 = 'custome-' + curcolor; 
 },
 methods:{
+   meshclick(e,index,key){
+     let that=this;
+     that.active=key;
+    console.log(key);
+  switch(key){
+     case 'tl1-0':
+  break;
+    case 'tl1-1':
+      break;
+    case 'tl2-0':
+      break; 
+    case 'tl2-1':
+      break;
+    case 'tl2-2':
+      break;
+    case 'tl2-3':
+       break;
+    case 'tl2-4':
+       break;
+    case'tl3-0':
+       break;
+    case'tl3-1':
+       break;
+    case'tl4-0':
+       break;
+    case'tl4-1':
+       break;
+    case'tl4-2':
+       break;
+    case'tl4-3':
+       break;
+    case'tl4-4':
+       break;
+    case'tl4-5':
+       break;
+    case'tl4-6':
+       break;
+     
+       
+  }
+  },
   exlodingfalse(res){
     this.elodingfalse=res;
   },
@@ -446,6 +559,11 @@ methods:{
 }
 }
 }
+.toolmain{
+  width: 100%;
+  height:32px;
+  overflow: hidden;
+}
 html,body{
     width: 100%;
     height: 100%;
@@ -663,6 +781,18 @@ html,body{
     color: #b6b6b6;
     margin-top: 15px;
 }
+.itemimg1{
+  padding: 0;
+}
+.activeOrange1{
+      background-color:rgba(240, 171, 39, 1);
+      border-radius: 5px;
+      box-sizing: border-box;
+    }
+.itemimg1 .item1 .el-image{
+  width: 20px;
+  height: 20px;
+}
 </style>
 <style lang="scss" scoped>
  /deep/.toolbar-part-detail{