From 739ef9cb2dfaa5449ae1f919846e179ca6ed465e Mon Sep 17 00:00:00 2001 From: A0010407 Date: Fri, 19 Jul 2024 15:30:48 +0800 Subject: [PATCH 1/3] =?UTF-8?q?2024-07-19=20=E8=AE=BE=E5=A4=87-=E7=82=B9?= =?UTF-8?q?=E6=A3=80=E3=80=81=E5=B7=A1=E6=A3=80=E3=80=81=E4=BF=9D=E5=85=BB?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=B6=E9=87=8D=E7=BD=AE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/device/inspectionPlan/index.vue | 8 ++++++-- src/views/device/spotCheckPlan/index.vue | 7 ++++++- src/views/device/upkeepPlan/index.vue | 10 ++++++---- 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/src/views/device/inspectionPlan/index.vue b/src/views/device/inspectionPlan/index.vue index c346c4a4..60d1cc34 100644 --- a/src/views/device/inspectionPlan/index.vue +++ b/src/views/device/inspectionPlan/index.vue @@ -444,7 +444,7 @@ { this.form = response.data; - this.selectPersonList = response.data.personListVO; for (let i = 0; i < this.form.equipmentItem.length; i++) { @@ -1693,9 +1692,12 @@ export default { for (let j = 0; j < this.form.equipmentItem[i].equPlanDetailList.length; j++) { this.form.equipmentItem[i].itemTempName = this.form.equipmentItem[i].itemTempName + this.form.equipmentItem[i].equPlanDetailList[j].itemName + "," } - } - + //把数组放入 + this.equipmentItemList = []; + for (let i = 0; i < response.data.equipmentItem.length; i++) { + this.equipmentItemList.push(response.data.equipmentItem[i]); + }; this.loading = false; this.open = true; this.title = "修改计划"; From 31a983951acb63a3649588a65048f3183868cb38 Mon Sep 17 00:00:00 2001 From: A0010407 Date: Fri, 19 Jul 2024 15:45:57 +0800 Subject: [PATCH 2/3] =?UTF-8?q?2024-07-19=20=E8=AE=BE=E5=A4=87-=E5=A4=87?= =?UTF-8?q?=E5=93=81=E5=A4=87=E4=BB=B6=E5=8F=B0=E8=B4=A6=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/device/sparePartsLedger/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/device/sparePartsLedger/index.vue b/src/views/device/sparePartsLedger/index.vue index a152da5f..5c6cdf78 100644 --- a/src/views/device/sparePartsLedger/index.vue +++ b/src/views/device/sparePartsLedger/index.vue @@ -161,7 +161,7 @@ label="备品备件号" align="center" prop="materialCode" - width="120" + width="150" /> Date: Fri, 19 Jul 2024 16:35:07 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layout/components/Navbar.vue | 4 ++-- src/views/mes/reportWork/index.vue | 2 ++ src/views/plan/order/index.vue | 9 +++++++-- src/views/wms/equipment/index.vue | 8 ++++++++ 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index a4381608..ef12da55 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -313,14 +313,14 @@ export default { setInterval(() => this.getAlarmData(), 1000 * 60); this.poolNameList = JSON.parse(localStorage.getItem("POOL_NAME_LIST")); this.poolName = localStorage.getItem("USER_POOL_NAME_CURRENT"); - /** + //先执行一次 this.getUnReadList(); // 实现轮询 this.timer = setInterval(() => { setTimeout(this.getUnReadList(), 30000); }, 30000); - **/ + }, components: { Breadcrumb, diff --git a/src/views/mes/reportWork/index.vue b/src/views/mes/reportWork/index.vue index 35db624c..4cca208a 100644 --- a/src/views/mes/reportWork/index.vue +++ b/src/views/mes/reportWork/index.vue @@ -448,6 +448,8 @@ + +