fix:光芯合格数统计
This commit is contained in:
parent
2a0bcc4692
commit
14e2fe211d
|
|
@ -13,7 +13,7 @@
|
|||
</el-option>
|
||||
</el-select>
|
||||
<el-date-picker
|
||||
v-model="query.start_date"
|
||||
v-model="queryDate"
|
||||
type="date"
|
||||
placeholder="查询日期"
|
||||
value-format="YYYY-MM-DD"
|
||||
|
|
@ -97,6 +97,7 @@ import scEcharts from "@/components/scEcharts";
|
|||
function deepCopy(obj) {
|
||||
return JSON.parse(JSON.stringify(obj));
|
||||
}
|
||||
const ondDayTime = 86400000;
|
||||
export default {
|
||||
name: "chart",
|
||||
components: {
|
||||
|
|
@ -112,6 +113,7 @@ export default {
|
|||
order_bys_material: "",
|
||||
select_cols_material: ""
|
||||
},
|
||||
queryDate:'',
|
||||
currentYear: "",
|
||||
currentMonth: "",
|
||||
xAxisData: [],
|
||||
|
|
@ -128,7 +130,7 @@ export default {
|
|||
},
|
||||
xAxis: {
|
||||
type: "category",
|
||||
data: [],
|
||||
data: ["周一","周二","周三","周四","周五","周六","周日"],
|
||||
},
|
||||
yAxis: {
|
||||
type: "value",
|
||||
|
|
@ -149,25 +151,37 @@ export default {
|
|||
},
|
||||
mounted() {
|
||||
let that = this;
|
||||
let date = new Date();
|
||||
let year = date.getFullYear();
|
||||
let month = date.getMonth() + 1;
|
||||
let day = date.getDate();
|
||||
that.currentYear = year;
|
||||
that.currentMonth = month;
|
||||
month = month < 10 ? "0" + month : month;
|
||||
day = day < 10 ? "0" + day : day;
|
||||
that.query.start_date = that.query.end_date = year + "-" + month + "-" + day;
|
||||
|
||||
let days = new Date(year, month, 0).getDate();
|
||||
for (let i = 0; i < that.days; i++) {
|
||||
let day = i + 1;
|
||||
let text = day + "日";
|
||||
}
|
||||
let nowDate = new Date();
|
||||
that.getMgroup();
|
||||
// that.getData();
|
||||
that.getWeekDate(nowDate);
|
||||
},
|
||||
methods: {
|
||||
getWeekDate(dates){
|
||||
let that = this;
|
||||
dates = new Date(dates);
|
||||
let week =dates.getDay(); //当前时间的week数
|
||||
let weekFirst = 0, weekLast = 0;
|
||||
if (week == 0) {
|
||||
weekFirst = 6;
|
||||
weekLast = 0; //周日特殊处理
|
||||
} else {
|
||||
weekFirst = week - 1;
|
||||
weekLast = 7 - week;
|
||||
}
|
||||
let first = new Date(dates.getTime() - weekFirst * ondDayTime); //本周周一
|
||||
let last = new Date(new Date(dates.getTime() + weekLast * ondDayTime)); //本周周日
|
||||
let dateArr = [];
|
||||
for (let i = 0; i < 7; i++) {
|
||||
let itemDate = new Date(first.getTime() + i * ondDayTime);
|
||||
let item = itemDate.getDate();
|
||||
dateArr.push(item);
|
||||
}
|
||||
that.weekDateList = dateArr;
|
||||
console.log('dateArr',dateArr);
|
||||
that.query.start_date =first.getFullYear() +"-" +(first.getMonth() + 1) +"-" +first.getDate();
|
||||
that.query.end_date =last.getFullYear() +"-" +(last.getMonth() + 1) +"-" +last.getDate();
|
||||
that.getData();
|
||||
},
|
||||
setChart(name, option = null) {
|
||||
// 根据name 渲染数据, option需填写，否则option为模拟数据
|
||||
var myChart = echarts.getInstanceByDom(
|
||||
|
|
@ -205,21 +219,36 @@ export default {
|
|||
let tableData = res.data2.ds0 ? res.data2.ds0 : [];
|
||||
that.tableData = tableData;
|
||||
if (tableData.length > 0) {
|
||||
let seriesData = [],
|
||||
nameList = [];
|
||||
let dataList = [],
|
||||
nameList = [],
|
||||
datas = [];
|
||||
tableData.forEach((ite) => {
|
||||
if (nameList.indexOf(ite.物料名) > -1) {
|
||||
} else {
|
||||
if (nameList.indexOf(ite.物料名) > -1) {} else {
|
||||
nameList.push(ite.物料名);
|
||||
seriesData.push(0);
|
||||
datas.push([0,0,0,0,0,0,0]);
|
||||
}
|
||||
});
|
||||
that.xAxisData = nameList;
|
||||
tableData.forEach((item) => {
|
||||
let indexX = nameList.indexOf(item.物料名);
|
||||
seriesData[indexX] += item.合格数;
|
||||
dataList[indexX].push(item);
|
||||
});
|
||||
for(let i = 0;i<dataList.length;i++){
|
||||
for(let j = 0;j<dataList[i].length;j++){
|
||||
let index = that.weekDateList.indexOf(dataList[i][j].日);
|
||||
datas[i][index].push(dataList[i][j].合格数); //将当前日期对应的合格数添加到datas中
|
||||
}
|
||||
}
|
||||
ption.xAxis.data = nameList;
|
||||
ption.series[0].data = serisData;
|
||||
nameList.forEach((index,item) => {
|
||||
let obj = {
|
||||
data: datas[index],
|
||||
stack: "Ad",
|
||||
type: "bar",
|
||||
barWidth: "15px",
|
||||
};
|
||||
ption.series[index].data = serisData;
|
||||
});
|
||||
that.setChart("bachart1", option);
|
||||
} else {
|
||||
that.setChart("bachart1", option);
|
||||
|
|
@ -227,9 +256,7 @@ export default {
|
|||
});
|
||||
},
|
||||
handleQuery() {
|
||||
let that = this;
|
||||
that.query.end_date = that.query.start_date ;
|
||||
that.getData();
|
||||
this.getWeekDate(this.queryDate);
|
||||
},
|
||||
handleExport(val) {
|
||||
this.exportLoading = true;
|
||||
|
|
|
|||
Loading…
Reference in New Issue