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
ddd527a8
Commit
ddd527a8
authored
Dec 10, 2020
by
zhangyanni
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/master'
parents
4e8fa3e3
5729b028
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
19 additions
and
5 deletions
+19
-5
feedbackpage.vue
src/views/innovatecompany/feedback/feedbackpage.vue
+1
-1
peoplehome.vue
src/views/peoplehomepage/peoplehome.vue
+6
-1
tabAttentionbar.vue
src/views/peoplehomepage/tabAttentionbar.vue
+5
-0
tabNewsbar.vue
src/views/peoplehomepage/tabNewsbar.vue
+2
-2
tabsbar.vue
src/views/peoplehomepage/tabsbar.vue
+5
-1
No files found.
src/views/innovatecompany/feedback/feedbackpage.vue
View file @
ddd527a8
...
...
@@ -64,7 +64,7 @@
if
(
valid
)
{
api
.
submit
(
this
.
formData
).
then
(
response
=>
{
if
(
response
.
code
==
0
)
{
this
.
formData
=
{}
;
this
.
$refs
[
'formData'
].
resetFields
()
;
this
.
$message
.
success
(
this
.
$t
(
'Otherjson.harder'
));
}
else
{
this
.
$message
.
error
(
response
.
msg
);
...
...
src/views/peoplehomepage/peoplehome.vue
View file @
ddd527a8
...
...
@@ -157,7 +157,7 @@
<!-- basetype 1默认页-->
<introductionbar
v-if=
"basetype == 1"
@
fatherChange=
"fatherChange"
:workList=
"userInfoData.workList"
:educationList=
"userInfoData.educationList"
:id=
"$route.query.id"
></introductionbar>
<!-- 2tab切换个人信息-->
<tabsbar
@
empConcernCount=
"empConcernCount"
@
empFriendCount=
"empFriendCount"
:activeNames=
"activeName"
v-if=
"basetype == 2"
:id=
"$route.query.id"
></tabsbar>
<tabsbar
@
empConcernCount=
"empConcernCount"
ref=
"tabsChange"
@
empFriendCount=
"empFriendCount"
:activeNames=
"activeName"
v-if=
"basetype == 2"
:id=
"$route.query.id"
></tabsbar>
<!-- 3勋章页-->
<mineMedal
v-if=
"basetype == 3"
></mineMedal>
<!-- 4关注我的页-->
...
...
@@ -441,6 +441,11 @@
if
(
routers
==
'/peoplehome/commonWork'
)
this
.
mustNotType
=
3
;
else
if
(
routers
==
'/peoplehome/commonSchool'
)
this
.
mustNotType
=
2
;
else
this
.
mustNotType
=
null
;
if
(
routers
==
'/peoplehome/tabs/ticeCount'
){
if
(
this
.
$refs
.
tabsChange
){
this
.
$refs
.
tabsChange
.
tabAttentions
();
}
};
},
//查看联系方式
empContact
(){
...
...
src/views/peoplehomepage/tabAttentionbar.vue
View file @
ddd527a8
...
...
@@ -136,6 +136,11 @@
tohome
(
row
){
this
.
$router
.
push
({
path
:
"/peoplehome"
,
query
:{
id
:
row
.
empId
}});
},
//初始化
initialConcerns
(){
this
.
cur_page
=
1
;
this
.
getEmpConcern
();
},
},
mounted
()
{
this
.
getEmpConcern
();
...
...
src/views/peoplehomepage/tabNewsbar.vue
View file @
ddd527a8
...
...
@@ -43,7 +43,7 @@
</p>
<p
v-if=
"item.messageType == 3"
><i
@
click=
"tohome(item)"
>
{{
item
.
empName
}}
</i>
关注了您
</p>
<p
v-if=
"item.messageType == 4"
>
<span
v-if=
"
userInfo.empId
== item.empId"
>
<span
v-if=
"
item.createdBy
== item.empId"
>
我不同意添加
<i
@
click=
"tohome(item)"
>
{{
item
.
empName
}}
</i>
为联系人
</span>
<span
v-else
>
...
...
@@ -52,7 +52,7 @@
</p>
<p
v-if=
"item.messageType == 5"
><i
@
click=
"tohome(item)"
>
{{
item
.
empName
}}
</i>
赞了您的评论
</p>
<p
v-if=
"item.messageType == 6"
>
<span
v-if=
"
userInfo.empId
== item.empId"
>
<span
v-if=
"
item.createdBy
== item.empId"
>
我同意添加
<i
@
click=
"tohome(item)"
>
{{
item
.
empName
}}
</i>
为联系人
</span>
<span
v-else
>
...
...
src/views/peoplehomepage/tabsbar.vue
View file @
ddd527a8
...
...
@@ -13,7 +13,7 @@
<!-- 评论-->
<tabCommentbar
:id=
"id"
v-if=
"activeName == 'comment'"
></tabCommentbar>
<!-- 关注-->
<tabAttentionbar
@
newempConcern=
"newempConcern"
:id=
"id"
v-if=
"activeName == 'attention'"
></tabAttentionbar>
<tabAttentionbar
ref=
"tabAttention"
@
newempConcern=
"newempConcern"
:id=
"id"
v-if=
"activeName == 'attention'"
></tabAttentionbar>
<!-- 话题-->
<tabTopicbar
:id=
"id"
v-if=
"activeName == 'topic'"
></tabTopicbar>
<!-- 消息-->
...
...
@@ -76,6 +76,10 @@
this
.
$router
.
push
({
path
:
urls
});
}
},
//关注初始化
tabAttentions
(){
this
.
$refs
.
tabAttention
.
initialConcerns
();
},
newempConcern
(
row
){
this
.
$emit
(
'empConcernCount'
,
row
);
},
...
...
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