fix:粗加工生产检验日期更正&添加环形图label
This commit is contained in:
parent
cf0cc53df9
commit
ed22e6a374
|
@ -132,7 +132,8 @@ export default {
|
||||||
query: {
|
query: {
|
||||||
start_date: this.start_date, end_date: this.end_date, dept_name: "6车间",
|
start_date: this.start_date, end_date: this.end_date, dept_name: "6车间",
|
||||||
select_cols_material: "", group_bys_material: "", order_bys_material: "",
|
select_cols_material: "", group_bys_material: "", order_bys_material: "",
|
||||||
select_cols_mgroup: ", mgroup.name AS 工段", group_bys_mgroup: ", mgroup.name"
|
is_count_utask:-1,select_cols_mgroup: ", mgroup.name AS 工段",
|
||||||
|
group_bys_mgroup: ", mgroup.name"
|
||||||
},
|
},
|
||||||
raise_exception: true
|
raise_exception: true
|
||||||
};
|
};
|
||||||
|
@ -158,12 +159,9 @@ export default {
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
that.xAxisData = xAxisData;
|
that.xAxisData = xAxisData;
|
||||||
console.log('data0:', data0);
|
|
||||||
console.log('data1:', data1);
|
|
||||||
that.option.xAxis.data = that.xAxisData;
|
that.option.xAxis.data = that.xAxisData;
|
||||||
that.option.series[0].data = data0;
|
that.option.series[0].data = data0;
|
||||||
that.option.series[1].data = data1;
|
that.option.series[1].data = data1;
|
||||||
console.log('that.option:', that.option);
|
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
handleQuery() {
|
handleQuery() {
|
||||||
|
|
|
@ -57,7 +57,7 @@
|
||||||
<el-table-column label="日期" prop="date">
|
<el-table-column label="日期" prop="date">
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
<span>{{ scope.row.年 }}</span>
|
<span>{{ scope.row.年 }}</span>
|
||||||
<span v-if="scope.row.月">-{{ scope.row.年 }}</span>
|
<span v-if="scope.row.月">-{{ scope.row.月 }}</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="规格" prop="规格">
|
<el-table-column label="规格" prop="规格">
|
||||||
|
@ -112,7 +112,10 @@
|
||||||
type: 'pie',
|
type: 'pie',
|
||||||
radius: ['40%', '60%'],
|
radius: ['40%', '60%'],
|
||||||
center: ['50%', '60%'],
|
center: ['50%', '60%'],
|
||||||
label: false,
|
label: {
|
||||||
|
show: true,
|
||||||
|
formatter: '{b} : {c}',
|
||||||
|
},
|
||||||
data: [
|
data: [
|
||||||
{value: 1048, name: '合格数'},
|
{value: 1048, name: '合格数'},
|
||||||
{value: 735, name: '不合格一'},
|
{value: 735, name: '不合格一'},
|
||||||
|
|
Loading…
Reference in New Issue