Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
T
techbook
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
front-end-dev
techbook
Commits
f15dbb03
Commit
f15dbb03
authored
Jan 12, 2021
by
zhangyanni
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/master'
parents
a2ead162
7e535e38
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
19 changed files
with
180 additions
and
107 deletions
+180
-107
reuiqreDialogCmpt.vue
src/components/common/reuiqreDialogCmpt.vue
+3
-3
PageLeft.vue
src/components/index/PageLeft.vue
+57
-56
PageTopindex.vue
src/components/index/PageTopindex.vue
+3
-2
minPageTopindex.vue
src/components/index/minPageTopindex.vue
+3
-2
router.js
src/router.js
+5
-5
detail.vue
src/views/bigbusiness/pages/detail.vue
+1
-1
eventlive.vue
src/views/findeventpage/eventlive.vue
+3
-3
newslist.vue
src/views/findeventpage/newslist.vue
+5
-1
userlist.vue
src/views/findeventpage/userlist.vue
+9
-3
industryReportDetail.vue
src/views/industryreportspage/industryReportDetail.vue
+12
-7
industrybar.vue
src/views/industryreportspage/industrybar.vue
+1
-1
viewproject.vue
src/views/innovatecompany/lreleaseproject/viewproject.vue
+1
-1
userintegral.vue
src/views/integralpage/userintegral.vue
+0
-0
topiclist.vue
src/views/keySearchpage/topiclist.vue
+3
-2
introductionbar.vue
src/views/peoplehomepage/introductionbar.vue
+46
-4
peoplehome.vue
src/views/peoplehomepage/peoplehome.vue
+19
-12
popoverBardbar.vue
src/views/peoplehomepage/popoverBardbar.vue
+5
-3
userContactbar.vue
src/views/peoplehomepage/userContactbar.vue
+3
-1
topicpool.vue
src/views/topicpage/topicpool.vue
+1
-0
No files found.
src/components/common/reuiqreDialogCmpt.vue
View file @
f15dbb03
...
...
@@ -7,7 +7,7 @@
:close-on-click-modal=
"false"
:before-close=
"handleClose"
center
>
<span
class=
"content"
>
{{
content
}}
</span>
<span
class=
"content"
style=
"font-size: 16px;"
>
{{
content
}}
</span>
<span
slot=
"footer"
class=
"dialog-footer"
v-if=
"isCancel&&!isListDialog"
>
<el-button
type=
"primary"
@
click=
"handleToAUth"
style=
"width: 130px;"
>
{{
$t
(
"commonTips.confirm"
)
}}
</el-button>
<el-button
plain
@
click=
"handleCancel"
style=
"width: 130px;"
>
{{
$t
(
"commonTips.cancel"
)
}}
</el-button>
...
...
@@ -24,8 +24,8 @@
<el-button
plain
@
click=
"handleCancel"
style=
"width: 130px;"
>
{{
$t
(
"commonTips.cancel"
)
}}
</el-button>
</span>
<span
slot=
"footer"
class=
"dialog-footer"
v-if=
"toPublish&&isCancel&&isListDialog"
>
<el-button
type=
"primary"
@
click=
"handleToPublish"
style=
"width: 130px;"
>
{{
buttonText
}}
</el-button>
<el-button
plain
@
click=
"handleCancel"
style=
"width: 130px;"
>
{{
$t
(
"commonTips.cancel"
)
}}
</el-button>
<el-button
type=
"primary"
@
click=
"handleToPublish"
style=
"width: 130px;
font-size: 16px;
"
>
{{
buttonText
}}
</el-button>
<el-button
plain
@
click=
"handleCancel"
style=
"width: 130px;
font-size: 16px;
"
>
{{
$t
(
"commonTips.cancel"
)
}}
</el-button>
</span>
</el-dialog>
...
...
src/components/index/PageLeft.vue
View file @
f15dbb03
...
...
@@ -161,62 +161,63 @@
"selected"
:
null
,
"systemFunctionlist"
:
null
},
{
"functionId"
:
21
,
"functionName"
:
this
.
$t
(
"topNav.professionfocusing"
),
"functionNameEn"
:
"Industry Focus"
,
"functionUrl"
:
"/lndustryfocuschild"
,
"functionMethod"
:
"GET"
,
"functionLevel"
:
null
,
"functionTitle"
:
null
,
"functionIcon"
:
"jujiao"
,
"functionPid"
:
18
,
"functionType"
:
null
,
"pidList"
:
null
,
"isButton"
:
1
,
"functionParentName"
:
null
,
"buttonCode"
:
null
,
"functionTypeName"
:
null
,
"selected"
:
null
,
"systemFunctionlist"
:
null
},
{
"functionId"
:
22
,
"functionName"
:
this
.
$t
(
"topNav.cooperationcase"
),
"functionNameEn"
:
"Success Cases"
,
"functionUrl"
:
"/successfulcasechild"
,
"functionMethod"
:
"GET"
,
"functionLevel"
:
null
,
"functionTitle"
:
null
,
"functionIcon"
:
"kehu"
,
"functionPid"
:
18
,
"functionType"
:
null
,
"pidList"
:
null
,
"isButton"
:
1
,
"functionParentName"
:
null
,
"buttonCode"
:
null
,
"functionTypeName"
:
null
,
"selected"
:
null
,
"systemFunctionlist"
:
null
},{
"functionId"
:
23
,
"functionName"
:
this
.
$t
(
"topNav.Findevent"
),
"functionNameEn"
:
"Find Events"
,
"functionUrl"
:
"/activitylist"
,
"functionMethod"
:
"GET"
,
"functionLevel"
:
null
,
"functionTitle"
:
null
,
"functionIcon"
:
"huodong"
,
"functionPid"
:
18
,
"functionType"
:
null
,
"pidList"
:
null
,
"isButton"
:
1
,
"functionParentName"
:
null
,
"buttonCode"
:
null
,
"functionTypeName"
:
null
,
"selected"
:
null
,
"systemFunctionlist"
:
null
},];
// {
// "functionId":21,
// "functionName":this.$t("topNav.professionfocusing"),
// "functionNameEn":"Industry Focus",
// "functionUrl":"/lndustryfocuschild",
// "functionMethod":"GET",
// "functionLevel":null,
// "functionTitle":null,
// "functionIcon":"jujiao",
// "functionPid":18,
// "functionType":null,
// "pidList":null,
// "isButton":1,
// "functionParentName":null,
// "buttonCode":null,
// "functionTypeName":null,
// "selected":null,
// "systemFunctionlist":null
// },
// {
// "functionId":22,
// "functionName":this.$t("topNav.cooperationcase"),
// "functionNameEn":"Success Cases",
// "functionUrl":"/successfulcasechild",
// "functionMethod":"GET",
// "functionLevel":null,
// "functionTitle":null,
// "functionIcon":"kehu",
// "functionPid":18,
// "functionType":null,
// "pidList":null,
// "isButton":1,
// "functionParentName":null,
// "buttonCode":null,
// "functionTypeName":null,
// "selected":null,
// "systemFunctionlist":null
// },{
// "functionId":23,
// "functionName":this.$t("topNav.Findevent"),
// "functionNameEn":"Find Events",
// "functionUrl":"/activitylist",
// "functionMethod":"GET",
// "functionLevel":null,
// "functionTitle":null,
// "functionIcon":"huodong",
// "functionPid":18,
// "functionType":null,
// "pidList":null,
// "isButton":1,
// "functionParentName":null,
// "buttonCode":null,
// "functionTypeName":null,
// "selected":null,
// "systemFunctionlist":null
// },
];
}
else
{
api
.
getLeftNavAxios
().
then
((
res
)
=>
{
if
(
res
.
code
==
0
)
{
...
...
src/components/index/PageTopindex.vue
View file @
f15dbb03
...
...
@@ -19,7 +19,8 @@
<searchTopbar
@
search=
"search"
></searchTopbar>
</div>
</el-popover>
<el-input
class=
"index_search"
v-popover:popoverKey
@
keyup
.
enter
.
native=
"handleSearchDetail(keyword)"
v-model
.
trim=
"keyword"
maxlength=
"40"
:placeholder=
"$i18n.locale == 'zh-CN'?'请输入项目名称/企业名称/技术关键词':'Eenter Technology Keywords'"
:style=
"$i18n.locale == 'zh-CN'?'width: 470px;':'width: 350px;'"
></el-input>
<el-input
v-if=
"$i18n.locale == 'zh-CN'"
class=
"index_search"
v-popover:popoverKey
@
keyup
.
enter
.
native=
"handleSearchDetail(keyword)"
v-model
.
trim=
"keyword"
maxlength=
"40"
:placeholder=
"$i18n.locale == 'zh-CN'?'请输入项目名称/企业名称/技术关键词':'Eenter Technology Keywords'"
:style=
"$i18n.locale == 'zh-CN'?'width: 470px;':'width: 350px;'"
></el-input>
<el-input
v-else
class=
"index_search"
@
keyup
.
enter
.
native=
"handleSearchDetail(keyword)"
v-model
.
trim=
"keyword"
maxlength=
"40"
:placeholder=
"$i18n.locale == 'zh-CN'?'请输入项目名称/企业名称/技术关键词':'Eenter Technology Keywords'"
:style=
"$i18n.locale == 'zh-CN'?'width: 470px;':'width: 350px;'"
></el-input>
<p
class=
"topsearch"
type=
"primary"
@
click=
"handleSearchDetail(keyword)"
>
{{
$t
(
"searchResult.search"
)
}}
</p>
<!--
<p
class=
"recommend"
>
-->
<!--
<span
@
click=
"handleSearchDetail(item)"
v-for=
"item in keywordlist"
style=
"margin-right: 10px;cursor: pointer;"
>
{{
item
}}
</span>
-->
...
...
@@ -338,7 +339,7 @@
if
(
data
){
this
.
publicFun
.
setUserInfoCookie
(
"keyword"
,
this
.
Base64
.
encode
(
data
));
this
.
$store
.
dispatch
(
'saveSearchResultKeyword'
,{
path
:
this
.
$route
.
path
,
pars
:
data
});
this
.
$router
.
push
({
path
:
"/keySearchs
"
,
query
:{
key
:
this
.
Base64
.
encode
(
data
)}});
this
.
$router
.
push
({
path
:
this
.
$i18n
.
locale
==
'zh-CN'
?
"/keySearchs"
:
"/search
"
,
query
:{
key
:
this
.
Base64
.
encode
(
data
)}});
globalMsg
.
$emit
(
"sendResultData"
,
data
);
}
},
...
...
src/components/index/minPageTopindex.vue
View file @
f15dbb03
...
...
@@ -21,7 +21,8 @@
<searchTopbar
@
search=
"search"
></searchTopbar>
</div>
</el-popover>
<el-input
class=
"index_topsou"
v-popover:popoverKey
@
keyup
.
enter
.
native=
"handleSearchDetail(keyword)"
@
focus=
"keyword_search = true"
@
blur=
"keyword_search = false"
v-model=
"keyword"
maxlength=
"40"
:placeholder=
"$i18n.locale == 'zh-CN'?'请输入项目名称/企业名称/技术关键词':'Eenter Technology Keywords'"
style=
"width: 220px;height: 30px;"
></el-input>
<el-input
class=
"index_topsou"
v-if=
"$i18n.locale == 'zh-CN'"
v-popover:popoverKey
@
keyup
.
enter
.
native=
"handleSearchDetail(keyword)"
@
focus=
"keyword_search = true"
@
blur=
"keyword_search = false"
v-model=
"keyword"
maxlength=
"40"
:placeholder=
"$i18n.locale == 'zh-CN'?'请输入项目名称/企业名称/技术关键词':'Eenter Technology Keywords'"
style=
"width: 220px;height: 30px;"
></el-input>
<el-input
class=
"index_topsou"
v-else
@
keyup
.
enter
.
native=
"handleSearchDetail(keyword)"
@
focus=
"keyword_search = true"
@
blur=
"keyword_search = false"
v-model=
"keyword"
maxlength=
"40"
:placeholder=
"$i18n.locale == 'zh-CN'?'请输入项目名称/企业名称/技术关键词':'Eenter Technology Keywords'"
style=
"width: 220px;height: 30px;"
></el-input>
<p
class=
"topsearch_fixed"
type=
"primary"
:style=
"!keyword_search&&keyword==''?'':'background: #5D78FF'"
@
click=
"handleSearchDetail(keyword)"
>
<i
style=
"font-size: 12px;"
:style=
"!keyword_search&&keyword==''?'':'color:#ffffff'"
class=
"iconfont icon-iconsearch"
></i>
</p>
...
...
@@ -116,7 +117,7 @@
this
.
$refs
.
popoverKey
.
doClose
();
this
.
publicFun
.
setUserInfoCookie
(
"keyword"
,
this
.
Base64
.
encode
(
data
));
this
.
$store
.
dispatch
(
'saveSearchResultKeyword'
,{
path
:
this
.
$route
.
path
,
pars
:
data
});
this
.
$router
.
push
({
path
:
"/keySearchs
"
,
query
:{
key
:
this
.
Base64
.
encode
(
data
)}});
this
.
$router
.
push
({
path
:
this
.
$i18n
.
locale
==
'zh-CN'
?
"/keySearchs"
:
"/search
"
,
query
:{
key
:
this
.
Base64
.
encode
(
data
)}});
globalMsg
.
$emit
(
"sendResultData"
,
data
);
}
},
...
...
src/router.js
View file @
f15dbb03
...
...
@@ -360,6 +360,11 @@ const router = new Router({
component
:
resolve
=>
require
([
'views/peoplehomepage/peoplefinfo.vue'
],
resolve
).
catch
(
routerUtils
.
catchImport
),
meta
:
{
title
:
'个人资料'
}
},
{
path
:
'/userintegral'
,
component
:
resolve
=>
require
([
'views/integralpage/userintegral.vue'
],
resolve
).
catch
(
routerUtils
.
catchImport
),
meta
:
{
title
:
'我的积分'
}
},
// {
// path: '/networking',
// component: resolve => require(['views/netWorkpage/networkring.vue'], resolve).catch(routerUtils.catchImport),
...
...
@@ -871,11 +876,6 @@ const router = new Router({
component
:
resolve
=>
require
([
'views/integralpage/guessview.vue'
],
resolve
).
catch
(
routerUtils
.
catchImport
),
meta
:
{
title
:
'竞猜详情'
}
},
{
path
:
'/userintegral'
,
component
:
resolve
=>
require
([
'views/integralpage/userintegral.vue'
],
resolve
).
catch
(
routerUtils
.
catchImport
),
meta
:
{
title
:
'我的积分'
}
},
{
path
:
'/integralaudit'
,
component
:
resolve
=>
require
([
'views/integralpage/integralaudit.vue'
],
resolve
).
catch
(
routerUtils
.
catchImport
),
...
...
src/views/bigbusiness/pages/detail.vue
View file @
f15dbb03
...
...
@@ -963,7 +963,7 @@
text-align
:
left
;
position
:
sticky
;
position
:
-
webkit-sticky
;
top
:
60
px
;
top
:
45
px
;
z-index
:
2000
;
box-shadow
:
0px
1px
8px
0px
rgba
(
52
,
52
,
76
,
0
.05
);
i
{
...
...
src/views/findeventpage/eventlive.vue
View file @
f15dbb03
...
...
@@ -7,7 +7,7 @@
<div
class=
"gendisplay event_all"
:class=
"userClick?'':'event_lshow'"
>
<div
@
click=
"userClick = false"
class=
"event_l"
></div>
<div
class=
"event_r"
:class=
"userClick?'event_rshow':''"
>
<img
src=
"../../assets/img/pull.png"
:style=
"userClick?'':'display: none;'"
>
<img
@
click=
"userClick = false"
src=
"../../assets/img/pull.png"
:style=
"userClick?'':'display: none;'"
>
<div
class=
"gendisplay event_title"
>
<div>
<span
@
click=
"titleHover = 0"
:class=
"titleHover == 0?'title_hover':''"
>
交换名片
</span>
...
...
@@ -63,8 +63,8 @@
api
.
selectByEmpId
(
params
).
then
(
res
=>
{
if
(
res
.
code
==
0
)
{
var
email
=
this
.
userInfo
.
empAccount
.
indexOf
(
"@"
)
>
-
1
?
this
.
userInfo
.
empAccount
:
this
.
userInfo
.
empAccount
+
"@techcode.com"
;
this
.
publicFun
.
setUserInfoCookie
(
"liveEmail"
,
email
);
this
.
publicFun
.
setUserInfoCookie
(
"liveName"
,
res
.
result
.
nick
Name
);
sessionStorage
.
setItem
(
"liveEmail"
,
email
);
sessionStorage
.
setItem
(
"liveName"
,
res
.
result
.
empOther
Name
);
}
else
{
console
.
log
(
res
.
msg
);
}
...
...
src/views/findeventpage/newslist.vue
View file @
f15dbb03
...
...
@@ -4,7 +4,7 @@
<div
class=
"p_tabs_content"
v-infinite-scroll=
"load"
infinite-scroll-disabled=
"disabled"
>
<div
v-for=
"(item,index) in userRelationlist"
>
<p
v-if=
"item.messageType == 4 || item.messageType == 6"
>
我
<span
v-if=
"item.messageType == 4"
>
不
</span>
同意
添加
<i
@
click=
"tohome(item)"
>
{{
item
.
empName
}}
</i>
为联系人
我
<span
v-if=
"item.messageType == 4"
>
不
</span>
同意
与
<i
@
click=
"tohome(item)"
>
{{
item
.
empName
}}
</i>
交换名片
</p>
<p
v-else
><i
@
click=
"tohome(item)"
>
{{
item
.
empName
}}
</i>
想与您交换名片
</p>
<div
class=
"gendisplay"
>
...
...
@@ -62,6 +62,10 @@
this
.
getMyMessageList
();
}
},
//去主页
tohome
(
row
){
window
.
open
(
this
.
publicFun
.
getCurrentHrefEnv
()
+
"#/peoplehome?id="
+
row
.
empId
);
},
//联系人推荐处理
updateFriendStatus
(
row
,
type
){
let
params
=
{
...
...
src/views/findeventpage/userlist.vue
View file @
f15dbb03
...
...
@@ -11,15 +11,17 @@
<div>
<div
class=
"gendisplay"
>
<p>
<i
class=
"hover_cursor"
>
{{
item
.
empName
}}
</i>
<i
@
click=
"tohome(item)"
class=
"hover_cursor"
>
{{
item
.
empName
}}
</i>
<i
: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"
></popoverBardbar>
<popoverBardbar
:iseventlive=
"true"
v-if=
"item.isFriend == 2"
:row=
"item"
:placement=
"true"
></popoverBardbar>
<btnbar
v-else
:btnType=
"1"
:channelId=
"$route.query.id"
@
successState=
"successState"
:row=
"item"
:index=
"index"
></btnbar>
</div>
</div>
<p
@
click=
"tohome(item)"
style=
"color:#AAAAAA;"
>
{{
item
.
workName
}}
</p>
<p
@
click=
"tohome(item)"
style=
"color:#AAAAAA;"
>
{{
item
.
isProfessor
||
item
.
isModerator
?
item
.
empTitle
:
item
.
workName
}}
</p>
<p
style=
"color:#AAAAAA;"
>
{{
item
.
orgName
}}
</p>
...
...
@@ -72,6 +74,10 @@
this
.
getActivityCardList
();
}
},
//去主页
tohome
(
row
){
window
.
open
(
this
.
publicFun
.
getCurrentHrefEnv
()
+
"#/peoplehome?id="
+
row
.
empId
);
},
//交换名片列表
getActivityCardList
()
{
let
params
=
{
...
...
src/views/industryreportspage/industryReportDetail.vue
View file @
f15dbb03
<
template
>
<div
class=
"industryReportDetail"
>
<div
class=
"detail_content"
>
<p>
首页 / 行业报告
/
{{
dataDetail
.
reportTitle
}}
</p>
<p>
{{
$t
(
'topNav.index'
)
}}
/
{{
$t
(
'topNav.industry'
)
}}
/
{{
dataDetail
.
reportTitle
}}
</p>
<div
class=
"gendisplay"
>
<div>
<p
class=
"de_title"
>
{{
dataDetail
.
reportTitle
}}
</p>
<div
class=
"gendisplay de_description"
>
<p>
<span>
{{
dataDetail
.
createdTime
}}
</span>
<span>
下载量
:
{{
dataDetail
.
downloadNumber
}}
</span>
<span>
{{
$t
(
'commonTips.downloads'
)
}}
:
{{
dataDetail
.
downloadNumber
}}
</span>
</p>
<p>
{{
dataDetail
.
baseDataVO
.
dataName
}}
</p>
</div>
<div
id=
"htmldetail"
v-html=
"dataDetail.reportContent"
style=
"padding: 20px 35px;"
></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=
"text-align: center;"
>
<el-button
type=
"primary"
@
click=
"gocontentdetail(0)"
>
下载该报告
</el-button>
<el-button
type=
"primary"
@
click=
"gocontentdetail(0)"
>
{{
$t
(
'industryjson.downloadReport'
)
}}
</el-button>
<span
style=
"padding-left: 30px;"
>
<el-popover
placement=
"top-start"
...
...
@@ -110,12 +111,14 @@
document
.
body
.
appendChild
(
elink
);
elink
.
click
();
document
.
body
.
removeChild
(
elink
);
this
.
getArticleDetail
();
}
else
{
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
?
'确定'
:
''
,
type
:
''
,
distinguishCancelAndClose
:
true
,
dangerouslyUseHTMLString
:
true
,
customClass
:
'deleteConfirm'
}).
then
(()
=>
{
...
...
@@ -124,8 +127,9 @@
}
else
{
this
.
gocontentdetail
(
1
);
}
}).
catch
(()
=>
{
if
(
response
.
result
==
4
){
}).
catch
((
action
)
=>
{
if
(
response
.
result
==
4
&&
action
==
'cancel'
){
this
.
visible
=
true
;
}
});
...
...
@@ -154,8 +158,9 @@
min-height
:
600px
;
.detail_content
{
width
:
1200px
;
margin
:
20px
auto
30px
;
margin
:
0
auto
;
>
p
{
padding-top
:
20px
;
margin-bottom
:
18px
;
font-size
:
12px
;
color
:
#7A7A7A
;
...
...
src/views/industryreportspage/industrybar.vue
View file @
f15dbb03
<
template
>
<div
class=
"content_right"
>
<p><span>
</span>
热门报告
<i
v-if=
"state"
@
click=
"gocontentall"
>
更多
</i></p>
<p><span>
</span>
{{
$t
(
'industryjson.recommendRead'
)
}}
<i
v-if=
"state"
@
click=
"gocontentall"
>
{{
$t
(
'indexCount.lookMore'
)
}}
</i></p>
<div
class=
"hto_content"
>
<div
v-for=
"(item,index) in hotlist"
:key=
"index"
@
click=
"gocontentdetail(item)"
>
<div
class=
"gendisplay"
>
...
...
src/views/innovatecompany/lreleaseproject/viewproject.vue
View file @
f15dbb03
...
...
@@ -86,7 +86,7 @@
</el-tab-pane>
</el-tabs>
</el-row>
<el-row
class=
"projectTab "
v-if=
"!positions"
style=
"position: fixed;right: 0px;top:
60
px;width:calc(100% - 210px);z-index: 99;"
>
<el-row
class=
"projectTab "
v-if=
"!positions"
style=
"position: fixed;right: 0px;top:
45
px;width:calc(100% - 210px);z-index: 99;"
>
<el-tabs
v-model=
"activeName"
@
tab-click=
"handleClick"
>
<el-tab-pane
:label=
"$t('listproject.projectbasic')"
name=
"first"
></el-tab-pane>
<el-tab-pane
v-if=
"addData.showCompanyInfoAndCooperation||!isempinfo"
:label=
"$t('listproject.market')"
name=
"second"
></el-tab-pane>
...
...
src/views/integralpage/userintegral.vue
View file @
f15dbb03
This diff is collapsed.
Click to expand it.
src/views/keySearchpage/topiclist.vue
View file @
f15dbb03
...
...
@@ -34,8 +34,9 @@
</div>
</div>
<div
class=
"discuss_content"
>
<span
@
click=
"todetail(item,1)"
v-if=
"publicFun.getTextInRichtext(item.discussContent).length
<140
"
v-html=
"item.discussContent?publicFun.getTextInRichtext(item.discussContent):''"
></span>
<span
@
click=
"todetail(item,1)"
v-else
v-html=
"item.discussContent?publicFun.getTextInRichtext(item.discussContent.substr(0, 140)):''"
></span>
<span
@
click=
"todetail(item,1)"
v-if=
"publicFun.getTextInRichtext(item.discussContent).length
<140
"
v-html=
"item.discussContent?(item.pcState==0?publicFun.analyzeEmoji(item.discussContent):publicFun.getTextInRichtext(item.discussContent)):''"
></span>
<span
@
click=
"todetail(item,1)"
v-else
v-html=
"item.discussContent?(item.pcState==0?publicFun.analyzeEmoji(item.discussContent):publicFun.getTextInRichtext(item.discussContent.substr(0, 140))):''"
></span>
<span
@
click=
"todetail(item,1)"
v-if=
"publicFun.getTextInRichtext(item.discussContent).length>140"
>
...
<i
style=
"color:#5D78FF;"
>
全文
</i></span>
<p>
来自于
<i
style=
"color:#5D78FF;"
@
click=
"todetail(item,2)"
>
#
{{
item
.
topicTitle
}}
#
</i></p>
</div>
...
...
src/views/peoplehomepage/introductionbar.vue
View file @
f15dbb03
...
...
@@ -59,22 +59,24 @@
</div>
</div>
</div>
<div
@
click=
"routerpush(4,item)"
v-if=
"item.commentsType == 4"
class=
"gendisplay dynamic_contenttype dynamic_content"
>
<div
v-if=
"item.commentsType == 4"
class=
"gendisplay dynamic_contenttype dynamic_content"
>
<p
class=
"imgInfo"
style=
"position: relative"
@
click=
"routerpush(4,item)"
:style=
"
{backgroundImage:'url('+(item.activityDTO.channelPic?item.activityDTO.channelPic:require('../../assets/img/index/prodefaultLogo.png'))+')'}">
<i
class=
"signing"
:class=
"item.activityDTO.activityState == 2||item.activityDTO.activityState == 4?'signingup':item.activityDTO.activityState == 3?'applyend':item.activityDTO.activityState == 5?'activityEnd':''"
>
{{
item
.
activityDTO
.
activityState
==
2
||
item
.
activityDTO
.
activityState
==
4
?
item
.
activityDTO
.
channelType
==
5
?
$t
(
'pubactivities.conduct'
):
$t
(
'activityInfo.applying'
):
item
.
activityDTO
.
activityState
==
3
?
$t
(
'activityInfo.applyEnd'
):
item
.
activityState
==
5
?
$t
(
'activityInfo.activityEnd'
):
''
}}
{{
item
.
activityDTO
.
activityState
==
2
||
item
.
activityDTO
.
activityState
==
4
?
item
.
activityDTO
.
channelType
==
5
?
$t
(
'pubactivities.conduct'
):
$t
(
'activityInfo.applying'
):
item
.
activityDTO
.
activityState
==
3
?
$t
(
'activityInfo.applyEnd'
):
item
.
activity
DTO
.
activity
State
==
5
?
$t
(
'activityInfo.activityEnd'
):
''
}}
</i>
</p>
<div>
<p
class=
"ellipsisFont2"
>
<span
class=
"event_hasLive"
v-if=
"item.activityDTO.hasLive == 1"
:style=
"item.activityDTO.baseLive.liveState == 1?'background: #FE9F2C':'background: #5d78ff;'"
>
<span
class=
"event_hasLive"
@
click=
"openeventlive(item.activityDTO)"
v-if=
"item.activityDTO.hasLive == 1"
:style=
"item.activityDTO.baseLive.liveState == 1?'background: #FE9F2C':'background: #5d78ff;'"
>
<i
class=
"iconfont icon-zhibo"
></i>
{{
item
.
activityDTO
.
baseLive
.
liveState
==
0
?
$t
(
'activityInfo.liveTitle'
):
item
.
activityDTO
.
baseLive
.
liveState
==
1
?
$t
(
'activityInfo.living'
):
item
.
activityDTO
.
baseLive
.
liveState
==
2
&&
item
.
activityDTO
.
baseLive
.
liveBack
==
0
?
$t
(
'activityInfo.liveBack'
):
$t
(
'activityInfo.liveTitle'
)
}}
</span>
{{
item
.
activityDTO
.
channelTitle
}}
<span
@
click=
"routerpush(4,item)"
>
{{
item
.
activityDTO
.
channelTitle
}}
</span>
</p>
<div>
<span
class=
"commentsTabel"
>
活动
</span>
...
...
@@ -206,6 +208,46 @@
this
.
$router
.
push
({
path
:
routers
});
}
},
//打开直播
openeventlive
(
row
){
var
liveUrl
=
this
.
Base64
.
encode
(
row
.
baseLive
.
liveUrl
);
this
.
publicFun
.
setUserInfoCookie
(
"liveUrl"
,
row
.
baseLive
.
liveUrl
);
if
(
row
.
baseLive
.
liveState
!=
0
){
if
(
this
.
userInfo
&&
this
.
userInfo
.
empId
==
row
.
createdBy
){
if
(
row
.
baseLive
.
liveState
==
1
||
row
.
baseLive
.
liveBack
==
0
){
window
.
open
(
this
.
publicFun
.
getCurrentHrefEnv
()
+
"#/eventlive?url="
+
liveUrl
+
'&id='
+
row
.
channelId
);
}
}
else
{
if
(
row
.
baseLive
.
liveState
==
2
&&
row
.
baseLive
.
liveBack
==
0
){
if
(
!
this
.
publicFun
.
getUserInfoCookieType
()){
this
.
$refs
.
login
.
isexpertVisible
();
return
}
window
.
open
(
this
.
publicFun
.
getCurrentHrefEnv
()
+
"#/eventlive?url="
+
liveUrl
+
'&id='
+
row
.
channelId
);
}
else
{
if
(
row
.
baseLive
.
livePowers
==
0
&&
row
.
activityState
==
2
&&
row
.
isJoin
==
2
){
if
(
!
this
.
publicFun
.
getUserInfoCookieType
()){
this
.
$refs
.
login
.
isexpertVisible
();
return
}
this
.
$message
.
error
(
this
.
$t
(
'activityInfo.applyFirst'
));
}
else
if
(
row
.
baseLive
.
livePowers
==
0
&&
row
.
activityState
==
5
&&
row
.
isJoin
==
2
||
row
.
baseLive
.
livePowers
==
0
&&
row
.
activityState
==
3
&&
row
.
isJoin
==
2
){
if
(
row
.
baseLive
.
liveState
!=
2
){
this
.
$message
.
error
(
this
.
$t
(
'activityInfo.applyEndTitle'
));
}
}
else
{
if
(
row
.
baseLive
.
liveState
==
1
||
row
.
baseLive
.
liveState
==
2
&&
row
.
baseLive
.
liveBack
==
0
){
if
(
!
this
.
publicFun
.
getUserInfoCookieType
()){
this
.
$refs
.
login
.
isexpertVisible
();
return
}
window
.
open
(
this
.
publicFun
.
getCurrentHrefEnv
()
+
"#/eventlive?url="
+
liveUrl
+
'&id='
+
row
.
channelId
);
}
}
}
}
}
},
},
mounted
()
{
this
.
getMyDynamicList
();
...
...
src/views/peoplehomepage/peoplehome.vue
View file @
f15dbb03
...
...
@@ -12,14 +12,14 @@
<div
class=
"people_name"
>
<p
class=
"userImg"
>
<span>
{{
userInfoData
.
empName
}}
</span>
<span
style=
"font-size: 16px;"
>
昵称:
{{
userInfoData
.
nickName
}}
</span>
<span
v-if=
"userInfoData.nickName&&userInfoData.nickName.length>=1"
style=
"font-size: 16px;"
>
昵称:
{{
userInfoData
.
nickName
}}
</span>
<img
style=
"width: 20px;right: -35px;top: 10px;"
class=
"userImg_vip"
v-if=
"userInfoData.moderator&&userInfoData.professor"
src=
"../../assets/img/mobile/moderator.png"
alt=
""
>
</p>
<div
v-if=
"isTrans"
class=
"gendisplay about_top"
>
<div
class=
"gendisplay"
>
<span
@
click=
"topageType('/peoplehome/contactPerson')"
>
{{
userInfoData
.
friendCount
}}
联系人
</span>
<span
@
click=
"topageType('/peoplehome/commonSchool')"
>
{{
userInfoData
.
schoolCount
}}
位校友
</span>
<span
@
click=
"topageType('/peoplehome/commonWork')"
>
{{
userInfoData
.
colleagueCount
}}
同事
</span>
<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
v-if=
"$route.query.id&&$route.query.id != userInfo.empId"
>
<el-popover
placement=
"bottom"
...
...
@@ -50,7 +50,9 @@
<div
class=
"bard_user"
:style=
"'background-image:url('+require('../../assets/img/contactBjt.png')+')'"
>
<p
class=
"bard_info_img"
><img
:src=
"empContactData.baseEmpInformation.empLogo?empContactData.baseEmpInformation.empLogo:require('../../assets/img/defaultlogo.png')"
alt=
""
></p>
<p
class=
"bard_info_name"
>
{{
empContactData
.
baseEmpInformation
.
empName
}}
</p>
<p
v-if=
"empContactData.baseEmpInformation.workName"
class=
"bard_info_work"
>
{{
empContactData
.
baseEmpInformation
.
workName
}}
</p>
<p
class=
"bard_info_work"
>
{{
empContactData
.
baseEmpInformation
.
isModerator
==
1
||
empContactData
.
baseEmpInformation
.
isProfessor
==
1
?
empContactData
.
baseEmpInformation
.
empTitle
:
empContactData
.
baseEmpInformation
.
workName
}}
</p>
<p
v-if=
"empContactData.baseEmpInformation.orgName"
class=
"bard_info_org"
>
{{
empContactData
.
baseEmpInformation
.
orgName
}}
</p>
</div>
<div
class=
"bard_info"
>
...
...
@@ -76,7 +78,10 @@
<span>
{{
empContactData
.
queryValue
}}
</span>
</div>
</div>
<i
@
click=
"empContact"
style=
"cursor: pointer;font-size: 18px;color: #aaaaaa;"
slot=
"reference"
class=
"iconfont icon-mingpian1"
></i>
<p
@
click=
"empContact"
slot=
"reference"
style=
"display: flex;-ms-flex-align: center;color: #5D78FF;"
>
<i
style=
"cursor: pointer;font-size: 18px;"
class=
"iconfont icon-mingpian1"
></i>
<i
style=
"font-size: 14px;display: inline-block;padding-left: 5px;"
>
电子名片
</i>
</p>
</el-popover>
</span>
<span
@
click=
"topageType('/peoplehome/tabs/news')"
class=
"iconmail"
v-if=
"!$route.query.id|| $route.query.id == userInfo.empId"
>
...
...
@@ -123,7 +128,9 @@
<div
class=
"gendisplay"
>
<div
class=
"gendisplay"
>
<p><i
style=
"color:#AAAAAA;font-size: 12px;"
class=
"iconfont icon-hangye"
></i></p>
<p
style=
"margin-left: 10px;"
>
{{
userInfoData
.
orgName
}}
</p>
<p
style=
"margin-left: 10px;"
>
{{
userInfoData
.
moderator
&&
userInfoData
.
professor
?
userInfoData
.
title
:
userInfoData
.
orgName
}}
</p>
</div>
<div
style=
"margin-left: 20px;"
class=
"gendisplay"
>
<p><i
style=
"color:#AAAAAA;font-size: 12px;"
class=
"iconfont icon-qiye"
></i></p>
...
...
@@ -171,18 +178,18 @@
<p>
积分
</p>
</div>
</div>
<div
v-if=
"
!$route.query.id || $route.query.id==userInfo.empId
"
style=
"margin: 20px 0 0;"
class=
"gendisplay number_privacy"
>
<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')"
>
<p><i
style=
"font-size: 30px;color: #4A4A4A;font-weight: normal;"
class=
"iconfont icon-fabudexuqiu"
></i></p>
<p>
发需求
</p>
<p>
{{
publicFun
.
isgetUserRoleFunc
(
5
)?
'代发需求'
:
'发需求'
}}
</p>
</div>
<div
@
click=
"toWorkbench('/totceldata')"
>
<p><i
style=
"font-size: 30px;color: #4A4A4A;font-weight: normal;"
class=
"iconfont icon-fabuxiangmu"
></i></p>
<p>
发项目
</p>
<p>
{{
publicFun
.
isgetUserRoleFunc
(
5
)?
'代发项目'
:
'发项目'
}}
</p>
</div>
<div
@
click=
"to
pageType(
'/bigBusiness/detail')"
>
<div
@
click=
"to
Workbench(publicFun.isgetUserRoleFunc(5)?'/salerequire/list':
'/bigBusiness/detail')"
>
<p><i
style=
"font-size: 30px;color: #4A4A4A;font-weight: normal;"
class=
"iconfont icon-yifabu"
></i></p>
<p>
已发布
</p>
<p>
{{
publicFun
.
isgetUserRoleFunc
(
5
)?
'我维护的需求'
:
'已发布'
}}
</p>
</div>
</div>
</div>
...
...
src/views/peoplehomepage/popoverBardbar.vue
View file @
f15dbb03
<
template
>
<div>
<el-popover
placement=
"bottom
"
:placement=
"placement?'left':'bottom'
"
width=
"300"
ref=
"popover"
popper-class=
"bard_popover"
...
...
@@ -29,7 +29,9 @@
<div
class=
"bard_user"
:style=
"'background-image:url('+require('../../assets/img/contactBjt.png')+')'"
>
<p
class=
"bard_info_img"
><img
:src=
"empContactData.baseEmpInformation.empLogo?empContactData.baseEmpInformation.empLogo:require('../../assets/img/defaultlogo.png')"
alt=
""
></p>
<p
class=
"bard_info_name"
>
{{
empContactData
.
baseEmpInformation
.
empName
}}
</p>
<p
v-if=
"empContactData.baseEmpInformation.workName"
class=
"bard_info_work"
>
{{
empContactData
.
baseEmpInformation
.
workName
}}
</p>
<p
class=
"bard_info_work"
>
{{
empContactData
.
baseEmpInformation
.
isModerator
==
1
||
empContactData
.
baseEmpInformation
.
isProfessor
==
1
?
empContactData
.
baseEmpInformation
.
empTitle
:
empContactData
.
baseEmpInformation
.
workName
}}
</p>
<p
v-if=
"empContactData.baseEmpInformation.orgName"
class=
"bard_info_org"
>
{{
empContactData
.
baseEmpInformation
.
orgName
}}
</p>
</div>
<div
class=
"bard_info"
>
...
...
@@ -92,7 +94,7 @@
}
},
components
:{
VueQRCodeComponent
},
props
:[
'row'
,
'ishome'
,
'iseventlive'
],
props
:[
'row'
,
'ishome'
,
'iseventlive'
,
'placement'
],
methods
:{
cancelBtn
()
{
this
.
$refs
.
popover
.
doClose
();
...
...
src/views/peoplehomepage/userContactbar.vue
View file @
f15dbb03
...
...
@@ -18,7 +18,7 @@
</div>
</el-col>
</el-row>
<el-row
v-if=
"
cur_page
>1"
style=
"padding-top: 20px;text-align: center;border-top: 1px solid #E4E6F2;"
>
<el-row
v-if=
"
pages
>1"
style=
"padding-top: 20px;text-align: center;border-top: 1px solid #E4E6F2;"
>
<el-pagination
@
current-change=
"handleCurrentChange"
background
...
...
@@ -42,6 +42,7 @@
return
{
visibleContact
:
true
,
cur_page
:
1
,
//页数
pages
:
1
,
totalListResult
:
0
,
numberData
:
6
,
//设置个数
contactList
:[],
...
...
@@ -77,6 +78,7 @@
if
(
response
.
code
==
0
)
{
this
.
contactList
=
response
.
result
.
records
;
this
.
totalListResult
=
response
.
result
.
total
;
this
.
pages
=
response
.
result
.
pages
;
}
else
{
this
.
$toast
(
response
.
msg
);
}
...
...
src/views/topicpage/topicpool.vue
View file @
f15dbb03
...
...
@@ -164,6 +164,7 @@
this
.
search
.
contentType
=
2
;
}
this
.
sousearch
();
this
.
getpoolTotal
();
},
handleSelectionChange
(
val
){
this
.
enticationlist
=
val
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment