liuqiao 4 年之前
父节点
当前提交
db04f6a7bc

+ 19 - 12
src/layout/index.vue

@@ -1,7 +1,7 @@
 /*layout模板*/
 <template>
   <div>
-    <div :class="['header', fixedHeader ? 'fixed-header' : '',this.flag?'show':'hidden']"  >
+    <div :class="['header', fixedHeader ? 'fixed-header' : '',this.flag?'hidden':'show']"  >
       <div class="logo">
         <router-link to="/indexLayout/workbench"
           ><el-image v-show="xglogo" :src="qylogo" fit="cover"
@@ -172,7 +172,7 @@ export default {
   data() {
     return {
       zhucenum:false,
-      flag: false,
+       flag: false,
       logo:logo,
       qylogo:qylogo,
       yingyong:false,
@@ -197,23 +197,25 @@ export default {
         this.redirect = route.query && route.query.redirect
         this.getCount() // 获取统计信息
          //判断是否是前沿的logo;
-        if(route.path=="/indexLayout/workbench"){
+     
+        if(route.path=="/indexLayout/workbench"||route.path=="/indexLayout/home"){
           this.flag=false;
              this.qylogos=true;
           this.xglogo=false;
           this.yingyong=false;
-        }else{
-           this.flag=true;
-           this.xglogo=true;
-           this.qylogos=false;
-             this.yingyong=true;
+        }  else{
+          this.flag=true;
+          this.xglogo=true;
+          this.qylogos=false;
+          this.yingyong=true;
         }
       },
       immediate: true,
     },
   },
   mounted(){
- 
+  //  console.log(this.$store.getters.fixedHeader)
+  //   console.log(this.$store.getters.lesseeId);
   },
   created() {
     
@@ -262,7 +264,10 @@ export default {
   },
   computed: {
     fixedHeader() {
-      return this.$store.getters.fixedHeader
+      return this.$store.getters.fixedHeader  
+    },
+      lesseeId() {
+      return this.$store.getters.lesseeId  
     },
     ...mapGetters(['name', 'userType', 'loginStatus']),
     key() {
@@ -423,10 +428,12 @@ export default {
   }
 }
 .show{
-     background: rgba($color: #0158a8, $alpha: 0.2);
+     background: $color_f;
+
 }
 .hidden{
-  background: $color_f;
+   background: rgba($color: #0158a8, $alpha: 0.2);
+   
 }
 .yingyong{
   font-size: 14px;

+ 3 - 1
src/settings.js

@@ -16,6 +16,8 @@ module.exports = {
      * @description auth TokenKey
      * @desc token
      */
-  TokenKey: 'xigital_token'
+  TokenKey: 'xigital_token',
+  lesseeId:'2'
+
 
 }

+ 1 - 0
src/store/getters.js

@@ -11,5 +11,6 @@ const getters = {
     workbench: state => state.user.workbench,
     backgroundFileid: state => state.user.backgroundFileid,
     userRole: state => state.user.userRole,
+    lesseeId: state => state.config.lesseeId,
 }
 export default getters

+ 5 - 1
src/store/modules/config.js

@@ -1,8 +1,12 @@
 import { fixedHeader } from '@/settings' // 引入settings.js
+import { lesseeId } from '@/settings' // 引入settings.js
+
 
 // Vuex状态树
 const state = {
-  fixedHeader: fixedHeader
+  fixedHeader: fixedHeader,
+  lesseeId:lesseeId,
+
 }
 
 // 同步更改设置 (更改Vuex的store中的状态的唯一方法是提交mutation)

+ 1 - 1
src/utils/token.js

@@ -1,5 +1,5 @@
 import {
-    TokenKey
+    TokenKey,
 } from '@/settings' // 引入settings.js
 
 /**

+ 8 - 2
src/views/index/workbench/index.vue

@@ -107,6 +107,7 @@
 
 <script>
 import { request, getImage } from '@/utils/request'
+import { lesseeId} from '@/settings'
 export default {
   name: 'Cae',
   components: {},
@@ -137,7 +138,9 @@ export default {
       immediate: true,
     },
   },
-  created() {},
+  created() {
+
+  },
   beforeDestroy() {
     this.$store.dispatch('user/changeState', {
       key: 'workbench',
@@ -214,13 +217,16 @@ this.jiazai();
           request(params)
             .then((res) => {
               this.$message.success(' 即将进入' + name)
+               let lesseeId=this.$store.getters.lesseeId;
               setTimeout(() => {
                 window.open(
                   this.$store.getters.cfdUrl +
                     '?authCode=' +
                     res.authCode +
                     '&projectType=' +
-                    projectType,
+                    projectType+
+                     '&lesseeId=' +
+                    lesseeId,
                   '_blank'
                 )
               }, 1000)

+ 5 - 2
src/views/user/project/details/index.vue

@@ -339,10 +339,11 @@ export default {
       }
       request(params)
         .then((res) => {
+              let lesseeId=this.$store.getters.lesseeId;
           console.log(res)
- 
           this.$message.success(' 即将进入求解器')
           console.log( res.authCode);
+
           setTimeout(() => {
             window.open(
               this.$store.getters.cfdUrl +
@@ -351,7 +352,9 @@ export default {
                 '&projectId=' +
                 this.projectId +
                 '&projectType=' +
-                this.data.projectType,
+                this.data.projectType+
+                 '&lesseeId=' +
+                this.data.lesseeId,
               '_blank'
             )
           }, 1000)