Merge branch 'dev0124' into dev0515

src/api/growth/index.js

@@ -3,3 +3,5 @@ import ajax from "@/api/ajax"
 export const getList = (params) => ajax.get('/manageApi',`/stu/grow/getStuLearnInfo?userId=${params}`);
 //获取路径图详情
 export const taskList = (params) => ajax.get('/manageApi',`/stu/grow/taskList?growId=${params}`);
+//全岗位路径
+export const getFullJobPath = (params) => ajax.get('/manageApi',`/stu/grow/getFullJobPath`);

src/views/study/Growth.vue

@@ -181,7 +181,7 @@ export default {
     startLearn(){
       this.$router.push({
         path: '/growthpath',
-        query: {growId:this.detailData.growId,name: this.detailData.growName,isTrue: true}
+        query: {growId:this.detailData.growId,name: this.detailData.growName,isTrue: true,status:this.detailData.overallCompletionRate}
       })
     },
     checkedTrue(){

src/views/study/GrowthPath.vue

@@ -88,7 +88,7 @@
                 <div :style="{
                   left: (getPosition(item.name, index).left + 55) + 'px',
                   top: (getPosition(item.name, index).top + 60) + 'px'
-                  }" class="growth_explain1" v-if="item.id == istabId && explainBody">
+                  }" class="growth_explain1" v-if="item.id == istabId && explainBody && $route.query.status == 0">
                   <div class="growth_explain_text">
                     <div class="text">《{{item.title}}》是您当前所在位置，请您从这里开始学习哦～</div>
                     <div class="explain_close"  @click="explainBody = false"></div>
@@ -275,7 +275,7 @@
 
 <script>
 import portalHeader from '@/components/PortalHeader.vue';
-import {taskList} from '@/api/growth';
+import {taskList,getFullJobPath} from '@/api/growth';
 import { scrollTo } from '@/utils/scroll-to'
 export default {
   name: 'GrowthPath',
@@ -439,6 +439,9 @@ export default {
         }
       }
     })
+    getFullJobPath().then(res=>{
+      console.log(res,'res')
+    })
   },
   methods: {
     toggleFlag() {