diff --git a/src/api/kanban/quality.js b/src/api/kanban/quality.js index ab18d16..31f1038 100644 --- a/src/api/kanban/quality.js +++ b/src/api/kanban/quality.js @@ -104,3 +104,10 @@ export function getMonthOfYearContrast(data) { data: data }); } +// 过程检验--产品不合格率同期对比 +export function getKBTest() { + return request({ + url: '/quality/qcInterface/getKBTest', + method: 'post' + }); +} diff --git a/src/api/quality/qcTable.js b/src/api/quality/qcTable.js index 34487b1..ff65403 100644 --- a/src/api/quality/qcTable.js +++ b/src/api/quality/qcTable.js @@ -315,3 +315,11 @@ export function getCpDefectDate(query) { params: query }); } +//黑 蚊 香 成 品 包 装 不 良 排 列 图头部 +export function getHWXCPBZTitle(query) { + return request({ + url: '/quality/staticTable/getHWXCPBZTitle', + method: 'get', + params: query + }); +} diff --git a/src/views/kanban/Dryingprocess/index.vue b/src/views/kanban/Dryingprocess/index.vue index 3c24e25..96e418e 100644 --- a/src/views/kanban/Dryingprocess/index.vue +++ b/src/views/kanban/Dryingprocess/index.vue @@ -761,7 +761,7 @@ export default { }, getDeviceRefreshTime() { const _this = this; - getDeviceRefreshTime().then((response) => { + getDeviceRefreshTime({ poolName: "ds_1000" }).then((response) => { if (response) { this.RefreshTime = response.data; _this.getDatalist(); diff --git a/src/views/kanban/dailyoutput/index.vue b/src/views/kanban/dailyoutput/index.vue index 48c3fc9..067542a 100644 --- a/src/views/kanban/dailyoutput/index.vue +++ b/src/views/kanban/dailyoutput/index.vue @@ -310,7 +310,7 @@ export default { }).then((response) => { if (response.data) { _this.getLineList = response.data; - _this.selectxt = _this.getLineList[0].parentName; + _this.selectxt = _this.getLineList[2].parentName; getBoardShifts({ factory: _this.selectxt, }).then((response) => { @@ -327,7 +327,7 @@ export default { }, getDeviceRefreshTime() { const _this = this; - getDeviceRefreshTime().then((response) => { + getDeviceRefreshTime({ poolName: "ds_1000" }).then((response) => { if (response.data) { console.log(response.data); this.RefreshTime = response.data; diff --git a/src/views/kanban/quality/kanban1.vue b/src/views/kanban/quality/kanban1.vue index 7e65e58..31150d8 100644 --- a/src/views/kanban/quality/kanban1.vue +++ b/src/views/kanban/quality/kanban1.vue @@ -254,6 +254,7 @@ import { getProMonthNoOk, getLineDayNoOk, getMonthOfYearContrast, + getKBTest, getDictData, } from "@/api/kanban/quality"; import { getDeviceRefreshTime } from "@/api/kanban/equipment"; @@ -1050,20 +1051,19 @@ export default { }; myChart6.setOption(option6); getMonthOfYearContrast({ - typeCode: "product", - factoryCode: "ds_" + _this.selectxt, + factoryCode: _this.selectxt || "1000", }).then((response) => { if (response) { - let seriesdata1 = response[0].dataBarArrays; - let seriesdata2 = response[0].dataLineArrays; - let xAxisdata = response[0].dayStr; - let seriesdata3 = response[1].dataBarArrays; - let seriesdata4 = response[1].dataLineArrays; + let xAxisdata = response.mapListCurrentYear.map(item => item.month); + let seriesdata1 = response.mapListPreviousYear.map(item => item.total_noOkQty); + let seriesdata2 = response.mapListPreviousYear.map(item => item.defect_ratio); + let seriesdata3 = response.mapListCurrentYear.map(item => item.total_noOkQty); + let seriesdata4 = response.mapListCurrentYear.map(item => item.defect_ratio); let max1 = Math.max(...seriesdata1) + 5; let max2 = Math.max(...seriesdata3) + 5; let max3 = Math.max(...seriesdata2) + 5; let max4 = Math.max(...seriesdata4) + 5; - + // let legenddata = []; legenddata.push("去年不合格数量(PC)"); legenddata.push("本年不合格数量(PC)"); @@ -1116,6 +1116,12 @@ export default { myChart6.setOption(option6); } }); + // getKBTest({ + // typeCode: "product", + // factoryCode: "ds_" + _this.selectxt, + // }).then((response) => { + // console.log(response); + // }) }, initChart2() { const _this = this; diff --git a/src/views/plan/order/index.vue b/src/views/plan/order/index.vue index 5fbfe02..bef017e 100644 --- a/src/views/plan/order/index.vue +++ b/src/views/plan/order/index.vue @@ -199,7 +199,7 @@ type="text" icon="el-icon-s-home" @click="handleUpdate(scope.row)" - v-hasPermi="['mes:pro:order:bom']" + v-hasPermi="['wms:bomComponent:list']" v-if="scope.row.parentOrder == 0 && scope.row.delFlag == 0" >查看库存 diff --git a/src/views/quality/report/cpDefect/index.vue b/src/views/quality/report/cpDefect/index.vue index c1588cc..42c7cf2 100644 --- a/src/views/quality/report/cpDefect/index.vue +++ b/src/views/quality/report/cpDefect/index.vue @@ -24,13 +24,14 @@ plain icon="el-icon-download" size="mini" - @click="handleExport" + @click="exportToExcel" + :loading="exportLoading" >导出 - +