Merge branch 'third' of https://codeup.aliyun.com/6265f483e4166464dc2f9c14/boeu/portal into third

src/components/HomePage/homePage.vue

@@ -81,13 +81,10 @@
         width="42%"
         class="teardiabox"
         >
-        <div class="teachbox" style="height:100px">
-          <div class="tearch-img"><img :src="fileBaseUrl+userData.avatar" alt=""></div>
-          <span> {{ teachtext.name }} </span>
-        </div>
+       
         <div class="teachphoto">
           <h6>教师职业照</h6>
-          <img src="../../../public/images/Avatarman.png" alt="">
+          <img :src="tearchUrl" alt="">
         </div>
         <div class="teachphoto">
            <h6>教师经历</h6>
@@ -95,28 +92,18 @@
         </div>
         <div class="teachphoto" style="height:70px">
           <h6>擅长课程</h6>
-          <div class="teachexcel">
-            通用力
-          </div>
-           <div class="teachexcel">
-            产品经理培训
-          </div>
-          <div class="teachexcel">
-            规章制度
-          </div>
-          <div class="teachexcel">
-            职业操守与道德
+          <div v-for="(item,idx) in teachtext.courses" :key="idx" class="teachexcel">
+            {{ item }}
           </div>
+         
         </div>
         <div class="teachphoto" style="height:70px">
           <h6>专长</h6>
-          <div class="teachexcel">
-            通用力
-          </div>
-           <div class="teachexcel">
-            产品经理培训
+          <div v-for="(item,idx) in workname" :key="idx" class="teachexcel">
+            {{ item }}
           </div>
            
+         
         </div>
       </el-dialog>
     </div>
@@ -124,7 +111,7 @@
 
   <script>
   import {userAvatarText,cutFullName} from "@/utils/tools.js";
-    import { mapGetters } from 'vuex'
+    import { mapGetters,mapActions } from 'vuex'
     import apiTeach from '@/api/modules/teacher.js';
     import apiStart from '@/api/phase2/stat.js';
     import apiFollow from "@/api/phase2/userfollow.js"
@@ -132,14 +119,17 @@
     export default {
       name: 'UcHeader',
       computed:{
-        ...mapGetters(['curIdentity','identity','userInfo']),
+        ...mapGetters(['curIdentity','identity','sysTypeMap','userInfo']),
               avatarText(){
                   return userAvatarText(this.userInfo.name);
               }
           },
       data(){
         return {
-          teachtext:[],
+          workname:[],
+          childData:[],
+          sysTypeListtear:[],
+          teachtext:{},
           dialogVisible: false,
           teaechswich:false,
           fileBaseUrl:process.env.VUE_APP_FILE_BASE_URL,
@@ -168,7 +158,6 @@
         }
       },
       mounted() {
-       
         this.pageId = this.$xpage.getHomeId(this.$route);
         this.sex = this.userInfo.sex;
         // 判断路由是进入的学员默认页面就重置setCurIdentity
@@ -176,7 +165,9 @@
           this.setCurIdentity(1);
         }
         this.orgInfo=cutFullName(this.userInfo.departFullName,1);
-
+        this.getSysTypeTree().then(rs => {
+        this.sysTypeListtear = rs;
+      });
         this.loadUserStat();
         if(this.pageId !== this.userInfo.aid) {
           this.followHas();
@@ -184,10 +175,37 @@
        this.Teacherprofile();
        this.Teacherinfo();
       },
+     
       methods:{
+        ...mapActions({
+            getResOwnerTree: 'resOwner/getResOwnerTree',
+            loadResOwners: 'resOwner/loadResOwners',
+            getSysTypeTree: 'sysType/getSysTypeTree',
+            loadSysTypes: 'sysType/loadSysTypes'
+        }),
         Teacherinfo(){
           apiTeach.detailTeacher(this.userInfo.aid).then(res =>{
-            this.teachtext = res.result;
+            this.teachtext.workExperience = res.result.workExperience;
+            this.teachtext.courses = res.result.courses.split( ',' );
+            this.tearchUrl = this.fileBaseUrl + res.result.photo;
+            this.teachtext.expertise = res.result.expertise.split( ',' );
+            console.log(this.teachtext);
+            this.sysTypeListtear.forEach(nm =>{
+                nm.children.forEach(lk =>{
+                  this.childData.push(lk);
+                })
+              });
+              this.teachtext.expertise.forEach(item =>{
+              this.childData.forEach(it =>{
+                if(item == it.id){
+                  console.log(item)
+                  this.workname.push(it.name);
+
+                 
+                }
+
+              })
+            })
           })
         },
         Teacherprofile(){