From b531a4f47c4dcd9b77747b838fab1b61f42a6441 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9C=E7=AC=99=E6=AD=8C?= <2277317060@qq.com>
Date: Sat, 12 Oct 2024 16:35:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/components/BoardTopNav/index.vue |  3 ++-
 ruoyi-ui/src/components/Pagination/index.vue  | 10 +++++-----
 ruoyi-ui/src/views/board/equipment/index.vue  |  5 +++--
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/ruoyi-ui/src/components/BoardTopNav/index.vue b/ruoyi-ui/src/components/BoardTopNav/index.vue
index fbddbf9..bf27cc8 100644
--- a/ruoyi-ui/src/components/BoardTopNav/index.vue
+++ b/ruoyi-ui/src/components/BoardTopNav/index.vue
@@ -187,7 +187,8 @@ export default {
     },
     async toEquipmentRecord() {
       this.dialogTableVisible = true
-      const data = await getRedisFile(this.$store.getters.tenantId)
+      const data = await getRedisFile(this.$store.getters.tenantId) || {}
+      console.log(data)
       this.tableData = JSON.parse(data.content)
       this.tableTh = Object.keys(data.Header).map(e => data.Header[e])
     },
diff --git a/ruoyi-ui/src/components/Pagination/index.vue b/ruoyi-ui/src/components/Pagination/index.vue
index 56f5a6b..9ec3e48 100644
--- a/ruoyi-ui/src/components/Pagination/index.vue
+++ b/ruoyi-ui/src/components/Pagination/index.vue
@@ -16,7 +16,7 @@
 </template>
 
 <script>
-import { scrollTo } from '@/utils/scroll-to'
+import {scrollTo} from '@/utils/scroll-to'
 
 export default {
   name: 'Pagination',
@@ -62,8 +62,7 @@ export default {
     }
   },
   data() {
-    return {
-    };
+    return {};
   },
   computed: {
     currentPage: {
@@ -88,13 +87,13 @@ export default {
       if (this.currentPage * val > this.total) {
         this.currentPage = 1
       }
-      this.$emit('pagination', { page: this.currentPage, limit: val })
+      this.$emit('pagination', {page: this.currentPage, limit: val})
       if (this.autoScroll) {
         scrollTo(0, 800)
       }
     },
     handleCurrentChange(val) {
-      this.$emit('pagination', { page: val, limit: this.pageSize })
+      this.$emit('pagination', {page: val, limit: this.pageSize})
       if (this.autoScroll) {
         scrollTo(0, 800)
       }
@@ -108,6 +107,7 @@ export default {
   background: #fff;
   padding: 32px 16px;
 }
+
 .pagination-container.hidden {
   display: none;
 }
diff --git a/ruoyi-ui/src/views/board/equipment/index.vue b/ruoyi-ui/src/views/board/equipment/index.vue
index ae955a6..970499a 100644
--- a/ruoyi-ui/src/views/board/equipment/index.vue
+++ b/ruoyi-ui/src/views/board/equipment/index.vue
@@ -154,7 +154,7 @@
           width="180">
           <template slot-scope="scope">
             <div v-if="historyTh[i] === '时间'">{{ parseTime(scope.row['ts']) }}</div>
-            <div v-else>{{ scope.row[historyTh[i]] }}</div>
+            <div v-else>{{ scope.row[i] }}</div>
           </template>
         </el-table-column>
       </el-table>
@@ -495,14 +495,15 @@ export default {
               }]
             }
           })
+          console.log(chartData)
           let series = Object.keys(chartData).map(e => {
             return {
               name: (this.propArr.find(item => item.id === parseFloat(e)) || {}).name,
               type: 'line',
-              stack: 'Total',
               data: chartData[e]
             }
           })
+          console.log(series)
           this.$refs.chart.setData({
             tooltip: {
               trigger: 'axis'