6.27测试环境与生产环境

.env.development

@@ -6,4 +6,6 @@ ENV = 'development'
 
 VUE_APP_BASE_API = '/api'
 
+VUE_APP_BASE_websokt = '/192.168.0.43'
+
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

.env.production

@@ -4,3 +4,4 @@ ENV = 'production'
 
 VUE_APP_BASE_API = '/tadi'
 
+VUE_APP_BASE_websokt = '/www.adicn.com'

src/views/index/FEMLab/fem.vue

@@ -3103,7 +3103,8 @@ this.styX.left=e.clientX+'px';
     getwebsocket() {
      // 初始化weosocket
      this.numlist=[];
-      const wsuri = "ws://192.168.0.43:8031/websocket?projectId="+this.pid;
+      //const wsuri = "ws://192.168.0.43:8031/websocket?projectId="+this.pid;
+        const wsuri = "ws://"+process.env.VUE_APP_BASE_websokt+"/eswebsocket?projectId="+this.pid;
       this.websock = new WebSocket(wsuri);
       this.websock.onmessage = this.websocketonmessage;
       this.websock.onopen = this.websocketonopen;

src/views/index/FemLab2_0/index.vue

@@ -1828,7 +1828,8 @@ this.styX.left=e.clientX+'px';
     getwebsocket() {
      // 初始化weosocket
      this.numlist=[];
-      const wsuri = "ws://192.168.0.43:8031/websocket?projectId="+this.pid;
+      //const wsuri = "ws://192.168.0.43:8031/websocket?projectId="+this.pid;
+       const wsuri = "ws://"+process.env.VUE_APP_BASE_websokt+"/eswebsocket?projectId="+this.pid;
       this.websock = new WebSocket(wsuri);
       this.websock.onmessage = this.websocketonmessage;
       this.websock.onopen = this.websocketonopen;

src/views/index/HCFDLab/echartsHFCD.vue

@@ -173,7 +173,8 @@ export default {
      this.numlist=[];
      this.option.series=[];
      this.convergeDate.value=[];
-      const wsuri = "ws://192.168.0.43:8031/websocket?projectId="+this.projectId;
+    //  const wsuri = "ws://192.168.0.43:8031/websocket?projectId="+this.projectId;
+      const wsuri = "ws://"+process.env.VUE_APP_BASE_websokt+"/eswebsocket?projectId="+this.projectId;
       this.websock = new WebSocket(wsuri);
       this.websock.onmessage = this.websocketonmessage;
       this.websock.onopen = this.websocketonopen;

src/views/index/HCFDLab/index.vue

@@ -1728,43 +1728,6 @@
                         </el-option>
                   </el-select>
                 </el-form-item>
-                          <!-- <el-form-item :label=" $t('HCFD.results.scalar') " :label-width="formLabelWidth2">
-                          <el-select size="mini" v-model="bScalar" placeholder="请选择">
-                          <el-option
-                            v-for="scalar in boundaryScalars"
-                            :key="scalar"
-                            :label="scalar"
-                            :value="scalar"
-                          >
-                          </el-option>
-                        </el-select>
-                    </el-form-item>  -->
-                  <!-- <div>
-                       <el-form-item :label=" $t('HCFD.results.contour')" :label-width="formLabelWidth2">
-                         <el-input-number v-model="Surfacenum" @change="SurfaceChange" :min="1" :max="10" label="描述文字"></el-input-number>
-                    </el-form-item>
-                    <li class="disflex lheig34 liitem">
-                      <span class="span100 marb5 formLabelWidth15">{{ $t("HCFD.results.vector")}} </span>
-                      <el-checkbox checked>Velocity</el-checkbox>
-                    </li>
-                    <li class="disflex lheig34 liitem">
-                      <span class='span100 marb5 formLabelWidth15' >{{ $t("HCFD.results.show")}} </span>
-                      <el-checkbox-group v-model="belementCheckeds" style="display:flex">
-                        <el-checkbox label="Mesh"  @change="Contourval('Mesh')"
-                        ></el-checkbox>
-                        <el-checkbox label="Contour"    @change="Contourval('Contour')"
-                        ></el-checkbox>
-                      </el-checkbox-group>
-                    </li>
-                  </div> -->
-                      <!-- <el-button
-                        size="mini"
-                        type="primary"
-                        style="margin:30px 0 30px 40%"
-                        @click="boundaryShow()"
-
-                        > {{ $t("HCFD.results.Surface")}} </el-button> -->
-        
       </el-form>
       </div>
           </div>
@@ -2373,16 +2336,26 @@
       <div class="line">
       <div class="linetext">动画</div>
     </div> 
+     <div class="listbtn anbtn"> 
+       <el-button plain class="anniu"  @click="animationclick()">轮廓显示</el-button>
+        <el-button plain class="anniu" @click="animationclick()">线</el-button>
+        <el-button plain class="anniu" @click="animationclick()">矢量</el-button>
+          <el-button plain class="anniu" @click="animationclick()">实体表面</el-button>
+      </div>
+          <div class="yiinpu loadclass" >
+             <el-button plain class="anniu">Lode</el-button>
+             <el-progress :percentage="50" :stroke-width="5" ></el-progress>
+ </div>
        <el-form-item label="第一步" :label-width="formLabelWidth2" >
-      <el-input value="PingYi" autocomplete="off"></el-input>
+      <el-input v-model="animationobj.firststep" autocomplete="off"></el-input>
       </el-form-item>
           <el-form-item label="最后一步" :label-width="formLabelWidth2" >
-      <el-input value="PingYi" autocomplete="off"></el-input>
+      <el-input v-model="animationobj.laststep" autocomplete="off"></el-input>
       </el-form-item>
           <el-form-item label="当前步" :label-width="formLabelWidth2" >
-      <el-input value="PingYi" autocomplete="off"></el-input>
+      <el-input  v-model="animationobj.currentstep" autocomplete="off"></el-input>
       </el-form-item>
-      <div class="timeanmiantion">
+      <!-- <div class="timeanmiantion">
         <ul>
         <li>Time<span>1</span></li>
         <li style="flex:2;">
@@ -2400,14 +2373,14 @@
         </li>
    
         </ul>
-      </div>
+      </div> -->
 <div class="line">
       <div class="linetext">通用场景</div>
     </div> 
      <div class="block1" style="dispaly:flex">
         <div class="listbtn"> 
        <el-button plain class="anniu">low</el-button>
-         <el-slider v-model="value1" style="width:50%"></el-slider>
+         <el-slider v-model="value1" style="width:50%;margin: 0 10px 0 15px;"></el-slider>
         <el-button plain class="anniu">Quick</el-button>
       </div>
         <div class="listbtn anbtn"> 
@@ -2861,6 +2834,11 @@ export default {
         nameTypes:'',
         scalarmax:'',
      },
+     animationobj:{
+        firststep:'',
+        laststep:'',
+        currentstep:'',
+     },
     colorobj:{
       R:'0',
       G:'0',
@@ -3952,7 +3930,7 @@ setpnum(){
            request(params)
         .then((res) => {
         let steps= res.steps.split(',');
-        this.boundaryStep=steps;
+        this.boundaryStep=steps;                                                                                                                                                                                                                                                  
         this.volumStep=steps;
             })
   }
@@ -4274,6 +4252,9 @@ this.styX.left=e.clientX+'px';
        break;
   }
 
+  },
+  animationclick(){
+
   },
     //清除相关信息
     clearAll() {
@@ -4506,7 +4487,11 @@ bStepChange(val){
             message: "请选择setp有效值",
           });
   }
-
+    this.animationobj.firststep= this.boundaryStep[0];
+    this.animationobj.laststep= this.boundaryStep[this.boundaryStep.length -1];
+    this.animationobj.currentstep=this.bStep;   
+    console.log( this.animationobj);
+    console.log(333333);
 },
 //选择step
 vStepChange(val){
@@ -4517,6 +4502,9 @@ vStepChange(val){
             message: "请选择setp有效值",
           });
   }
+   this.animationobj.firststep= this.volumStep[0];
+    this.animationobj.laststep= this.volumStep[this.volumStep.length -1];
+    this.animationobj.currentstep=val;    
 },
 // 表面加载
 SurfaceChange(value){// 选择色条个数
@@ -4583,8 +4571,8 @@ VolumenumChange(value){// 选择色条个数
         projectId: this.project.projectId,
         lesseeId: this.$store.getters.lesseeId
       };
-        console.log(this.parameterObj.nmlParam.a_u);
-      console.log(this.parameterObj);
+      //   console.log(this.parameterObj.nmlParam.a_u);
+      // console.log(this.parameterObj);
       await request(params)
         .then((res) => {
           this.solverState = res.solverState;
@@ -5371,6 +5359,16 @@ html,body{
   }
  
 }
+.loadclass{
+  margin-bottom:10px;
+    display: flex;
+  .el-button{
+      margin-right:10px;
+  }
+  .el-progress{
+    width:100%;
+  }
+}
 .ulist ul{
   display: flex;
   margin: 0;

src/views/index/index.vue

@@ -386,7 +386,6 @@ created(){
   this.init();
 },
 mounted(){
-
       let curcolor  = this.$store.state.themecolor;
       this.classH2 = 'custome-' + curcolor;
 },
@@ -713,12 +712,15 @@ let params = {
     // // 文件渲染websoket图片的渲染
     initWebSocket(){ //初始化weosocket
 
-        const wsuri = "ws://192.168.0.43:8087//websocket?projectId="+this.pid;
+       // const wsuri = "ws://192.168.0.43:8087//websocket?projectId="+this.pid;
+         const wsuri = "ws://"+process.env.VUE_APP_BASE_websokt+"//websocket?projectId="+this.pid;
         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;
+  
+    console.log(wsuri)
       },
       websocketonopen(e){ //连接建立之后执行send方法发送数据
         this.startimg("init",'loaddata');