liuqiao 2 years ago
parent
commit
559fec4042
2 changed files with 21 additions and 6 deletions
  1. 4 4
      src/views/index/FEMLab/fem.vue
  2. 17 2
      src/views/index/index.vue

+ 4 - 4
src/views/index/FEMLab/fem.vue

@@ -1115,7 +1115,7 @@
       <div class="linetext">输出控制</div>
       <div class="linetext">输出控制</div>
     </div> 
     </div> 
             <el-form-item label="结果文件名称" :label-width="formLabelWidth5">
             <el-form-item label="结果文件名称" :label-width="formLabelWidth5">
-      <el-input v-model="parameterObj.result_file.value"  disabled autocomplete="off"></el-input>
+      <el-input v-model="parameterObj.result_file.value" disabled autocomplete="off"></el-input>
     </el-form-item>
     </el-form-item>
     <el-checkbox v-model="parameterObj.dump_stiff.value"  true-label="true" false-label="false">刚度矩阵输出</el-checkbox>
     <el-checkbox v-model="parameterObj.dump_stiff.value"  true-label="true" false-label="false">刚度矩阵输出</el-checkbox>
     <el-checkbox v-model="parameterObj.dump_mass.value"  true-label="true" false-label="false" >质量矩阵输出</el-checkbox>
     <el-checkbox v-model="parameterObj.dump_mass.value"  true-label="true" false-label="false" >质量矩阵输出</el-checkbox>
@@ -1574,7 +1574,7 @@
         > -->
         > -->
       </div>
       </div>
 </el-dialog>
 </el-dialog>
-<!--Solid Surface固体 -->
+<!--Solid Surface实体表面 -->
  <el-dialog  :visible.sync="dialog.Solid_Surface" 
  <el-dialog  :visible.sync="dialog.Solid_Surface" 
      v-if="active=='six3-0'"
      v-if="active=='six3-0'"
     :modal='false'
     :modal='false'
@@ -1586,7 +1586,7 @@
        >
        >
             <div slot="title" class=dialog_header>
             <div slot="title" class=dialog_header>
      <el-image class="imge" :src="p14" fit="cover" />
      <el-image class="imge" :src="p14" fit="cover" />
-     <span class="text-color">Solid Surface</span>
+     <span class="text-color">实体表面</span>
   </div>
   </div>
   <el-form :model="form">
   <el-form :model="form">
    <div class="heigeinput">
    <div class="heigeinput">
@@ -2226,7 +2226,7 @@ export default {
             { icon:p4, titlie:'矢量'},
             { icon:p4, titlie:'矢量'},
         ],
         ],
         displaylist2:[
         displaylist2:[
-           { icon:p14, titlie:'Solid Surface'},
+           { icon:p14, titlie:'实体表面'},
             { icon:p15, titlie:'切片'},
             { icon:p15, titlie:'切片'},
             { icon:p16, titlie:'Stream'},
             { icon:p16, titlie:'Stream'},
         ],
         ],

+ 17 - 2
src/views/index/index.vue

@@ -557,7 +557,6 @@ linezhexian(num){
           
           
         }
         }
          }else{
          }else{
-              console.log(2222)
             }
             }
           })
           })
           .catch((err) => {
           .catch((err) => {
@@ -567,14 +566,22 @@ linezhexian(num){
       // 调用求解过程日志
       // 调用求解过程日志
       fun(){
       fun(){
         if( this.state=='1'){
         if( this.state=='1'){
+          console.log(111)
            this.$refs.monitor.getwebsocket(); 
            this.$refs.monitor.getwebsocket(); 
         }else{
         }else{
           this.$refs.hcfd.hcfdrun();
           this.$refs.hcfd.hcfdrun();
+         
         }
         }
            this.$refs.monitor.container_show=true;
            this.$refs.monitor.container_show=true;
            this.monitorHCFD=this.$refs.monitor.container_show
            this.monitorHCFD=this.$refs.monitor.container_show
             this.$refs.TFileStream.imgtupian=false;
             this.$refs.TFileStream.imgtupian=false;
       },
       },
+      funagain(){
+          this.$refs.monitor.getwebsocket(); 
+             this.$refs.monitor.container_show=true;
+           this.monitorHCFD=this.$refs.monitor.container_show
+            this.$refs.TFileStream.imgtupian=false;
+      },
 // 工具栏的显示隐藏
 // 工具栏的显示隐藏
 changehcfd(pare){
 changehcfd(pare){
     this.$refs.monitor.getwebsocket(); 
     this.$refs.monitor.getwebsocket(); 
@@ -632,6 +639,7 @@ let params = {
       this.loading = true;
       this.loading = true;
       request(params)
       request(params)
         .then((res) => {
         .then((res) => {
+          this.logs='HCFD'
               if(res.returnCode=='000000000'){
               if(res.returnCode=='000000000'){
             this.startimgloaddata(action2)
             this.startimgloaddata(action2)
               }else{
               }else{
@@ -690,7 +698,7 @@ let params = {
         //  // loading.close();
         //  // loading.close();
         // }, 3000);
         // }, 3000);
     console.log(e);
     console.log(e);
-    console.log(111);
+  
     // if(e==){
     // if(e==){
 
 
     // }else{
     // }else{
@@ -701,7 +709,14 @@ let params = {
     // }
     // }
         try{
         try{
             const redata = JSON.parse(e.data);   
             const redata = JSON.parse(e.data);   
+         
            if(redata.hasOwnProperty("img")){
            if(redata.hasOwnProperty("img")){
+                if(redata.img=''||redata.img==null||redata.img==undefined||redata.img==false){
+                  console.log(11111)
+
+                }else{
+                    console.log(2222)
+            }
            this.$refs.TFileStream.imgtupian=true;
            this.$refs.TFileStream.imgtupian=true;
           this.$refs.TFileStream.fetchData(redata);
           this.$refs.TFileStream.fetchData(redata);
           this.$refs.monitor.container_show=false;
           this.$refs.monitor.container_show=false;