From dfb7cf29cba115691424713de221c2f2969ff45e Mon Sep 17 00:00:00 2001
From: fanluyan <754122931@qq.com>
Date: Wed, 20 Dec 2023 13:50:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B4=BB=E5=8A=A8=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/activityList/index.vue            | 29 ++++++++++++++++++++-
 src/views/homePage/components/tableMain.vue | 19 ++++++++++++++
 src/views/report/index.vue                  |  9 +++++++
 src/views/upgradation/index.vue             | 17 +++++++-----
 4 files changed, 66 insertions(+), 8 deletions(-)

diff --git a/src/views/activityList/index.vue b/src/views/activityList/index.vue
index 4702d77..26f2c23 100644
--- a/src/views/activityList/index.vue
+++ b/src/views/activityList/index.vue
@@ -77,7 +77,12 @@
       :close-on-click-modal="false"
       width="50%"
     >
+      <el-button class="exportBtn" type="primary" @click="handleExport"
+        >导出活动列表</el-button
+      >
       <el-table
+        ref="activityTable"
+        id="activityTable"
         :data="termsData"
         style="width: 100%"
         :header-cell-style="{ 'text-align': 'center' }"
@@ -106,7 +111,9 @@
 </template>
 <script>
 import { updActivityApi, getqueryActivityApi } from "@/utils/api/index";
-
+import htmlToExcel from "@/utils/htmlToExcel";
+import { saveAs } from "file-saver";
+import XLSX from "xlsx";
 export default {
   name: "activity",
   components: {},
@@ -142,6 +149,10 @@ export default {
     this.getactivityList();
   },
   methods: {
+    //导出活动列表表格
+    handleExport() {
+      htmlToExcel.getExcel("#activityTable", "设备活动列表");
+    },
     //获取活动列表
     getactivityList() {
       this.activityloading = true;
@@ -310,9 +321,25 @@ export default {
       top: 50%;
       transform: translate(-50%, -50%);
     }
+    .exportBtn {
+      position: absolute;
+      z-index: 1;
+      top: 16px;
+      right: 66px;
+    }
+
     .el-dialog__body {
       padding: 12px;
     }
   }
 }
+.el-dialog__headerbtn {
+  top: 18px;
+  .el-dialog__close {
+    font-size: 26px;
+    &:hover {
+      background: #e2e2e2;
+    }
+  }
+}
 </style>
diff --git a/src/views/homePage/components/tableMain.vue b/src/views/homePage/components/tableMain.vue
index 2ced4f9..2483336 100644
--- a/src/views/homePage/components/tableMain.vue
+++ b/src/views/homePage/components/tableMain.vue
@@ -98,6 +98,9 @@
       </el-table-column>
       <el-table-column label="运维" prop="in_maintain" width="100" sortable>
         <template slot="header" slot-scope="scope">
+          <p :class="ywNumber != 0 ? 'redClass' : 'noClass'">
+            {{ ywNumber }}<span> / {{ tableData.length }}</span>
+          </p>
           <span @click.stop>
             <el-checkbox
               v-model="checkAllYW"
@@ -123,6 +126,9 @@
       </el-table-column>
       <el-table-column label="快心跳" prop="quick_hb" width="108" sortable>
         <template slot="header" slot-scope="scope">
+          <p :class="ywNumber != 0 ? 'redClass' : 'noClass'">
+            {{ kxtNumber }}<span> / {{ tableData.length }}</span>
+          </p>
           <span @click.stop>
             <el-checkbox
               v-model="checkAllKXT"
@@ -1528,6 +1534,19 @@ export default {
     th.el-table__cell {
       background: #d3d3d3;
     }
+    .noClass {
+      color: #333;
+      font-size: 12px;
+      line-height: 12px;
+    }
+    .redClass {
+      color: red;
+      font-weight: 700;
+      line-height: 12px;
+      span {
+        color: #333;
+      }
+    }
     thead.is-group th.el-table__cell {
       background: #d3d3d3;
     }
diff --git a/src/views/report/index.vue b/src/views/report/index.vue
index 9f6d1b8..f2665e3 100644
--- a/src/views/report/index.vue
+++ b/src/views/report/index.vue
@@ -580,4 +580,13 @@ export default {
     }
   }
 }
+.el-dialog__headerbtn {
+  top: 18px;
+  .el-dialog__close {
+    font-size: 26px;
+    &:hover {
+      background: #e2e2e2;
+    }
+  }
+}
 </style>
diff --git a/src/views/upgradation/index.vue b/src/views/upgradation/index.vue
index 5bd061f..f01d2d0 100644
--- a/src/views/upgradation/index.vue
+++ b/src/views/upgradation/index.vue
@@ -188,13 +188,7 @@ export default {
               });
               this.getUpgradeList();
             })
-            .catch(() => {
-              this.$message({
-                type: "info",
-                showClose: true,
-                message: "已取消删除",
-              });
-            });
+            .catch(() => {});
         })
         .catch((err) => {});
     },
@@ -314,4 +308,13 @@ export default {
     }
   }
 }
+.el-dialog__headerbtn {
+  top: 18px;
+  .el-dialog__close {
+    font-size: 26px;
+    &:hover {
+      background: #e2e2e2;
+    }
+  }
+}
 </style>