diff --git a/src/views/home/widgets/index_gx.vue b/src/views/home/widgets/index_gx.vue index 9e9329c8..bb9bf80d 100644 --- a/src/views/home/widgets/index_gx.vue +++ b/src/views/home/widgets/index_gx.vue @@ -138,7 +138,7 @@ -
+
预警提示
diff --git a/src/views/statistics/good_check_gx.vue b/src/views/statistics/good_check_gx.vue index 4990cac7..4f841b9d 100644 --- a/src/views/statistics/good_check_gx.vue +++ b/src/views/statistics/good_check_gx.vue @@ -94,25 +94,25 @@ - + - + - + - + @@ -168,12 +168,21 @@ + + + + + + + + + @@ -195,6 +204,9 @@ + + + @@ -292,10 +304,19 @@ - + - - + + @@ -333,7 +354,11 @@ export default { page:1, page_size:20, ordering:"-last_time", - querys:[[{field:"data__has_key",compare:"",value:"尺寸检验_日期"}]], + querys:[ + [{field:"data__has_key",compare:"",value:"尺寸检验_日期"}], + [{field:"data__has_key",compare:"",value:"外观检验_日期"}], + [{field:"data__has_key",compare:"",value:"外观检验_返修_日期"}] + ], }, apiObj: this.$API.wpm.batchst, dataTotal:0, diff --git a/src/views/statistics/pass_num_gx.vue b/src/views/statistics/pass_num_gx.vue index 81f04294..e531aac8 100644 --- a/src/views/statistics/pass_num_gx.vue +++ b/src/views/statistics/pass_num_gx.vue @@ -2,16 +2,6 @@
- + + + + + +
+ + + + + 导出 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + 导出 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + 导出 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1053,14 +1223,14 @@ export default { tableData13: [], tableData14: [], tableData15: [], + tableData16: [], + tableData17: [], + tableData18: [], options:[], }; }, mounted() { - let that = this; - let nowDate = new Date(); - that.getMgroup(); - // that.getWeekDate(nowDate); + this.getMgroup(); }, methods: { getWeekDate(dates){ @@ -1112,8 +1282,9 @@ export default { that.$API.mtm.mgroup.list.req({ page: 0}).then((res) => { let arr = []; res.forEach(item=>{ - if(that.mgroupList.indexOf(item.name)>-1){ - arr.push(item.name) + let indexes = that.mgroupList.indexOf(item.name); + if(indexes>-1){ + arr[indexes] = item.name; } }) that.query.mgroup_name = arr[0]; @@ -1167,6 +1338,14 @@ export default { let chartId = 'bachart'+mgroup_index; that.setChart(chartId, option); } else { + let obj = { + name:'', + data: [], + stack: "Ad", + type: "bar", + barWidth: "15px", + }; + option.series.push(obj) let chartId = 'bachart'+mgroup_index; that.setChart(chartId, option); } @@ -1190,7 +1369,8 @@ export default { #bachart1,#bachart2,#bachart3,#bachart4, #bachart5,#bachart6,#bachart7,#bachart8, #bachart9,#bachart10,#bachart11,#bachart12, -#bachart13,#bachart14,#bachart15,#bachart0{ +#bachart13,#bachart14,#bachart15,#bachart16, +#bachart17,#bachart18,#bachart0{ width: 100%; height: 300px; }