|
|
@@ -15,7 +15,8 @@ export default {
|
|
|
weekCategory: [],
|
|
|
radarData: [],
|
|
|
radarDataAvg: [],
|
|
|
- maxData: 12000,
|
|
|
+ maxData: 100,
|
|
|
+ minData: 100,
|
|
|
weekMaxData: [],
|
|
|
weekLineData: []
|
|
|
}
|
|
|
@@ -44,7 +45,7 @@ export default {
|
|
|
this.setData();
|
|
|
}, 20000);
|
|
|
},
|
|
|
- setData () {
|
|
|
+ async setData () {
|
|
|
// 清空轮询数据
|
|
|
this.cdata.weekCategory = [];
|
|
|
this.cdata.weekMaxData = [];
|
|
|
@@ -54,8 +55,66 @@ export default {
|
|
|
|
|
|
let dateBase = new Date();
|
|
|
this.cdata.year = dateBase.getFullYear();
|
|
|
+ //良率直通图
|
|
|
+ await this.$http.get("kanban/datalist.action?caller=DAYTURNOUT&_noc=1&page=1&pageSize=100&condition=1=1")
|
|
|
+ .then((result)=>{
|
|
|
+ let dataList = JSON.parse(result.data.data);
|
|
|
+ let weekCategory = new Array();
|
|
|
+ let weekLineData = new Array();
|
|
|
+ let minDa = dataList[0].v_okrate ;
|
|
|
+ for (let index = 0; index < dataList.length; index++) {
|
|
|
+ const element = dataList[index];
|
|
|
+ //this.cdata.weekMaxData.push(this.cdata.maxData);
|
|
|
+ //x轴数据日期
|
|
|
+ weekCategory.push(element.v_md);
|
|
|
+ //y轴数据
|
|
|
+ weekLineData.push(element.v_okrate);
|
|
|
+ if(element.v_okrate<minDa){
|
|
|
+ minDa = element.v_okrate;
|
|
|
+ }
|
|
|
+ console.log(minDa);
|
|
|
+ }
|
|
|
+ //获取最小值,取整十的数
|
|
|
+ minDa = Math.floor(minDa/10)*10;
|
|
|
+ console.log(minDa);
|
|
|
+ this.cdata.minData = minDa;
|
|
|
+ this.cdata.weekCategory = weekCategory;
|
|
|
+ this.cdata.weekLineData = weekLineData;
|
|
|
+ },(result)=>{
|
|
|
+ console.error(result)
|
|
|
+ }
|
|
|
+ );
|
|
|
+ //雷达图:
|
|
|
+ await this.$http.get("kanban/datalist.action?caller=RadiusBadDuty&_noc=1&page=1&pageSize=100&condition=1=1")
|
|
|
+ .then((result)=>{
|
|
|
+ let dataList = JSON.parse(result.data.data);
|
|
|
+ let radarData = new Array();
|
|
|
+ let radarAvgData = new Array();
|
|
|
+ const element = dataList[0];
|
|
|
+ //来料不良
|
|
|
+ radarData.push(element.v_llrate);
|
|
|
+ //制程不良
|
|
|
+ radarData.push(element.v_zcrate);
|
|
|
+ //设计不良
|
|
|
+ radarData.push(element.v_sjrate);
|
|
|
+ //其它
|
|
|
+ radarData.push(element.v_othrate);
|
|
|
+ this.cdata.radarData=radarData;
|
|
|
+ //来料不良
|
|
|
+ radarAvgData.push(element.v_llavgrate);
|
|
|
+ //制程不良
|
|
|
+ radarAvgData.push(element.v_zcavgrate);
|
|
|
+ //设计不良
|
|
|
+ radarAvgData.push(element.v_sjavgrate);
|
|
|
+ //其它
|
|
|
+ radarAvgData.push(element.v_othavgrate);
|
|
|
+ this.cdata.radarDataAvg=radarAvgData;
|
|
|
+ },(result)=>{
|
|
|
+ console.error(result)
|
|
|
+ }
|
|
|
+ );
|
|
|
// 周数据
|
|
|
- for (let i = 0; i < 7; i++) {
|
|
|
+ /*for (let i = 0; i < 7; i++) {
|
|
|
// 日期
|
|
|
let date = new Date();
|
|
|
this.cdata.weekCategory.unshift([date.getMonth() + 1, date.getDate()-i].join("/"));
|
|
|
@@ -85,7 +144,7 @@ export default {
|
|
|
hourAvg
|
|
|
];
|
|
|
this.cdata.radarDataAvg.unshift(radarDayDataAvg);
|
|
|
- }
|
|
|
+ }*/
|
|
|
|
|
|
}
|
|
|
}
|