Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
N
NLT-e-cigarette
Project
Project
Details
Activity
Releases
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
张伯涛
NLT-e-cigarette
Commits
161e4751
Commit
161e4751
authored
Jun 20, 2022
by
zhangyichen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug 55830 生产模型-添加工站页暂无数据
parent
d5f45fde
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
20 additions
and
5 deletions
+20
-5
Item.vue
src/layout/components/Sidebar/Item.vue
+6
-1
SidebarItem.vue
src/layout/components/Sidebar/SidebarItem.vue
+8
-4
sidebar.scss
src/styles/sidebar.scss
+4
-0
ModelDetails.vue
src/views/productionInfo/ModelDetails.vue
+2
-0
No files found.
src/layout/components/Sidebar/Item.vue
View file @
161e4751
...
@@ -22,7 +22,7 @@ export default {
...
@@ -22,7 +22,7 @@ export default {
if
(
title
)
{
if
(
title
)
{
vnodes
.
push
(
vnodes
.
push
(
<
div
style
=
'padding-bottom: 5px;'
slot
=
'title'
>
<
div
style
=
'padding-bottom: 5px;
position: relative; right: 10px
'
slot
=
'title'
>
<
div
>
{(
title
.
split
(
';'
)[
0
])}
<
/div
>
<
div
>
{(
title
.
split
(
';'
)[
0
])}
<
/div
>
<
div
style
=
'padding-left: 5px;font-size: 12px;'
>
{(
title
.
split
(
';'
)[
1
])}
<
/div
>
<
div
style
=
'padding-left: 5px;font-size: 12px;'
>
{(
title
.
split
(
';'
)[
1
])}
<
/div
>
<
/div
>
<
/div
>
...
@@ -32,3 +32,8 @@ export default {
...
@@ -32,3 +32,8 @@ export default {
}
}
}
}
</
script
>
</
script
>
<
style
>
{
position
:
relative
;
}
</
style
>
src/layout/components/Sidebar/SidebarItem.vue
View file @
161e4751
<
template
>
<
template
>
<div
v-if=
"!item.hidden"
>
<div
v-if=
"!item.hidden"
>
<template
v-if=
"item.showFather !== 'true' && hasOneShowingChild(item.children,item) && (!onlyOneChild.children
||onlyOneChild.noShowingChildren)&&
!item.alwaysShow"
>
<template
v-if=
"item.showFather !== 'true' && hasOneShowingChild(item.children,item) && (!onlyOneChild.children
|| onlyOneChild.noShowingChildren) &&
!item.alwaysShow"
>
<app-link
v-if=
"onlyOneChild.meta"
:to=
"resolvePath(onlyOneChild.path)"
>
<app-link
v-if=
"onlyOneChild.meta"
:to=
"resolvePath(onlyOneChild.path)"
>
<div
class=
"menuTitle"
>
<div
class=
"menuTitle"
>
<el-menu-item
style=
""
:index=
"resolvePath(onlyOneChild.path)"
:class=
"
{'submenu-title-noDropdown':!isNest}">
<el-menu-item
style=
""
:index=
"resolvePath(onlyOneChild.path)"
:class=
"
{'submenu-title-noDropdown':!isNest}">
...
@@ -66,8 +66,9 @@ export default {
...
@@ -66,8 +66,9 @@ export default {
data
()
{
data
()
{
// To fix https://github.com/PanJiaChen/vue-admin-template/issues/237
// To fix https://github.com/PanJiaChen/vue-admin-template/issues/237
// TODO: refactor with render function
// TODO: refactor with render function
this
.
onlyOneChild
=
null
return
{
return
{}
onlyOneChild
:
null
}
},
},
methods
:
{
methods
:
{
hasOneShowingChild
(
children
=
[],
parent
)
{
hasOneShowingChild
(
children
=
[],
parent
)
{
...
@@ -83,7 +84,10 @@ export default {
...
@@ -83,7 +84,10 @@ export default {
// When there is only one child router, the child router is displayed by default
// When there is only one child router, the child router is displayed by default
if
(
showingChildren
.
length
===
1
)
{
if
(
showingChildren
.
length
===
1
)
{
return
true
if
(
showingChildren
[
0
].
path
===
'/Home'
)
{
return
true
}
return
false
}
}
// Show parent if there are no child router to display
// Show parent if there are no child router to display
...
...
src/styles/sidebar.scss
View file @
161e4751
...
@@ -89,6 +89,7 @@
...
@@ -89,6 +89,7 @@
&
:hover
{
&
:hover
{
background-color
:
$subMenuHover
!
important
;
background-color
:
$subMenuHover
!
important
;
color
:
$font-white
}
}
}
}
}
}
...
@@ -278,6 +279,9 @@
...
@@ -278,6 +279,9 @@
&
.is-active
{
&
.is-active
{
color
:
white
!
important
;
color
:
white
!
important
;
}
}
&
:hover
{
color
:
white
!
important
;
}
}
}
}
}
...
...
src/views/productionInfo/ModelDetails.vue
View file @
161e4751
...
@@ -749,6 +749,7 @@ export default {
...
@@ -749,6 +749,7 @@ export default {
// 添加工站弹窗
// 添加工站弹窗
addPosition
()
{
addPosition
()
{
this
.
workType
=
'1'
this
.
workType
=
'1'
this
.
queryParams
.
page
=
1
this
.
openPosition
=
true
this
.
openPosition
=
true
this
.
title
=
'添加工站'
this
.
title
=
'添加工站'
this
.
addPositionMapOne
=
{}
this
.
addPositionMapOne
=
{}
...
@@ -757,6 +758,7 @@ export default {
...
@@ -757,6 +758,7 @@ export default {
// 修改工站弹窗
// 修改工站弹窗
editPosition
(
row
)
{
editPosition
(
row
)
{
this
.
workType
=
'2'
this
.
workType
=
'2'
this
.
queryParams
.
page
=
1
this
.
disposeMaterialId
=
row
.
businessId
this
.
disposeMaterialId
=
row
.
businessId
this
.
openPosition
=
true
this
.
openPosition
=
true
this
.
title
=
'修改工站'
this
.
title
=
'修改工站'
...
...
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