From 63a5c3ff0e4a27b4e296c1cf6deaacbbd8f3c1cd Mon Sep 17 00:00:00 2001
From: zhaohy <1695786511@qq.com>
Date: Mon, 2 Sep 2024 14:05:59 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=20=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../view/equipmentControl/electricDoor/index.vue   | 10 +--
 .../src/view/equipmentControl/liftSystem/index.vue |  2 +
 .../view/equipmentControl/liftSystem/liftPage.vue  | 93 +++++++++++++++-------
 lib/component/form/form/form.vue                   |  2 +-
 4 files changed, 73 insertions(+), 34 deletions(-)

diff --git a/hx-ai-intelligent/src/view/equipmentControl/electricDoor/index.vue b/hx-ai-intelligent/src/view/equipmentControl/electricDoor/index.vue
index 7ee3954..6216663 100644
--- a/hx-ai-intelligent/src/view/equipmentControl/electricDoor/index.vue
+++ b/hx-ai-intelligent/src/view/equipmentControl/electricDoor/index.vue
@@ -20,7 +20,7 @@
           class="door-box-item"
           :style="{
             'background-color': { '0': 'rgba(191, 205, 226, 1)', '1': '#0dffa4', '2': '#ffbc46' }[
-              item.record.EGstRu
+              item?.record?.EGstRu
             ],
           }">
           {{ item.deviceInfoName }}
@@ -43,7 +43,7 @@
           class="door-box-item"
           :style="{
             'background-color': { '0': 'rgba(191, 205, 226, 1)', '1': '#0dffa4', '2': '#ffbc46' }[
-              item.record.EGstRu
+              item?.record?.EGstRu
             ],
           }">
           {{ item.deviceInfoName }}
@@ -81,14 +81,14 @@
                             '0': 'rgba(191, 205, 226, 1)',
                             '1': 'rgba(0, 255, 210, 1)',
                             '2': 'rgba(255, 188, 70, 1)',
-                          }[record.record.EGstRu],
+                          }[record?.record?.EGstRu],
                         color: {
                           '0': 'rgba(191, 205, 226, 1)',
                           '1': 'rgba(0, 255, 210, 1)',
                           '2': 'rgba(255, 188, 70, 1)',
-                        }[record.record.EGstRu],
+                        }[record?.record?.EGstRu],
                       }">
-                      {{ record.record.runMode.label }}
+                      {{ record.record?.runMode?.label }}
                     </a-tag>
                   </template>
                   <template v-if="column.dataIndex === 'time'">
diff --git a/hx-ai-intelligent/src/view/equipmentControl/liftSystem/index.vue b/hx-ai-intelligent/src/view/equipmentControl/liftSystem/index.vue
index 8477cf9..d8ef1f8 100644
--- a/hx-ai-intelligent/src/view/equipmentControl/liftSystem/index.vue
+++ b/hx-ai-intelligent/src/view/equipmentControl/liftSystem/index.vue
@@ -139,6 +139,8 @@
   }
   :deep(.ant-tabs-tab.ant-tabs-tab-active .ant-tabs-tab-btn) {
     color: white !important;
+    font-size: 16px;
+    font-weight: 700;
   }
   :deep(.ant-tabs-ink-bar) {
     background: linear-gradient(180deg, rgba(86, 221, 253, 1) 0%, rgba(25, 176, 255, 1) 100%);
diff --git a/hx-ai-intelligent/src/view/equipmentControl/liftSystem/liftPage.vue b/hx-ai-intelligent/src/view/equipmentControl/liftSystem/liftPage.vue
index 5eaf62c..834c160 100644
--- a/hx-ai-intelligent/src/view/equipmentControl/liftSystem/liftPage.vue
+++ b/hx-ai-intelligent/src/view/equipmentControl/liftSystem/liftPage.vue
@@ -25,47 +25,53 @@
         :columns="column"
         :loading="loading"
         :data-source="dataSource"
-        :pagination="pagination">
+        :pagination="pagination"
+        :bordered="true"
+        :rowClassName="
+          () => {
+            return 'rowClass';
+          }
+        ">
         <template #bodyCell="{ record, column }">
           <template v-if="column.dataIndex === 'switch'">
             <a-tag
-              style="background-color: rgba(0, 0, 0, 0.5); width: 50px"
+              style="background-color: rgba(0, 0, 0, 0.5); width: 50px; border-radius: 2px"
               :style="{
                 border: {
                   '1': '1px solid rgba(0, 255, 210, 1)', //2
                   '0': '1px solid rgba(191, 205, 226, 1)', //关闭
-                }[record.switchStatus.value],
+                }[record?.switchStatus?.value],
                 color: {
                   '1': 'rgba(0, 255, 210, 1)', //正常
                   '0': 'rgba(191, 205, 226, 1)', //关闭
-                }[record.switchStatus.value],
+                }[record?.switchStatus?.value],
               }"
-              >{{ { '1': '开启', '0': '关闭' }[record.switchStatus.value] }}</a-tag
+              >{{ { '1': '开启', '0': '关闭' }[record?.switchStatus?.value] }}</a-tag
             >
           </template>
           <template v-if="column.dataIndex === 'state'">
             <a-tag
-              style="background-color: rgba(0, 0, 0, 0.5); width: 50px"
+              style="background-color: rgba(0, 0, 0, 0.5); width: 50px; border-radius: 2px"
               :style="{
                 border: {
                   '0': '1px solid rgba(0, 255, 210, 1)', //正常
                   '1': '1px solid rgba(255, 118, 54, 1)', //故障
                   '2': '1px solid rgba(255, 188, 70, 1)', //维修
                   '3': '1px solid rgba(243, 97, 99, 1)', //告警
-                }[record.runStatus.value],
+                }[record?.runStatus?.value],
                 color: {
                   '0': 'rgba(0, 255, 210, 1)', //正常
                   '1': 'rgba(255, 118, 54, 1)', //故障
                   '2': 'rgba(255, 188, 70, 1)', //维修
                   '3': 'rgba(243, 97, 99, 1)', //告警
-                }[record.runStatus.value],
+                }[record?.runStatus?.value],
               }"
-              >{{ record.runStatus.label }}</a-tag
+              >{{ record?.runStatus?.label }}</a-tag
             >
           </template>
           <template v-if="column.dataIndex === 'lift'">
             <a-tag
-              style="background-color: rgba(0, 0, 0, 0.5); width: 50px"
+              style="background-color: rgba(0, 0, 0, 0.5); width: 50px; border-radius: 2px"
               :style="{
                 border: {
                   '0': '1px solid rgba(0, 255, 210, 1)', //上行
@@ -73,16 +79,16 @@
                   '2': '1px solid rgba(255, 188, 70, 1)', //暂停
                   '3': '1px solid rgba(243, 97, 99, 1)', //急停
                   '4': '1px solid rgba(167, 66, 255, 1)', //未知
-                }[record.runMode.value],
+                }[record?.runMode?.value],
                 color: {
                   '0': 'rgba(0, 255, 210, 1)', //上行
                   '1': 'rgba(0, 255, 210, 1)', //下行
                   '2': 'rgba(255, 188, 70, 1)', //暂停
                   '3': 'rgba(243, 97, 99, 1)', //急停
                   '4': 'rgba(167, 66, 255, 1)', //未知
-                }[record.runMode.value],
+                }[record?.runMode?.value],
               }"
-              >{{ record.runMode.label }}</a-tag
+              >{{ record?.runMode?.label }}</a-tag
             >
           </template>
         </template>
@@ -191,16 +197,16 @@
   }
   :deep(.ant-table-thead > tr > th) {
     background-color: #1a2230;
-    border: 1px solid rgba(163, 192, 243, 0.8);
+    // border: 1px solid rgba(163, 192, 243, 0.8);
     color: white;
     text-align: center;
-    font-weight: normal !important;
     padding: 12px !important;
+    font-weight: 600;
   }
   :deep(.ant-table-tbody > tr > td) {
     background-color: rgba(0, 0, 0, 0.9) !important;
     color: white;
-    border: 1px solid rgba(163, 192, 243, 0.8);
+    // border: 1px solid rgba(163, 192, 243, 0.8);
     text-align: center;
     padding: 12px !important;
   }
@@ -243,18 +249,18 @@
   :deep(.anticon) {
     color: rgba(12, 140, 246, 1) !important;
   }
-  :deep(.ant-table-pagination) {
-    display: flex;
-    position: absolute;
-    bottom: 0;
-    right: 0;
-  }
-  :deep(.ant-spin-container) {
-    height: 95% !important;
-  }
-  :deep(.ant-spin-nested-loading) {
-    height: 95% !important;
-  }
+  // :deep(.ant-table-pagination) {
+  //   display: flex;
+  //   position: absolute;
+  //   bottom: 0;
+  //   right: 0;
+  // }
+  // :deep(.ant-spin-container) {
+  //   height: 95% !important;
+  // }
+  // :deep(.ant-spin-nested-loading) {
+  //   height: 95% !important;
+  // }
   //分页 在右边 取消
   // :deep(.ant-table-pagination-right) {
   //   justify-content: normal !important;
@@ -283,4 +289,35 @@
   :deep(.ant-empty-description) {
     color: white !important;
   }
+  :deep(.rowClass > td) {
+    border-right: 1px solid #abd1f5 !important;
+    border-bottom: 1px solid #abd1f5 !important;
+  }
+
+  :deep(.rowClass > td:first-child) {
+    border-bottom: 1px solid #abd1f5 !important;
+  }
+  :deep(.ant-table-thead > tr > th) {
+    border-bottom: 1px solid #abd1f5 !important;
+  }
+  :deep(.ant-table.ant-table-bordered > .ant-table-container) {
+    border-left: 1px solid #abd1f5 !important;
+  }
+  :deep(
+      .ant-table.ant-table-bordered
+        > .ant-table-container
+        > .ant-table-content
+        > table
+        > thead
+        > tr
+        > th
+    ) {
+    border-right: 1px solid #abd1f5 !important;
+  }
+  :deep(
+      .ant-table.ant-table-bordered > .ant-table-container > .ant-table-content > table,
+      .ant-table.ant-table-bordered > .ant-table-container > .ant-table-header > table
+    ) {
+    border-top: 1px solid #abd1f5 !important;
+  }
 </style>
diff --git a/lib/component/form/form/form.vue b/lib/component/form/form/form.vue
index ef5936e..8e7d703 100644
--- a/lib/component/form/form/form.vue
+++ b/lib/component/form/form/form.vue
@@ -48,7 +48,7 @@
         :span="getFormClass.span" />
       <a-col v-if="showAction" :span="getFormClass.span" class="ns-operate">
         <a-button @click="reset">重置</a-button>
-        <a-button type="primary" html-type="submit" :loading="loading">搜索</a-button>
+        <a-button type="primary" html-type="submit" :loading="loading">查询</a-button>
         <a-button
           type="link"
           class="ns-operate-expand"