4.21

src/views/index/HCFDLab/echartsHFCD.vue

@@ -1,6 +1,8 @@
 <template>
 <div>
+ 
   <div class="x-bar" v-show="container_show">
+     <span>我是折线图的显示隐藏</span>
     <div id="container"></div>
   </div>
   </div>

src/views/index/HCFDLab/index.vue

@@ -1438,7 +1438,7 @@
             <el-radio label="on">On</el-radio>
           </el-radio-group>
     </el-form-item>
-    <el-button type="info"  @click="hcfdparam()"> 运行</el-button>
+    <!-- <el-button type="info"  @click="hcfdparam()"> 运行</el-button> -->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button   @click="runcvisiable()"> {{ $t("HCFD.file.cancel")}} </el-button>
@@ -2171,7 +2171,7 @@
     :label="item.title"
     :name="item.name"
   >
-    
+    {{item.content}}
      <Addtabs :is=item.content> {{item.content}}</Addtabs>
   </el-tab-pane>
 </el-tabs>
@@ -2655,7 +2655,7 @@ export default {
       secheck:'',
       },
       target:'',
-        editableTabsValue: '2',
+        editableTabsValue: '1',
         editableTabs: [
         //   {
         //   title: '1',
@@ -2667,7 +2667,7 @@ export default {
         //   content: 'Tab 2 content'
         // },
         ],
-        tabIndex: 2,
+        tabIndex: 1,
        
      
       value1: 0,

src/views/index/compoents/tool1.vue

@@ -41,6 +41,7 @@ import tl7 from '@/assets/icon/u3871.png'
 
 import tl8 from '@/assets/icon/u3879.png'
 import tl9 from '@/assets/icon/u9872.png'
+import tl17 from '@/assets/icon/u3738.png'
 
 import tl10 from '@/assets/icon/view_front.png'
 import tl11 from '@/assets/icon/view_back.png'
@@ -50,6 +51,7 @@ 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 Vue from 'vue' // 引入vue
 import $ from 'jquery' ;
 import store from "@/store";
@@ -66,7 +68,7 @@ export default {
         return {
            active:'',
                 tl1,tl2,tl3,tl4,tl5,tl6,tl7,tl8,tl9,tl10,
-     tl11,tl12,tl13,tl14,tl15,tl16,
+     tl11,tl12,tl13,tl14,tl15,tl16,tl17,
            toollist:[
              { icon:tl1, titlie:'坐标轴'},
              { icon:tl2, titlie:'缩放'},
@@ -77,6 +79,7 @@ export default {
              { icon:tl5, titlie:'轨道'},
              { icon:tl6, titlie:'pan'},
              { icon:tl7, titlie:'zoom'},
+             { icon:tl17, titlie:'折线图'},
            ],
             toollist3:[
              { icon:tl8, titlie:'点击选择'},
@@ -117,7 +120,9 @@ export default {
     case 'tl2-3':
        break;
     case 'tl2-4':
-      
+       break;
+   case 'tl2-5':
+      this.$emit("changehcfd",true);
        break;
     case'tl3-0':
        break;

src/views/index/index.vue

@@ -104,7 +104,7 @@
   <el-container class="beij-container">
 <el-container>
    <el-main ref="main3d" :class="headMenu_2Show?'maxh400':'maxh221'" style="padding:0">
-     <tool1 @startimg="startimg" :monitorHCFD="monitorHCFD"></tool1>
+     <tool1 @startimg="startimg" :monitorHCFD="monitorHCFD" @changehcfd="changehcfd"></tool1>
      <!-- 加载折线图 -->
     <echartsHFCD ref="monitor" v-if="femnum=='HCFDLab'"  @getthislog='getthislog' @restimeyear='restimeyear'  :projectId='pid' :nmlsteps="Number(numsteps)"></echartsHFCD>
     <!-- 加载图片 -->
@@ -487,7 +487,6 @@ methods:{
         
       },
       solverchange(val){
-        console.log(val)
         let that=this;
         this.femnum=val;
            const params = {
@@ -524,12 +523,18 @@ methods:{
       },
       // 调用求解过程日志
       fun(){
-            this.$refs.monitor.getwebsocket(); 
+           this.$refs.monitor.getwebsocket(); 
            this.$refs.monitor.container_show=true;
            this.monitorHCFD=this.$refs.monitor.container_show
                this.$refs.TFileStream.imgtupian=false;
       },
+// 工具栏的显示隐藏
+changehcfd(pare){
+    this.$refs.monitor.getwebsocket(); 
+  this.$refs.TFileStream.imgtupian=false;
+  this.$refs.monitor.container_show=pare;
 
+},
  // 日志的文本框
        footerShows(evt) {
          if(evt=='claer'){
@@ -628,13 +633,14 @@ let params = {
               this.websock.close() 
       },
       websocketonmessage(e){ //数据接收
-        //  this.loadingopen();
+        //   this.loadingopen();
+             this.$refs.monitor.hiden();
          console.log(e);
         try{
             const redata = JSON.parse(e.data);   
             console.log(redata);
             console.log(redata.img)
-              this.$refs.monitor.hiden();
+
               this.$refs.TFileStream.imgtupian=true;
               this.$refs.TFileStream.fetchData(redata);