Merge branch 'zcwy-master' into dev0515

src/api/manage/manage.js

@@ -20,6 +20,10 @@ const getTaskNum = function(){
 const userTaskList = function(data){
   return ajax.postJson(baseURL,'/todoTask/queryTodoTaskDetail',data);
 }
+//已读
+const userRead = function(data){
+  return ajax.postJson(baseURL,'/todoTask/read',data);
+}
 //查询未读数量
 const queryTaskCounts = function(){
   return ajax.get(baseURL,'/todoTask/queryTaskCounts');
@@ -56,5 +60,6 @@ export default {
     compulsoryList,
     userDeleteStudy,
     userRsSginupCourse,
-    queryTaskCounts
+    queryTaskCounts,
+    userRead
 }

src/components/UserCenter/menu.vue

@@ -277,19 +277,19 @@
           <!-- <span slot="title" class="textl">历史记录</span>
           </el-menu-item> -->
         <!-- </el-submenu> -->
-        <el-submenu v-if="fistTotal+pathTotal+proTotal+growTotal" index="mystudy" v-show="curIdentity == 1">
+        <el-submenu v-if="fistTotals+pathTotals+proTotals+growTotal" index="mystudy" v-show="curIdentity == 1">
           <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>我的必修</span>
+            <span><el-badge :value="fistTotal + pathTotal + proTotal||''" class="item">我的必修</el-badge></span>
           </template>
-          <el-menu-item v-if="fistTotal" index="/uc/study/task?type=1">
+          <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>
           </el-menu-item>
           <el-menu-item v-if="growTotal" index="/uc/study/growth">
             <span slot="title" class="textl">专业力必修</span>
           </el-menu-item>
-           <el-menu-item v-if="pathTotal + proTotal" index="/uc/study/task?type=2">
+           <el-menu-item v-if="pathTotals + proTotals" index="/uc/study/task?type=2">
             <span slot="title" class="textl"><el-badge :value="pathTotal + proTotal||''" class="item">定制化学习</el-badge></span>
           </el-menu-item>
         </el-submenu>
@@ -426,6 +426,7 @@ import {pageList} from "@/api/modules/lecturer"
 import courseImage from "@/components/Course/courseImage.vue"
 import testUser from '@/utils/testUsers.js'
 import apiManage from '@/api/manage/manage.js'
+import {getList} from '@/api/growth'
 export default {
   name: 'UcMenu',
     components: {
@@ -458,8 +459,11 @@ export default {
       overlayShow: false,
       instructor:0,
       fistTotal:0,
+      fistTotals:0,
       proTotal: 0,
+      proTotals: 0,
       pathTotal:0,
+      pathTotals:0,
       growTotal: 0,
       openedsList:[]
     };
@@ -484,11 +488,34 @@ export default {
   },
   methods: {
     learnTotal(){
+      let params = {
+        pageNo: 1,
+        pageSize: 10,
+        cmtask_user_status: "",
+        cmtask_name: ""
+      }
+      //领导力
+      apiManage.leadership(params).then(res=>{
+        this.fistTotals =parseInt(res.data.total);
+      })
+      //项目
+      apiManage.customized(params).then(res=>{
+        this.proTotals =parseInt(res.data.total);
+      })
+      //学习路径
+      apiManage.compulsoryList(params).then(res=>{
+        this.pathTotals =parseInt(res.data.total);
+      })
+      getList(this.userInfo.aid).then(res=>{
+        if(res.code == 200 ){
+          this.growTotal = 1
+        }
+      })
       apiManage.queryTaskCounts().then(res=>{
         this.proTotal =parseInt(res.data.count);  //学习项目
         this.fistTotal =parseInt(res.data.count1); // 领导力必修
         this.pathTotal =parseInt(res.data.count2); // 学习路径
-        this.growTotal = parseInt(res.data.count3); //成长路径
+        // this.growTotal = parseInt(res.data.count3); //成长路径
       })
     },
     //讲师认证条数

src/views/study/TaskList.vue

@@ -147,6 +147,12 @@ export default {
 
       //let urlPre=window.location.protocol+'//'+window.location.host;
       let studentPath=process.env.VUE_APP_STUDENT_PATH;
+      // type: 0 新任管理者，1 学习项目 2 学习路径图 3 成长路径
+      let type = {1:'2',2:'1',3:'0'}[item.cmtask_type]
+      if(this.$route.query.type==1 || !this.$route.query.type){
+        type = '0'
+      }
+      apiManage.userRead({type,id:item.cmtask_id})
       if(item.cmtask_type==1){ //学习路径图
          let params=encodeURIComponent('routerId='+item.cmtask_id);
          //this.$router.push('/forward?to='+studentPath+'/pathdetails&params='+params);