Commit a9c44d7d authored by anxixi's avatar anxixi

pc搜索等新功能及优化

parent 50fe54b5
......@@ -912,6 +912,10 @@
display: none!important;
}
.indextop_popover .popper__arrow{
display: none!important;
}
.indextop_popover{
padding: 0 12px!important;
}
......
......@@ -218,8 +218,10 @@
},
mounted() {
this.tabstate(this.$route.path);
this.keyword = this.publicFun.getCookie("keyword")?this.Base64.decode(this.publicFun.getCookie("keyword")):'';
globalMsg.$on("isTopindex", (data) => {
this.tabstate(data);
if(data!='/keySearchs')this.keyword = '';
});
},
watch:{
......
......@@ -13,7 +13,7 @@
</div>
</div>
<div class="matchfixed" v-if="!publicFun.isgetUserRoleFunc(2)&&!publicFun.isgetUserRoleFunc(5)">
<div class="matchfixed" v-if="isshowRole">
<div @click="pushClick('project')">
<img :src="publicFun.getCookie('language') == 'en'?require('../../assets/img/pushprojecten.png'):require('../../assets/img/pushproject.png')" alt="">
</div>
......@@ -38,6 +38,7 @@
dataName:'first',
projectNum:'——',
customerNum:'——',
isshowRole:this.publicFun.isgetUserRoleFunc(2)||this.publicFun.isgetUserRoleFunc(5)?false:true,
userInfo:this.publicFun.getUserInfoCookieType() ? JSON.parse(this.Base64.decode(this.publicFun.getUserInfoCookieType())) : null,
}
},
......@@ -80,6 +81,7 @@
mounted() {
this.getCountData();
globalMsg.$on("loginsuccess",(data)=>{
this.isshowRole = this.publicFun.isgetUserRoleFunc(2)||this.publicFun.isgetUserRoleFunc(5)?false:true;
this.userInfo = this.publicFun.getUserInfoCookieType() ? JSON.parse(this.Base64.decode(this.publicFun.getUserInfoCookieType())) : null;
});
}
......
......@@ -255,7 +255,8 @@
methods:{
getonrouter(row){
if(row.integralTypeCode=="ITV008"||row.integralTypeCode=="ITV009"||row.integralTypeCode=="ITV010"){
window.open(this.publicFun.getCurrentHrefEnv()+"#/peoplefinfo");
if(row.integralTypeCode=="ITV008")window.open(this.publicFun.getCurrentHrefEnv()+"#/peoplefinfo?userInfo=true");
else window.open(this.publicFun.getCurrentHrefEnv()+"#/peoplefinfo");
}else if(row.integralTypeCode=="ITV013"){
this.visible = true;
}
......
......@@ -39,6 +39,7 @@
},
},
mounted() {
if(this.$route.query.userInfo)this.activeName = 2;
if(!this.publicFun.isgetUserRoleFunc(2)&&!this.publicFun.isgetUserRoleFunc(5)){
this.dataytpe = [
{name:this.$t('mineInfo.personalInfo'),type:1,icon:'icon-jibenziliao'},
......
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