|
|
@@ -59,6 +59,17 @@ export default {
|
|
|
fontSize: 16,
|
|
|
}
|
|
|
},
|
|
|
+ {
|
|
|
+ type: 'value',
|
|
|
+ max: 100,
|
|
|
+ nameTextStyle: {
|
|
|
+ fontSize: 20
|
|
|
+ },
|
|
|
+ axisLabel: {
|
|
|
+ formatter: '{value}%',
|
|
|
+ fontSize: 16
|
|
|
+ },
|
|
|
+ }
|
|
|
],
|
|
|
series: [
|
|
|
{
|
|
|
@@ -79,6 +90,38 @@ export default {
|
|
|
fontWeight: "bold",
|
|
|
color:"inherit",
|
|
|
},
|
|
|
+ },
|
|
|
+ {
|
|
|
+ name: '完成率%',
|
|
|
+ type: 'line',
|
|
|
+ data:[],
|
|
|
+ yAxisIndex: 1,
|
|
|
+ symbolSize: 4,
|
|
|
+ tooltip: {
|
|
|
+ valueFormatter: function (value) {
|
|
|
+ return value + '%';
|
|
|
+ }
|
|
|
+ },
|
|
|
+ label: {
|
|
|
+ show: true,
|
|
|
+ position: 'top',
|
|
|
+ color:'#fff',
|
|
|
+ fontSize:14,
|
|
|
+ fontWeight: "bold",
|
|
|
+ formatter: "{c}%"
|
|
|
+ },
|
|
|
+ lineStyle: {
|
|
|
+ width: 3
|
|
|
+ },
|
|
|
+ itemStyle: {
|
|
|
+ normal: {
|
|
|
+ barBorderRadius: 6,
|
|
|
+ color: "rgb(244,204,3)"
|
|
|
+ }
|
|
|
+ },
|
|
|
+ emphasis: {
|
|
|
+ focus: 'series'
|
|
|
+ }
|
|
|
}
|
|
|
]
|
|
|
},
|
|
|
@@ -117,19 +160,23 @@ export default {
|
|
|
let dataList = JSON.parse(result.data.data);
|
|
|
let xAxis0 = new Array();
|
|
|
let series0 = new Array();
|
|
|
- var maxnumber=0;
|
|
|
- for (let index = 0; index < dataList.length; index++) {
|
|
|
- const element = dataList[index];
|
|
|
- xAxis0.push(element.v_md);
|
|
|
- //产出
|
|
|
- series0.push(element.v_outqty);
|
|
|
- if(element.v_outqty>maxnumber){
|
|
|
- maxnumber= element.v_outqty;
|
|
|
- }
|
|
|
- }
|
|
|
- this.options.xAxis[0].data = xAxis0;
|
|
|
- this.options.series[0].data = series0;
|
|
|
- // this.options.yAxis[0].max = (maxnumber*1.2).toFixed();
|
|
|
+ let series1 = new Array();
|
|
|
+ var maxnumber=0;
|
|
|
+ for (let index = 0; index < dataList.length; index++) {
|
|
|
+ const element = dataList[index];
|
|
|
+ xAxis0.push(element.v_md);
|
|
|
+ //产出
|
|
|
+ series0.push(element.v_outqty);
|
|
|
+ if(element.v_outqty>maxnumber){
|
|
|
+ maxnumber= element.v_outqty;
|
|
|
+ }
|
|
|
+ //比率
|
|
|
+ series1.push(element.v_finishrate);
|
|
|
+ }
|
|
|
+ this.options.xAxis[0].data = xAxis0;
|
|
|
+ this.options.series[0].data = series0;
|
|
|
+ this.options.series[1].data = series1;
|
|
|
+ // this.options.yAxis[0].max = (maxnumber*1.2).toFixed();
|
|
|
},(result)=>{
|
|
|
console.error(result)
|
|
|
}
|