Skip to content

T
techbook
Commit 34bad129 authored by zhangyanni's avatar zhangyanni
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents e9ef64e8 a29d1cbe
Hide whitespace changes
Inline Side-by-side
Showing with 76 additions and 43 deletions
src/components/index/minPageTopindex.vue
View file @ 34bad129
......@@ -195,6 +195,9 @@
},
mounted() {
this.tabstate(this.$route.path);
globalMsg.$on("isTopindex", (data) => {
this.tabstate(data);
});
},
watch:{
messageCount(val){
......
src/views/netWorkpage/dynamicbar.vue
View file @ 34bad129
......@@ -17,7 +17,7 @@
<div v-if="item.dynamicType == 1">
<p class="gendisplay">
<span @click="tohome(item.empId)">{{item.empName}}</span>&nbsp;在&nbsp;
<span @click="$router.push({path:'/topicDetails',query:{id:item.pid,newnpen:true}})"> {{'#'+item.topicName}}</span>
<span @click="$router.push({path:'/discussdetail',query:{id:item.pid,disId:item.id}})"> {{'#'+item.topicName}}</span>
<span>...</span>
话题下发布了讨论
</p>
......
src/views/netWorkpage/networkSearch.vue
View file @ 34bad129
......@@ -25,7 +25,7 @@
<span style="margin-left: 20px;" v-else>{{item.workName}}</span>
<span style="margin-left: 20px;">{{item.orgName}}</span>
</p>
<p @click="tohome(item)" >{{item.empIntroduction}}</p>
<p class="ellipsisFont1" @click="tohome(item)" >{{item.empIntroduction?item.empIntroduction:'暂无简介'}}</p>
<p @click="tohome(item)">
<span>{{item.friendCount}} 位联系人</span>
<span style="margin-left: 20px;">{{item.followedCount}} 位关注者</span>
......@@ -33,7 +33,7 @@
</div>
<div v-if="item.empId != userInfo.empId">
<popoverBardbar v-if="item.isFriend == 2" :row="item"></popoverBardbar>
<btnbar v-else @loginState="loginState" @successState="successState" :row="item" :index="index"></btnbar>
<btnbar v-else @loginState="loginState" :searchType="true" @successState="successState" :row="item" :index="index"></btnbar>
</div>
</li>
</ul>
......@@ -160,6 +160,11 @@
},
mounted() {
this.getuserSearch();
globalMsg.$on("loginsuccess",(data)=>{
this.userInfo = this.publicFun.getUserInfoCookieType() ? JSON.parse(this.Base64.decode(this.publicFun.getUserInfoCookieType())) : {};
this.cur_page = 1;
this.getuserSearch();
});
}
}
</script>
......
src/views/netWorkpage/networkring.vue
View file @ 34bad129
......@@ -30,7 +30,7 @@
<span v-if="item.relationType == 6">共同兴趣的人</span>
</p>
<div style="width: 100px;margin: 0 auto;">
<btnbar @successState="successState" :row="item" :index="index" :btnType="2"></btnbar>
<btnbar @loginState="loginState" @successState="successState" :row="item" :index="index" :btnType="2"></btnbar>
</div>
</div>
</el-col>
......@@ -149,18 +149,25 @@
this.delcancelEmpConcern(row,index);
}
},
//调取快捷登录
loginState(){
this.$refs.login.isexpertVisible();
},
//关注
successState(row,index){
this.$set(this.networkringlist, index, row.baseEmpRelationDTO);
},
},
beforeDestroy() { // 在组件生命周期结束的时候销毁。、
globalMsg.$off('loginsuccess');
},
mounted() {
this.getActivityList();
globalMsg.$on("loginsuccess",(data)=>{
this.empInfo = this.publicFun.getUserInfoCookieType() ? JSON.parse(this.Base64.decode(this.publicFun.getUserInfoCookieType())) : null;
this.cur_page = 1;
this.getActivityList();
})
});
}
}
</script>
......
src/views/peoplehomepage/btnbar.vue
View file @ 34bad129
<template>
<div class="btn">
<div>
<!-- btnType 1你可能认识的人 -->
<p v-if="row.relationType == 1 || row.relationType== 2 || row.relationType == 3"
:class="[row.isFriend == 0?'btn_p':'btnfail_Friend',btnType==1?'operating':btnType == 2?'btn_relation':'btn_content']"
@click="addEmpContact(row)">
<i v-if="row.isFriend == 0" style="font-size: 12px;" class="iconfont icon-jiahao"></i>
{{row.isFriend == 0?'联系人':row.isFriend == 1?'等待通过':'互为联系人'}}
</p>
<p v-else
@mouseover="mouseOver"
@mouseleave="mouseLeave"
:class="[row.isFollowed == 0?'btn_p':'btnfail_Followed',btnType==1?'operating':btnType == 2?'btn_relation':'btn_content']"
@click="isEmpContact">
<i v-if="row.isFollowed == 0" style="font-size: 12px;" class="iconfont icon-jiahao"></i>
{{row.isFollowed == 0?'关注':followed}}
</p>
<div class="btn" v-if="searchType">
<p v-if="row.isFriend != 0 || row.relationType == 1 || row.relationType== 2 || row.relationType == 3"
:class="[row.isFriend == 0?'btn_p':'btnfail_Friend',btnType==1?'operating':btnType == 2?'btn_relation':'btn_content']"
@click="addEmpContact(row)">
<i v-if="row.isFriend == 0" style="font-size: 12px;" class="iconfont icon-jiahao"></i>
{{row.isFriend == 0?'联系人':row.isFriend == 1?'等待通过':'互为联系人'}}
</p>
<p v-else
@mouseover="mouseOver"
@mouseleave="mouseLeave"
:class="[row.isFollowed == 0?'btn_p':'btnfail_Followed',btnType==1?'operating':btnType == 2?'btn_relation':'btn_content']"
@click="isEmpContact">
<i v-if="row.isFollowed == 0" style="font-size: 12px;" class="iconfont icon-jiahao"></i>
{{row.isFollowed == 0?'关注':followed}}
</p>
</div>
<div class="btn" v-else>
<p v-if="row.relationType == 1 || row.relationType== 2 || row.relationType == 3"
:class="[row.isFriend == 0?'btn_p':'btnfail_Friend',btnType==1?'operating':btnType == 2?'btn_relation':'btn_content']"
@click="addEmpContact(row)">
<i v-if="row.isFriend == 0" style="font-size: 12px;" class="iconfont icon-jiahao"></i>
{{row.isFriend == 0?'联系人':row.isFriend == 1?'等待通过':'互为联系人'}}
</p>
<p v-else
@mouseover="mouseOver"
@mouseleave="mouseLeave"
:class="[row.isFollowed == 0?'btn_p':'btnfail_Followed',btnType==1?'operating':btnType == 2?'btn_relation':'btn_content']"
@click="isEmpContact">
<i v-if="row.isFollowed == 0" style="font-size: 12px;" class="iconfont icon-jiahao"></i>
{{row.isFollowed == 0?'关注':followed}}
</p>
</div>
</div>
</template>
......@@ -28,7 +46,7 @@
followed:'已关注',
}
},
props:['row','index','type','btnType'],
props:['row','index','type','btnType','searchType'],
methods:{
mouseOver(){
this.followed = '取消关注';
......
src/views/peoplehomepage/editInfo.vue
View file @ 34bad129
......@@ -58,11 +58,11 @@
</div>
<ul class="addul_l">
<li v-for="(item,index) in formData.workList" class="gendisplay">
<div class="gendisplay">
<p>{{item.workName}}</p>
<p>{{item.orgName}}</p>
<p v-if="item.startTime">{{item.startTime}} - {{item.endTime=='now'?'至今':item.endTime}}</p>
<p>{{item.address}}</p>
<div>
<span>{{item.workName}}</span>
<span>{{item.orgName}}</span>
<span v-if="item.startTime">{{item.startTime}} - {{item.endTime=='now'?'至今':item.endTime}}</span>
<span>{{item.address}}</span>
</div>
<div>
<i @click="editjobs(item,index)" class="iconfont icon-bianji"></i>
......@@ -490,6 +490,7 @@
};
this.workdata.workName = row.workName;
this.workdata.orgName = row.orgName;
this.workdata.address = row.address,
this.workdata.nationId = row.nationId;
this.workdata.cityId = row.cityId;
this.workdata.provinceId = row.provinceId;
......@@ -519,7 +520,7 @@
if(this.workdata.startYear > this.workdata.endYear&&this.workdata.endYear!='至今'){
this.$message.error('起始时间填写错误');
return
}else{
}else if(this.workdata.endYear!='至今'&&this.workdata.startYear == this.workdata.endYear){
if(this.workdata.startMonth > this.workdata.endMonth&&this.workdata.endYear!='至今'){
this.$message.error('起始时间填写错误');
return
......@@ -859,14 +860,14 @@
border-bottom: 1px solid #E7E9F5;
>div:first-child{
width: 80%;
>p{
>span{
margin-right: 20px;
max-width: 200px;
height: 20px;
/*max-width: 130px;*/
/*height: 20px;*/
line-height: 20px;
overflow: hidden;
/*overflow: hidden;*/
}
>p:nth-child(1){
>span:nth-child(1){
font-weight: bold;
}
}
......
src/views/peoplehomepage/introductionbar.vue
View file @ 34bad129
......@@ -123,13 +123,10 @@
<div v-for="(item,index) in workList" class="gendisplay">
<p><i class="iconfont icon-gongzuojingli"></i></p>
<p>
<span>{{item.workName}}</span>
<i v-if="item.orgName">|</i>
<span>{{item.orgName}}</span>
<i v-if="item.workTime">|</i>
<span>{{item.workTime}}</span>
<i v-if="item.address">|</i>
<span>{{item.address}}</span>
<span v-if="item.workName">{{item.workName}}</span>
<span v-if="item.orgName">{{item.orgName}}</span>
<span v-if="item.workTime">{{item.workTime}}</span>
<span v-if="item.address">{{item.address}}</span>
</p>
</div>
</div>
......@@ -151,7 +148,6 @@
<p><i class="iconfont icon-jiaoyujingli" style="color:#B7E5CC;"></i></p>
<p>
<span>{{item.schoolName}}</span>
<i>|</i>
<span>{{item.majorName}}</span>
</p>
</div>
......@@ -323,9 +319,12 @@
color:#1A1A1E;
font-weight: bold;
}
>i{
margin: 0 20px;
color:#E8E8E8;
>span{
padding: 0 20px;
border-right: 1px solid #E8E8E8;
}
>span:last-child{
border: none;
}
>span:nth-child(3){
color:#7A7A7A;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment