From 60ec9786b47ed493e3eb2995f8f9d2f4781c375a Mon Sep 17 00:00:00 2001 From: mengjiao <3338049200@qq,com> Date: Fri, 26 Jul 2024 17:39:46 +0800 Subject: [PATCH 1/3] =?UTF-8?q?wms=E6=88=90=E5=93=81=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/wmsProductProductionRecords.js | 12 + .../wms/wmsProductProductionRecords/index.vue | 320 ++++++++++++++++++ 2 files changed, 332 insertions(+) create mode 100644 src/api/wms/wmsProductProductionRecords.js create mode 100644 src/views/wms/wmsProductProductionRecords/index.vue diff --git a/src/api/wms/wmsProductProductionRecords.js b/src/api/wms/wmsProductProductionRecords.js new file mode 100644 index 0000000..8438422 --- /dev/null +++ b/src/api/wms/wmsProductProductionRecords.js @@ -0,0 +1,12 @@ +import request from '@/utils/request' + +// 查询成品生记录列表 +export function selectProductProductionRecords(query) { + return request({ + url: '/wms/put/selectProductProductionRecords', + method: 'get', + params: query + }); + + +} diff --git a/src/views/wms/wmsProductProductionRecords/index.vue b/src/views/wms/wmsProductProductionRecords/index.vue new file mode 100644 index 0000000..1d2d350 --- /dev/null +++ b/src/views/wms/wmsProductProductionRecords/index.vue @@ -0,0 +1,320 @@ + + + From cefd6b0f62583945cd90d36f28e29a8313cf0184 Mon Sep 17 00:00:00 2001 From: yinq Date: Mon, 29 Jul 2024 09:54:51 +0800 Subject: [PATCH 2/3] =?UTF-8?q?update=20-=20=E8=83=BD=E6=BA=90=E6=B0=B4?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/energy/WaterManagement/Energystatistics/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/energy/WaterManagement/Energystatistics/index.vue b/src/views/energy/WaterManagement/Energystatistics/index.vue index 05547a6..70fcd5b 100644 --- a/src/views/energy/WaterManagement/Energystatistics/index.vue +++ b/src/views/energy/WaterManagement/Energystatistics/index.vue @@ -464,7 +464,7 @@ export default { this.number = this.number.toFixed(2); if (this.queryParams.monitorHierarchy == "" && this.queryParams.publicShareType == ""){ this.queryParams.type = 0; - this.queryParams.energyType = 2; + this.queryParams.energyType = 3; this.queryParams.relationId = 1; previewPolyline(this.queryParams).then((res) => { this.number = res.data.sumEnergyValue; From c17e2d4393e18dbb1b9f67e0c67319acddd17197 Mon Sep 17 00:00:00 2001 From: guoshuang Date: Fri, 2 Aug 2024 09:57:09 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=9C=8B=E7=89=88=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/kanban/Packagingline/index2.vue | 75 ++++++++++++++++++----- 1 file changed, 59 insertions(+), 16 deletions(-) diff --git a/src/views/kanban/Packagingline/index2.vue b/src/views/kanban/Packagingline/index2.vue index dab2d6c..5340b9c 100644 --- a/src/views/kanban/Packagingline/index2.vue +++ b/src/views/kanban/Packagingline/index2.vue @@ -129,6 +129,7 @@ style="height: 44px" :key="index" v-for="(n, index) in orderdetail" + @click="getorderdetail(n.workorderCodeSap)" > {{ n.workorderCodeSap }} @@ -407,11 +408,12 @@ export default { optionDatalist5: [], optionDatalist6: [], colorlist: ["#005aff", "#f8b551"], - datetime: null, + datetime: 0, time1: null, getlist: [], repairlist: [], orderdetail: [], + gudingworkorderCodeSap:'', packaginglinerepairlist: [], packaginglinestabilizelist: [], packaginglineinfo: [], @@ -483,7 +485,7 @@ export default { this.RefreshTime = response.data; this.time1 = setInterval(() => { _this.getdatalist(_this.selectxt); - }, 1000 * 60 * this.RefreshTime); + },1000 * 60 * this.RefreshTime); } }); }, @@ -505,9 +507,61 @@ export default { const _this = this; _this.initChart1(); _this.piedata = []; - getProductionLineInfo({ + // getProductionLineInfo({ + // equCode: _this.selectxtclasses, + // factoryCode: "ds_" + _this.selectxt, + // }).then((response) => { + // if (response) { + // _this.workOrder = response.data.workOrder; + // _this.taskNum = response.data.taskNum; + // _this.taskSampleNum = response.data.taskSampleNum; + // if (response.data.piedata.checkList) { + // response.data.piedata.checkList.forEach((item) => { + // let a = {}; + // let b = {}; + // if (item.checkResult == "合格") { + // a.name = item.checkResult; + // a.value = item.quality; + // _this.piedata[0] = a; + // } + // if (item.checkResult == "不合格") { + // b.name = item.checkResult; + // b.value = item.quality; + // _this.piedata[1] = b; + // } + // }); + // _this.initChart2(); + // } else { + // _this.initChart3(); + // } + // } + // }); + getPorOrderList({ equCode: _this.selectxtclasses, factoryCode: "ds_" + _this.selectxt, + }).then((response) => { + if (response) { + _this.orderdetail = response.data; + + if(_this.datetime == 0){ + _this.gudingworkorderCodeSap = _this.orderdetail[0].workorderCodeSap; + _this.getorderdetail(_this.gudingworkorderCodeSap); + } + _this.datetime+=1; + + if (_this.orderdetail.length == 0) { + _this.orderdetail = this.ceshitable; + } + } + }); + }, + //选择订单查看详细 + getorderdetail(item) { + const _this = this; + getProductionLineInfo({ + equCode: _this.selectxtclasses, + factoryCode: "ds_" + _this.selectxt, + workorderCodeSap: item, }).then((response) => { if (response) { _this.workOrder = response.data.workOrder; @@ -528,20 +582,9 @@ export default { _this.piedata[1] = b; } }); - _this.initChart2(); + //_this.initChart2(); } else { - _this.initChart3(); - } - } - }); - getPorOrderList({ - equCode: _this.selectxtclasses, - factoryCode: "ds_" + _this.selectxt, - }).then((response) => { - if (response) { - _this.orderdetail = response.data; - if (_this.orderdetail.length == 0) { - _this.orderdetail = this.ceshitable; + //_this.initChart3(); } } });