From 7f14feea8adca8cddf9673b4f80e9ae6cfc8c166 Mon Sep 17 00:00:00 2001
From: fanluyan <754122931@qq.com>
Date: Mon, 25 Dec 2023 09:35:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E5=8D=93=E9=87=8D=E5=90=AF=E6=96=87?=
 =?UTF-8?q?=E5=AD=97=E6=94=B9=E4=B8=BA=E9=87=8D=E5=90=AF=E8=AE=BE=E5=A4=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/activityList/index.vue            | 8 ++++++--
 src/views/homePage/components/tableMain.vue | 8 ++++----
 src/views/report/index.vue                  | 4 ++--
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/views/activityList/index.vue b/src/views/activityList/index.vue
index 26f2c23..e3a3316 100644
--- a/src/views/activityList/index.vue
+++ b/src/views/activityList/index.vue
@@ -48,7 +48,11 @@
           width="180"
         ></el-table-column>
         <el-table-column prop="title" label="活动名称"> </el-table-column>
-        <el-table-column prop="termCount" label="装置数量"> </el-table-column>
+        <el-table-column prop="termCount" label="装置数量">
+          <template slot-scope="scope">
+            {{ scope.row.termCount }}
+          </template>
+        </el-table-column>
         <!-- <el-table-column prop="path" label="文件路径"> </el-table-column> -->
         <el-table-column label="操作" width="300" class-name="editClass">
           <template slot-scope="scope">
@@ -180,7 +184,7 @@ export default {
           console.log(res);
           this.termsLoading = false;
           this.activityName =
-            res.data.activity.title + "(" + res.data.activity.termCount + ")";
+            res.data.activity.title + "(" + res.data.terms.length + ")";
           this.termsData = res.data.terms;
         })
         .catch((err) => {});
diff --git a/src/views/homePage/components/tableMain.vue b/src/views/homePage/components/tableMain.vue
index 2483336..e2c15b5 100644
--- a/src/views/homePage/components/tableMain.vue
+++ b/src/views/homePage/components/tableMain.vue
@@ -107,7 +107,7 @@
               @change="handlecheckAllYW"
               :class="
                 (ywNumber == tableData.length && tableData.length != 0) ||
-                (ywNumber == 0 && tableData.length == 0)
+                ywNumber == 0
                   ? ''
                   : 'is-indeterminate'
               "
@@ -126,7 +126,7 @@
       </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'">
+          <p :class="kxtNumber != 0 ? 'redClass' : 'noClass'">
             {{ kxtNumber }}<span> / {{ tableData.length }}</span>
           </p>
           <span @click.stop>
@@ -135,7 +135,7 @@
               @change="handlecheckAllKXT"
               :class="
                 (kxtNumber == tableData.length && tableData.length != 0) ||
-                (kxtNumber == 0 && tableData.length == 0)
+                kxtNumber == 0
                   ? ''
                   : 'is-indeterminate'
               "
@@ -770,7 +770,7 @@ export default {
       MCUcheck: false,
       //运维操作列表
       operateOptions: [
-        { id: 1, name: "安卓重启" },
+        { id: 1, name: "重启设备" },
         { id: 2, name: "MCU单片机重启" },
         { id: 3, name: "设置I1服务器" },
         // { id: 4, name: "设置运维服务器" },
diff --git a/src/views/report/index.vue b/src/views/report/index.vue
index f2665e3..1e27981 100644
--- a/src/views/report/index.vue
+++ b/src/views/report/index.vue
@@ -160,7 +160,7 @@ export default {
       commandShow: false,
       deveceMsg: "",
       cmdCn: {
-        yw_cmd_android_reboot: "安卓重启",
+        yw_cmd_android_reboot: "重启设备",
         yw_cmd_mcu_reboot: "MCU单片机重启",
         i1_cmd_set_i1_server_ip_port: "设置I1服务器",
         i1_cmd_set_xy_yw_ip_port: "设置运维服务器",
@@ -177,7 +177,7 @@ export default {
       //运维操作列表
       operateOptions: [
         { id: 0, name: "全部" },
-        { id: 1, name: "安卓重启" },
+        { id: 1, name: "重启设备" },
         { id: 2, name: "MCU单片机重启" },
         { id: 3, name: "设置I1服务器" },
         // { id: 4, name: "设置运维服务器" },