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
89f6ad30
Commit
89f6ad30
authored
Jul 01, 2020
by
zhangyanni
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/master'
parents
36b4afd9
fee9fc0c
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
10 additions
and
5 deletions
+10
-5
industrypage.vue
src/views/industryreportspage/industrypage.vue
+2
-0
viewproject.vue
src/views/innovatecompany/lreleaseproject/viewproject.vue
+1
-1
commentdetail.vue
src/views/topicpage/commentdetail.vue
+3
-1
discussall.vue
src/views/topicpage/discussall.vue
+2
-0
topicdetail.vue
src/views/topicpage/topicdetail.vue
+2
-3
No files found.
src/views/industryreportspage/industrypage.vue
View file @
89f6ad30
...
...
@@ -303,6 +303,8 @@
let
params
=
[{
classifyId
:
this
.
$route
.
query
.
classifyId
,
classifyName
:
this
.
$route
.
query
.
classifyName
}];
this
.
classifyclk
(
params
);
}
globalMsg
.
$emit
(
'topisInit'
,
false
);
globalMsg
.
$emit
(
'sendIndex'
,
$i18n
.
locale
==
'zh-CN'
?
6
:
4
);
if
(
this
.
$i18n
.
locale
==
'zh-CN'
){
//右侧热门
let
params
=
{};
...
...
src/views/innovatecompany/lreleaseproject/viewproject.vue
View file @
89f6ad30
...
...
@@ -213,7 +213,7 @@
<!--<img style="width:100%;height: 100%; border-radius: 3px;opacity: 0.5" src="../../../assets/img/index/demand.jpg" alt="图片">-->
<!--</div>-->
<!--</div>-->
<div
v-if=
"addData.showCompanyInfoAndCooperation&&(addData.companyIndustryList
||addData.cooperationWay||addData.customerLabelList||addData.customerCase
)||state"
class=
"contentsy"
>
<div
v-if=
"addData.showCompanyInfoAndCooperation&&(addData.companyIndustryList
&&addData.companyIndustryList.length>=1||addData.cooperationWay&&addData.cooperationWay.length>=1||addData.customerLabelList&&addData.customerLabelList.length>=1||addData.customerCase&&addData.customerCase.length>=1
)||state"
class=
"contentsy"
>
<div>
<p>
{{$t("listproject.market")}}
</p>
</div>
...
...
src/views/topicpage/commentdetail.vue
View file @
89f6ad30
...
...
@@ -80,7 +80,7 @@
<div
style=
"position: relative;margin-right: 15px;"
>
<img
v-if=
"empuser.empLogo"
:src=
"empuser.empLogo"
style=
"border-radius: 50%; border:1px solid #DCDFF1; width: 36px;height: 36px;"
>
<img
v-else
src=
"../../assets/img/defaultlogo.png"
style=
"border-radius: 50%; border:1px solid #DCDFF1; width: 36px;height: 36px;"
>
<img
v-if=
"empuser.isProfessor==1"
src=
"../../assets/img/proFeedBack/vip.png"
alt=
""
style=
"position: absolute;right: 0px;bottom:
0
px;width: 10px;"
>
<img
v-if=
"empuser.isProfessor==1"
src=
"../../assets/img/proFeedBack/vip.png"
alt=
""
style=
"position: absolute;right: 0px;bottom:
57
px;width: 10px;"
>
</div>
<div
style=
"width: 100%;"
>
<el-input
...
...
@@ -609,6 +609,8 @@
},
},
mounted
(){
globalMsg
.
$emit
(
'topisInit'
,
false
);
globalMsg
.
$emit
(
'sendIndex'
,
5
);
if
(
this
.
empId
){
this
.
getselectByEmpId
();
}
...
...
src/views/topicpage/discussall.vue
View file @
89f6ad30
...
...
@@ -124,6 +124,8 @@
},
},
mounted
(){
globalMsg
.
$emit
(
'topisInit'
,
false
);
globalMsg
.
$emit
(
'sendIndex'
,
5
);
this
.
getselectTopicList
();
api
.
selectHotTopicList
().
then
(
response
=>
{
if
(
response
.
code
==
0
)
{
...
...
src/views/topicpage/topicdetail.vue
View file @
89f6ad30
...
...
@@ -1136,9 +1136,8 @@
this
.
getMyproject
();
this
.
getselectByEmpId
();
}
if
(
this
.
$route
.
query
.
newnpen
){
globalMsg
.
$emit
(
'sendIndex'
,
5
);
}
globalMsg
.
$emit
(
'topisInit'
,
false
);
globalMsg
.
$emit
(
'sendIndex'
,
5
);
this
.
getselectHotAndTopList
();
api
.
selectTopicById
(
this
.
$route
.
query
.
id
).
then
((
res
)
=>
{
if
(
res
.
code
==
0
)
{
...
...
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