diff --git a/src/views/material-manage/cockpit/components/bomList.vue b/src/views/material-manage/cockpit/components/bomList.vue
index a5d2cd4..326b354 100644
--- a/src/views/material-manage/cockpit/components/bomList.vue
+++ b/src/views/material-manage/cockpit/components/bomList.vue
@@ -3,9 +3,7 @@
-
{{ item.name }}
-
@@ -41,21 +39,6 @@ export default {
width: 100%;
text-align: center;
bottom: 6%;
- .leftTriangle,
- .rightTriangle {
- display: inline-block;
- width: 0px;
- height: 0px;
- border: 5px solid transparent;
- }
- .leftTriangle {
- border-right-color: #fff;
- margin-right: 10px;
- }
- .rightTriangle {
- border-left-color: #fff;
- margin-left: 10px;
- }
}
}
}
diff --git a/src/views/material-manage/cockpit/index.vue b/src/views/material-manage/cockpit/index.vue
index c7fa6d7..5cfcab4 100644
--- a/src/views/material-manage/cockpit/index.vue
+++ b/src/views/material-manage/cockpit/index.vue
@@ -111,7 +111,7 @@ const material = [
},
{
prop: 'spec',
- label: '辅料规格',
+ label: '辅料名称',
minWidth: 32.4
},
{
@@ -178,7 +178,7 @@ export default {
const productList = ['2.0-1128*1716', '2.0-1128*2251', '2.0-1128*2272', '3.2-1128*1716', '3.2-1128*1718','3.2-1032*1747', '3.2-1033*2089']
for (let i = 0; i < 20; i++) {
const obj = {}
- const sj = parseInt(Math.random() * 14 + 1)
+ const sj = parseInt(Math.random() * 15)
obj.time = moment().subtract(sj, 'days').subtract(sj, 'hours').subtract(sj, 'minute').subtract(sj, 'second').format('YYYY-MM-DD HH:mm:ss')
obj.productLine = sj % 2 ? 'A' : 'B'
obj.spec = productList[parseInt(Math.random() * (productList.length))]
@@ -187,15 +187,21 @@ export default {
arr.push(obj)
}
this.originalFilmList = arr
- const eqList = ['清洗机', 'A1一次冷却机', 'A1下片机', 'A1一次固化机', 'A1一次镀膜机', 'A1二次固化机', 'A1二次镀膜机', 'A1磨边机', 'A1磨边清洗机', 'A1预热机', 'A2一次冷却机', 'A2一次固化机', 'A2一次镀膜机', 'A2下片机', 'A2二次固化机', 'A2磨边机', 'A2磨边清洗机', 'A储片机206']
- const spcList = ['200*231*0.5', '100*120*0.2', '70*80', '100*100']
+ const eqList = [
+ {name: '磨边机', fc: ''},
+ {name: '丝印机', fc: ['油墨', '刮胶']},
+ {name: '镀膜机', fc: ['镀膜液', '异丙醇']},
+ {name: '包装机', fc: ['隔离纸', '包装辅材']}
+ ]
for (let i = 0; i < 20; i++) {
const obj = {}
- const sj = parseInt(Math.random() * 200)
- obj.time = moment().add(sj, 'days').add(sj, 'hours').add(sj, 'minute').add(sj, 'second').format('YYYY-MM-DD HH:mm:ss')
- obj.eqName = eqList[parseInt(Math.random() * eqList.length)]
- obj.spec = spcList[parseInt(Math.random() * spcList.length)]
- obj.batch = moment().subtract(sj, 'days').format('YYYYMMDD') + '0000' + parseInt(Math.random() * 89 + 10)
+ const sj = parseInt(Math.random() * 15)
+ const sj2 = parseInt(Math.random() * eqList.length)
+ const sj3 = sj % 2 ? 1 : 0
+ obj.time = moment().subtract(sj, 'days').subtract(sj, 'hours').subtract(sj, 'minute').subtract(sj, 'second').format('YYYY-MM-DD HH:mm:ss')
+ obj.eqName = eqList[sj2].name
+ obj.spec = eqList[sj2].fc ? (eqList[sj2].fc[sj3]) : ''
+ obj.batch = moment().subtract(sj, 'days').format('YYYYMMDD')
obj.num = parseInt(Math.random() * 800 + 100)
temp.push(obj)
}