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
e309af12
Commit
e309af12
authored
Dec 16, 2020
by
zhangyanni
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/master'
parents
154a610a
427875be
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
11 deletions
+12
-11
networkSearch.vue
src/views/netWorkpage/networkSearch.vue
+2
-2
editInfo.vue
src/views/peoplehomepage/editInfo.vue
+10
-9
No files found.
src/views/netWorkpage/networkSearch.vue
View file @
e309af12
...
...
@@ -21,12 +21,12 @@
<div>
<p
@
click=
"tohome(item)"
>
<span>
{{
item
.
empName
}}
</span>
<span
style=
"margin-left: 20px;"
v-if=
"item.isProfessor == 1"
>
{{
item
.
empTitle
}}
</span>
<span
style=
"margin-left: 20px;"
v-if=
"item.isProfessor == 1
||item.isModerator == 1
"
>
{{
item
.
empTitle
}}
</span>
<span
style=
"margin-left: 20px;"
v-else
>
{{
item
.
workName
}}
</span>
<span
style=
"margin-left: 20px;"
>
{{
item
.
orgName
}}
</span>
</p>
<p
@
click=
"tohome(item)"
>
{{
item
.
empIntroduction
}}
</p>
<p>
<p
@
click=
"tohome(item)"
>
<span>
{{
item
.
friendCount
}}
位联系人
</span>
<span
style=
"margin-left: 20px;"
>
{{
item
.
followedCount
}}
位关注者
</span>
</p>
...
...
src/views/peoplehomepage/editInfo.vue
View file @
e309af12
...
...
@@ -61,8 +61,8 @@
<div
class=
"gendisplay"
>
<p>
{{
item
.
workName
}}
</p>
<p>
{{
item
.
orgName
}}
</p>
<p>
{{
item
.
address
}}
</p>
<p
v-if=
"item.startTime"
>
{{
item
.
startTime
}}
-
{{
item
.
endTime
==
'now'
?
'至今'
:
item
.
endTime
}}
</p>
<p>
{{
item
.
address
}}
</p>
</div>
<div>
<i
@
click=
"editjobs(item,index)"
class=
"iconfont icon-bianji"
></i>
...
...
@@ -522,6 +522,7 @@
provinceId
:
this
.
workdata
.
provinceId
,
startTime
:
this
.
workdata
.
startTime
,
endTime
:
this
.
workdata
.
endTime
,
address
:
this
.
workdata
.
address
,
id
:
this
.
workdata
.
id
?
this
.
workdata
.
id
:
null
,
};
}
else
{
...
...
@@ -533,6 +534,7 @@
provinceId
:
this
.
workdata
.
provinceId
,
startTime
:
this
.
workdata
.
startTime
,
endTime
:
this
.
workdata
.
endTime
,
address
:
this
.
workdata
.
address
,
id
:
this
.
workdata
.
id
?
this
.
workdata
.
id
:
null
,
});
}
...
...
@@ -836,16 +838,15 @@
border-bottom
:
1px
solid
#E7E9F5
;
>
div
:first-child
{
width
:
80%
;
>
p
:nth-child
(
1
)
{
font-weight
:
bold
;
>
p
{
margin-right
:
20px
;
max-width
:
200px
;
height
:
20px
;
line-height
:
20px
;
overflow
:
hidden
;
}
>
p
:nth-child
(
2
)
{
max-width
:
300px
;
margin
:
0
30px
;
}
>
p
:nth-child
(
3
)
{
max-width
:
200px
;
>
p
:nth-child
(
1
)
{
font-weight
:
bold
;
}
}
>
div
:last-child
{
...
...
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