Browse Source

5.14改了关于我们

liuqiao 4 năm trước cách đây
mục cha
commit
8434dfa9fb

+ 1 - 1
src/layout/index.vue

@@ -198,7 +198,7 @@ export default {
         this.getCount() // 获取统计信息
          //判断是否是前沿的logo;
      
-        if(route.path=="/indexLayout/workbench"||route.path=="/indexLayout/home"){
+        if(route.path=="/indexLayout/workbench"||route.path=="/indexLayout/home"||route.path=="/indexLayout/guanyuwe"){
           this.flag=false;
              this.qylogos=true;
           this.xglogo=false;

+ 1 - 1
src/permission.js

@@ -11,7 +11,7 @@ NProgress.configure({ showSpinner: false }) // NProgress配置
 
 const whiteList = ['', '/', '/indexLayout', '/indexLayout/', 
     '/indexLayout/home', '/indexLayout/data', '/indexLayout/cae', 
-    '/indexLayout/xitech', 
+    '/indexLayout/xitech', '/indexLayout/guanyuwe', 
     '/indexLayout/workbench', 
     '/indexLayout/design', 
     '/indexLayout/megagame',

+ 10 - 0
src/router/index.js

@@ -56,6 +56,16 @@ export const constantRoutes = [{
                             icon: ''
                         }
                     },
+                    {
+                        path: 'guanyuwe',
+                        name: 'Guanyuwe',
+                        component: () =>
+                            import ('@/views/index/guanyuwe'),
+                        meta: {
+                            title: '数据中心',
+                            icon: ''
+                        }
+                    },
                     {
                         path: 'cae',
                         name: 'Cae',

+ 16 - 16
src/views/index/indexLayout.vue

@@ -91,27 +91,27 @@
     <!-- 进入前沿的首页 -->
     <div ref="getFooterHeight" class="footer" v-show="qianyan" >
       <div class="tab">
-           <!-- <div class="tab-list qiany"  v-if="
+           <div class="tab-list qiany"  v-if="
               currentPage == 'workbench' ||
-              currentPage == 'cae'"   id='z'  >
+              currentPage == 'home'"   id='z'    @click="selectTab('workbench')" >
           <div class='tab-listcontent'>
           <h1>云求解器</h1>
           
        </div>   
-      </div> -->
-         <div class="tab-list qiany" id='z'  >
+      </div>
+         <div class="tab-list qiany" id='b'  v-else  @click="selectTab('workbench')" >
           <div class='tab-listcontent'>
           <h1>云求解器</h1>
           
        </div>   
       </div>
-        <!-- <div class="tab-list qiany"   v-if="currentPage == 'design'"   id='z'    @click="selectTab('home')">
+        <div class="tab-list qiany"   v-if="currentPage == 'guanyuwe'"   id='z'     @click="selectTab('guanyuwe')">
           <div class='tab-listcontent'>
-          <h1>聚合仿真</h1>
+          <h1>关于我们</h1>
              
       </div>
-      </div> -->
-         <div class="tab-list qiany"  @click="selectTab('guanyuwe')" id='b' >
+      </div>
+         <div class="tab-list qiany" v-else  id='b'  @click="selectTab('guanyuwe')">
            <div class='tab-listcontent'>
           <h1>关于我们</h1>
              
@@ -136,7 +136,6 @@
       :workbench-config="workbenchConfig"
       @putWorkbench="getWorkbench"
     />
-        <guanyuwe ref="guanyuwe"></guanyuwe>
   </div>
 
 </template>
@@ -144,10 +143,10 @@
 <script>
  import Workbench from './components/Workbench'
 import { request } from '@/utils/request'
-import guanyuwe from './workbench/components/guanyuwe'
+
 export default {
   name: 'IndexLayout',
-  components: { Workbench,guanyuwe },
+  components: { Workbench},
   data() {
     return {
       currentPage: 'home',
@@ -204,7 +203,7 @@ export default {
     // 切换tab
     selectTab(router) {
    console.log(router);
-      if (router == 'workbench') {
+      if (router == 'workbench'||router == 'home') {
         const params = {
           transCode: 'C00038',
         }
@@ -219,13 +218,13 @@ export default {
             if(this.qianyan==true){
               this.$router.replace({
                 path: '/indexLayout/workbench',
-                query: {id, pretreatment, solver },
+                // query: {id, pretreatment, solver },
               })
             }else{
 
           this.$router.replace({
                 path: '/indexLayout/workbench',
-                query: {id, pretreatment, solver },
+                // query: {id, pretreatment, solver },
               })
             // this.workbenchConfig = {
             //   isShow: true,
@@ -236,8 +235,9 @@ export default {
           })
           .catch((err) => {})
       }else if(router=='guanyuwe'){
-        console.log(this.$refs);
-        this.$refs.guanyuwe.gyisShow=true;
+         this.$router.replace({
+                path: '/indexLayout/guanyuwe',
+              })
 
       }
        else {

+ 5 - 5
src/views/index/workbench/components/guanyuwe.vue

@@ -2,7 +2,7 @@
 /*上传报告*/
 <template>
 
-  <el-dialog
+  <!-- <el-dialog
    ref="userForm"
       class="user-form"
       label-width="120px"
@@ -11,7 +11,7 @@
   :visible.sync="gyisShow"
     width="1200px"
     top="50px"
-  >
+  > -->
        <div class="gy_top">
       <div class="bakga">
         <el-image :src="bakga"></el-image>
@@ -36,12 +36,12 @@
         </div>
       </div>
     </div>
-   
+<!--    
     <span slot="footer" class="dialog-footer">
    
       <el-button size="small"  @click="gyisShow=false">取消</el-button>
-    </span>
-  </el-dialog>
+    </span> -->
+  <!-- </el-dialog> -->
 </template>