From affea8af59a3de067bf5011e2aa6780f05dc48ae Mon Sep 17 00:00:00 2001 From: lb Date: Thu, 4 Aug 2022 16:13:20 +0800 Subject: [PATCH] =?UTF-8?q?update=20axios=20response=E7=9A=84=E8=A7=A3?= =?UTF-8?q?=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .prettierrc | 21 +- src/App.vue | 46 ++--- src/views/main-content.vue | 176 ++++++++--------- src/views/main-sidebar.vue | 44 ++--- .../{code => monitoring}/equipmenFile.vue | 4 +- .../{code => monitoring}/equipmenGroup.vue | 4 +- .../equipmenalarmlog-add-or-update.vue | 0 .../equipmenattr-add-or-update.vue | 0 .../{code => monitoring}/equipmenattr.vue | 4 +- .../equipmenfile-add-or-update.vue | 0 .../equipmengroup-add-or-update.vue | 0 .../equipmengroupalarm-add-or-update.vue | 0 .../equipmenplc-add-or-update.vue | 0 .../equipmenplcconnect-add-or-update.vue | 0 .../equipmenplcparam-add-or-update.vue | 0 .../equipmenquantity-add-or-update.vue | 0 .../equipmenstatuslog-add-or-update.vue | 0 .../equipment-add-or-update.vue | 0 .../{code => monitoring}/equipment.vue | 70 +++---- .../equipmentAlarmLog.vue | 4 +- .../equipmentGroupAlarm.vue | 4 +- .../{code => monitoring}/equipmentPlc.vue | 4 +- .../equipmentPlcConnect.vue | 4 +- .../equipmentPlcParam.vue | 4 +- .../equipmentQuantity.vue | 4 +- .../equipmentStatusLog.vue | 4 +- .../{code => monitoring}/equipmentType.vue | 4 +- .../equipmentTypeFile.vue | 4 +- .../equipmentype-add-or-update.vue | 0 .../equipmentypefile-add-or-update.vue | 0 .../factory-add-or-update.vue | 0 .../modules/{code => monitoring}/factory.vue | 4 +- .../{code => monitoring}/producArrt.vue | 4 +- .../producarrt-add-or-update.vue | 0 .../product-add-or-update.vue | 0 .../modules/{code => monitoring}/product.vue | 4 +- .../{code => monitoring}/productionLine.vue | 4 +- .../productionLineRecSch.vue | 4 +- .../productionline-add-or-update.vue | 0 .../productionlinerecsch-add-or-update.vue | 0 .../qualityInspectionDet.vue | 4 +- .../qualityInspectionRecord.vue | 4 +- .../qualityInspectionType.vue | 4 +- .../qualityinspectiondet-add-or-update.vue | 0 .../qualityinspectionrecord-add-or-update.vue | 0 .../qualityinspectiontype-add-or-update.vue | 0 .../reporsheecategory-add-or-update.vue | 0 .../reporsheet-add-or-update.vue | 0 .../{code => monitoring}/reportSheet.vue | 4 +- .../reportSheetCategory.vue | 4 +- .../sysfile-add-or-update.vue | 0 .../modules/{code => monitoring}/sysfile.vue | 4 +- .../{code => monitoring}/sysfileType.vue | 4 +- .../sysfiletype-add-or-update.vue | 0 .../{code => monitoring}/workShopSection.vue | 4 +- .../workShopSectionEquipment.vue | 4 +- .../workshopsection-add-or-update.vue | 0 ...workshopsectionequipment-add-or-update.vue | 0 src/views/pages/login.vue | 186 +++++++++--------- 59 files changed, 329 insertions(+), 318 deletions(-) rename src/views/modules/{code => monitoring}/equipmenFile.vue (98%) rename src/views/modules/{code => monitoring}/equipmenGroup.vue (98%) rename src/views/modules/{code => monitoring}/equipmenalarmlog-add-or-update.vue (100%) rename src/views/modules/{code => monitoring}/equipmenattr-add-or-update.vue (100%) rename src/views/modules/{code => monitoring}/equipmenattr.vue (98%) rename src/views/modules/{code => monitoring}/equipmenfile-add-or-update.vue (100%) rename src/views/modules/{code => monitoring}/equipmengroup-add-or-update.vue (100%) rename src/views/modules/{code => monitoring}/equipmengroupalarm-add-or-update.vue (100%) rename src/views/modules/{code => monitoring}/equipmenplc-add-or-update.vue (100%) rename src/views/modules/{code => monitoring}/equipmenplcconnect-add-or-update.vue (100%) rename src/views/modules/{code => monitoring}/equipmenplcparam-add-or-update.vue (100%) rename src/views/modules/{code => monitoring}/equipmenquantity-add-or-update.vue (100%) rename src/views/modules/{code => monitoring}/equipmenstatuslog-add-or-update.vue (100%) rename src/views/modules/{code => monitoring}/equipment-add-or-update.vue (100%) rename src/views/modules/{code => monitoring}/equipment.vue (75%) rename src/views/modules/{code => monitoring}/equipmentAlarmLog.vue (98%) rename src/views/modules/{code => monitoring}/equipmentGroupAlarm.vue (98%) rename src/views/modules/{code => monitoring}/equipmentPlc.vue (98%) rename src/views/modules/{code => monitoring}/equipmentPlcConnect.vue (98%) rename src/views/modules/{code => monitoring}/equipmentPlcParam.vue (99%) rename src/views/modules/{code => monitoring}/equipmentQuantity.vue (98%) rename src/views/modules/{code => monitoring}/equipmentStatusLog.vue (98%) rename src/views/modules/{code => monitoring}/equipmentType.vue (98%) rename src/views/modules/{code => monitoring}/equipmentTypeFile.vue (98%) rename src/views/modules/{code => monitoring}/equipmentype-add-or-update.vue (100%) rename src/views/modules/{code => monitoring}/equipmentypefile-add-or-update.vue (100%) rename src/views/modules/{code => monitoring}/factory-add-or-update.vue (100%) rename src/views/modules/{code => monitoring}/factory.vue (98%) rename src/views/modules/{code => monitoring}/producArrt.vue (98%) rename src/views/modules/{code => monitoring}/producarrt-add-or-update.vue (100%) rename src/views/modules/{code => monitoring}/product-add-or-update.vue (100%) rename src/views/modules/{code => monitoring}/product.vue (98%) rename src/views/modules/{code => monitoring}/productionLine.vue (98%) rename src/views/modules/{code => monitoring}/productionLineRecSch.vue (98%) rename src/views/modules/{code => monitoring}/productionline-add-or-update.vue (100%) rename src/views/modules/{code => monitoring}/productionlinerecsch-add-or-update.vue (100%) rename src/views/modules/{code => monitoring}/qualityInspectionDet.vue (98%) rename src/views/modules/{code => monitoring}/qualityInspectionRecord.vue (98%) rename src/views/modules/{code => monitoring}/qualityInspectionType.vue (98%) rename src/views/modules/{code => monitoring}/qualityinspectiondet-add-or-update.vue (100%) rename src/views/modules/{code => monitoring}/qualityinspectionrecord-add-or-update.vue (100%) rename src/views/modules/{code => monitoring}/qualityinspectiontype-add-or-update.vue (100%) rename src/views/modules/{code => monitoring}/reporsheecategory-add-or-update.vue (100%) rename src/views/modules/{code => monitoring}/reporsheet-add-or-update.vue (100%) rename src/views/modules/{code => monitoring}/reportSheet.vue (98%) rename src/views/modules/{code => monitoring}/reportSheetCategory.vue (98%) rename src/views/modules/{code => monitoring}/sysfile-add-or-update.vue (100%) rename src/views/modules/{code => monitoring}/sysfile.vue (98%) rename src/views/modules/{code => monitoring}/sysfileType.vue (98%) rename src/views/modules/{code => monitoring}/sysfiletype-add-or-update.vue (100%) rename src/views/modules/{code => monitoring}/workShopSection.vue (98%) rename src/views/modules/{code => monitoring}/workShopSectionEquipment.vue (98%) rename src/views/modules/{code => monitoring}/workshopsection-add-or-update.vue (100%) rename src/views/modules/{code => monitoring}/workshopsectionequipment-add-or-update.vue (100%) diff --git a/.prettierrc b/.prettierrc index fb44611..bf412f1 100644 --- a/.prettierrc +++ b/.prettierrc @@ -1,11 +1,12 @@ { - "singleQuote": true, - "tabWidth": 2, - "bracketSameLine": true, - "embeddedLanguageFormatting": "auto", - "printWidth": 180, - "quoteProps": "consistent", - "trailingComma": "none", - "semi": false, - "useTabs": true -} \ No newline at end of file + "singleQuote": true, + "tabWidth": 2, + "bracketSameLine": true, + "htmlWhitespaceSensitivity": "ignore", + "embeddedLanguageFormatting": "auto", + "printWidth": 180, + "quoteProps": "consistent", + "trailingComma": "none", + "semi": false, + "useTabs": true +} diff --git a/src/App.vue b/src/App.vue index f57d30a..9a78fa5 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,34 +1,34 @@ diff --git a/src/views/main-content.vue b/src/views/main-content.vue index 0ab04d4..e07e65a 100644 --- a/src/views/main-content.vue +++ b/src/views/main-content.vue @@ -1,96 +1,96 @@ diff --git a/src/views/main-sidebar.vue b/src/views/main-sidebar.vue index bd21b03..6c3be5c 100644 --- a/src/views/main-sidebar.vue +++ b/src/views/main-sidebar.vue @@ -1,30 +1,30 @@ diff --git a/src/views/modules/code/equipmenFile.vue b/src/views/modules/monitoring/equipmenFile.vue similarity index 98% rename from src/views/modules/code/equipmenFile.vue rename to src/views/modules/monitoring/equipmenFile.vue index 6f4e686..ac30973 100644 --- a/src/views/modules/code/equipmenFile.vue +++ b/src/views/modules/monitoring/equipmenFile.vue @@ -187,8 +187,8 @@ }) }).then(({data}) => { if (data && data.code === 0) { - this.dataList = data.list - this.totalPage = data.total + this.dataList = data.data.list + this.totalPage = data.data.total } else { this.dataList = [] this.totalPage = 0 diff --git a/src/views/modules/code/equipmenGroup.vue b/src/views/modules/monitoring/equipmenGroup.vue similarity index 98% rename from src/views/modules/code/equipmenGroup.vue rename to src/views/modules/monitoring/equipmenGroup.vue index 75522ad..4210a09 100644 --- a/src/views/modules/code/equipmenGroup.vue +++ b/src/views/modules/monitoring/equipmenGroup.vue @@ -169,8 +169,8 @@ }) }).then(({data}) => { if (data && data.code === 0) { - this.dataList = data.list - this.totalPage = data.total + this.dataList = data.data.list + this.totalPage = data.data.total } else { this.dataList = [] this.totalPage = 0 diff --git a/src/views/modules/code/equipmenalarmlog-add-or-update.vue b/src/views/modules/monitoring/equipmenalarmlog-add-or-update.vue similarity index 100% rename from src/views/modules/code/equipmenalarmlog-add-or-update.vue rename to src/views/modules/monitoring/equipmenalarmlog-add-or-update.vue diff --git a/src/views/modules/code/equipmenattr-add-or-update.vue b/src/views/modules/monitoring/equipmenattr-add-or-update.vue similarity index 100% rename from src/views/modules/code/equipmenattr-add-or-update.vue rename to src/views/modules/monitoring/equipmenattr-add-or-update.vue diff --git a/src/views/modules/code/equipmenattr.vue b/src/views/modules/monitoring/equipmenattr.vue similarity index 98% rename from src/views/modules/code/equipmenattr.vue rename to src/views/modules/monitoring/equipmenattr.vue index 77f32ae..fd9a6e5 100644 --- a/src/views/modules/code/equipmenattr.vue +++ b/src/views/modules/monitoring/equipmenattr.vue @@ -163,8 +163,8 @@ }) }).then(({data}) => { if (data && data.code === 0) { - this.dataList = data.list - this.totalPage = data.total + this.dataList = data.data.list + this.totalPage = data.data.total } else { this.dataList = [] this.totalPage = 0 diff --git a/src/views/modules/code/equipmenfile-add-or-update.vue b/src/views/modules/monitoring/equipmenfile-add-or-update.vue similarity index 100% rename from src/views/modules/code/equipmenfile-add-or-update.vue rename to src/views/modules/monitoring/equipmenfile-add-or-update.vue diff --git a/src/views/modules/code/equipmengroup-add-or-update.vue b/src/views/modules/monitoring/equipmengroup-add-or-update.vue similarity index 100% rename from src/views/modules/code/equipmengroup-add-or-update.vue rename to src/views/modules/monitoring/equipmengroup-add-or-update.vue diff --git a/src/views/modules/code/equipmengroupalarm-add-or-update.vue b/src/views/modules/monitoring/equipmengroupalarm-add-or-update.vue similarity index 100% rename from src/views/modules/code/equipmengroupalarm-add-or-update.vue rename to src/views/modules/monitoring/equipmengroupalarm-add-or-update.vue diff --git a/src/views/modules/code/equipmenplc-add-or-update.vue b/src/views/modules/monitoring/equipmenplc-add-or-update.vue similarity index 100% rename from src/views/modules/code/equipmenplc-add-or-update.vue rename to src/views/modules/monitoring/equipmenplc-add-or-update.vue diff --git a/src/views/modules/code/equipmenplcconnect-add-or-update.vue b/src/views/modules/monitoring/equipmenplcconnect-add-or-update.vue similarity index 100% rename from src/views/modules/code/equipmenplcconnect-add-or-update.vue rename to src/views/modules/monitoring/equipmenplcconnect-add-or-update.vue diff --git a/src/views/modules/code/equipmenplcparam-add-or-update.vue b/src/views/modules/monitoring/equipmenplcparam-add-or-update.vue similarity index 100% rename from src/views/modules/code/equipmenplcparam-add-or-update.vue rename to src/views/modules/monitoring/equipmenplcparam-add-or-update.vue diff --git a/src/views/modules/code/equipmenquantity-add-or-update.vue b/src/views/modules/monitoring/equipmenquantity-add-or-update.vue similarity index 100% rename from src/views/modules/code/equipmenquantity-add-or-update.vue rename to src/views/modules/monitoring/equipmenquantity-add-or-update.vue diff --git a/src/views/modules/code/equipmenstatuslog-add-or-update.vue b/src/views/modules/monitoring/equipmenstatuslog-add-or-update.vue similarity index 100% rename from src/views/modules/code/equipmenstatuslog-add-or-update.vue rename to src/views/modules/monitoring/equipmenstatuslog-add-or-update.vue diff --git a/src/views/modules/code/equipment-add-or-update.vue b/src/views/modules/monitoring/equipment-add-or-update.vue similarity index 100% rename from src/views/modules/code/equipment-add-or-update.vue rename to src/views/modules/monitoring/equipment-add-or-update.vue diff --git a/src/views/modules/code/equipment.vue b/src/views/modules/monitoring/equipment.vue similarity index 75% rename from src/views/modules/code/equipment.vue rename to src/views/modules/monitoring/equipment.vue index 7bad911..ea1f3cd 100644 --- a/src/views/modules/code/equipment.vue +++ b/src/views/modules/monitoring/equipment.vue @@ -11,35 +11,39 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + +