Commit 161e4751 authored by zhangyichen's avatar zhangyichen

修改bug 55830 生产模型-添加工站页暂无数据

parent d5f45fde
......@@ -22,7 +22,7 @@ export default {
if (title) {
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 style='padding-left: 5px;font-size: 12px;'>{(title.split(';')[1])}</div>
</div>
......@@ -32,3 +32,8 @@ export default {
}
}
</script>
<style>
{
position: relative;
}
</style>
<template>
<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)">
<div class="menuTitle">
<el-menu-item style="" :index="resolvePath(onlyOneChild.path)" :class="{'submenu-title-noDropdown':!isNest}">
......@@ -66,8 +66,9 @@ export default {
data() {
// To fix https://github.com/PanJiaChen/vue-admin-template/issues/237
// TODO: refactor with render function
this.onlyOneChild = null
return {}
return {
onlyOneChild: null
}
},
methods: {
hasOneShowingChild(children = [], parent) {
......@@ -83,7 +84,10 @@ export default {
// When there is only one child router, the child router is displayed by default
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
......
......@@ -89,6 +89,7 @@
&:hover {
background-color: $subMenuHover !important;
color: $font-white
}
}
}
......@@ -278,6 +279,9 @@
&.is-active {
color: white !important;
}
&:hover {
color: white !important;
}
}
}
......
......@@ -749,6 +749,7 @@ export default {
// 添加工站弹窗
addPosition() {
this.workType = '1'
this.queryParams.page = 1
this.openPosition = true
this.title = '添加工站'
this.addPositionMapOne = {}
......@@ -757,6 +758,7 @@ export default {
// 修改工站弹窗
editPosition(row) {
this.workType = '2'
this.queryParams.page = 1
this.disposeMaterialId = row.businessId
this.openPosition = true
this.title = '修改工站'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment