From 5aa016a08024de6a1d69e8dea59857d86f038242 Mon Sep 17 00:00:00 2001 From: wws <18630710203@163.com> Date: Wed, 13 Dec 2023 15:40:57 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E5=AE=8C=E5=A5=BD=E7=8E=87init=E3=80=81?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=E9=80=89=E6=8B=A9=E9=80=BB=E8=BE=91=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E7=BB=84=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/device/operation.js | 44 ++ src/api/device/plan.js | 8 + src/views/device/inspectionPlan/index.vue | 34 +- src/views/device/operation/index.vue | 494 ++++++++++++++++++++++ src/views/device/spotCheckPlan/index.vue | 34 +- src/views/device/upkeepOrder/index.vue | 34 +- src/views/device/upkeepPlan/index.vue | 34 +- 7 files changed, 670 insertions(+), 12 deletions(-) create mode 100644 src/api/device/operation.js create mode 100644 src/views/device/operation/index.vue diff --git a/src/api/device/operation.js b/src/api/device/operation.js new file mode 100644 index 0000000..5e8dde2 --- /dev/null +++ b/src/api/device/operation.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询设备运行记录列表 +export function listOperation(query) { + return request({ + url: '/device/operation/list', + method: 'get', + params: query + }); +} + +// 查询设备运行记录详细 +export function getOperation(id) { + return request({ + url: '/device/operation/' + id, + method: 'get' + }); +} + +// 新增设备运行记录 +export function addOperation(data) { + return request({ + url: '/device/operation', + method: 'post', + data: data + }); +} + +// 修改设备运行记录 +export function updateOperation(data) { + return request({ + url: '/device/operation', + method: 'put', + data: data + }); +} + +// 删除设备运行记录 +export function delOperation(id) { + return request({ + url: '/device/operation/' + id, + method: 'delete' + }); +} diff --git a/src/api/device/plan.js b/src/api/device/plan.js index fe7ffb0..c75952f 100644 --- a/src/api/device/plan.js +++ b/src/api/device/plan.js @@ -43,6 +43,14 @@ export function getEquList(equQuery) { }); } +// 获取设备组线信息 +export function getGroupLine() { + return request({ + url: '/device/inspectionPlan/getGroupLine', + method: 'get' + }); +} + // 查询计划列表 export function listPlan(query) { return request({ diff --git a/src/views/device/inspectionPlan/index.vue b/src/views/device/inspectionPlan/index.vue index 14e7567..0777e0e 100644 --- a/src/views/device/inspectionPlan/index.vue +++ b/src/views/device/inspectionPlan/index.vue @@ -539,11 +539,21 @@ + + + + + { + this.groupLineList = response.data; + this.equipmentQuery.groupLine = response.data[0].equipmentCode; + this.getEquList(); + }) + this.selectEqu = true; }, // 编辑标准确认按钮 @@ -1032,6 +1059,7 @@ export default { equipmentCode: null, equipmentName: null, workshopCode: null, + groupLine:this.groupLineList[0].equipmentCode, pageNum: 1, pageSize: 10, }; diff --git a/src/views/device/operation/index.vue b/src/views/device/operation/index.vue new file mode 100644 index 0000000..0a1cc12 --- /dev/null +++ b/src/views/device/operation/index.vue @@ -0,0 +1,494 @@ + + + diff --git a/src/views/device/spotCheckPlan/index.vue b/src/views/device/spotCheckPlan/index.vue index c14520f..642b942 100644 --- a/src/views/device/spotCheckPlan/index.vue +++ b/src/views/device/spotCheckPlan/index.vue @@ -567,11 +567,21 @@ border title="选择设备" :visible.sync="selectEqu" - width="50%" + width="1100px" append-to-body > + + + + + { + this.groupLineList = response.data; + this.equipmentQuery.groupLine = response.data[0].equipmentCode; + this.getEquList(); + }) + this.selectEqu = true; }, // 编辑标准确认按钮 @@ -1077,6 +1104,7 @@ export default { equipmentCode: null, equipmentName: null, workshopCode: null, + groupLine:this.groupLineList[0].equipmentCode, pageNum: 1, pageSize: 10, }; diff --git a/src/views/device/upkeepOrder/index.vue b/src/views/device/upkeepOrder/index.vue index c254d5e..0d9a38d 100644 --- a/src/views/device/upkeepOrder/index.vue +++ b/src/views/device/upkeepOrder/index.vue @@ -617,11 +617,21 @@ + + + + + { + this.groupLineList = response.data; + this.equipmentQuery.groupLine = response.data[0].equipmentCode; + this.getEquList(); + }) + this.selectEqu = true; }, // 备件选择完成按钮 diff --git a/src/views/device/upkeepPlan/index.vue b/src/views/device/upkeepPlan/index.vue index e79f265..eb0f3fe 100644 --- a/src/views/device/upkeepPlan/index.vue +++ b/src/views/device/upkeepPlan/index.vue @@ -597,11 +597,21 @@ + + + + + { + this.groupLineList = response.data; + this.equipmentQuery.groupLine = response.data[0].equipmentCode; + this.getEquList(); + }) + this.selectEqu = true; }, // 上一步 @@ -1561,6 +1588,7 @@ export default { equipmentCode: null, equipmentName: null, workshopCode: null, + groupLine:this.groupLineList[0].equipmentCode, pageNum: 1, pageSize: 10, }; From f4ce92f40a25ea3aeb0ac45a48c2eb80a4f8b90b Mon Sep 17 00:00:00 2001 From: A0010407 Date: Wed, 13 Dec 2023 16:22:35 +0800 Subject: [PATCH 02/12] =?UTF-8?q?=E7=BB=91=E5=AE=9A=E8=BE=85=E5=8A=A9?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/device/summaryReport/index.vue | 2 +- src/views/wms/equipment/index.vue | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/views/device/summaryReport/index.vue b/src/views/device/summaryReport/index.vue index a37dff7..30bb251 100644 --- a/src/views/device/summaryReport/index.vue +++ b/src/views/device/summaryReport/index.vue @@ -76,7 +76,7 @@ - + diff --git a/src/views/wms/equipment/index.vue b/src/views/wms/equipment/index.vue index 028480f..d99e332 100644 --- a/src/views/wms/equipment/index.vue +++ b/src/views/wms/equipment/index.vue @@ -1221,6 +1221,8 @@ export default { getList() { this.loading = true; listEquipment(this.queryParams).then((response) => { + this.auxiliaryEquipmentLeftList = []; + this.auxiliaryEquipmentRightList = []; for (let i in response.rows) { // 将返回的列表赋值于穿梭框左边列表 this.auxiliaryEquipmentLeftList.push({ @@ -1229,9 +1231,8 @@ export default { }); } for (let i in response.selected) { - this.auxiliaryEquipmentLeftList.push(response.selected[i].key); - this.form.auxiliaryEquipmentRightData = - this.auxiliaryEquipmentRightList; + this.auxiliaryEquipmentRightList.push(response.selected[i].key); + this.form.auxiliaryEquipmentRightData = this.auxiliaryEquipmentRightList; } this.equipmentList = response.rows; this.total = response.total; From 58169855015154679c5b3acefdba5055bf08f8e5 Mon Sep 17 00:00:00 2001 From: A0010407 Date: Wed, 13 Dec 2023 17:02:15 +0800 Subject: [PATCH 03/12] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E8=AE=BE=E5=A4=87bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wms/equipment/index.vue | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/src/views/wms/equipment/index.vue b/src/views/wms/equipment/index.vue index d99e332..866024f 100644 --- a/src/views/wms/equipment/index.vue +++ b/src/views/wms/equipment/index.vue @@ -60,7 +60,7 @@ - + 上一步 - 下一步 + 下一步 提 交 + 提 交 Date: Wed, 13 Dec 2023 17:57:47 +0800 Subject: [PATCH 04/12] =?UTF-8?q?=E9=A2=86=E6=96=99=E5=8D=95+=E8=B4=A8?= =?UTF-8?q?=E9=87=8F=E7=9C=8B=E6=9D=BF=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/mes/prepare/index.vue | 72 ++++++++++++------------------ src/views/mes/reportWork/index.vue | 2 +- 2 files changed, 30 insertions(+), 44 deletions(-) diff --git a/src/views/mes/prepare/index.vue b/src/views/mes/prepare/index.vue index fef9d83..dced4b2 100644 --- a/src/views/mes/prepare/index.vue +++ b/src/views/mes/prepare/index.vue @@ -9,9 +9,9 @@ @keyup.enter.native="handleQuery" /> - + + 搜索 重置 @@ -128,41 +129,24 @@ - - - - + + + - - - + - + + --> + + + width="170"> + width="320"> { console.log(response.data) this.printData.factory = response.data.mesPrepareDetailList[0].factoryCode - this.printData.productDate = response.data.mesPrepare.productDate + this.printData.productDate = response.data.mesPrepareDetailList[0].productDate this.printData.printDate = moment(new Date()).format('YYYY-MM-DD') this.printData.workTable = response.data.mesPrepareDetailList this.refreshNewWorkerTable = true // 立即将refreshProTable设置为true，显示表格 diff --git a/src/views/mes/reportWork/index.vue b/src/views/mes/reportWork/index.vue index 52d6272..a396547 100644 --- a/src/views/mes/reportWork/index.vue +++ b/src/views/mes/reportWork/index.vue @@ -935,7 +935,7 @@ export default { return reportSap(code); }).then(() => { this.getList(); - this.$modal.msgSuccess("报工成功"); + //this.$modal.msgSuccess("报工成功"); }).catch(() => {}); }, /** 报工详情按钮操作 */ From 05b288b81c0b2cd8d2af2035c7fe11aff628fe52 Mon Sep 17 00:00:00 2001 From: A0010407 Date: Wed, 13 Dec 2023 22:12:35 +0800 Subject: [PATCH 05/12] =?UTF-8?q?=E5=A4=87=E4=BB=B6=E7=94=B3=E9=A2=86?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repairOrder/selectSparePartsLedger.vue | 4 +++- .../sparePartsApplicationRecord/index.vue | 8 +++---- .../selectSinglePerson.vue | 14 ----------- .../selectSparePartsLedger.vue | 23 ++++--------------- 4 files changed, 10 insertions(+), 39 deletions(-) diff --git a/src/views/device/repairOrder/selectSparePartsLedger.vue b/src/views/device/repairOrder/selectSparePartsLedger.vue index 7acffbf..3ca7600 100644 --- a/src/views/device/repairOrder/selectSparePartsLedger.vue +++ b/src/views/device/repairOrder/selectSparePartsLedger.vue @@ -6,7 +6,7 @@ :modal="false" width="1100px" center - :before-close="cancel" + :before-close = "cancel" > { this.sparePartsLedgerList = response.rows; diff --git a/src/views/device/sparePartsApplicationRecord/index.vue b/src/views/device/sparePartsApplicationRecord/index.vue index c50bd06..e8c0888 100644 --- a/src/views/device/sparePartsApplicationRecord/index.vue +++ b/src/views/device/sparePartsApplicationRecord/index.vue @@ -306,15 +306,15 @@ @@ -486,9 +486,6 @@ export default { spareName: [ { required: true, message: "备品备件名称不能为空", trigger: "blur" }, ], - spareModel: [ - { required: true, message: "规格型号不能为空", trigger: "blur" }, - ], spareQuantity: [ { required: true, message: "数量不能为空", trigger: "blur" }, ], @@ -517,6 +514,7 @@ export default { this.form.amount = obj[0].amount; this.form.storageAmount = obj[0].storageAmount; this.form.availableQuantity = obj[0].amount - obj[0].storageAmount; + this.form.spareQuantity = obj[0].spareQuantity; }, //设备选择 handleSelectEquipment() { diff --git a/src/views/device/sparePartsApplicationRecord/selectSinglePerson.vue b/src/views/device/sparePartsApplicationRecord/selectSinglePerson.vue index 111400c..493e3b0 100644 --- a/src/views/device/sparePartsApplicationRecord/selectSinglePerson.vue +++ b/src/views/device/sparePartsApplicationRecord/selectSinglePerson.vue @@ -84,18 +84,6 @@ v-if="columns[1].visible" :show-overflow-tooltip="true" /> - - - - - - - + - \ No newline at end of file From 946e15378ccbd8d70cc3f102a9577f22b27f583c Mon Sep 17 00:00:00 2001 From: wws <18630710203@163.com> Date: Thu, 14 Dec 2023 15:35:46 +0800 Subject: [PATCH 06/12] =?UTF-8?q?=E5=AE=8C=E5=A5=BD=E7=8E=87=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E6=8A=A5=E8=A1=A8=E3=80=81=E8=AE=BE=E5=A4=87=E8=BF=90?= =?UTF-8?q?=E8=A1=8C=E8=AE=B0=E5=BD=95=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/device/operation/index.vue | 163 ++++++++++++++++++--------- 1 file changed, 108 insertions(+), 55 deletions(-) diff --git a/src/views/device/operation/index.vue b/src/views/device/operation/index.vue index 0a1cc12..a0d60f6 100644 --- a/src/views/device/operation/index.vue +++ b/src/views/device/operation/index.vue @@ -33,7 +33,7 @@ @keyup.enter.native="handleQuery" /> - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + 搜索 重置 - + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + @@ -30,10 +36,12 @@ import LineChart from './dashboard/LineChart'; import PieChart from './dashboard/PieChart'; import PieChart2 from './dashboard/PieChart2'; -import {getLineChartData} from '@/api/mes/reportWork' +import {getGroupLineEquInfo, getLineChartData} from '@/api/mes/reportWork' +import DeviceChartLine from "./dashboard/DeviceChartLine"; export default { name: "Index", components: { + DeviceChartLine, LineChart//,PieChart,PieChart2 }, data() { @@ -41,11 +49,14 @@ export default { // 版本号 version: "1.0.0", lineChartData: null, - title:"本月工厂产量" + deviceChartLineData:null, + title:"本月工厂产量", + deviceTitle: "各组线月设备故障数" }; }, created() { this.getLineChartData(); + this.getGroupLineEquInfo(); }, methods: { goTarget(href) { @@ -55,6 +66,11 @@ export default { getLineChartData().then(data => { this.lineChartData = data; }); + }, + getGroupLineEquInfo(){ + getGroupLineEquInfo().then(response => { + this.deviceChartLineData = response.data; + }); } }, };