细节

src/components/PortalHeader.vue

@@ -222,7 +222,8 @@ export default {
       if(this.studyTaskCount>0){
         this.isTiao = true;
       }else{
-        this.isTiao = false;
+        // this.isTiao = false;
+        this.isTiao = true;
       }
       // let params = {
       //   // keyword:this.keyword,

src/components/UserCenter/menu.vue

@@ -281,7 +281,7 @@
           <template slot="title">
             <!-- <svg-icon icon-class="mystudy"></svg-icon> -->
              <i style="margin-right: 8px;width: 19px;color:#303133;" class="el-icon-collection"></i>
-            <span><el-badge :value="fistTotal + pathTotal + proTotal||''" class="item">我的必修</el-badge></span>
+            <span><el-badge :value="fistTotal + pathTotal||''" class="item">我的必修</el-badge></span>
           </template>
           <el-menu-item v-if="fistTotals" index="/uc/study/task?type=1">
             <span slot="title" class="study textl"><el-badge :value="fistTotal||''" class="item">领导力必修</el-badge></span>
@@ -289,8 +289,8 @@
           <el-menu-item v-if="growTotal" index="/uc/study/growth">
             <span slot="title" class="textl">专业力必修</span>
           </el-menu-item>
-           <el-menu-item v-if="pathTotals + proTotals" index="/uc/study/task?type=2">
+           <el-menu-item v-if="pathTotals" index="/uc/study/task?type=2">
-            <span slot="title" class="textl"><el-badge :value="pathTotal + proTotal||''" class="item">定制化学习</el-badge></span>
+            <span slot="title" class="textl"><el-badge :value="pathTotal||''" class="item">定制化学习</el-badge></span>
           </el-menu-item>
         </el-submenu>
         <el-menu-item v-else index="/uc/study/task?type=9" v-show="curIdentity == 1">
@@ -463,12 +463,12 @@ export default {
       overlayShow: false,
       instructor:0,
       fistTotal:0,
-      fistTotals:0,
+      fistTotals:1,
       proTotal: 0,
-      proTotals: 0,
+      proTotals: 1,
       pathTotal:0,
-      pathTotals:0,
+      pathTotals:1,
-      growTotal: 0,
+      growTotal: 1,
       openedsList:[]
     };
   },
@@ -503,9 +503,9 @@ export default {
         this.fistTotals =parseInt(res.data.total);
       })
       //项目
-      apiManage.customized(params).then(res=>{
+      // apiManage.customized(params).then(res=>{
-        this.proTotals =parseInt(res.data.total);
+      //   this.proTotals =parseInt(res.data.total);
-      })
+      // })
       //学习路径
       apiManage.compulsoryList(params).then(res=>{
         this.pathTotals =parseInt(res.data.total);
@@ -513,10 +513,12 @@ export default {
       getList(this.userInfo.aid).then(res=>{
         if(res.code == 200 && Object.keys(res.data).length){
           this.growTotal = 1
+        }else{
+          this.growTotal = 0
         }
       })
       apiManage.queryTaskCounts().then(res=>{
-        this.proTotal =parseInt(res.data.count);  //学习项目
+        // this.proTotal =parseInt(res.data.count);  //学习项目
         this.fistTotal =parseInt(res.data.count1); // 领导力必修
         this.pathTotal =parseInt(res.data.count2); // 学习路径
         // this.growTotal = parseInt(res.data.count3); //成长路径

src/views/study/TaskList.vue

@@ -11,10 +11,10 @@
         <div class="progress"><div class="msg">路径图完成情况</div> <el-progress :text-inside="true" :stroke-width="16" :percentage="porcessData.router" class="progressItem"> </el-progress>  </div>
        
         </div> -->
-        <div v-if="isType == 2" class="title">
+        <!-- <div v-if="isType == 2" class="title">
           <div class="item" style="margin-right: 19px;" :class="typeClass == 1?'item1':'item'" @click="learnType(1)">学习项目</div>
           <div class="item" :class="typeClass == 2?'item1':'item'" @click="learnType(2)">学习路径</div>
-        </div>
+        </div> -->
       <div style="display: flex; justify-content: space-between; padding: 12px 32px 10px 22px;">
         <div style="display: flex; justify-content: flex-start">
           <div>
@@ -163,6 +163,9 @@ export default {
       }else if(item.cmtask_type==3){
          let pushUrl=`/course/boeframe?id=${item.cmtask_id}&type=3`;
          this.$router.push(pushUrl);
+      }else if(item.cmtask_type==4){ 
+         let params=encodeURIComponent('projectId='+item.cmtask_id);
+         this.$router.push('/forward?to='+studentPath+'/projectdetails&params='+params);
       }
     },
   getPossData(){
@@ -205,31 +208,17 @@ export default {
           })
       }else if (this.isType == 2){
         //定制化学习
-        if(this.typeClass == 1){
+        apiManage.compulsoryList(params).then(res=>{
-          apiManage.customized(params).then(res=>{
+        if(res.code==200){
-          if(res.code==200){
+              this.total =parseInt(res.data.total);
-               this.total =parseInt(res.data.total);
+              this.couresList = res.data.records;
-               this.couresList = res.data.records;
+            }else{
-             }else{
+              this.$message.error('查询数据失败：'+res.msg);
-               this.$message.error('查询数据失败：'+res.msg);
+            }
-             }
+            this.loading=false;
-             this.loading=false;
+        }).catch(()=>{
-          }).catch(()=>{
+            this.loading=false;
-             this.loading=false;
+        })
-          })
-        }else{
-          apiManage.compulsoryList(params).then(res=>{
-          if(res.code==200){
-               this.total =parseInt(res.data.total);
-               this.couresList = res.data.records;
-             }else{
-               this.$message.error('查询数据失败：'+res.msg);
-             }
-             this.loading=false;
-          }).catch(()=>{
-             this.loading=false;
-          })
-        }
       }else{
         apiManage.userTaskList(params).then(res=>{
           if(res.code==200){