From f9c01ec7e59bb37888b3833f6f1e1d2bc891daea Mon Sep 17 00:00:00 2001
From: liuhr <liuhr@taisoft.com.cn>
Date: Tue, 31 Oct 2023 09:56:41 +0800
Subject: [PATCH] =?UTF-8?q?[FEAT]:=201.=E8=B0=83=E6=95=B4=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E7=AE=A1=E7=90=86=E5=88=86=E9=A1=B5=E5=88=97=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 PVDEMCSUI/src/Utils/helper.ts           | 3 +++
 PVDEMCSUI/src/pages/equipment/index.vue | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/PVDEMCSUI/src/Utils/helper.ts b/PVDEMCSUI/src/Utils/helper.ts
index c614abb..e3bab19 100644
--- a/PVDEMCSUI/src/Utils/helper.ts
+++ b/PVDEMCSUI/src/Utils/helper.ts
@@ -427,6 +427,9 @@ export default class helper {
       case 'Alarm':
         textStatus = '报警';
         break;
+      default:
+        textStatus = '';
+        break;
     }
     return textStatus;
   };
diff --git a/PVDEMCSUI/src/pages/equipment/index.vue b/PVDEMCSUI/src/pages/equipment/index.vue
index 3943f5f..5de4570 100644
--- a/PVDEMCSUI/src/pages/equipment/index.vue
+++ b/PVDEMCSUI/src/pages/equipment/index.vue
@@ -62,7 +62,8 @@
                                     <q-td style="font-size: 16px;" key="state" :props="props">{{ helper.getEquipmentState(
                                         props.row.state)
                                     }}</q-td>
-                                    <q-td style="font-size: 16px;" key="activated" :props="props">{{ props.row.activated
+                                    <q-td style="font-size: 16px;" key="activated" :props="props">{{ props.row.activated ==
+                                        true ? '是' : '否'
                                     }}</q-td>
                                     <q-td style="font-size: 16px;" key="remark" :props="props">{{ props.row.remark }}</q-td>
                                     <q-td key="action" :props="props" style="width: 100px">
@@ -132,7 +133,6 @@ const columns = ref([
     },
     { name: 'equipmentName', align: 'center', label: '设备名称', field: 'equipmentName', headerStyle: 'background-color: #5186ec;color: white;font-weight: bold;font-size:20px;' },
     { name: 'equipmentType', align: 'center', label: '设备类型', field: 'equipmentType', headerStyle: 'background-color: #5186ec;color: white;font-weight: bold;font-size:20px;' },
-    { name: 'configType', align: 'center', label: '是否系统内置', field: 'configType', headerStyle: 'background-color: #5186ec;color: white;font-weight: bold;font-size:20px;' },
     { name: 'state', align: 'center', label: '设备状态', field: 'state', headerStyle: 'background-color: #5186ec;color: white;font-weight: bold;font-size:20px;' },
     { name: 'activated', align: 'center', label: '设备启停用', field: 'activated', headerStyle: 'background-color: #5186ec;color: white;font-weight: bold;font-size:20px;' },
     { name: 'remark', align: 'center', label: '备注', field: 'remark', headerStyle: 'background-color: #5186ec;color: white;font-weight: bold;font-size:20px;' },