Merge remote-tracking branch 'origin/master'

src/App.vue

@@ -91,6 +91,7 @@
                         rEmpId: data.rEmpId,
                         rTargetType: data.rTargetType,
                         empId:data.empId,
+                        otherEmpId:data.otherEmpId
                     },
                     curl: document.location.href
                 };

src/views/industryreportspage/industryReportDetail.vue

@@ -104,7 +104,7 @@
                     this.$refs.login.isexpertVisible();
                     return
                 }
-                globalMsg.$emit('maidianfunc',({type:'report-report-file-read',reportId:this.$route.query.id}));
+
                 api.getDownloadUrl(this.$route.query.id,state).then(response => {
                     if(response.code == 0) {
                         const elink = document.createElement('a');
@@ -146,6 +146,7 @@
             },
         },
         mounted() {
+            globalMsg.$emit('maidianfunc',({type:'report-report-file-read',reportId:this.$route.query.id}));
             this.getArticleDetail();
         }
     }

src/views/peoplehomepage/introductionbar.vue

@@ -69,9 +69,9 @@
                                     {{item.activityDTO.activityState == 2||item.activityDTO.activityState == 4?item.activityDTO.channelType==5?$t('pubactivities.conduct'):$t('activityInfo.applying'):item.activityDTO.activityState == 3?$t('activityInfo.applyEnd'):item.activityDTO.activityState == 5?$t('activityInfo.activityEnd'):''}}
                                 </i>
                             </p>
-                            <div>
+                            <div @click="openeventlive(item.activityDTO,item)">
                                 <p class="ellipsisFont2">
-                                    <span class="event_hasLive" @click="openeventlive(item.activityDTO,item)" v-if="item.activityDTO.hasLive == 1" :style="item.activityDTO.baseLive.liveState == 1?'background: #FE9F2C':'background: #5d78ff;'">
+                                    <span class="event_hasLive" v-if="item.activityDTO.hasLive == 1" :style="item.activityDTO.baseLive.liveState == 1?'background: #FE9F2C':'background: #5d78ff;'">
                                         <i class="iconfont icon-zhibo"></i>
                                         {{item.activityDTO.baseLive.liveState == 0?$t('activityInfo.liveTitle'):item.activityDTO.baseLive.liveState == 1?$t('activityInfo.living'):item.activityDTO.baseLive.liveState==2&&item.activityDTO.baseLive.liveBack == 0?$t('activityInfo.liveBack'):$t('activityInfo.liveTitle')}}
                                     </span>

src/views/peoplehomepage/peoplehome.vue

@@ -591,7 +591,7 @@
                 this.$router.push({path:"/circleList"});
                 return
             }else{
-                globalMsg.$emit('maidianfunc',({type:'report-emp-detail',empId:this.$route.query.id?this.$route.query.id:this.userInfo.empId}));
+                globalMsg.$emit('maidianfunc',({type:'report-emp-detail',otherEmpId:this.$route.query.id?this.$route.query.id:this.userInfo.empId}));
                 if(this.isTrans){
                     this.isrouterType(this.$route.path);
                 }else{