From 458e20e4c2ef1d2aee9bb953c8d26c63dd9f76ca Mon Sep 17 00:00:00 2001
From: zhangsir <z1823137@163.com>
Date: Mon, 1 Jul 2024 15:46:01 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/UserCenter/menu.vue |  9 ++++++---
 src/views/study/GrowthPath.vue     | 12 ++++++++----
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/components/UserCenter/menu.vue b/src/components/UserCenter/menu.vue
index 3ade104d..a4b778ac 100644
--- a/src/components/UserCenter/menu.vue
+++ b/src/components/UserCenter/menu.vue
@@ -279,7 +279,8 @@
         <!-- </el-submenu> -->
         <el-submenu v-if="fistTotal+pathTotal+proTotal+growTotal" index="mystudy" v-show="curIdentity == 1">
           <template slot="title">
-            <svg-icon icon-class="mystudy"></svg-icon>
+            <!-- <svg-icon icon-class="mystudy"></svg-icon> -->
+             <i style="margin-right: 8px;width: 19px;color:#303133;" class="el-icon-collection"></i>
             <span>我的必修</span>
           </template>
           <el-menu-item v-if="fistTotal" index="/uc/study/task?type=1">
@@ -293,7 +294,8 @@
           </el-menu-item>
         </el-submenu>
         <el-menu-item v-else index="/uc/study/task?type=9" v-show="curIdentity == 1">
-          <svg-icon :icon-class="activeMenu == '/uc/study/task'?'mystudy':'mystudy'"></svg-icon>
+          <!-- <svg-icon :icon-class="activeMenu == '/uc/study/task'?'mystudy':'mystudy'"></svg-icon> -->
+          <i style="margin-right: 8px;width: 19px;" :style="{color:activeMenu == '/uc/study/task?type=9'?'rgb(51, 121, 251)':'#303133'}" class="el-icon-collection"></i>
           <span slot="title">我的必修</span>
         </el-menu-item>
         <el-submenu index="myelective" v-show="curIdentity == 1">
@@ -306,7 +308,8 @@
           </el-menu-item>
         </el-submenu>
         <el-menu-item index="/exam/mytask" v-show="curIdentity == 1">
-          <svg-icon :icon-class="activeMenu == '/exam/mytask'?'mybiji-active':'mybiji'"></svg-icon>
+          <!-- <svg-icon :icon-class="activeMenu == '/exam/mytask'?'mybiji-active':'mybiji'"></svg-icon> -->
+          <i style="margin-right: 8px;width: 19px;" :style="{color:activeMenu == '/exam/mytask'?'rgb(51, 121, 251)':'#303133'}" class="el-icon-reading"></i>
           <span slot="title">我的考试</span>
         </el-menu-item>
         <el-menu-item index="/user/Mynotes" v-show="curIdentity == 1">
diff --git a/src/views/study/GrowthPath.vue b/src/views/study/GrowthPath.vue
index 73cc3873..7e02aa15 100644
--- a/src/views/study/GrowthPath.vue
+++ b/src/views/study/GrowthPath.vue
@@ -228,16 +228,16 @@
       </el-table> -->
       <div style="margin-bottom: 30px;min-height: 300px;" class="table_box">
         <div class="title">
-          <div v-for="title,index in titleList">
-            <div class="title_item">{{ title.title }}</div>
-          </div>
+          <!-- <div> -->
+            <div v-for="title,index in titleList" :key="index" :style="{maxWidth: index==0?'142px':'none'}" class="title_item">{{ title.title }}</div>
+          <!-- </div> -->
         </div>
         <div class="body" v-for="(item,index) in preparedData">
           <div>
             <div class="body_left" :title="item.isOtherPosition == 1 ? item.positionName + '(' + item.organizationName + ')' : item.positionName">{{ item.isOtherPosition == 1 ? item.positionName + '(' + item.organizationName + ')' : item.positionName }}</div>
           </div>
           <div class="body_right">
-            <div class="body_item" :style="{width: (142 * t.number) + 'px'}" v-for="t,i in item.bandCodes">
+            <div class="body_item" :style="{width: (142 * t.number) + 'px',flexGrow:1*t.number}" v-for="t,i in item.bandCodes">
               <img v-if="(t && t.isMajorPosition) " src="../../assets/images/growth/CurrentPath.png" alt="">
               <img @click="goLearnPath(t)" v-else-if="(t && t.permission)" src="../../assets/images/growth/NoPermissionPath.png" alt="">
               <!-- <img v-else-if="!(t && t.permission)" src="../../assets/images/growth/OtherPath.png" alt=""> -->
@@ -865,9 +865,11 @@ export default {
   overflow-x: auto;
   border: 1px solid #F0F6FC;
   border-radius: 4px 4px 0px 0px;
+  box-sizing: content-box;
   .title{
     display: flex;
     .title_item{
+      flex-grow: 1;
       background: #F0F6FC;
       width: 142px;
       height: 88px;
@@ -897,9 +899,11 @@ export default {
     }
     .body_right{
       display: flex;
+      flex-grow: 1;
       .body_item{
         width: 142px;
         height: 88px;
+        // flex-grow: 1;
         border: 1px solid #F0F6FC;
         line-height: 88px;
         text-align: center;