diff --git a/src/api/kanban/quality.js b/src/api/kanban/quality.js
index ab18d16..209d499 100644
--- a/src/api/kanban/quality.js
+++ b/src/api/kanban/quality.js
@@ -104,3 +104,12 @@ export function getMonthOfYearContrast(data) {
data: data
});
}
+
+// 白坯每月不合格数量
+export function getBpMonthNoOk(data) {
+ return request({
+ url: '/quality/qcInterface/getBpMonthNoOk',
+ method: 'get',
+ data: data
+ });
+}
diff --git a/src/views/kanban/quality/kanban1.vue b/src/views/kanban/quality/kanban1.vue
index 7e65e58..13ebfc2 100644
--- a/src/views/kanban/quality/kanban1.vue
+++ b/src/views/kanban/quality/kanban1.vue
@@ -211,7 +211,7 @@
-
本年各月产品不合格数量对比
+
本年各月白坯不合格数量对比
{
if (response) {
diff --git a/src/views/quality/report/bpDefectItem/index.vue b/src/views/quality/report/bpDefectItem/index.vue
index f30406e..437ecb3 100644
--- a/src/views/quality/report/bpDefectItem/index.vue
+++ b/src/views/quality/report/bpDefectItem/index.vue
@@ -34,7 +34,7 @@
- {{form.column080090}} 年 {{form.column090100}} 月 份 白 坯 不 良 排 列 图
+ {{ parseTime(queryParams.yearMonthDate,'{y}-{m}')}} 白 坯 不 良 排 列 图
@@ -57,7 +57,6 @@
-
@@ -68,6 +67,7 @@
import {getDefectItemTitle,getDefectItemData,getDefectItemLine} from "@/api/quality/qcTable";
import moment from 'moment';
import * as echarts from "echarts";
+import {parseTime} from "../../../../utils/ruoyi";
export default {
name: "BpDefectItem",
data() {
@@ -142,6 +142,7 @@ export default {
this.getList();
},
methods: {
+ parseTime,
/**获取默认查询时间段**/
getDate() {
let start = this.Fungetdate (0);
diff --git a/src/views/quality/report/bpDefectItemPC/index.vue b/src/views/quality/report/bpDefectItemPC/index.vue
index 29943b4..285fc05 100644
--- a/src/views/quality/report/bpDefectItemPC/index.vue
+++ b/src/views/quality/report/bpDefectItemPC/index.vue
@@ -34,7 +34,7 @@
- {{queryParams.yearMonthDate}} 黑蚊香白坯性能不良排列图
+ {{ parseTime(queryParams.yearMonthDate,'{y}-{m}')}} 黑蚊香白坯性能不良排列图
@@ -53,11 +53,10 @@
-
+
-
@@ -182,6 +181,7 @@ export default {
//获取Table数据
getDefectItemDataPC(this.queryParams).then(response => {
this.itemProList = response;
+ this.itemProList.push("其他")
this.getTbody();
this.loading = false;
});