diff --git a/src/views/cs/index7.vue b/src/views/cs/index7.vue deleted file mode 100644 index 5b94631..0000000 --- a/src/views/cs/index7.vue +++ /dev/null @@ -1,169 +0,0 @@ - - - - - diff --git a/src/views/kanban/Packagingline/index2.vue b/src/views/kanban/Packagingline/index2.vue index 43fb109..50f7a12 100644 --- a/src/views/kanban/Packagingline/index2.vue +++ b/src/views/kanban/Packagingline/index2.vue @@ -108,7 +108,7 @@ 工单号 产品名称 - 批次号 + 计划数量 报工数量 @@ -134,7 +134,7 @@ {{ n.workorderCodeSap }} {{ n.productName }} - {{ n.batchCode }} + {{ n.quantitySplit }} {{ n.quantityProduced }} diff --git a/src/views/kanban/quality/kanban1.vue b/src/views/kanban/quality/kanban1.vue index 2754b88..7e65e58 100644 --- a/src/views/kanban/quality/kanban1.vue +++ b/src/views/kanban/quality/kanban1.vue @@ -336,10 +336,9 @@ export default { methods: { /**获取默认查询时间段**/ getDate() { - let start = this.Fungetdate(0); - let end = this.Fungetdate(0); - this.ymdArray1.push(start, end); - this.ymdArray2.push(start, end); + let dates = this.getMonthDates(); + this.ymdArray1 = [dates.start, dates.end]; + this.ymdArray2 = [dates.start, dates.end]; this.optionDatalist1 = []; this.optionDatalist2 = []; this.optionDatalist3 = []; @@ -352,13 +351,28 @@ export default { this.initChart1(); }, - Fungetdate(num) { - var dd = new Date(); - dd.setDate(dd.getDate() + num); - var y = dd.getFullYear(); - var m = dd.getMonth() + 1; //获取当前月份的日期 - var d = dd.getDate(); - return y + "-" + m + "-" + d; + // Fungetdate(num) { + // var dd = new Date(); + // dd.setDate(dd.getDate() + num); + // var y = dd.getFullYear(); + // var m = dd.getMonth() + 1; //获取当前月份的日期 + // var d = dd.getDate(); + // return y + "-" + m + "-" + d; + // }, + getMonthDates() { + const now = new Date(); + const start = new Date(now.getFullYear(), now.getMonth(), 1); + const end = new Date(now.getFullYear(), now.getMonth() + 1, 0); + return { + start: this.formatDate(start), + end: this.formatDate(end) + }; + }, + formatDate(date) { + const y = date.getFullYear(); + const m = date.getMonth() + 1; + const d = date.getDate(); + return `${y}-${m < 10 ? '0' + m : m}-${d < 10 ? '0' + d : d}`; }, back() { this.$router.push({ path: "/index" }); @@ -384,22 +398,19 @@ export default { }, getDeviceRefreshTime() { const _this = this; - getDeviceRefreshTime().then((response) => { - - if (response.data) { // console.log(response.data) - this.RefreshTime = response.data; + this.RefreshTime = 5; this.time1 = setInterval(() => { _this.getdatalist(); _this.initChart1(); }, 1000 * 60 * this.RefreshTime); - } - }); + }, noOkTimeChange(){ - this.ymdStart1 = moment(this.ymdArray1[0]).format("YYYY-MM-DD"); - this.ymdEnd1 = moment(this.ymdArray1[1]).format("YYYY-MM-DD"); + const now = moment(); + this.ymdStart1 = now.startOf('month').format("YYYY-MM-DD"); + this.ymdEnd1 = now.endOf('month').format("YYYY-MM-DD"); //质量异常信息 getProduceNoOkList({ typeCode: "produce", @@ -442,7 +453,8 @@ export default { //检验统计 getProduceStaticInfo({ ymdType: _this.selectxtclasses, - typeCode: "produce", + typeCode: "product", + checkType: "checkTypeCPPC", factoryCode: "ds_" + _this.selectxt, }).then((response) => { if (response) { @@ -769,7 +781,7 @@ export default { }; myChart5.setOption(option5); getLineDayNoOk({ - typeCode: "produce", + typeCode: "product", factoryCode: "ds_" + _this.selectxt, }).then((response) => { if (response) { @@ -1038,7 +1050,7 @@ export default { }; myChart6.setOption(option6); getMonthOfYearContrast({ - typeCode: "produce", + typeCode: "product", factoryCode: "ds_" + _this.selectxt, }).then((response) => { if (response) { diff --git a/src/views/mes/dailyReportNew/index.vue b/src/views/mes/dailyReportNew/index.vue index 14b6feb..fca3e0a 100644 --- a/src/views/mes/dailyReportNew/index.vue +++ b/src/views/mes/dailyReportNew/index.vue @@ -103,6 +103,7 @@ + diff --git a/src/views/quality/report/cpDefect/index.vue b/src/views/quality/report/cpDefect/index.vue index 83eb274..c1588cc 100644 --- a/src/views/quality/report/cpDefect/index.vue +++ b/src/views/quality/report/cpDefect/index.vue @@ -8,14 +8,14 @@ placeholder="选择月"> - - - + + + + + + + + 搜索 @@ -32,7 +32,7 @@ - + @@ -143,9 +143,39 @@ export default { }); //获取Table数据 getCpDefectDate(this.queryParams).then(response => { - this.defectList = response; + this.defectList = response; this.loading = false; }); + // function calculateDefectData(defectList) { + // if (!defectList || !Array.isArray(defectList)) { + // console.error('defectList必须是一个数组'); + // return; + // } + // + // defectList.forEach(item => { + // // 获取所需字段的值并转换为数字 + // const dataTitle7 = parseFloat(item.dataTitle7) || 0; + // const dataTitle8 = parseFloat(item.dataTitle8) || 0; + // const dataTitle9 = parseFloat(item.dataTitle9) || 0; + // const dataTitle10 = parseFloat(item.dataTitle10) || 0; + // + // // 避免除以零的情况 + // if (dataTitle7 === 0) { + // console.warn('dataTitle7的值为0，无法计算百分比'); + // item.dataTitle12 = '0'; + // return; + // } + // + // // 计算加权和：dataTitle8 * 1 + dataTitle9 * 0.65 + dataTitle10 * 0.35 + // const weightedSum = (dataTitle8 * 1) + (dataTitle9 * 0.65) + (dataTitle10 * 0.35); + // + // // 除以dataTitle7并转换为百分比（保留两位小数） + // const percentage = (weightedSum / dataTitle7) * 100; + // item.dataTitle12 = percentage.toFixed(2) + '%'; + // }); + // + // return defectList; + // } }, diff --git a/src/views/quality/report/cpSortChart/index.vue b/src/views/quality/report/cpSortChart/index.vue index be79842..37befbe 100644 --- a/src/views/quality/report/cpSortChart/index.vue +++ b/src/views/quality/report/cpSortChart/index.vue @@ -45,7 +45,7 @@ {{form.noOkQty}} {{form.noOkNumRate}} - {{form.okNumRate}} + {{form.okNumRate}}
@@ -59,7 +59,7 @@ - + @@ -325,7 +325,7 @@ export default { ] }; - option && myChart.setOption(option); + option && myChart.setOption(option); }, // 生成表头序号 @@ -339,4 +339,4 @@ export default { .my-description-item1 { width: 200px; /* 或者你想要的任何宽度 */ } - \ No newline at end of file + diff --git a/src/views/quality/report/cpTranChart/index.vue b/src/views/quality/report/cpTranChart/index.vue index 38f3f63..d2c072b 100644 --- a/src/views/quality/report/cpTranChart/index.vue +++ b/src/views/quality/report/cpTranChart/index.vue @@ -8,14 +8,6 @@ placeholder="选择月"> - - - 搜索 @@ -29,43 +21,40 @@ 说明：空白处表示当日未生产。 - + -

{{form.column080090}} 年 {{form.column090100}} 月 份 白 坯 不 良 排 列 图

+

{{form.column080090}} 年 {{form.column090100}} 月 份 黑 蚊 香 成 品 包 装 不 良 排 列 图

 - - {{form.materialName}} - {{form.sampleQty}} - - {{form.workCenter}} - {{form.noOkQty}} - - {{form.noOkNumRate}} - {{form.okNumRate}} - -
+
- - - - - - - - + + + + + + + + + + + + + + + @@ -339,4 +269,4 @@ export default { .my-description-item1 { width: 200px; /* 或者你想要的任何宽度 */ } - \ No newline at end of file + diff --git a/src/views/wms/team/index.vue b/src/views/wms/team/index.vue index d6acac8..9410ae7 100644 --- a/src/views/wms/team/index.vue +++ b/src/views/wms/team/index.vue @@ -356,15 +356,15 @@ v-model="rightList" style="text-align: left" > - + + + + + + + + + @@ -445,7 +445,7 @@ export default { }, teamQueryParams: { pageNum: 1, - pageSize: 10, + pageSize: 3000, total:0 }, options: [