Skip to content

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

Merge remote-tracking branch 'origin/master'

parents 2e34883b 746298d0
Hide whitespace changes
Inline Side-by-side
Showing with 138 additions and 64 deletions
src/views/netWorkpage/networkSearch.vue
View file @ a79dcb40
......@@ -25,11 +25,11 @@
<span style="margin-left: 20px;" v-else>{{item.workName}}</span>
<span style="margin-left: 20px;">{{item.orgName}}</span>
</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>
</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>-->
<!-- </p>-->
</div>
<div v-if="item.empId != userInfo.empId">
<popoverBardbar v-if="item.isFriend == 2" :row="item"></popoverBardbar>
......@@ -310,10 +310,10 @@
line-height: 17px;
overflow: hidden;
}
> p:last-child {
font-size: 12px;
color: #AAAAAA;
}
/*> p:last-child {*/
/* font-size: 12px;*/
/* color: #AAAAAA;*/
/*}*/
}
}
.noIntegral{
......
src/views/netWorkpage/networkring.vue
View file @ a79dcb40
......@@ -19,15 +19,16 @@
<img class="userImg_vip" v-if="item.isModerator == 1&&item.isProfessor == 0" src="../../assets/img/mobile/moderator.png" alt="">
</span>
<p class="hover_cursor" @click="tohome(item)">{{item.empName}}</p>
<p class="ellipsisFont1">{{item.empIntroduction?item.empIntroduction:'暂无简介'}}</p>
<p class="ellipsisFont1">{{item.orgName?item.orgName:item.empIntroduction}}</p>
<p>
<span v-if="item.relationType == 0"></span>
<span v-if="item.relationType == 1">有 {{item.relationValue}} 位共同联系人</span>
<span v-if="item.relationType == 2">共同学校的人</span>
<span v-if="item.relationType == 3">共同单位的人</span>
<span v-if="item.relationType == 4">{{ item.relationValue }} 位关注者</span>
<span v-if="item.relationType == 5">共同加入话题的人</span>
<span v-if="item.relationType == 6">共同兴趣的人</span>
{{item.workName}}
<!-- <span v-if="item.relationType == 0"></span>-->
<!-- <span v-if="item.relationType == 1">有 {{item.relationValue}} 位共同联系人</span>-->
<!-- <span v-if="item.relationType == 2">共同学校的人</span>-->
<!-- <span v-if="item.relationType == 3">共同单位的人</span>-->
<!-- <span v-if="item.relationType == 4">{{ item.relationValue }} 位关注者</span>-->
<!-- <span v-if="item.relationType == 5">共同加入话题的人</span>-->
<!-- <span v-if="item.relationType == 6">共同兴趣的人</span>-->
</p>
<div style="width: 100px;margin: 0 auto;">
<btnbar @loginState="loginState" @successState="successState" :row="item" :index="index" :btnType="2"></btnbar>
......
src/views/peoplehomepage/btnbar.vue
View file @ a79dcb40
<template>
<div>
<!-- btnType 1你可能认识的人 -->
<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
<!-- <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 class="btn">
<p v-if="isempConcern"
@mouseover="mouseOver"
@mouseleave="mouseLeave"
:class="[row.isFollowed == 0?'btn_p':'btnfail_Followed',btnType==1?'operating':btnType == 2?'btn_relation':'btn_content']"
......@@ -16,21 +42,11 @@
<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"
<p v-else
: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}}
<!-- <i v-if="row.isFriend == 0" style="font-size: 12px;" class="iconfont icon-jiahao"></i>-->
{{row.isFriend == 0?'交换名片':row.isFriend == 1?'等待通过':'互为联系人'}}
</p>
</div>
</div>
......@@ -46,7 +62,7 @@
followed:'已关注',
}
},
props:['row','index','type','btnType','searchType'],
props:['row','index','type','btnType','searchType','isempConcern'],
methods:{
mouseOver(){
this.followed = '取消关注';
......
src/views/peoplehomepage/commonSchool.vue
View file @ a79dcb40
......@@ -10,7 +10,12 @@
<img class="userImg_vip" v-if="item.isModerator == 1&&item.isProfessor == 0" src="../../assets/img/mobile/moderator.png" alt="">
</span>
<div>
<p @click="tohome(item)">{{item.empName}}</p>
<p @click="tohome(item)" >
<span>{{item.empName}}</span>
<span style="margin-left: 20px;" v-if="item.isProfessor == 1||item.isModerator == 1">{{item.empTitle}}</span>
<span style="margin-left: 20px;" v-else>{{item.workName}}</span>
<span style="margin-left: 20px;">{{item.orgName}}</span>
</p>
<p @click="tohome(item)" class="ellipsisFont1">{{item.empIntroduction}}</p>
<p>
<span v-if="item.relationType == 0"></span>
......@@ -189,7 +194,13 @@
padding:0 30px 0 15px;
color: #1A1A1E;
>p:nth-child(1){
font-weight: bold;
>span:nth-child(1){
font-weight: bold;
font-size: 14px;
}
>span{
font-size: 12px;
}
}
>p:nth-child(2){
font-size: 12px;
......
src/views/peoplehomepage/commonWork.vue
View file @ a79dcb40
......@@ -10,7 +10,12 @@
<img class="userImg_vip" v-if="item.isModerator == 1&&item.isProfessor == 0" src="../../assets/img/mobile/moderator.png" alt="">
</span>
<div>
<p @click="tohome(item)">{{item.empName}}</p>
<p @click="tohome(item)" >
<span>{{item.empName}}</span>
<span style="margin-left: 20px;" v-if="item.isProfessor == 1||item.isModerator == 1">{{item.empTitle}}</span>
<span style="margin-left: 20px;" v-else>{{item.workName}}</span>
<span style="margin-left: 20px;">{{item.orgName}}</span>
</p>
<p @click="tohome(item)" class="ellipsisFont1">{{item.empIntroduction}}</p>
<p>
<span v-if="item.relationType == 0"></span>
......@@ -189,7 +194,13 @@
padding:0 30px 0 15px;
color: #1A1A1E;
>p:nth-child(1){
font-weight: bold;
>span:nth-child(1){
font-weight: bold;
font-size: 14px;
}
>span{
font-size: 12px;
}
}
>p:nth-child(2){
font-size: 12px;
......
src/views/peoplehomepage/contactPerson.vue
View file @ a79dcb40
......@@ -10,7 +10,12 @@
<img class="userImg_vip" v-if="item.isModerator == 1&&item.isProfessor == 0" src="../../assets/img/mobile/moderator.png" alt="">
</span>
<div class="liIntroduction">
<p @click="tohome(item)">{{item.empName}}</p>
<p @click="tohome(item)" >
<span>{{item.empName}}</span>
<span style="margin-left: 20px;" v-if="item.isProfessor == 1||item.isModerator == 1">{{item.empTitle}}</span>
<span style="margin-left: 20px;" v-else>{{item.workName}}</span>
<span style="margin-left: 20px;">{{item.orgName}}</span>
</p>
<p @click="tohome(item)" class="ellipsisFont1">{{item.empIntroduction}}</p>
<p>
<span v-if="item.relationType == 0"></span>
......@@ -185,6 +190,15 @@
border: 1px solid #F2F2F2;
}
}
>p:nth-child(1){
>span:nth-child(1){
font-weight: bold;
font-size: 14px;
}
>span{
font-size: 12px;
}
}
>p:last-child {
width: 110px;
margin-right: 20px;
......
src/views/peoplehomepage/contactbar.vue
View file @ a79dcb40
......@@ -16,10 +16,13 @@
</span>
<div>
<div class="gendisplay">
<p @click="tohome(item)" class="ellipsisFont1 hover_cursor">{{item.empName}}</p>
<p @click="tohome(item)">
<i class="hover_cursor">{{item.empName}}</i>
<i style="font-size: 12px;padding-left:10px;font-weight: normal;">{{item.workName}}</i>
</p>
<btnbar @successState="successState" :row="item" :index="index" :btnType="1"></btnbar>
</div>
<p @click="tohome(item)" class="ellipsisFont1" style="color:#1A1A1E;height: 24px;">{{item.empIntroduction?item.empIntroduction:'暂无简介'}}</p>
<p @click="tohome(item)" class="ellipsisFont1" style="color:#1A1A1E;height: 24px;">{{item.orgName?item.orgName:item.empIntroduction}}</p>
<p style="color:#AAAAAA;">
<span v-if="item.relationType == 0"></span>
<span v-if="item.relationType == 1" @click="getCommonContact(item)">有 {{item.relationValue}} 个共同联系人</span>
......@@ -178,6 +181,7 @@
font-size: 14px;
font-weight: bold;
width: calc(100% - 65px);
margin-right: 10px;
line-height: 24px;
height: 24px;
overflow: hidden;
......
src/views/peoplehomepage/editInfo.vue
View file @ a79dcb40
......@@ -636,17 +636,19 @@
// this.$message.error('请填写兴趣标签');
// return
// };
if(this.formData.isStudent == 1){
if(!this.formData.educationList || this.formData.educationList.length == 0){
this.$message.error('请填写至少一条教育经历');
return
}
}else{
if(!this.formData.workList || this.formData.workList.length == 0){
this.$message.error('请填写至少一条工作经历');
return
if(this.isTrans){
if(this.formData.isStudent == 1){
if(!this.formData.educationList || this.formData.educationList.length == 0){
this.$message.error('请填写至少一条教育经历');
return
}
}else{
if(!this.formData.workList || this.formData.workList.length == 0){
this.$message.error('请填写至少一条工作经历');
return
}
}
};
}
this.formData.empId = this.empInfo.empId;
api.improveInformation(this.formData).then(response => {
if(response.code == 0) {
......
src/views/peoplehomepage/followers.vue
View file @ a79dcb40
......@@ -10,7 +10,12 @@
<img class="userImg_vip" v-if="item.isModerator == 1&&item.isProfessor == 0" src="../../assets/img/mobile/moderator.png" alt="">
</span>
<div>
<p @click="tohome(item)" >{{item.empName}}</p>
<p @click="tohome(item)" >
<span>{{item.empName}}</span>
<span style="margin-left: 20px;" v-if="item.isProfessor == 1||item.isModerator == 1">{{item.empTitle}}</span>
<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>
<span v-if="item.relationType == 0"></span>
......@@ -22,7 +27,10 @@
<span v-if="item.relationType == 6">共同兴趣的人</span>
</p>
</div>
<btnbar v-if="!id || id == userInfo.empId" @successState="successState" :row="item" :index="index"></btnbar>
<div v-if="!id || id == userInfo.empId">
<popoverBardbar v-if="item.isFriend == 2" :row="item"></popoverBardbar>
<btnbar v-else @successState="successState" :row="item" :index="index"></btnbar>
</div>
</li>
</ul>
<p style="color: #9197B4;text-align: center;line-height: 50px;" v-if="loading">{{$t('industryjson.loading')}}</p>
......@@ -44,6 +52,7 @@
import api from "./api/api";
import btnbar from "./btnbar";
import userContactbar from "./userContactbar";
import popoverBardbar from "./popoverBardbar";
export default {
name: "followers",
data() {
......@@ -69,7 +78,7 @@
}
},
props:['id'],
components:{btnbar,userContactbar},
components:{btnbar,userContactbar,popoverBardbar},
methods: {
getCommonContact(row){
this.visibleContact = true;
......@@ -185,7 +194,13 @@
padding:0 30px 0 15px;
color: #1A1A1E;
>p:nth-child(1){
font-weight: bold;
>span:nth-child(1){
font-weight: bold;
font-size: 14px;
}
>span{
font-size: 12px;
}
}
>p:nth-child(2){
font-size: 12px;
......
src/views/peoplehomepage/mineMedal.vue
View file @ a79dcb40
<template>
<div class="medalall">
<p class="medal_t">您已经获得 {{detailInfo.medalNum}} 个勋章</p>
<p class="medal_t">已经获得 {{detailInfo.medalNum}} 个勋章</p>
<div class="medal_c gendisplay">
<div class="gendisplay" v-for="item in detailInfo.baseMedalDTOList">
<div class="medal" :class="['medal'+item.medalId,item.isHaveMedal==0?'grayMedal':'']"></div>
......@@ -29,7 +29,7 @@
methods: {
//初始化
getInitInfo() {
api.getMedalInfoById(this.userInfo.empId).then((res) => {
api.getMedalInfoById(this.$route.query.id?this.$route.query.id:this.userInfo.empId).then((res) => {
if (res.code == 0) {
this.detailInfo = res.result;
} else {
......
src/views/peoplehomepage/peoplehome.vue
View file @ a79dcb40
......@@ -82,7 +82,7 @@
</p>
</div>
<div v-if="$route.query.id&&$route.query.id!=userInfo.empId" class="btn_topic">
<span @click="addEmpContact" v-if="empRelationstate.contactState == 0"><i class="iconfont icon-jiahao"></i>联系人</span>
<span @click="addEmpContact" v-if="empRelationstate.contactState == 0">交换名片</span>
<span @click="addEmpContact" style="background: #AAAAAA;box-shadow:none;" v-if="empRelationstate.contactState == 1">等待通过</span>
<span style="background: #AAAAAA;box-shadow:none;" v-if="empRelationstate.contactState == 2">互为联系人</span>
<span @click="isEmpContact" style="background: #FF9E29;box-shadow: 0px 3px 10px 1px rgba(255, 158, 41, 0.4);" v-if="empRelationstate.concernState == 0">
......
src/views/peoplehomepage/tabAttentionbar.vue
View file @ a79dcb40
......@@ -23,7 +23,7 @@
</p>
</div>
<div style="padding-top: 14px;">
<btnbar v-if="!id || id == userInfo.empId" @successState="successState" :row="item" :index="index"></btnbar>
<btnbar v-if="!id || id == userInfo.empId" @successState="successState" :isempConcern="true" :row="item" :index="index"></btnbar>
</div>
</div>
</el-col>
......
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