Skip to content

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

Merge remote-tracking branch 'origin/master'

parents 6b47b151 26d86e93
Hide whitespace changes
Inline Side-by-side
Showing with 77 additions and 44 deletions
src/views/netWorkpage/dynamicbar.vue
View file @ 3f4ccb24
......@@ -59,7 +59,7 @@
return {
// direction: 0,//向下滚动
// hoverStop:false,//鼠标悬浮不停止
step:0.5,
step:0.2,
}
}
},
......
src/views/netWorkpage/networkSearch.vue
View file @ 3f4ccb24
......@@ -108,9 +108,11 @@
})
},
searchDetail(){
this.cur_page = 1;
this.linsearchkey = this.searchkey;
this.getuserSearch();
if(this.searchkey.length>=1){
this.cur_page = 1;
this.linsearchkey = this.searchkey;
this.getuserSearch();
}
},
//去主页
tohome(row){
......
src/views/netWorkpage/networkring.vue
View file @ 3f4ccb24
......@@ -132,7 +132,9 @@
})
},
searchDetail(){
this.$router.push({path:"/networkSearch",query:{key:this.Base64.encode(this.searchkey)}});
if(this.searchkey.length>=1){
this.$router.push({path:"/networkSearch",query:{key:this.Base64.encode(this.searchkey)}});
}
},
//去主页
tohome(row){
......
src/views/peoplehomepage/contactbar.vue
View file @ 3f4ccb24
......@@ -18,7 +18,7 @@
<div class="gendisplay">
<p class="ellipsisFont1">{{item.empName}}</p>
<p @click="empRelation(item,index)" class="operating">
<span class="btnFriend" v-if="item.relationValue== 2 || item.relationValue == 3">
<span class="btnFriend" v-if="item.relationType== 2 || item.relationType == 3">
<i v-if="item.isFriend == 0" style="font-size: 12px;" class="iconfont icon-jiahao"></i>
{{item.isFriend == 0?'联系人':item.isFriend == 1?'已添加':'互为联系人'}}
</span>
......@@ -99,7 +99,7 @@
})
},
empRelation(row,index){
if(row.relationValue== 2 || row.relationValue == 3){
if(row.relationType== 2 || row.relationType == 3){
this.addEmpContact(row,index);
}else{
if(row.isFollowed == 0){
......
src/views/peoplehomepage/editInfo.vue
View file @ 3f4ccb24
......@@ -10,7 +10,7 @@
<uploadcoverbar
:imgUrl="formData.empLogo"
:upload_Url="'/base/upload/uploadOriginalImg'"
:maxsize="2"
:maxsize="5"
@postOneThing="guestimg">
</uploadcoverbar>
</div>
......@@ -267,7 +267,7 @@
provinceIf:false,
jobsindex:null,//工作经历
educationindex:null,//教育经历
schoollist:[],//学校联想
schoolList:[],//学校联想
visiblefield:false,//兴趣标签
fielddata:[],
fielddisabled:true,
......@@ -299,7 +299,12 @@
getInitSchoolFunc() {
api.schoolName('').then((res) => {
if (res.code == 0) {
this.schoolList = res.result;
res.result.forEach((item) => {
this.schoolList.push({
address: item.id,
value: item.schoolName,
})
});
} else this.$toast(res.msg);
}).catch((err) => {
this.$toast(err);
......@@ -396,13 +401,6 @@
this.formData.empLogo = url;
this.$refs.guestimg.clearValidate();
},
//学校联想
querySearch(queryString, cb) {
var restaurants = this.schoollist;
var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants;
// 调用 callback 返回建议列表的数据
cb(results);
},
createFilter(queryString) {
return (restaurant) => {
return (restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) === 0);
......@@ -411,19 +409,7 @@
handleSelect(item) {
console.log(item);
},
//学校联想数据
getschoolName(name){
api.getEmpIndustries(name).then(response => {
if(response.code == 0) {
this.schoollist = response.result;
} else {
this.$toast(response.msg);
}
}).catch(error => {
console.log("提交出错");
return false;
});
},
//新增工作经历
newjobs(){
this.visiblejobs = true;
......@@ -433,6 +419,9 @@
editjobs(row,index){
this.visiblejobs = true;
this.jobsindex = index;
if(row.id){
this.workdata.id = row.id;
};
this.workdata.workName = row.workName;
this.workdata.orgName = row.orgName;
this.workdata.nationId = row.nationId;
......@@ -491,6 +480,9 @@
editeducation(row,index){
this.visibleeducation = true;
this.educationindex = index;
if(row.id){
this.educationdata.id = row.id;
};
this.educationdata.schoolName = row.schoolName;
this.educationdata.degreeName = row.degreeName;
this.educationdata.majorName = row.majorName;
......@@ -650,7 +642,6 @@
mounted() {
this.getEmpIndustries();
this.getNationList();
// this.getschoolName();
this.getEmpInformation();
this.getBaseDataList();
this.getInitSchoolFunc();
......
src/views/peoplehomepage/introductionbar.vue
View file @ 3f4ccb24
......@@ -10,28 +10,50 @@
<div>
<el-row :gutter="30">
<el-col :span="12" v-for="(item,index) in dynamicList" :key="index">
<div @click="$router.push({path:'/articleDetail',query:{id:item.id,newnpen:true}})" v-if="item.commentsType == 2" class="dynamic_content">
<div>
<p class="ellipsisFont2" v-html="item.commentsContent">
<div @click="routerpush(2,item)" v-if="item.commentsType == 2">
<div v-if="item.baseContent.contentCoverUrl || item.baseContent.contentUrl" class="gendisplay dynamic_contenttype dynamic_content">
<p class="imgInfo"
:style="{backgroundImage:'url('+(item.baseContent.contentCoverUrl?item.baseContent.contentCoverUrl:item.baseContent.contentUrl.split(',')[0]?item.baseContent.contentUrl.split(',')[0]:'')+')'}">
</p>
<div>
<p class="ellipsisFont2" v-html="item.commentsContent"></p>
<div>
{{item.createdTimeStr}} 发布了评论
</div>
</div>
</div>
<div v-else class="dynamic_content">
<p class="ellipsisFont2" v-html="item.commentsContent"></p>
<div>
{{item.createdTimeStr}} 发布了评论
</div>
</div>
</div>
<div @click="$router.push({path:'/discussdetail',query:{disId:item.id,id:item.pid}})" v-if="item.commentsType == 1" class="dynamic_content">
<div>
<p class="ellipsisFont2" v-html="item.commentsContent">
<div @click="routerpush(1,item)" v-if="item.commentsType == 1">
<div v-if="item.topicUrl" class="gendisplay dynamic_contenttype dynamic_content">
<p class="imgInfo"
:style="{backgroundImage:'url('+(item.topicUrl?item.topicUrl:'')+')'}">
</p>
<div>
{{item.createdTimeStr}} 发布了评论
<p class="ellipsisFont2" v-html="item.commentsContent"></p>
<div>
{{item.createdTimeStr}} 发布了评论
</div>
</div>
</div>
<div v-else class="dynamic_content">
<div>
<p class="ellipsisFont2" v-html="item.commentsContent">
</p>
<div>
{{item.createdTimeStr}} 发布了评论
</div>
</div>
</div>
</div>
<div @click="$router.push({path:'/eventdetail',query:{id:item.activityDTO.channelId,ismyevent:0,type:item.activityDTO.channelType}})" v-if="item.commentsType == 4" class="gendisplay dynamic_contenttype dynamic_content">
<p class="indeximgInfo"
<div @click="routerpush(4,item)" v-if="item.commentsType == 4" class="gendisplay dynamic_contenttype dynamic_content">
<p class="imgInfo"
:style="{backgroundImage:'url('+(item.activityDTO.channelPic?item.activityDTO.channelPic:require('../../assets/img/index/prodefaultLogo.png'))+')'}">
</p>
<div>
......@@ -43,8 +65,8 @@
</div>
</div>
</div>
<div @click="$router.push({path:'/guessDetail',query:{id:item.baseGuessDTO.guessId}})" v-if="item.commentsType == 5" class="gendisplay dynamic_contenttype dynamic_content">
<p class="indeximgInfo"
<div @click="routerpush(5,item)" v-if="item.commentsType == 5" class="gendisplay dynamic_contenttype dynamic_content">
<p class="imgInfo"
:style="{backgroundImage:'url('+(item.baseGuessDTO.coverUrl?item.baseGuessDTO.coverUrl:require('../../assets/img/index/prodefaultLogo.png'))+')'}">
</p>
<div>
......@@ -136,6 +158,17 @@
}
},
methods:{
routerpush(state,row){
if(state == 1){
window.open(this.publicFun.getCurrentHrefEnv()+"#/discussdetail?disId="+row.id+'&id='+item.pid);
}else if(state == 2){
window.open(this.publicFun.getCurrentHrefEnv()+"#/articleDetail?id="+row.pid+'&newnpen=true');
}else if(state == 4){
window.open(this.publicFun.getCurrentHrefEnv()+"#/eventdetail?id="+row.activityDTO.channelId+'&ismyevent=0'+'&type='+row.activityDTO.channelType);
}else if(state == 5){
window.open(this.publicFun.getCurrentHrefEnv()+"#/guessDetail?id="+row.baseGuessDTO.guessId);
}
},
getMyDynamicList(){
api.selectMyDynamicList({empId:this.id?this.id:this.userInfo.empId}).then((res)=>{
if(res.code==0){
......
src/views/peoplehomepage/tabTopicbar.vue
View file @ 3f4ccb24
......@@ -148,6 +148,11 @@
this.baseTopicList.push(response.result.records[i]);
}
}
if(this.baseTopicList&&this.baseTopicList.length == 0){
this.iscontent = true;
}else{
this.iscontent = false;
}
this.loading = false;
this.pages = response.result.pages;
this.totalListResult = response.result.totalStr;
......
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