From ee27a9318169c453b45f6714cd4fc27ab81dcbd2 Mon Sep 17 00:00:00 2001 From: lb Date: Fri, 5 Aug 2022 10:07:53 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E7=94=9F=E6=88=90=E7=9A=84=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.js | 1 + src/views/modules/monitoring/equipment.vue | 1 - ...dd-or-update.vue => equipmentAlarmLog-add-or-update.vue} | 0 src/views/modules/monitoring/equipmentAlarmLog.vue | 2 +- ...tr-add-or-update.vue => equipmentAttr-add-or-update.vue} | 0 ...le-add-or-update.vue => equipmentFile-add-or-update.vue} | 0 .../monitoring/{equipmenFile.vue => equipmentFile.vue} | 2 +- ...p-add-or-update.vue => equipmentGroup-add-or-update.vue} | 0 .../monitoring/{equipmenGroup.vue => equipmentGroup.vue} | 2 +- ...-or-update.vue => equipmentGroupAlarm-add-or-update.vue} | 0 src/views/modules/monitoring/equipmentGroupAlarm.vue | 2 +- ...plc-add-or-update.vue => equipmentPlc-add-or-update.vue} | 0 src/views/modules/monitoring/equipmentPlc.vue | 2 +- ...-or-update.vue => equipmentPlcConnect-add-or-update.vue} | 0 src/views/modules/monitoring/equipmentPlcConnect.vue | 2 +- ...dd-or-update.vue => equipmentPlcParam-add-or-update.vue} | 0 src/views/modules/monitoring/equipmentPlcParam.vue | 2 +- ...dd-or-update.vue => equipmentQuantity-add-or-update.vue} | 0 src/views/modules/monitoring/equipmentQuantity.vue | 6 +++--- ...d-or-update.vue => equipmentStatusLog-add-or-update.vue} | 0 src/views/modules/monitoring/equipmentStatusLog.vue | 6 +++--- ...pe-add-or-update.vue => equipmentType-add-or-update.vue} | 0 src/views/modules/monitoring/equipmentType.vue | 2 +- ...dd-or-update.vue => equipmentTypeFile-add-or-update.vue} | 0 src/views/modules/monitoring/equipmentTypeFile.vue | 2 +- src/views/modules/monitoring/equipmentattr.vue | 2 +- ...arrt-add-or-update.vue => productArrt-add-or-update.vue} | 0 .../modules/monitoring/{producArrt.vue => productArrt.vue} | 2 +- src/views/modules/monitoring/productionLine.vue | 2 +- src/views/modules/monitoring/productionLineRecSch.vue | 2 +- src/views/modules/monitoring/qualityInspectionDet.vue | 2 +- src/views/modules/monitoring/qualityInspectionRecord.vue | 2 +- src/views/modules/monitoring/qualityInspectionType.vue | 2 +- ...heet-add-or-update.vue => reportSheet-add-or-update.vue} | 0 src/views/modules/monitoring/reportSheet.vue | 2 +- ...-or-update.vue => reportSheetCategory-add-or-update.vue} | 0 src/views/modules/monitoring/reportSheetCategory.vue | 2 +- src/views/modules/monitoring/sysfile.vue | 2 +- src/views/modules/monitoring/sysfileType.vue | 2 +- src/views/modules/monitoring/workShopSection.vue | 6 +++--- src/views/modules/monitoring/workShopSectionEquipment.vue | 6 +++--- .../modules/monitoring/workshopsection-add-or-update.vue | 4 ++-- .../monitoring/workshopsectionequipment-add-or-update.vue | 4 ++-- 43 files changed, 37 insertions(+), 37 deletions(-) rename src/views/modules/monitoring/{equipmenalarmlog-add-or-update.vue => equipmentAlarmLog-add-or-update.vue} (100%) rename src/views/modules/monitoring/{equipmenattr-add-or-update.vue => equipmentAttr-add-or-update.vue} (100%) rename src/views/modules/monitoring/{equipmenfile-add-or-update.vue => equipmentFile-add-or-update.vue} (100%) rename src/views/modules/monitoring/{equipmenFile.vue => equipmentFile.vue} (99%) rename src/views/modules/monitoring/{equipmengroup-add-or-update.vue => equipmentGroup-add-or-update.vue} (100%) rename src/views/modules/monitoring/{equipmenGroup.vue => equipmentGroup.vue} (98%) rename src/views/modules/monitoring/{equipmengroupalarm-add-or-update.vue => equipmentGroupAlarm-add-or-update.vue} (100%) rename src/views/modules/monitoring/{equipmenplc-add-or-update.vue => equipmentPlc-add-or-update.vue} (100%) rename src/views/modules/monitoring/{equipmenplcconnect-add-or-update.vue => equipmentPlcConnect-add-or-update.vue} (100%) rename src/views/modules/monitoring/{equipmenplcparam-add-or-update.vue => equipmentPlcParam-add-or-update.vue} (100%) rename src/views/modules/monitoring/{equipmenquantity-add-or-update.vue => equipmentQuantity-add-or-update.vue} (100%) rename src/views/modules/monitoring/{equipmenstatuslog-add-or-update.vue => equipmentStatusLog-add-or-update.vue} (100%) rename src/views/modules/monitoring/{equipmentype-add-or-update.vue => equipmentType-add-or-update.vue} (100%) rename src/views/modules/monitoring/{equipmentypefile-add-or-update.vue => equipmentTypeFile-add-or-update.vue} (100%) rename src/views/modules/monitoring/{producarrt-add-or-update.vue => productArrt-add-or-update.vue} (100%) rename src/views/modules/monitoring/{producArrt.vue => productArrt.vue} (99%) rename src/views/modules/monitoring/{reporsheet-add-or-update.vue => reportSheet-add-or-update.vue} (100%) rename src/views/modules/monitoring/{reporsheecategory-add-or-update.vue => reportSheetCategory-add-or-update.vue} (100%) diff --git a/src/router/index.js b/src/router/index.js index 65efea5..016650d 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -106,6 +106,7 @@ router.beforeEach((to, from, next) => { Vue.prototype.$message.error(res.msg) return next({ name: 'login' }) } + console.log('menulist: ', res.data) window.SITE_CONFIG['menuList'] = res.data fnAddDynamicMenuRoutes(window.SITE_CONFIG['menuList']) next({ ...to, replace: true }) diff --git a/src/views/modules/monitoring/equipment.vue b/src/views/modules/monitoring/equipment.vue index e85d18a..fa2d412 100644 --- a/src/views/modules/monitoring/equipment.vue +++ b/src/views/modules/monitoring/equipment.vue @@ -102,7 +102,6 @@ export default { key: this.dataForm.key }) }).then(({ data }) => { - console.log('===', data) if (data && data.code === 0) { this.dataList = data.data.list this.totalPage = data.data.total diff --git a/src/views/modules/monitoring/equipmenalarmlog-add-or-update.vue b/src/views/modules/monitoring/equipmentAlarmLog-add-or-update.vue similarity index 100% rename from src/views/modules/monitoring/equipmenalarmlog-add-or-update.vue rename to src/views/modules/monitoring/equipmentAlarmLog-add-or-update.vue diff --git a/src/views/modules/monitoring/equipmentAlarmLog.vue b/src/views/modules/monitoring/equipmentAlarmLog.vue index 8eab9f4..6ece42e 100644 --- a/src/views/modules/monitoring/equipmentAlarmLog.vue +++ b/src/views/modules/monitoring/equipmentAlarmLog.vue @@ -49,7 +49,7 @@