9.22

src/views/index/HCFDLab/index.vue

@@ -5181,7 +5181,7 @@ export default {
         { value: "3", name: "混合网格" },
       ],
          meshvallist1:[
-        { value: "triangle", name: "三角行" },
+        { value: "triangle", name: "三角形" },
         { value: "quad_dominant", name: "四边形" },
         { value: "full_quad", name: "全四边形" },
         { value: "local", name: "局部" },

src/views/index/index.vue

@@ -407,6 +407,7 @@ export default {
       statecustom: "0", //自定义求解状态
       active: "",
       restime: "",
+      logmatter:'',
       monitorHCFD: false,
       footerShow: true,
       headMenu_2Show: false,
@@ -934,7 +935,7 @@ export default {
         //新连接
         that.initWebSocket();
         that.lockReconnect = false;
-      }, 5000);
+      }, 10000);
     },
     reset() {
       //重置心跳
@@ -1006,18 +1007,26 @@ export default {
             this.$refs.fem.percentage = srtpnum;
           }
         } else {
-          this.loadingopen();
-
+         // this.loadingopen();
           //  let eadata=e.data
+           
           var rdata = JSON.parse(e.data);
+             console.log(rdata);
+             if(rdata.action== "meshSplit"){
+            this.logmatter=rdata.log+"\n" +this.logmatter
+            this.logs=this.logmatter;
+          }else{
+             this.loadingopen();
           if (rdata.hasOwnProperty("img")) {
-            this.loadingopen();
+             //this.loadingopen();
+          console.log(222222);
             this.$refs.TFileStream.imgtupian = true;
             this.$refs.TFileStream.fetchData(rdata, null);
             this.$refs.monitor.container_show = false;
+              this.loadingend(this.loadingopen());
           }
+           
           // HCFD云图的参数返回 存储
-          console.log(rdata);
           let rdataparamJson = JSON.parse(rdata.paramJson);
           if (rdataparamJson.hasOwnProperty("Error")) {
             Message({
@@ -1136,9 +1145,10 @@ export default {
             console.log(rdataparamJson);
           }
           return true;
-        }
-      } catch (error) {
-        this.loadingend(this.loadingopen());
+         }
+      } 
+      }catch (error) {
+        // this.loadingend(this.loadingopen());
         return false;
       }
     },