5.23

src/views/index/HCFDLab/echartsHFCD.vue

@@ -169,13 +169,14 @@ export default {
     getwebsocket() {
      // 初始化weosocket
      this.numlist=[];
+     this.option.series=[];
+     this.convergeDate.value=[];
       const wsuri = "ws://192.168.0.43:8031/websocket?projectId="+this.projectId;
       this.websock = new WebSocket(wsuri);
       this.websock.onmessage = this.websocketonmessage;
       this.websock.onopen = this.websocketonopen;
       this.websock.onerror = this.websocketonerror;
       this.websock.onclose = this.websocketclose;
-   
     },
     websocketonopen(e) {
           
@@ -207,10 +208,8 @@ export default {
               const onelines = kgReplace(lines.trim()).split(" ")
                 .map((str) => str.trim());
               this.s1= onelines.slice(1,2).map((str) => Number(str));
-          
             }
                this.timedata(redata.startTime,redata.time,this.s1[0]);
-            
             }
               }
             }catch(error){

src/views/index/HCFDLab/index.vue

@@ -139,6 +139,12 @@
                             <span >{{item.titlie}}</span>
             </div>
             </div>  
+               <div class="listitem lbg_color3 bkcolor3  imgsolution"  v-for="(item,index) in  runlist"  :key="'four41'+ index" :class="{activeOrange:active=='four41'+ index}" @click="clickgeometry($event,index,'four41'+ index)" >
+             <div class="item2 "   >
+                 <el-image :src="item.icon" fit="cover" />  
+                   <span >{{item.titlie}}</span>
+            </div>
+            </div>   
             </div>
         
           </el-tab-pane>
@@ -2084,7 +2090,7 @@
         > -->
       </div>
 </el-dialog>
-<!--Solid Surface固体 -->
+<!--Solid Surface实体表面 -->
  <el-dialog  :visible.sync="dialog.Solid_Surface" 
      v-if="active=='five8-0'"
     :modal='false'
@@ -2096,7 +2102,7 @@
        >
             <div slot="title" class=dialog_header>
      <el-image class="imge" :src="p14" fit="cover" />
-     <span class="text-color">Solid Surface</span>
+     <span class="text-color">实体表面</span>
   </div>
   <el-form :model="form">
    <div class="heigeinput">
@@ -2196,7 +2202,7 @@
         >
       </div>
 </el-dialog>
-<!-- Stream -->
+<!-- Stream流线 -->
  <el-dialog  :visible.sync="dialog.Stream_Surface" 
      v-if="active=='five8-2'"
     :modal='false'
@@ -2208,12 +2214,12 @@
        >
             <div slot="title" class=dialog_header>
      <el-image class="imge" :src="p16" fit="cover" />
-     <span class="text-color">Stream</span>
+     <span class="text-color">流线</span>
   </div>
   <el-form :model="form">
    <div class="heigeinput">
  <div class='selecttype'>
-        <span class="texttype">Stream</span>
+        <span class="texttype">流线</span>
          <div class='selecttype'>
         <span class="texttype">矢量</span>
          <div class="selecr">
@@ -2762,6 +2768,7 @@ import p15 from '@/assets/icon/result_slice.png'
 import p16 from '@/assets/icon/result_stream.png'
 import p17 from '@/assets/icon/animation.png'
 import p18 from '@/assets/icon/result_curve.png'
+import p19 from '@/assets/hcfd_images/run.png'
 
 
 
@@ -2914,7 +2921,7 @@ export default {
         d1,d2,d3,d4,
        j1,j2,
        q1, q2,q3,q4,q5,q6,qq,
-       p1,p2,p3,p4,p5,p6,p7,p8,p9,p10,p11,p12,p13,p14,p15,p16,p17,p18,
+       p1,p2,p3,p4,p5,p6,p7,p8,p9,p10,p11,p12,p13,p14,p15,p16,p17,p18,p19,
       visibles:false,
       restime:'',
       numzhexian:'',
@@ -3030,6 +3037,9 @@ export default {
         solutionlist3:[
             { icon:q5, titlie:'运行控制'},
             { icon:q6, titlie:'输出控制'},
+        ],
+        runlist:[
+            { icon:p19, titlie:'求解'},
         ],
          solutionlist4:[
             { icon:"icon-xitongcanshupeizhi", titlie:'Advanced Option_特殊的参数'},
@@ -3076,9 +3086,9 @@ export default {
             { icon:p4, titlie:'矢量'},
         ],
         displaylist2:[
-           { icon:p14, titlie:'Solid Surface'},
+           { icon:p14, titlie:'实体表面'},
             { icon:p15, titlie:'切片'},
-            { icon:p16, titlie:'Stream'},
+            { icon:p16, titlie:'流线'},
         ],
         animationlist:[
            { icon:p17, titlie:'动画'},
@@ -3818,9 +3828,10 @@ hcfdparam(){
                   type: "success",
                   message:res.returnMsg,
                 });
-           
+             // this.$emit("exlodingfalse",false)
         })
         .catch((err) => {
+             this.$emit("exlodingfalse",false)
           setTimeout(function () {
             _this.$refs.loading.visiable = false;
           }, 4000);
@@ -3868,7 +3879,7 @@ hcfdparam(){
      * 更新配置 并求解
      */
     async hcfdrun() {
-      if (this.state == "1") {
+      if (this.state == "1") {//求解状态（0-求解中，1-求解成功，-1-没有求解）
         //上次求解完成
         MessageBox.confirm(
           "已完成计算，是否放弃上次计算结果，重新计算? 如果不放弃请自行下载上次结果文件！",
@@ -3887,7 +3898,8 @@ hcfdparam(){
             let _this = this;
             let isStop = false;
               // if (!isStop && !_this.isSolverEnd) {
-              this.$parent.fun();
+           //this.$parent.fun();
+           this.$parent.funagain();
               // }
        
           })
@@ -3904,7 +3916,7 @@ hcfdparam(){
         let isStop = false;
           // if (!isStop && !_this.isSolverEnd) {
             isStop = true;
-             this.$parent.fun();
+              this.$parent.funagain();
           // }
       }
     },
@@ -3988,9 +4000,6 @@ bStepok(num,action,index,paramJson){
         range0:this.outlineobj.range0,
         range1:this.outlineobj.range1,
         isVolume:this.isVolume,
-        // dataU:this.vectorobj.dataU,
-        // dataV:this.vectorobj.dataV,
-        // dataW:this.vectorobj.dataW,
         dataU:this.vector.u,
         dataV:this.vector.v,
         dataW:this.vector.w,
@@ -4108,7 +4117,6 @@ bmScalarschange(val){
 },
 //实体的颜色的控制
 colorchange(val){
-console.log(this.lineColor)
 if(this.lineColor!=null){
  let str=this.lineColor.slice(5,-1)
   let colorstr=str.split(",");
@@ -4118,14 +4126,11 @@ if(this.lineColor!=null){
   this.colorobj.transparency=colorstr[3];
   console.log(colorstr);
 }
-
 },
 colorsolid(){
 let r=(Number(this.colorobj.R)/255).toFixed(4);
 let g=(Number(this.colorobj.G)/255).toFixed(4);
 let b=(Number(this.colorobj.B)/255).toFixed(4);
-;
-
  const params = {
         transCode: 'AFT001',
         pid:this.project.projectId,
@@ -4159,8 +4164,7 @@ let b=(Number(this.colorobj.B)/255).toFixed(4);
  //模块选择
   clickgeometry(e,index,key){
   
-var e=e||window.Event
-  console.log(e.screenX)
+var e=e||window.Event;
 this.styX.left=e.clientX+'px';
     this.active=key;
     console.log(key);
@@ -4236,8 +4240,13 @@ this.styX.left=e.clientX+'px';
        this.dialog.swap_visiable = true;
        break;
         case 'four44-0':
-          this.hcfdrun();
+        this.$parent.fun();
        break;
+          case 'four410':
+               this.hcfdrun();
+
+       break;
+      
       //   case 'four4-3':
       //  break;
       //   case 'four4-4':