5.11

src/layout/index.vue

@@ -80,7 +80,7 @@
             v-if="loginStatus && userType != 1"
             :class="currentMenu == 'my-workbench' ? 'itemOn' : ''"
           >
-            <router-link to="/indexLayout/my-workbench" v-show="yingyong" >我的工作台</router-link>
+            <!-- <router-link to="/indexLayout/my-workbench" v-show="yingyong" >我的工作台</router-link> -->
           </el-menu-item>
           <el-menu-item
             v-if="loginStatus"
@@ -366,7 +366,7 @@ export default {
       this.$message.success('退出成功!')
       setTimeout(() => {
         // this.$router.replace(`/login?redirect=${this.$route.fullPath}`)
-        this.$router.replace(`/indexLayout`)
+        this.$router.replace(`/indexLayout/workbench`)
       }, 1000)
     },
     logout() {

src/router/index.js

@@ -41,7 +41,7 @@ export const constantRoutes = [{
                         path: 'home',
                         name: 'Home',
                         component: () =>
-                            import ('@/views/index/home'),
+                            import ('@/views/index/workbench'),
                         meta: {
                             title: '首页',
                             icon: ''
@@ -283,17 +283,6 @@ export const constantRoutes = [{
                         icon: ''
                     }
                 },
-           
-            // {
-            //     path: 'topic',
-            //     name: 'Topic',
-            //     component: () =>
-            //         import ('@/views/megagame/topic'),
-            //     meta: {
-            //         title: '题目领取',
-            //         icon: ''
-            //     }
-            // },
             {
                 path: 'topic',
                 name: 'Topic',
@@ -303,18 +292,7 @@ export const constantRoutes = [{
                     title: '题目领取',
                     icon: ''
                 },
-                // children: [
-                //         {
-                //     path: 'detailsxq',
-                //     name: 'Detailsxq',
-                //     component: () =>
-                //         import ('@/views/megagame/topic/detailsxq'),
-                //     meta: {
-                //         title: '领题的详情页面',
-                //         icon: ''
-                //     }
-                //     },
-                // ]
+             
             },
             {
                 path: 'detailsxq',

src/views/index/indexLayout.vue

@@ -91,15 +91,15 @@
     <!-- 进入前沿的首页 -->
     <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'  >
           <div class='tab-listcontent'>
           <h1>云求解器</h1>
           
        </div>   
-      </div>
-         <div class="tab-list qiany" v-else id='b'  >
+      </div> -->
+         <div class="tab-list qiany" id='z'  >
           <div class='tab-listcontent'>
           <h1>云求解器</h1>
           
@@ -170,14 +170,17 @@ export default {
   },
   created() {
     const path = this.$route.path
+     this.qianyan=true;
  // 判断当前跳入的是哪个页面
-  if((path.indexOf('workbench')>0 && path.indexOf('my-workbench')<0 ) ){
-    this.qianyan=true;
-    this.xigong=false;
-  } else{
-    this.qianyan=false;
-     this.xigong=true;
-  }
+  // if((path.indexOf('workbench')>0 && path.indexOf('my-workbench')<0 ) ){
+  //   this.qianyan=true;
+  //   this.xigong=false;
+  // } else{
+  //   this.qianyan=false;
+  //    this.xigong=true;
+  //   //     this.qianyan=true;
+  //   // this.xigong=false;
+  // }
   
  
 
@@ -233,7 +236,8 @@ export default {
           })
           .catch((err) => {})
       }else if(router=='guanyuwe'){
-     this.$$refs.guanyuwe.gyisShow=true;
+        console.log(this.$refs);
+        this.$refs.guanyuwe.gyisShow=true;
 
       }
        else {

src/views/index/workbench/components/guanyuwe.vue

@@ -38,7 +38,7 @@
    
     <span slot="footer" class="dialog-footer">
    
-      <el-button size="small" type="primary" @click="cancel">取消</el-button>
+      <el-button size="small"  @click="gyisShow=false">取消</el-button>
     </span>
   </el-dialog>
 </template>
@@ -51,7 +51,7 @@ export default {
   name: 'Workench',
   data(){
     return{
-      gyisShow:true,
+      gyisShow:false,
       bakga,
 
     }
@@ -61,6 +61,7 @@ export default {
     
   },
   methods: {
+   
     // 点击关闭
     close() {
       this.$emit('putWorkbench', false)

src/views/megagame/matchLayout.vue

@@ -52,10 +52,10 @@ export default {
     }
   },
   created() {
-  this.megeme();
+
   },
   mounted(){
-
+  this.megeme();
   },
   methods: {
     

src/views/user/userLayout.vue

@@ -30,9 +30,9 @@
             index="/userLayout/account"
             >账户管理</el-menu-item
           >
-          <el-menu-item v-if="userType != 1" index="/userLayout/customize"
+          <!-- <el-menu-item v-if="userType != 1" index="/userLayout/customize"
             >定制工作台</el-menu-item
-          >
+          > -->
           <!-- //userLayout/megagame -->
              <el-menu-item v-if="userRole == 2 ||userRole ==3" index="/userLayout/owerdas"
             >我的大赛</el-menu-item
@@ -96,13 +96,16 @@ export default {
   padding: 10px 0;
   @include w_h(100%, 100%);
   background: $color_f2;
+ //background-color: #3d70b2;
+   //background-color: rgba($color: #0158a8, $alpha: 0.8);
+
   .container {
     @include flex(space-between, normal);
     @include w_h(100%, 830px);
     padding: 0 $pad;
     .user-slider {
       @include w_h(180px);
-      background: $color_f;
+    background-color: rgba($color: #0158a8, $alpha: 1.0);
     }
     .user-main {
       @include w_h(calc(100% - 190px), 100%);
@@ -117,15 +120,23 @@ export default {
 .user-slider {
   .el-menu {
     border: none;
+    // background-color: rgba($color: #0158a8, $alpha: 1.0);
+       background-color:#0158a8;
     &-item {
       height: 40px;
       line-height: 40px;
       font-size: 14px;
       text-align: center;
+      //color: $color_9;
+      color: $color_f;
+      &:hover{
       color: $color_9;
+      }
       &.is-active {
         color: $color_f;
-        background: $color_on;
+       // background:#3d70b2;
+       // background: $color_on;
+        background-color: rgba($color:  $color_on, $alpha: 0.5);
       }
     }
   }

vue.config.js

@@ -25,12 +25,12 @@ module.exports = {
         disableHostCheck: true,
         proxy: {
             '/api': {
-               // target: 'http://192.168.0.43:8181/', // 测试服
+               target: 'http://192.168.0.43:8181/', // 测试服
                 // target: 'http://26t13m1315.wicp.vip:32471/cae/service/TransServlet/',//黄工接口调用地址
                 // target: 'http://192.168.0.42:8081/', // 亮哥
                 // target: 'http://192.168.0.15:8081/', // 喻泽
                 // target: 'http://26t13m1315.wicp.vip:32470/', // 测试服
-                 target: 'http://192.168.0.43:8181/', // 测试服
+                // target: 'http://192.168.0.43:8181/', // 测试服
                  //target: 'http://192.168.0.140:32470/', // 测试服
                 // target: ' https://www.xigital.com.cn/cae/service/', // 测试服
                 secure: false, //接受使用https