From b1b6c007e0a1f8ada903760dbff7ffaa756e455d Mon Sep 17 00:00:00 2001
From: 小小儁爺 <1694218219@qq.com>
Date: 星期三, 31 七月 2024 13:26:13 +0800
Subject: [PATCH] 1.看板优化
---
src/views/kanbanManager/ckgl.vue | 8 ++--
src/views/statistic/workOrderProcess.vue | 2
src/views/kanbanManager/cj.vue | 23 +++++++----
src/utils/myEcharts.js | 40 ++++++++++++++-----
4 files changed, 48 insertions(+), 25 deletions(-)
diff --git a/src/utils/myEcharts.js b/src/utils/myEcharts.js
index b659d64..e1f9f65 100644
--- a/src/utils/myEcharts.js
+++ b/src/utils/myEcharts.js
@@ -356,8 +356,8 @@
// 缁煎悎鐪嬫澘鍥�
export function bar02(dataArr, titlenameArr) {
- // const data = [70, 60, 50, 40, 30]
- // const titlename = ['澶栬鍒掍激', '琛ㄩ潰娌规薄', '灏哄', '棰滆壊', '澶у皬']
+ // const data = [700, 600, 50, 40, 30]
+ // const titlename = ['500ml鎻愭墜鐩栧挅鍟℃澂 钃濊壊 鍠峰', '500ml鎻愭墜鐩栧挅鍟℃澂 钃濊壊 鍠峰', '灏哄', '棰滆壊', '澶у皬']
// const data = val.map(i => i.cont)
// const titlename = val.map(i => i.name)
const data = dataArr.filter((item, index) => index < 5)
@@ -371,7 +371,9 @@
}
}
- const valdata = [683, 500, 400, 300, 200]
+ console.log(titlename,123);
+
+ // const valdata = [683, 500, 400, 300, 200]
// const myColor = ['#FF0000', '#FF5511', '#FF8800', '#FFBB00', '#FFFF00']
// const myColor = ['#0000FF']
// const myColor = ['#7af5f5', '#00FFFF', '#00FFFF', '#00FFFF', '#00FFFF']
@@ -421,11 +423,16 @@
show: false
},
axisLabel: {
+ show:false,
// color: '#fff',
color: function(value, index) {
return value === '0' ? 'transparent' : '#fff'
},
+ verticalAlign: 'bottom',
+ // align: 'left',
+ // margin: 80,
fontSize: 20,
+
// formatter: function(value, index) {
// return [
// '{lg|' + (index + 1) + '銆� }' + '{title|' + value + '} '
@@ -455,12 +462,12 @@
}
},
{
- show: false,
+ show: true,
inverse: true,
- data: valdata,
+ data: data,
axisLabel: {
textStyle: {
- fontSize: 12,
+ fontSize: 20,
color: '#fff'
}
},
@@ -495,13 +502,24 @@
},
label: {
normal: {
+ color: '#fff',
show: true,
- position: 'right',
- formatter: '{c}',
- fontSize: 20,
- color: '#fff'
- // formatter: '{c}%',
+ position: [0, '-20px'],
+ textStyle: {
+ fontSize: 16
+ },
+ formatter: function(a, b) {
+ return a.name
+ }
}
+ // normal: {
+ // show: true,
+ // position: 'right',
+ // formatter: '{c}',
+ // fontSize: 20,
+ // color: '#fff'
+ // // formatter: '{c}%',
+ // }
}
}
]
diff --git a/src/views/kanbanManager/cj.vue b/src/views/kanbanManager/cj.vue
index 2be4153..523396f 100644
--- a/src/views/kanbanManager/cj.vue
+++ b/src/views/kanbanManager/cj.vue
@@ -47,6 +47,11 @@
width="220"
/>
<el-table-column
+ prop="saleOrderCode"
+ label="鐢熶骇鍗曞彿"
+ width="160"
+ />
+ <el-table-column
prop="partcode"
label="浜у搧缂栫爜"
width="160"
@@ -56,15 +61,15 @@
label="浜у搧鍚嶇О"
width="160"
/>
- <el-table-column
- prop="partspec"
- label="浜у搧瑙勬牸"
- width="160"
- >
- <template slot-scope="{row}">
- {{ row.partspec ? row.partspec : '/' }}
- </template>
- </el-table-column>
+<!-- <el-table-column-->
+<!-- prop="partspec"-->
+<!-- label="浜у搧瑙勬牸"-->
+<!-- width="160"-->
+<!-- >-->
+<!-- <template slot-scope="{row}">-->
+<!-- {{ row.partspec ? row.partspec : '/' }}-->
+<!-- </template>-->
+<!-- </el-table-column>-->
<el-table-column
prop="plan_qty"
label="浠诲姟鏁伴噺"
diff --git a/src/views/kanbanManager/ckgl.vue b/src/views/kanbanManager/ckgl.vue
index 1407700..2117bae 100644
--- a/src/views/kanbanManager/ckgl.vue
+++ b/src/views/kanbanManager/ckgl.vue
@@ -421,22 +421,22 @@
// 鑾峰彇echarts
getEcharts() {
WareHouseRightTopData().then(res => {
- loadEcharts('bar03', bar02(res.data.filter(i => i.CanuseBaseQuantity > 0).map(i => i.CanuseBaseQuantity), res.data.filter(i => i.CanuseBaseQuantity > 0).map(i => i.materiel_name)))
+ loadEcharts('bar03', bar02(res.data.map(i => i.CanuseBaseQuantity), res.data.map(i => i.materiel_name)))
})
WareHouseRightBottomData().then(res => {
- loadEcharts('bar04', bar02(res.data.filter(i => i.CanuseBaseQuantity > 0).map(i => i.CanuseBaseQuantity), res.data.filter(i => i.CanuseBaseQuantity > 0).map(i => i.materiel_name)))
+ loadEcharts('bar04', bar02(res.dat.map(i => i.CanuseBaseQuantity), res.data.map(i => i.materiel_name)))
})
this.echartsRightTop = setInterval(() => {
WareHouseRightTopData().then(res => {
- loadEcharts('bar03', bar02(res.data.filter(i => i.CanuseBaseQuantity > 0).map(i => i.CanuseBaseQuantity), res.data.filter(i => i.CanuseBaseQuantity > 0).map(i => i.materiel_name)))
+ loadEcharts('bar03', bar02(res.data.map(i => i.CanuseBaseQuantity), res.data.map(i => i.materiel_name)))
})
}, 1000 * 15)
this.echartsRightBottom = setInterval(() => {
WareHouseRightBottomData().then(res => {
- loadEcharts('bar04', bar02(res.data.filter(i => i.CanuseBaseQuantity > 0).map(i => i.CanuseBaseQuantity), res.data.filter(i => i.CanuseBaseQuantity > 0).map(i => i.materiel_name)))
+ loadEcharts('bar04', bar02(res.data.map(i => i.CanuseBaseQuantity), res.data.map(i => i.materiel_name)))
})
}, 1000 * 15)
},
diff --git a/src/views/statistic/workOrderProcess.vue b/src/views/statistic/workOrderProcess.vue
index 581ffb9..0fd0279 100644
--- a/src/views/statistic/workOrderProcess.vue
+++ b/src/views/statistic/workOrderProcess.vue
@@ -198,7 +198,7 @@
<!-- show-tooltip-when-overflow-->
<template slot-scope="{row}">
- <div style="min-width: 900px;display: flex;overflow-x: auto;overflow-y: hidden;height: 65px;">
+ <div style="min-width:500px;display: flex;overflow-x: auto;overflow-y: hidden;height: 65px;">
<div
v-for="item in row.concat_name.split(',')"
:key="item+row.wo_code"
--
Gitblit v1.9.3