소스 검색

4.19 调试加载图片

liuqiao 2 년 전
부모
커밋
0e3badc51d
4개의 변경된 파일85개의 추가작업 그리고 62개의 파일을 삭제
  1. 38 13
      src/views/index/HCFDLab/index.vue
  2. 0 2
      src/views/index/compoents/TFileStreamhcfd.vue
  3. 16 2
      src/views/index/compoents/tool1.vue
  4. 31 45
      src/views/index/index.vue

+ 38 - 13
src/views/index/HCFDLab/index.vue

@@ -269,7 +269,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button  @click="dialog.upload_visiable = false">{{ $t("HCFD.file.cancel")}}</el-button>
-        <el-button type="primary" @click="dialog.upload_visiable = false"
+        <el-button type="primary" @click="runugrid();dialog.upload_visiable = false"
           >{{ $t("HCFD.file.ok")}}</el-button
         >
       </div>
@@ -2156,7 +2156,7 @@
    <div class="heigeinput">
       <div class="listbtn"> 
        <el-button plain class="anniu"  @click="addTab(editableTabsValue) ">添加</el-button>
-        <el-button plain class="anniu" @click="moveTab() ">清除</el-button>
+        <el-button plain class="anniu" @click="moveTab(targetName) ">清除</el-button>
       </div>
      <el-tabs v-model="editableTabsValue" type="card" closable @tab-remove="removeTab">
   <el-tab-pane
@@ -2165,8 +2165,8 @@
     :label="item.title"
     :name="item.name"
   >
-    {{item.content}}
-     <Addtabs ></Addtabs>
+    
+     <Addtabs :is=item.content> {{item.content}}</Addtabs>
   </el-tab-pane>
 </el-tabs>
 
@@ -2347,7 +2347,11 @@
      -->
  <el-dialog  :visible.sync="dialog.Curve_Disp1ay" 
      v-if="active=='five10-1'"
-  
+     :modal='false'
+    :close-on-click-modal="false"
+    :modal-append-to-body='false'
+      @close='activecleer()'
+        :style="styX"
   
     custom-class='dialoglocation dialog_color'
      width="385px"
@@ -2603,7 +2607,6 @@ import { Caegw_ProUrl } from "@/settings"; // 引入settings.js
 import loading from "./loading.vue";
 import transformtool from "./loads/transformtool.vue";
 import echartsHFCD from "./echartsHFCD.vue";
-import TFileStream from "./TFileStream.vue";
 import Addtabs from './addtabs.vue'
 
 export default {
@@ -2616,7 +2619,6 @@ export default {
     Pagination,
     // vtkLoad,
     echartsHFCD,
-    TFileStream,
         Addtabs,},
     // websocket,},
     props:{
@@ -2646,6 +2648,7 @@ export default {
       colorlevel:'Sectionalplane',
       secheck:'',
       },
+      target:'',
         editableTabsValue: '2',
         editableTabs: [
         //   {
@@ -3341,18 +3344,27 @@ export default {
   //     this.websock.close() //离开路由之后断开websocket连接
   //   },
 methods:{
+  // 上传文件,加载图片 
+  runugrid(){
+      this.$parent.startimg("init",'loaddata');
+  },
   // 添加div
  addTab(targetName) {
+   this.target= targetName;
     console.log(targetName);
         let newTabName = ++this.tabIndex + '';
         this.editableTabs.push({
           title:newTabName,
           name: newTabName,
-          content:Addtabs,
+          content:"Addtabs",
         });
         this.editableTabsValue = newTabName;
+         console.log( this.editableTabs);
+      
       },
       removeTab(targetName) {
+        
+         console.log(targetName);
         let tabs = this.editableTabs;
         let activeName = this.editableTabsValue;
         if (activeName === targetName) {
@@ -3368,13 +3380,26 @@ methods:{
         
         this.editableTabsValue = activeName;
         this.editableTabs = tabs.filter(tab => tab.name !== targetName);
+        
       },
       //删除新增的tab
-// moveTab(targetName){
-//         let tabs = this.editableTabs;
-//      this.editableTabs = tabs.filter(tab => tab.name !== targetName);
-//     tabs.pop();
-// },
+moveTab(){
+      let tabs = this.editableTabs;
+        let activeName = this.editableTabsValue;
+        if (activeName === targetName) {
+          tabs.forEach((tab, index) => {
+            if (tab.name === targetName) {
+              let nextTab = tabs[index + 1] || tabs[index - 1];
+              if (nextTab) {
+                activeName = nextTab.name;
+              }
+            }
+          });
+        }
+        
+        this.editableTabsValue = activeName;
+        this.editableTabs = tabs.filter(tab => tab.name !== targetName);
+},
   changedesc1(val){
     this.desclist=JSON.parse(val);
      this.parameterObj.hcfdBoundarys= this.desclist;

+ 0 - 2
src/views/index/compoents/TFileStreamhcfd.vue

@@ -33,8 +33,6 @@ export default {
     },
     methods:{
       fetchData(imgs) {
-        console.log(imgs.img)
-
       this.loadingend(this.loadingopen());
           this.imgsrc = imgs.img;
      

+ 16 - 2
src/views/index/compoents/tool1.vue

@@ -1,5 +1,5 @@
 <template>
-<div>
+<div class="tool">
     <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)">
@@ -110,10 +110,12 @@ export default {
      case 'tl1-0':
   break;
     case 'tl1-1':
+        this.$emit('startimg',"init",'zoomin')
       break;
     case 'tl2-0':
       break; 
     case 'tl2-1':
+         this.$emit('startimg',"init",'zoomout')
       break;
     case 'tl2-2':
       break;
@@ -126,19 +128,25 @@ export default {
     case'tl3-1':
        break;
     case'tl4-0':
-    this.$emit('startimg','ALignToPlusAxisX')
+       this.$emit('startimg',"init",'AlignToPlusAxisY');
        break;
     case'tl4-1':
+    this.$emit('startimg',"init",'AlignToMinusAxisY');
        break;
     case'tl4-2':
+      this.$emit('startimg',"init",'AlignToMinusAxisZ');
        break;
     case'tl4-3':
+         this.$emit('startimg',"init",'AlignToPlusAxisZ');
        break;
     case'tl4-4':
+       this.$emit('startimg',"init",'AlignToMinusAxisX');
        break;
     case'tl4-5':
+     this.$emit('startimg',"init",'AlignToPlusAxisX');
        break;
     case'tl4-6':
+       this.$emit('startimg',"init",'RelocateToCenter');
        break;
      
        
@@ -155,6 +163,12 @@ export default {
 
 </script>
 <style scoped>
+.tool{
+   position: absolute;
+    top: 0;
+    width: 100%;
+    z-index: 999;
+}
 .activeOrange1{
       background-color:rgba(240, 171, 39, 0);
       border-radius: 5px;

+ 31 - 45
src/views/index/index.vue

@@ -105,33 +105,6 @@
 <el-container>
    <el-main ref="main3d" :class="headMenu_2Show?'maxh400':'maxh221'" style="padding:0">
      <tool1 @startimg="startimg"></tool1>
-     <!-- <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="{activeOrange2:active=='tl4-'+ index}" :tabIndex="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>
     <!-- 加载图片 -->
@@ -466,8 +439,8 @@ methods:{
 
         },
         init(){
-         //this.pid=this.$route.query.pid;
-         this.pid='31f117acb7e74232a3267b091391eab2';
+         this.pid=this.$route.query.pid;
+        // this.pid='31f117acb7e74232a3267b091391eab2';
           this.solverchange('HCFDLab');
      
         },
@@ -495,13 +468,7 @@ methods:{
           this.$refs.hcfd.hcfdchange(this.objopp,res.solverConfigid);
           this.solverConfigid=res.solverConfigid;
          let data= JSON.parse(this.objopp);
-            // this.startimg("init");
-     //this.startimg("loaddata");
-     setTimeout(function(){
-       //  that.initWebSocket();
-     },500)
-      
-         
+          this.startimg("init",'loaddata');
           this.numsteps=data.nmlParam.steps;
          console.log(this.numsteps);
            })   
@@ -510,8 +477,6 @@ methods:{
              // this.$refs.fem.femchange(res.parameterObj,res.solverConfigid);
               this.$refs.fem.femchange(res.parameterObj,'abc6db6cb2c0482eb7964df6fea02c70');
            })   
-         
-
         }else{
           
         }
@@ -524,6 +489,7 @@ methods:{
       fun(){
             this.$refs.monitor.getwebsocket(); 
            this.$refs.monitor.container_show=true;
+               this.$refs.TFileStream.imgtupian=false;
       },
 
  // 日志的文本框
@@ -565,8 +531,8 @@ loadingend(loading){
 
 },
   // 文件渲染之前的动作
-  startimg(action){
-    console.log(2222);
+  startimg(action,action2){
+    console.log(111)
 let params = {
         transCode: "AFT001",// 服务器渲染实例接口创建推流
         pid:this.pid,
@@ -578,10 +544,30 @@ let params = {
       request(params)
         .then((res) => {
             console.log(res);
+            this.startimgloaddata(action2)
            
         })
         .catch((err) => {
-               this.loadingend(this.loadingopen());
+
+        }); 
+  },
+   startimgloaddata(action){
+     let that=this;
+let params = {
+        transCode: "AFT001",// 服务器渲染实例接口创建推流
+        pid:this.pid,
+        solverConfigId: this.solverConfigid,
+       action:action,
+       paramJson:"",
+      };
+      this.loading = true;
+      request(params)
+        .then((res) => {
+            console.log(res);
+            that.initWebSocket();
+        })
+        .catch((err) => {
+              
 
         }); 
   },
@@ -604,10 +590,10 @@ let params = {
               this.websock.close() 
       },
       websocketonmessage(e){ //数据接收
-     
+        //  this.loadingopen();
+         console.log(e);
         try{
-            const redata = JSON.parse(e.data); 
-               console.log(redata.img);       
+            const redata = JSON.parse(e.data);   
                 
             // if(redata.hasOwnProperty("data")){          
             // }else{
@@ -617,9 +603,9 @@ let params = {
             // }
           //  if(redata.data!=undefined){
                 // this.$refs.monitor.hiden();
+                 this.$refs.monitor.container_show=false;
               this.$refs.TFileStream.imgtupian=true;
               this.$refs.TFileStream.fetchData(redata);
-              console.log(22222)
           //  }