diff --git a/src/views/MicroExhibition/components/BarChart.vue b/src/views/MicroExhibition/components/BarChart.vue index 14509a8..926fe5f 100644 --- a/src/views/MicroExhibition/components/BarChart.vue +++ b/src/views/MicroExhibition/components/BarChart.vue @@ -33,6 +33,7 @@ const setCharts = () => { grid:{ left:'40', right:'0', + bottom:'40', }, color:['#2FC5D4','#FEDA81'], xAxis: { diff --git a/src/views/MicroExhibition/components/BoardBar.vue b/src/views/MicroExhibition/components/BoardBar.vue index 7345774..b33d234 100644 --- a/src/views/MicroExhibition/components/BoardBar.vue +++ b/src/views/MicroExhibition/components/BoardBar.vue @@ -37,7 +37,7 @@ const prop = defineProps({ } }) let header = ['序号', '设备名称', '设备编码','完成率', '稼动率', '状态'] -let columnWidth = [90, 290, 140, 120, 120,100]; +let columnWidth = [90, 295, 145, 110, 110,85]; let sum = 850; let computedWidth = (width: number) => { @@ -49,9 +49,9 @@ let config = reactive({ oddRowBGC: '#000F1D', evenRowBGC: '#000F1D', wrap: [false, false, false, false, false], - columnWidth: [80, 290, 140, 120, 120,100], + columnWidth: [80, 295, 145, 110, 110,85], align: ['center', 'center', 'center', 'center', 'center', 'center'], - rowNum: 2, + rowNum: 3, waitTime: 3000, }) const handleData = () => { @@ -124,7 +124,7 @@ onMounted(() => { .bb-top { width: 100%; - height: 35%; + height: 40%; } .dev-list { @@ -134,6 +134,6 @@ onMounted(() => { .bb-bottom { width: 100%; - height: 65%; + height: 60%; } diff --git a/src/views/MicroExhibition/table.vue b/src/views/MicroExhibition/table.vue index 2eba939..e9acf41 100644 --- a/src/views/MicroExhibition/table.vue +++ b/src/views/MicroExhibition/table.vue @@ -30,7 +30,7 @@ @@ -78,14 +78,32 @@ async function fetchPlanProduction(): Promise { tableData.value = res.data res.data.forEach((item) => { if (obj.caijian.includes(item.label)) { + let unit = ''; + if (item.label == '1190269') { + unit = '件' + } else if (item.label == '1050910') { + unit = '米' + } + item.unit = unit objList.裁剪设备.push(item) } else if (obj.tuoxie.includes(item.label)) { + item.unit = '只' objList.一次性拖鞋生产线.push(item) } else if (obj.fengzhong.includes(item.label)) { + let unit = ''; + let arr = ['RP2011001#', 'RP2011157', '10102109', '10102154'] + if (arr.includes(item.label)) { + unit = '片' + } else if (item.label == '1021629') { + unit = '件' + } + item.unit = unit objList.缝中设备.push(item) } else if (obj.banfang.includes(item.label)) { + item.unit = '版' objList.板房设备.push(item) } else if (obj.zuoyi.includes(item.label)) { + item.unit = '件' objList.座椅面套生产线.push(item) } })