From 809f8b1279bf84f28bccabc4f95a8eba6c22a24d Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期二, 29 八月 2023 10:30:04 +0800
Subject: [PATCH] 放行委托新增
---
src/views/chart/work/index.vue | 102 ++++++++++++++++++++++++++++++++++----------------
1 files changed, 69 insertions(+), 33 deletions(-)
diff --git a/src/views/chart/work/index.vue b/src/views/chart/work/index.vue
index e04f144..d958e62 100644
--- a/src/views/chart/work/index.vue
+++ b/src/views/chart/work/index.vue
@@ -91,27 +91,33 @@
}
},
mounted(){
- // this.initLeaderStatiChart("");
- this.initLeaderTimelyChart("leaderTimely");
- this.initTesterStatiChart("testerStati");
- this.initTesterTimelyChart("testerTimely");
+ this.queryData();
},
methods: {
async queryData(){
- let date = this.formInline.date;
+ let date = [];
+ let type;
+ if(this.formInline.date == null || this.formInline.date == ""){
+ let currentDate = new Date();
+ let year = currentDate.getFullYear();
+ let month = currentDate.getMonth() + 1;
+ let day = currentDate.getDate();
+ date.push(year +"-" + month + "-01");
+ date.push(year +"-" + month + "-" + day);
+ type = 0;
+ }else{
+ date = this.formInline.date;
+ type = this.formInline.type;
+ }
let obj = {
startTime : date[0],
endTime : date[1],
- type : this.formInline.type
+ type : type
}
const dutyMater = await getDutyMater(obj);
const dutyTimely = await getDutyTimely(obj);
const executeMater = await getExecuteMater(obj);
const executeTimely = await getExecuteTimely(obj);
- console.log("dm",dutyMater.data);
- console.log("dt",dutyTimely.data);
- console.log("em",executeMater.data.length);
- console.log("et",executeTimely.data);
this.initLeaderStatiChart("leaderStati",dutyMater.data);
this.initLeaderTimelyChart("leaderTimely",dutyTimely.data);
this.initTesterStatiChart("testerStati",executeMater.data);
@@ -182,7 +188,7 @@
series: [
{
name: '宸插畬鎴�',
- barWidth: '20%',
+ barWidth: '30%',
type: 'bar',
stack: 'one',
emphasis: emphasisStyle,
@@ -207,22 +213,25 @@
option && myChart.setOption(option);
},
initTesterStatiChart(id,executeMater){
- console.log("qqq----",executeMater);
var chartDom = document.getElementById(id);
var myChart = echarts.init(chartDom);
window.addEventListener('resize', function() {
myChart.resize();
});
var option;
-
+ let max = 0;
let xAxisData = [];
let data1 = [];
let data2 = [];
- // for(let i=0;i<executeMater.length;i++){
- // xAxisData.push(executeMater[i].name);
- // data1.push(executeMater[i].finsh);
- // data2.push(executeMater[i].unfinsh);
- // }
+ for(let i=0;i<executeMater.length;i++){
+ xAxisData.push(executeMater[i].name);
+ data1.push(executeMater[i].finsh);
+ data2.push(executeMater[i].unfinsh);
+ let sum = executeMater[i].finsh + executeMater[i].unfinsh;
+ if(sum > max){
+ max = sum;
+ }
+ }
var emphasisStyle = {
itemStyle: {
shadowBlur: 10,
@@ -244,8 +253,8 @@
},
yAxis: {
min: 0,
- max: 60,
- interval: 10,
+ max: max,
+ interval: 1,
},
grid: {
bottom: 100
@@ -255,6 +264,7 @@
name: '鏁版嵁1',
type: 'bar',
stack: 'one',
+ barWidth: '30%',
emphasis: emphasisStyle,
data: data1,
itemStyle:{
@@ -265,6 +275,7 @@
name: '鏁版嵁2',
type: 'bar',
stack: 'one',
+ barWidth: '30%',
emphasis: emphasisStyle,
data: data2,
itemStyle:{
@@ -282,6 +293,18 @@
myChart.resize();
});
var option;
+ let xAxisData = [];
+ let data1 = [];
+ let data2 = [];
+ let yAxisData1 = 0;
+ for(let i=0;i<dutyTimely.length;i++){
+ xAxisData.push(dutyTimely[i].name);
+ data1.push(dutyTimely[i].total);
+ data2.push(dutyTimely[i].timely);
+ if(dutyTimely[i].total > yAxisData1){
+ yAxisData1 = dutyTimely[i].total;
+ }
+ }
option = {
tooltip: {
trigger: 'axis',
@@ -299,12 +322,12 @@
{
name: '濮撳悕',
type: 'category',
- data: ['娌愮',],
+ data: xAxisData,
axisPointer: {
type: 'shadow'
},
- itemStyle: {
- top: '20px'
+ nameTextStyle:{
+ padding:20
}
}
],
@@ -313,7 +336,7 @@
type: 'value',
name: '鏁伴噺',
min: 0,
- max: 10,
+ max: yAxisData1,
interval: 1,
axisLabel: {
formatter: '{value}'
@@ -334,13 +357,13 @@
{
name: '鏍峰搧鏁�',
type: 'bar',
- barWidth: '20%',
+ barWidth: '30%',
tooltip: {
valueFormatter: function (value) {
return value;
}
},
- data: [4.0],
+ data: data1,
itemStyle: {
color: '#9fceff'
}
@@ -348,19 +371,19 @@
{
name: '瀹屾垚鍙婃椂鐜�',
type: 'line',
+ yAxisIndex: 1,
tooltip: {
valueFormatter: function (value) {
return value + ' %';
}
},
- data: [7.5],
+ data: data2,
itemStyle: {
color: '#d2eec5'
}
},
]
};
-
option && myChart.setOption(option);
},
initTesterTimelyChart(id,executeTimely){
@@ -370,6 +393,18 @@
myChart.resize();
});
var option;
+ let xAxisData = [];
+ let data1 = [];
+ let data2 = [];
+ let yAxisData1 = 0;
+ for(let i=0;i<executeTimely.length;i++){
+ xAxisData.push(executeTimely[i].name);
+ data1.push(executeTimely[i].total);
+ data2.push(executeTimely[i].timely);
+ if(executeTimely[i].total > yAxisData1){
+ yAxisData1 = executeTimely[i].total;
+ }
+ }
option = {
tooltip: {
trigger: 'axis',
@@ -387,7 +422,7 @@
xAxis: [
{
type: 'category',
- data: ["","",""],
+ data: xAxisData,
axisPointer: {
type: 'shadow'
}
@@ -398,8 +433,8 @@
type: 'value',
name: '',
min: 0,
- max: 50,
- interval: 5,
+ max: yAxisData1,
+ interval: 1,
axisLabel: {
formatter: '{value}'
}
@@ -419,12 +454,13 @@
{
name: '椤圭洰鏁�',
type: 'bar',
+ barWidth: '30%',
tooltip: {
valueFormatter: function (value) {
return value ;
}
},
- data: [2.0, 4.9, 7.0],
+ data: data1,
itemStyle: {
color: '#5087ec'
}
@@ -438,7 +474,7 @@
return value + ' %';
}
},
- data: [2.0, 2.2, 3.3],
+ data: data2,
itemStyle: {
color: '#68bbc4'
}
--
Gitblit v1.9.3