liuqiao hace 2 años
padre
commit
d7901dbc15

+ 4 - 3
src/utils/request.js

@@ -87,12 +87,13 @@ axios.interceptors.response.use(res => {
           .then(() => {
             MessageBox.close()
             // window.location.hash = "/login/index";
-            // window.location.href = "#/login/index";
+             window.location.href = "#/indexLayout/index";
             // router.replace(`/login/index`)
              // this.$router.replace('/login/index')
-             let logUrl = getLoginUrl();
+            // let logUrl = getLoginUrl();
              // console.log(logUrl);
-             window.location.href=logUrl
+            // window.location.href=logUrl;
+             console.log(  window.location.href);
           })
           .catch(() => {
             Message.info('已取消!')

+ 14 - 28
src/views/index/FEMLab/fem.vue

@@ -1208,10 +1208,10 @@
        <el-form-item label="时间步增量" :label-width="formLabelWidth5">
       <el-input v-model="parameterObj.dt_str.value" autocomplete="off"></el-input>
     </el-form-item>
-       <el-form-item label="出频率" :label-width="formLabelWidth5">
+       <el-form-item label="出频率" :label-width="formLabelWidth5">
       <el-input  v-model="parameterObj.freq.value" autocomplete="off"></el-input>
     </el-form-item>
-      <el-form-item label="出格式" :label-width="formLabelWidth5">
+      <el-form-item label="出格式" :label-width="formLabelWidth5">
       <el-select  @change="changest" v-model="parameterObj.sort.value"  placeholder="请选择">
     <el-option
       v-for="item in jlialist4"
@@ -1628,7 +1628,7 @@
         <el-button   @click="dialog.Solid_Surface= false"
           >{{ $t("HCFD.file.cancel")}}</el-button
         >
-        <el-button type="primary" @click="colorsolid(); "
+        <el-button type="primary" @click="colorsolid();dialog.Solid_Surface= false"
           >{{ $t("HCFD.file.ok")}}</el-button
         >
         <!-- <el-button type="primary" @click="dialog.Solid_Surface = false"
@@ -1679,9 +1679,9 @@
         <el-button type="primary" @click=" liceOK();"
           >{{ $t("HCFD.file.ok")}}</el-button
         >
-        <el-button type="primary" @click="dialog.Slice_Surface = false"
+        <!-- <el-button type="primary" @click="dialog.Slice_Surface = false"
           >Apply</el-button
-        >
+        > -->
       </div>
 </el-dialog>
 <!-- Stream流线 -->
@@ -2406,10 +2406,10 @@ export default {
         ],
        
             jlialist4:[
-               {value:'0',name:'1'},
-               {value:'1',name:'2'},
+               {value:'1',name:'1'},
+               {value:'2',name:'2'},
         ],
-        jliaval4:'0',
+        jliaval4:'1',
         cjalist:[
           {value:'0',name:'静力分析'},
           {value:'1',name:'模态分析'},
@@ -2648,9 +2648,6 @@ vectordata(){
     this.vectorobj.dataUarr=datau.split(",");
     this.vectorobj.dataVarr=datav.split(",");
     this.vectorobj.dataWarr=dataw.split(",");
-    // this.vectorobj.dataU=this.vectorobj.dataUarr[0]
-    // this.vectorobj.dataV=this.vectorobj.dataVarr[0]
-    //  this.vectorobj.dataW=this.vectorobj.dataWarr[0]
     this.vectorobj.scaleFactor=vectorparam.scaleFactor;
 
 },
@@ -2664,10 +2661,7 @@ vectorOK(){
 //add的参数
  // 添加div
  addTab(targetName) {
-   setTimeout(function(){
-
-  
-       this.femaddparam();
+    
    this.target= targetName;
         let newTabName = ++this.tabIndex + '';
        this.bStepok("SliceDisplayAdd",newTabName)
@@ -2691,17 +2685,13 @@ vectorOK(){
  
         this.editableTabsValue = newTabName;
            console.log( this.editableTabs);
-            },300)
       },
 femaddparam(){
-    console.log(333444);
      let dataslicedisplay=JSON.parse(sessionStorage.getItem("dataslicedisplay"));
    let data=JSON.parse(dataslicedisplay);
     let that=this;
     that.variableNamearr=data.variableName.split(",");
      let arr=this.editableTabs; 
-     console.log(arr);
-   
        that.$nextTick(()=>{
     for(var i = 0; i < arr.length; i++){
       arr[i].position_x=data.position_x;
@@ -2716,14 +2706,11 @@ femaddparam(){
        })
 },
       updata(){
-            this.bStepok("SliceDisplayUpdate",'');
-              this.updataparam();
-            
+            this.bStepok("SliceDisplayUpdate",'');       
       },
       //updata的参数
-updataparam(){
-  console.log(1122333);
-  let updateparam=JSON.parse(sessionStorage.getItem("updateparam"));
+updataparam(val){
+  let updateparam=JSON.parse(val);
               let edarr=this.editableTabs;
               let  updatadata=JSON.parse(updateparam);
               let updatarr=updatadata.update_param;
@@ -2788,7 +2775,7 @@ updataparam(){
       },
       liceOK(){
   let paramJson=JSON.stringify(this.editableTabs)
-  this.paramJson=paramJson;
+  this.streamparae=paramJson;
   this.bStepok("SliceDisplayApply",'');
   this.dialog.Slice_Surface= false;
 
@@ -3024,13 +3011,11 @@ this.styX.left=e.clientX+'px';
     async getLogs() {
       //打印日志
       var self = this;
-      console.log(self.pid);
       function getLog() {
           let params = {
               transCode: "C00006",
               pid:self.pid
           };
-          console.log(params);
           request(params)
             .then((res) => {
             console.log(res);
@@ -3129,6 +3114,7 @@ this.styX.left=e.clientX+'px';
     },
     websocketonmessage(e) {
       //数据接收
+       console.log(e);
    try{
          const redata = JSON.parse(e.data);
               if(redata.type == "log"){

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

@@ -51,7 +51,6 @@ loadingopen(){
 },
    // 关闭lodind
     loadingend(loading){
-      console.log(9999);
       loading.close()
       },
     //     inthetaclick(){