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 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + +