projects/mesxc-zhp #161

Closed
zhp wants to merge 119 commits from projects/mesxc-zhp into projects/mes-test
4 changed files with 35 additions and 11 deletions
Showing only changes of commit 4e26d49ff5 - Show all commits

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

View File

@ -2,7 +2,7 @@
<div class="choicepart-container">
<navbar />
<div class="choicepart-wrapper">
<div class="choicepart-box" id="choicepartBox" :style="'transform:scale('+scale+');width:1574px;height:538px;'" v-show="showItem">
<div class="choicepart-box" id="choicepartBox" :style="'transform:scale('+scale+');width:1710px;height:538px;'" v-show="showItem">
<div class="choicepart-line1">
<div
v-for="(item, index) in menuArr1"
@ -102,9 +102,7 @@ export default {
meta: {
title: ''
}
}
],
menuArr2: [
},
{
name: 'Packaging',
title: '包装管理',
@ -112,7 +110,9 @@ export default {
meta: {
title: ''
}
},
}
],
menuArr2: [
{
name: 'Material',
title: '物料管理',
@ -129,17 +129,41 @@ export default {
title: ''
}
},
// {
// name: 'Delivery',
// title: '',
// visible: false,
// meta: {
// title: ''
// }
// },
{
name: 'Delivery',
title: '成品发货',
name: 'Report',
title: '报表管理',
visible: false,
meta: {
title: ''
}
},
{
name: 'Report',
title: '报表管理',
name: 'Cost',
title: '成本管理',
visible: false,
meta: {
title: ''
}
},
{
name: 'SafetyEnvironmental',
title: '安环管理',
visible: false,
meta: {
title: ''
}
},
{
name: 'Databoard',
title: '数据驾驶舱',
visible: false,
meta: {
title: ''
@ -176,7 +200,7 @@ export default {
console.log(menuList)
if (menuList.length > 0) {
for (let i = 0; i < menuList.length; i ++) {
for (let k = 0; k < 7; k++) {
for (let k = 0; k < 8; k++) {
if (menuList[i].name === this.menuArr1[k].name) {
this.menuArr1[k].visible = true
this.menuArr1[k].id = menuList[i].id
@ -185,7 +209,7 @@ export default {
this.menuArr1[k].meta = menuList[i].meta
}
}
for (let j = 0; j < 6; j++) {
for (let j = 0; j < 7; j++) {
if (menuList[i].name === this.menuArr2[j].name) {
this.menuArr2[j].visible = true
this.menuArr2[j].id = menuList[i].id