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 @@ - - - - - - - {{ $t('contentTabs.closeCurrent') }} - {{ $t('contentTabs.closeOther') }} - {{ $t('contentTabs.closeAll') }} - - - - - - - - - - - - - - - - - - - - - + + + + + + + {{ $t('contentTabs.closeCurrent') }} + {{ $t('contentTabs.closeOther') }} + {{ $t('contentTabs.closeAll') }} + + + + + + + + + + + + + + + + + + + + + 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 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + 修改 @@ -55,8 +59,7 @@ :page-size="pageSize" :total="totalPage" layout="total, sizes, prev, pager, next, jumper" - > - + > @@ -99,9 +102,10 @@ export default { key: this.dataForm.key }) }).then(({ data }) => { + console.log('===', 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/equipmentAlarmLog.vue b/src/views/modules/monitoring/equipmentAlarmLog.vue similarity index 98% rename from src/views/modules/code/equipmentAlarmLog.vue rename to src/views/modules/monitoring/equipmentAlarmLog.vue index 5cbc7a8..7a0ff3d 100644 --- a/src/views/modules/code/equipmentAlarmLog.vue +++ b/src/views/modules/monitoring/equipmentAlarmLog.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/equipmentGroupAlarm.vue b/src/views/modules/monitoring/equipmentGroupAlarm.vue similarity index 98% rename from src/views/modules/code/equipmentGroupAlarm.vue rename to src/views/modules/monitoring/equipmentGroupAlarm.vue index 0064f71..9f03b05 100644 --- a/src/views/modules/code/equipmentGroupAlarm.vue +++ b/src/views/modules/monitoring/equipmentGroupAlarm.vue @@ -199,8 +199,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/equipmentPlc.vue b/src/views/modules/monitoring/equipmentPlc.vue similarity index 98% rename from src/views/modules/code/equipmentPlc.vue rename to src/views/modules/monitoring/equipmentPlc.vue index 54e73da..19d45b3 100644 --- a/src/views/modules/code/equipmentPlc.vue +++ b/src/views/modules/monitoring/equipmentPlc.vue @@ -217,8 +217,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/equipmentPlcConnect.vue b/src/views/modules/monitoring/equipmentPlcConnect.vue similarity index 98% rename from src/views/modules/code/equipmentPlcConnect.vue rename to src/views/modules/monitoring/equipmentPlcConnect.vue index ea38fab..8d84953 100644 --- a/src/views/modules/code/equipmentPlcConnect.vue +++ b/src/views/modules/monitoring/equipmentPlcConnect.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/equipmentPlcParam.vue b/src/views/modules/monitoring/equipmentPlcParam.vue similarity index 99% rename from src/views/modules/code/equipmentPlcParam.vue rename to src/views/modules/monitoring/equipmentPlcParam.vue index e380ffe..fcd41c1 100644 --- a/src/views/modules/code/equipmentPlcParam.vue +++ b/src/views/modules/monitoring/equipmentPlcParam.vue @@ -247,8 +247,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/equipmentQuantity.vue b/src/views/modules/monitoring/equipmentQuantity.vue similarity index 98% rename from src/views/modules/code/equipmentQuantity.vue rename to src/views/modules/monitoring/equipmentQuantity.vue index ef9e77e..29dfb03 100644 --- a/src/views/modules/code/equipmentQuantity.vue +++ b/src/views/modules/monitoring/equipmentQuantity.vue @@ -193,8 +193,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/equipmentStatusLog.vue b/src/views/modules/monitoring/equipmentStatusLog.vue similarity index 98% rename from src/views/modules/code/equipmentStatusLog.vue rename to src/views/modules/monitoring/equipmentStatusLog.vue index eddf9b7..9ab754f 100644 --- a/src/views/modules/code/equipmentStatusLog.vue +++ b/src/views/modules/monitoring/equipmentStatusLog.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/equipmentType.vue b/src/views/modules/monitoring/equipmentType.vue similarity index 98% rename from src/views/modules/code/equipmentType.vue rename to src/views/modules/monitoring/equipmentType.vue index dad627a..6d4e927 100644 --- a/src/views/modules/code/equipmentType.vue +++ b/src/views/modules/monitoring/equipmentType.vue @@ -181,8 +181,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/equipmentTypeFile.vue b/src/views/modules/monitoring/equipmentTypeFile.vue similarity index 98% rename from src/views/modules/code/equipmentTypeFile.vue rename to src/views/modules/monitoring/equipmentTypeFile.vue index 50b03e0..5e6b9fc 100644 --- a/src/views/modules/code/equipmentTypeFile.vue +++ b/src/views/modules/monitoring/equipmentTypeFile.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/equipmentype-add-or-update.vue b/src/views/modules/monitoring/equipmentype-add-or-update.vue similarity index 100% rename from src/views/modules/code/equipmentype-add-or-update.vue rename to src/views/modules/monitoring/equipmentype-add-or-update.vue diff --git a/src/views/modules/code/equipmentypefile-add-or-update.vue b/src/views/modules/monitoring/equipmentypefile-add-or-update.vue similarity index 100% rename from src/views/modules/code/equipmentypefile-add-or-update.vue rename to src/views/modules/monitoring/equipmentypefile-add-or-update.vue diff --git a/src/views/modules/code/factory-add-or-update.vue b/src/views/modules/monitoring/factory-add-or-update.vue similarity index 100% rename from src/views/modules/code/factory-add-or-update.vue rename to src/views/modules/monitoring/factory-add-or-update.vue diff --git a/src/views/modules/code/factory.vue b/src/views/modules/monitoring/factory.vue similarity index 98% rename from src/views/modules/code/factory.vue rename to src/views/modules/monitoring/factory.vue index 8cbdc0c..0e47e6a 100644 --- a/src/views/modules/code/factory.vue +++ b/src/views/modules/monitoring/factory.vue @@ -181,8 +181,8 @@ }) }).then(({data}) => { if (data && data.code === 0) { - this.dataList = data.list - this.totalPage = data.totalCount + this.dataList = data.data.list + this.totalPage = data.data.totalCount } else { this.dataList = [] this.totalPage = 0 diff --git a/src/views/modules/code/producArrt.vue b/src/views/modules/monitoring/producArrt.vue similarity index 98% rename from src/views/modules/code/producArrt.vue rename to src/views/modules/monitoring/producArrt.vue index de4acbb..20206a9 100644 --- a/src/views/modules/code/producArrt.vue +++ b/src/views/modules/monitoring/producArrt.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/producarrt-add-or-update.vue b/src/views/modules/monitoring/producarrt-add-or-update.vue similarity index 100% rename from src/views/modules/code/producarrt-add-or-update.vue rename to src/views/modules/monitoring/producarrt-add-or-update.vue diff --git a/src/views/modules/code/product-add-or-update.vue b/src/views/modules/monitoring/product-add-or-update.vue similarity index 100% rename from src/views/modules/code/product-add-or-update.vue rename to src/views/modules/monitoring/product-add-or-update.vue diff --git a/src/views/modules/code/product.vue b/src/views/modules/monitoring/product.vue similarity index 98% rename from src/views/modules/code/product.vue rename to src/views/modules/monitoring/product.vue index a0a7e6a..9b82013 100644 --- a/src/views/modules/code/product.vue +++ b/src/views/modules/monitoring/product.vue @@ -205,8 +205,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/productionLine.vue b/src/views/modules/monitoring/productionLine.vue similarity index 98% rename from src/views/modules/code/productionLine.vue rename to src/views/modules/monitoring/productionLine.vue index dc2d14b..6ca2df8 100644 --- a/src/views/modules/code/productionLine.vue +++ b/src/views/modules/monitoring/productionLine.vue @@ -193,8 +193,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/productionLineRecSch.vue b/src/views/modules/monitoring/productionLineRecSch.vue similarity index 98% rename from src/views/modules/code/productionLineRecSch.vue rename to src/views/modules/monitoring/productionLineRecSch.vue index 2686fa8..8d18e9b 100644 --- a/src/views/modules/code/productionLineRecSch.vue +++ b/src/views/modules/monitoring/productionLineRecSch.vue @@ -133,8 +133,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/productionline-add-or-update.vue b/src/views/modules/monitoring/productionline-add-or-update.vue similarity index 100% rename from src/views/modules/code/productionline-add-or-update.vue rename to src/views/modules/monitoring/productionline-add-or-update.vue diff --git a/src/views/modules/code/productionlinerecsch-add-or-update.vue b/src/views/modules/monitoring/productionlinerecsch-add-or-update.vue similarity index 100% rename from src/views/modules/code/productionlinerecsch-add-or-update.vue rename to src/views/modules/monitoring/productionlinerecsch-add-or-update.vue diff --git a/src/views/modules/code/qualityInspectionDet.vue b/src/views/modules/monitoring/qualityInspectionDet.vue similarity index 98% rename from src/views/modules/code/qualityInspectionDet.vue rename to src/views/modules/monitoring/qualityInspectionDet.vue index 5337802..e5a8f36 100644 --- a/src/views/modules/code/qualityInspectionDet.vue +++ b/src/views/modules/monitoring/qualityInspectionDet.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/qualityInspectionRecord.vue b/src/views/modules/monitoring/qualityInspectionRecord.vue similarity index 98% rename from src/views/modules/code/qualityInspectionRecord.vue rename to src/views/modules/monitoring/qualityInspectionRecord.vue index 2645646..78ac7d7 100644 --- a/src/views/modules/code/qualityInspectionRecord.vue +++ b/src/views/modules/monitoring/qualityInspectionRecord.vue @@ -193,8 +193,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/qualityInspectionType.vue b/src/views/modules/monitoring/qualityInspectionType.vue similarity index 98% rename from src/views/modules/code/qualityInspectionType.vue rename to src/views/modules/monitoring/qualityInspectionType.vue index 7f9db54..7f72212 100644 --- a/src/views/modules/code/qualityInspectionType.vue +++ b/src/views/modules/monitoring/qualityInspectionType.vue @@ -157,8 +157,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/qualityinspectiondet-add-or-update.vue b/src/views/modules/monitoring/qualityinspectiondet-add-or-update.vue similarity index 100% rename from src/views/modules/code/qualityinspectiondet-add-or-update.vue rename to src/views/modules/monitoring/qualityinspectiondet-add-or-update.vue diff --git a/src/views/modules/code/qualityinspectionrecord-add-or-update.vue b/src/views/modules/monitoring/qualityinspectionrecord-add-or-update.vue similarity index 100% rename from src/views/modules/code/qualityinspectionrecord-add-or-update.vue rename to src/views/modules/monitoring/qualityinspectionrecord-add-or-update.vue diff --git a/src/views/modules/code/qualityinspectiontype-add-or-update.vue b/src/views/modules/monitoring/qualityinspectiontype-add-or-update.vue similarity index 100% rename from src/views/modules/code/qualityinspectiontype-add-or-update.vue rename to src/views/modules/monitoring/qualityinspectiontype-add-or-update.vue diff --git a/src/views/modules/code/reporsheecategory-add-or-update.vue b/src/views/modules/monitoring/reporsheecategory-add-or-update.vue similarity index 100% rename from src/views/modules/code/reporsheecategory-add-or-update.vue rename to src/views/modules/monitoring/reporsheecategory-add-or-update.vue diff --git a/src/views/modules/code/reporsheet-add-or-update.vue b/src/views/modules/monitoring/reporsheet-add-or-update.vue similarity index 100% rename from src/views/modules/code/reporsheet-add-or-update.vue rename to src/views/modules/monitoring/reporsheet-add-or-update.vue diff --git a/src/views/modules/code/reportSheet.vue b/src/views/modules/monitoring/reportSheet.vue similarity index 98% rename from src/views/modules/code/reportSheet.vue rename to src/views/modules/monitoring/reportSheet.vue index 33ad3a9..c0bd632 100644 --- a/src/views/modules/code/reportSheet.vue +++ b/src/views/modules/monitoring/reportSheet.vue @@ -193,8 +193,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/reportSheetCategory.vue b/src/views/modules/monitoring/reportSheetCategory.vue similarity index 98% rename from src/views/modules/code/reportSheetCategory.vue rename to src/views/modules/monitoring/reportSheetCategory.vue index 55e4919..36f15c9 100644 --- a/src/views/modules/code/reportSheetCategory.vue +++ b/src/views/modules/monitoring/reportSheetCategory.vue @@ -175,8 +175,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/sysfile-add-or-update.vue b/src/views/modules/monitoring/sysfile-add-or-update.vue similarity index 100% rename from src/views/modules/code/sysfile-add-or-update.vue rename to src/views/modules/monitoring/sysfile-add-or-update.vue diff --git a/src/views/modules/code/sysfile.vue b/src/views/modules/monitoring/sysfile.vue similarity index 98% rename from src/views/modules/code/sysfile.vue rename to src/views/modules/monitoring/sysfile.vue index 2f44666..806521a 100644 --- a/src/views/modules/code/sysfile.vue +++ b/src/views/modules/monitoring/sysfile.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/sysfileType.vue b/src/views/modules/monitoring/sysfileType.vue similarity index 98% rename from src/views/modules/code/sysfileType.vue rename to src/views/modules/monitoring/sysfileType.vue index ffd731b..030ffec 100644 --- a/src/views/modules/code/sysfileType.vue +++ b/src/views/modules/monitoring/sysfileType.vue @@ -157,8 +157,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/sysfiletype-add-or-update.vue b/src/views/modules/monitoring/sysfiletype-add-or-update.vue similarity index 100% rename from src/views/modules/code/sysfiletype-add-or-update.vue rename to src/views/modules/monitoring/sysfiletype-add-or-update.vue diff --git a/src/views/modules/code/workShopSection.vue b/src/views/modules/monitoring/workShopSection.vue similarity index 98% rename from src/views/modules/code/workShopSection.vue rename to src/views/modules/monitoring/workShopSection.vue index 88cd837..ed21e91 100644 --- a/src/views/modules/code/workShopSection.vue +++ b/src/views/modules/monitoring/workShopSection.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/workShopSectionEquipment.vue b/src/views/modules/monitoring/workShopSectionEquipment.vue similarity index 98% rename from src/views/modules/code/workShopSectionEquipment.vue rename to src/views/modules/monitoring/workShopSectionEquipment.vue index 226f88b..1b85807 100644 --- a/src/views/modules/code/workShopSectionEquipment.vue +++ b/src/views/modules/monitoring/workShopSectionEquipment.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/workshopsection-add-or-update.vue b/src/views/modules/monitoring/workshopsection-add-or-update.vue similarity index 100% rename from src/views/modules/code/workshopsection-add-or-update.vue rename to src/views/modules/monitoring/workshopsection-add-or-update.vue diff --git a/src/views/modules/code/workshopsectionequipment-add-or-update.vue b/src/views/modules/monitoring/workshopsectionequipment-add-or-update.vue similarity index 100% rename from src/views/modules/code/workshopsectionequipment-add-or-update.vue rename to src/views/modules/monitoring/workshopsectionequipment-add-or-update.vue diff --git a/src/views/pages/login.vue b/src/views/pages/login.vue index fedc0f2..2c7919c 100644 --- a/src/views/pages/login.vue +++ b/src/views/pages/login.vue @@ -1,28 +1,28 @@ - - - - - {{ $t('brand.lg') }} - - - {{ $t('login.title') }} - - - - - - - - - - - - - - - - - - {{ $t('login.title') }} - - - - - - - + + {{ $t('login.title') }} + + + + + + +