Skip to content

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

Merge remote-tracking branch 'origin/master'

parents fc413d2b 9705b6d3
Hide whitespace changes
Inline Side-by-side
Showing with 43 additions and 28 deletions
src/components/index/PageTopindex.vue
View file @ b6e2ab8e
......@@ -396,6 +396,7 @@
globalMsg.$off('isTopindex');
},
mounted() {
this.userInfo = this.publicFun.getUserInfoCookieType() ? JSON.parse(this.Base64.decode(this.publicFun.getUserInfoCookieType())) : null;
if(this.userInfo){
this.getByEmpId();
this.getMessageCount();
......
src/views/bigbusiness/pages/list.vue
View file @ b6e2ab8e
......@@ -197,7 +197,8 @@
},
//去详情
handleRowClick(data){
this.$router.push({path:"/bigBusiness/detail",query:{id:data.businessId}});
// this.$router.push({path:"/bigBusiness/detail",query:{id:data.businessId}});
window.open(this.publicFun.getCurrentHrefEnv()+"#/bigBusiness/detail?id="+data.businessId);
},
//去认证
......
src/views/findeventpage/eventlive.vue
View file @ b6e2ab8e
<template>
<div>
<iframe name = "child" id = "child" src="live.html" frameborder="0" scrolling="no" style="position:related;top: 2.8px;left: 0px;width: 100%;height: 100vh;border: medium none;"></iframe>
<div @click="isuserClick" class="event_iconchange">
<div v-if="$i18n.locale=='zh-CN'" @click="isuserClick" class="event_iconchange">
<img src="../../assets/img/changeImg.png" alt="">
</div>
<div class="gendisplay event_all" :class="userClick?'':'event_lshow'">
......
src/views/findeventpage/eventpage.vue
View file @ b6e2ab8e
......@@ -3,7 +3,7 @@
<div class="divclasschild">
<div class="condition_top">
<region-choice @changecheck="regionData" ref="regionchild" :searchReturnData="stateData" :titleName="$t('pubactivities.activearea')"></region-choice>
<page-screen :screenlist="groupalllist" :screenchildListIf="false" ref="projectstatechild" :titleName="'行业通俗分类'" @changecheck="projectstateData"></page-screen>
<page-screen :screenlist="groupalllist" :screenchildListIf="false" ref="projectstatechild" :titleName="$t('indexCount.industryFlag')" @changecheck="projectstateData"></page-screen>
</div>
<div class="content">
<div class="content_list">
......
src/views/findeventpage/userlist.vue
View file @ b6e2ab8e
......@@ -12,7 +12,7 @@
<div class="gendisplay">
<p>
<i @click="tohome(item)" class="hover_cursor">{{item.empName}}</i>
<i :style="item.isOnline != 0?'background:#AAAAAA;':''" class="userOnline"></i>
<i v-if="item.isOnline!=2" :style="item.isOnline != 0?'background:#AAAAAA;':''" class="userOnline"></i>
</p>
<div v-if="item.empId != userInfo.empId">
<popoverBardbar :iseventlive="true" v-if="item.isFriend == 2" :row="item" :placement="true"></popoverBardbar>
......
src/views/index/pages/index.vue
View file @ b6e2ab8e
......@@ -531,10 +531,10 @@
<span>{{$t('commonTips.downloads')}} {{item.downloadNumber}}</span>
</p>
<p style="width:155px;text-align: right;">
<span @click="downloaddetail(item)" style="margin-right: 20px">
<i style="font-size: 12px;" class="iconfont icon-download-fill"></i>
{{lang==1?$t('newprojecttext.download'):''}}
</span>
<!-- <span @click="downloaddetail(item)" style="margin-right: 20px">-->
<!-- <i style="font-size: 12px;" class="iconfont icon-download-fill"></i>-->
<!-- {{lang==1?$t('newprojecttext.download'):''}}-->
<!-- </span>-->
<span>
<el-popover
placement="top-start"
......
src/views/industryreportspage/industryReportDetail.vue
View file @ b6e2ab8e
......@@ -12,8 +12,9 @@
</p>
<p>{{dataDetail.baseDataVO.dataName}}</p>
</div>
<div id="htmldetail" v-if="dataDetail.reportContent" v-html="dataDetail.reportContent" style="padding: 20px 35px;"></div>
<div v-else style="padding: 80px 35px;text-align: center">暂无介绍</div>
<p style="color: #1A1A1E;padding: 20px 35px 0;font-weight: bold;">{{$t('industryjson.reportIntro')}}</p>
<div id="htmldetail" v-if="dataDetail.reportContent" v-html="dataDetail.reportContent" style="padding: 10px 35px;"></div>
<div v-else style="padding: 80px 35px;text-align: center">{{$t('industryjson.noReportIntro')}}</div>
<p style="text-align: center;">
<el-button type="primary" @click="gocontentdetail(0)">{{$t('industryjson.downloadReport')}}</el-button>
<span style="padding-left: 30px;">
......@@ -116,14 +117,14 @@
if(response.result==4||response.result==5){
this.$confirm(response.msg, {
cancelButtonText: response.result==4?'分享即得积分':response.result==5?'取消':'',
confirmButtonText: response.result==4?'赚取积分':response.result==5?'确定':'',
confirmButtonText: response.result==4?(this.$i18n.locale=="zh-CN"?'赚取积分':''):response.result==5?'确定':'',
type: '',
distinguishCancelAndClose: true,
dangerouslyUseHTMLString:true,
customClass: 'deleteConfirm'
}).then(() => {
if(response.result==4){
window.open(this.publicFun.getCurrentHrefEnv()+"#/userintegral");
if(this.$i18n.locale=="zh-CN")window.open(this.publicFun.getCurrentHrefEnv()+"#/userintegral");
}else{
this.gocontentdetail(1);
}
......
src/views/integralpage/userintegral.vue
View file @ b6e2ab8e
......@@ -254,7 +254,7 @@
},
methods:{
getonrouter(row){
if(row.integralTypeCode=="ITV008"||row.integralTypeCode=="ITV009"){
if(row.integralTypeCode=="ITV008"||row.integralTypeCode=="ITV009"||row.integralTypeCode=="ITV010"){
window.open(this.publicFun.getCurrentHrefEnv()+"#/peoplefinfo");
}else if(row.integralTypeCode=="ITV013"){
this.visible = true;
......
src/views/netWorkpage/dynamicbar.vue
View file @ b6e2ab8e
......@@ -85,7 +85,8 @@
this.$refs.login.isexpertVisible();
return
}else{
this.$router.push({path:"/peoplehome",query:{id:id}});
window.open(this.publicFun.getCurrentHrefEnv()+"#/peoplehome?id="+id);
// this.$router.push({path:"/peoplehome",query:{id:id}});
}
},
},
......
src/views/peoplehomepage/peoplehome.vue
View file @ b6e2ab8e
......@@ -17,9 +17,9 @@
</p>
<div v-if="isTrans" class="gendisplay about_top">
<div class="gendisplay">
<span :style="userInfoData.friendCount==0?'cursor: none;':''" @click="topageType('/peoplehome/contactPerson')">{{userInfoData.friendCount}} 联系人</span>
<span :style="userInfoData.schoolCount==0?'cursor: none;':''" @click="topageType('/peoplehome/commonSchool')">{{userInfoData.schoolCount}} 位校友</span>
<span :style="userInfoData.colleagueCount==0?'cursor: none;':''" @click="topageType('/peoplehome/commonWork')">{{userInfoData.colleagueCount}} 同事</span>
<span :style="userInfoData.friendCount==0?'cursor: default;':''" @click="topageType('/peoplehome/contactPerson')">{{userInfoData.friendCount}} 联系人</span>
<span :style="userInfoData.schoolCount==0?'cursor: default;':''" @click="topageType('/peoplehome/commonSchool')">{{userInfoData.schoolCount}} 位校友</span>
<span :style="userInfoData.colleagueCount==0?'cursor: default;':''" @click="topageType('/peoplehome/commonWork')">{{userInfoData.colleagueCount}} 同事</span>
<span v-if="$route.query.id&&$route.query.id != userInfo.empId">
<el-popover
placement="bottom"
......@@ -126,13 +126,13 @@
<div class="gendisplay about_top privacy_content">
<div class="privacy_left">
<div class="gendisplay">
<div class="gendisplay">
<div v-if="((userInfoData.moderator||userInfoData.professor)&&userInfoData.title)||userInfoData.orgName" class="gendisplay">
<p><i style="color:#AAAAAA;font-size: 12px;" class="iconfont icon-hangye"></i></p>
<p style="margin-left: 10px;">
{{userInfoData.moderator&&userInfoData.professor?userInfoData.title:userInfoData.orgName}}
{{userInfoData.moderator||userInfoData.professor?userInfoData.title:userInfoData.orgName}}
</p>
</div>
<div style="margin-left: 20px;" class="gendisplay">
<div v-if="userInfoData.workName" style="margin-left: 20px;" class="gendisplay">
<p><i style="color:#AAAAAA;font-size: 12px;" class="iconfont icon-qiye"></i></p>
<p style="margin-left: 10px;">{{userInfoData.workName}}</p>
</div>
......@@ -179,7 +179,7 @@
</div>
</div>
<div v-if="(!$route.query.id || $route.query.id==userInfo.empId)&&!publicFun.isgetUserRoleFunc(2)" style="margin: 20px 0 0;" class="gendisplay number_privacy">
<div @click="toWorkbench('/bigBusiness/add')">
<div @click="toWorkbench(publicFun.isgetUserRoleFunc(5)?'/sale/addfirst':'/bigBusiness/add')">
<p><i style="font-size: 30px;color: #4A4A4A;font-weight: normal;" class="iconfont icon-fabudexuqiu"></i></p>
<p>{{publicFun.isgetUserRoleFunc(5)?'代发需求':'发需求'}}</p>
</div>
......
src/views/peoplehomepage/popoverBardbar.vue
View file @ b6e2ab8e
<template>
<div>
<el-popover
:placement="placement?'left':'bottom'"
:placement="placement?'left-start':'bottom'"
width="300"
ref="popover"
popper-class="bard_popover"
......
src/views/publishactivity/proactivity.vue
View file @ b6e2ab8e
......@@ -1056,9 +1056,17 @@
},
//修改自定义字段
editcontacts(){
if(this.contactsform.fieldLength == '' || this.contactsform.fieldLength < 1 || this.contactsform.fieldLength > 50){
this.$message.error(this.$t('pubactivities.sizeincorrectly'));
return;
if(this.contactsform.fieldType == 9 || this.contactsform.fieldType == 10){
if(this.contactsform.fieldLength == '' || this.contactsform.fieldLength < 1 || this.contactsform.fieldLength > 50){
this.$message.error(this.$t('pubactivities.sizeincorrectly'));
return;
}
}
if(this.contactsform.fieldType == 11){
if(this.contactsform.fieldLength == '' || this.contactsform.fieldLength < 1 || this.contactsform.fieldLength > 200){
this.$message.error(this.$t('pubactivities.sizeincorrectly'));
return;
}
}
this.$refs.contactsform.validate((valid) => {
if(valid) {
......
src/views/seeprojects/seeprojectlist.vue
View file @ b6e2ab8e
......@@ -222,7 +222,8 @@
this.add();
},
handleRowClick(row){
this.$router.push({path:"/viewproject",query:{projectId:row.projectId,state:0}});
window.open(this.publicFun.getCurrentHrefEnv()+"#/viewproject?projectId="+row.projectId+"&state=0");
// this.$router.push({path:"/viewproject",query:{projectId:row.projectId,state:0}});
},
add(){
let params = {
......@@ -273,6 +274,7 @@
type: '',
customClass: 'deleteConfirm'
}).then(() => {
this.cur_page = 1;
this.$refs.login.isexpertVisible();
}).catch(() => {
this.cur_page = 1;
......
src/views/topicpage/topicpool.vue
View file @ b6e2ab8e
......@@ -34,10 +34,11 @@
</div>
</el-form>
<el-row>
<!-- 红包模版-->
<el-table :data="topicpoollist" @selection-change="handleSelectionChange" tooltip-effect="dark" class="projectTable2">
<el-table-column v-if="activeName == 'first'" type="selection" width="55" align="center">
</el-table-column>
<el-table-column type="index" :label="$t('pubactivities.serialnumber')" align="center" width="80">
</el-table-column>
<el-table-column label="话题名称" align="center" width="180">
<template slot-scope="scope">
<div @click="topicpage(scope.row,true)">
......
src/views/topicpage/topictype.vue
View file @ b6e2ab8e
......@@ -29,7 +29,7 @@
<span v-if="item.isOpenReward==1||item.professorCount==0" class="ellipsisFont1" style="margin-right: 20px;max-width: 200px;height: 28px;">发起方： <i style="color:#5D78FF;">{{item.topicInitiator}}</i></span>
</span>
<span style="margin-right: 20px;">阅读 {{item.topicBrowseStr}}</span>
<span style="margin-right: 20px;">讨论 {{item.topicDiscussStr}}</span>
<span style="margin-right: 20px;">参与数 {{item.topicDiscussStr}}</span>
<span>成员 {{item.joinCount}}</span>
</div>
</div>
......
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