diff --git a/src/components/Audit.vue b/src/components/Audit.vue index d5150b1..26fcf15 100644 --- a/src/components/Audit.vue +++ b/src/components/Audit.vue @@ -68,6 +68,14 @@ @current-change="handleCurrentPageChange" /> + +
+
+ +

加载中

+
+
+
@@ -83,11 +91,13 @@ const auditStore = useAuditStore() onMounted(() => { // 读取全部审计记录 需要分页 webSocketStore.sendCommandMsg(getUserBehaviorRecordDescJSON(0, 6)) + auditStore.updateAuditLoading(true) }) const handleCurrentPageChange = page => { auditStore.updatePage(page - 1) webSocketStore.sendCommandMsg(getUserBehaviorRecordDescJSON(page - 1, 6)) + auditStore.updateAuditLoading(true) } @@ -167,4 +177,29 @@ const handleCurrentPageChange = page => { justify-content: flex-end; } } +.wrapper { + display: flex; + align-items: center; + justify-content: center; + height: 100%; +} +.block { + width: 120px; + height: 120px; + display: flex; + flex-direction: column; + padding: 16px; + align-items: center; + justify-content: center; + .shutdown_text { + margin-top: 24px; + font-family: Source Han Sans CN; + font-size: 18px; + font-weight: normal; + line-height: normal; + letter-spacing: 0.06em; + color: #fff; + white-space: nowrap; + } +} diff --git a/src/components/Progress.vue b/src/components/Progress.vue index 7991d0c..444c7c7 100644 --- a/src/components/Progress.vue +++ b/src/components/Progress.vue @@ -98,7 +98,11 @@ {{ (deviceStore.targetlog - (deviceStore.nowlog || 0)).toFixed(2) < 0 ? 0 - : (deviceStore.targetlog - (deviceStore.nowlog || 0)).toFixed(2) + : Math.abs( + (deviceStore.targetlog - (deviceStore.nowlog || 0)).toFixed( + 2, + ), + ) }}log

diff --git a/src/store/modules/audit.js b/src/store/modules/audit.js index dab0756..459a151 100644 --- a/src/store/modules/audit.js +++ b/src/store/modules/audit.js @@ -8,10 +8,14 @@ export const useAuditStore = defineStore({ totalPage: 0, total: 0, page: 1, + auditLoading: false, } }, // actions actions: { + updateAuditLoading(auditLoading) { + this.auditLoading = auditLoading + }, updateTotalPage(totalPage) { this.totalPage = totalPage }, diff --git a/src/store/modules/websocket.js b/src/store/modules/websocket.js index fa7ab11..03980a9 100644 --- a/src/store/modules/websocket.js +++ b/src/store/modules/websocket.js @@ -220,6 +220,7 @@ export const useWebSocketStore = defineStore({ auditStore.updateTotalPage(totalpage) auditStore.updateTotal(total) auditStore.updatePage(page) + auditStore.updateAuditLoading(false) break case 'getDisinfectionConfig': const { disinfectionConfig } = JSON.parse(ev.data)