From 93363c7550530cdceba956b1240a417484f9dd12 Mon Sep 17 00:00:00 2001
From: zhaohy <1695786511@qq.com>
Date: Fri, 16 Aug 2024 14:38:06 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9ui?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../energyAlarm/configureEnergyAlarms.vue     |  1 +
 .../equipmentAlarm/configureDeviceAlarms.vue  |  1 +
 .../linkPeople/index.vue                      |  4 +-
 .../alarmSettings/ts/energyAlarmConfig.ts     |  1 +
 .../alarmSettings/ts/equipmentAlarmConfig.ts  |  1 +
 .../ts/notificationManagementConfig.ts        |  1 +
 .../equipmentControl/electricDoor/index.vue   | 82 +++++++++++++------
 .../equipmentControl/electricDoor/tables.vue  | 13 +--
 8 files changed, 72 insertions(+), 32 deletions(-)

diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/configureEnergyAlarms.vue b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/configureEnergyAlarms.vue
index 966b7ca..0ee568d 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/configureEnergyAlarms.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/configureEnergyAlarms.vue
@@ -168,6 +168,7 @@
                 return text.index + 1;
               },
               width: 80,
+              fixed: 'left',
             },
             {
               title: '规则id',
diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/configureDeviceAlarms.vue b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/configureDeviceAlarms.vue
index ea2e97d..0d880f7 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/configureDeviceAlarms.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/configureDeviceAlarms.vue
@@ -146,6 +146,7 @@
                 return text.index + 1;
               },
               width: 80,
+              fixed: 'left',
             },
             {
               title: '规则id',
diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/notificationManagement/linkPeople/index.vue b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/notificationManagement/linkPeople/index.vue
index 2609424..819926a 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/notificationManagement/linkPeople/index.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/notificationManagement/linkPeople/index.vue
@@ -7,7 +7,7 @@
     @ok="handleOk"
     @cancel="handleCancel">
     <div class="ns-title-extra-box" style="position: absolute; top: 28px"></div>
-    <div class="box">
+    <div class="box-link">
       <div class="box-left">
         <a-input
           v-model:value="searchValue"
@@ -363,7 +363,7 @@
       margin-left: 6px !important;
     }
   }
-  .box {
+  .box-link {
     width: 100%;
     height: 490px;
     display: flex;
diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/energyAlarmConfig.ts b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/energyAlarmConfig.ts
index cfd9733..93c1be5 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/energyAlarmConfig.ts
+++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/energyAlarmConfig.ts
@@ -15,6 +15,7 @@ const tableKeyMap = [
       return text.index + 1;
     },
     width: 80,
+    fixed: 'left',
   },
   {
     title: '优先级',
diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/equipmentAlarmConfig.ts b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/equipmentAlarmConfig.ts
index 6c5e03b..1ec7dfb 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/equipmentAlarmConfig.ts
+++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/equipmentAlarmConfig.ts
@@ -15,6 +15,7 @@ const tableKeyMap = [
       return text.index + 1;
     },
     width: 80,
+    fixed: 'left',
   },
   {
     title: '优先级',
diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/notificationManagementConfig.ts b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/notificationManagementConfig.ts
index 413d723..20c2def 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/notificationManagementConfig.ts
+++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/notificationManagementConfig.ts
@@ -13,6 +13,7 @@ const tableKeyMap = [
       return text.index + 1;
     },
     width: 80,
+    fixed: 'left',
   },
   {
     title: '优先级',
diff --git a/hx-ai-intelligent/src/view/equipmentControl/electricDoor/index.vue b/hx-ai-intelligent/src/view/equipmentControl/electricDoor/index.vue
index d9a5e28..617acdd 100644
--- a/hx-ai-intelligent/src/view/equipmentControl/electricDoor/index.vue
+++ b/hx-ai-intelligent/src/view/equipmentControl/electricDoor/index.vue
@@ -4,37 +4,47 @@
     <div class="drawer-box-ins" v-if="!visible" @click="toggleDrawer">
       <DoubleLeftOutlined class="drawer-icon" style="color: white" />
     </div>
-    <!-- 门位置 -->
+    <!-- 下边门位置 -->
     <div
-      style="
-        width: 708px;
-        height: 42px;
-        background-color: rgba(245, 154, 35, 0.5);
-        position: absolute;
-        top: 49%;
-        left: 23%;
-        padding: 6px 6px;
-        display: flex;
-        gap: 10px;
-        cursor: pointer;
-      "
+      v-if="dataSource.length > 0"
+      style="top: 49%"
+      class="door-box"
       @click="
         () => {
           visible = !visible;
+          detailed = false;
         }
       ">
       <template v-for="(item, index) in dataSource" :key="item.deviceInfoCode">
         <div
-          style="
-            flex: 1;
-            height: 100%;
-            text-align: center;
-            line-height: 30px;
-            border: 1px solid #ab8757;
-            font-weight: 500;
-          "
-          :style="{ 'background-color': ['#e43e1e', '#f59a23', '#bbcf10', '#62d7a7'][0] }">
-          {{ ['A号门', 'B号门', 'C号门', 'D号门'][0] }}
+          v-if="item.type !== 1"
+          class="door-box-item"
+          :style="{
+            'background-color': ['#e43e1e', '#f59a23', '#bbcf10', '#62d7a7'][index % 3],
+          }">
+          {{ ['A号门', 'B号门', 'C号门', 'D号门'][index % 3] }}
+        </div>
+      </template>
+    </div>
+    <!-- 上边门位置 -->
+    <div
+      v-if="dataSource.length > 0"
+      style="top: 20%"
+      class="door-box"
+      @click="
+        () => {
+          visible = !visible;
+          detailed = false;
+        }
+      ">
+      <template v-for="(item, index) in dataSource" :key="item.deviceInfoCode">
+        <div
+          v-if="item.type === 1"
+          class="door-box-item"
+          :style="{
+            'background-color': ['#e43e1e', '#f59a23', '#bbcf10', '#62d7a7'][index % 3],
+          }">
+          {{ ['A号门', 'B号门', 'C号门', 'D号门'][index % 3] }}
         </div>
       </template>
     </div>
@@ -121,6 +131,10 @@
       })
       .then((res) => {
         if (res.msg === 'success') {
+          //确认上边下边门 暂时随机区分
+          res.data.forEach((item: any, index: any) => {
+            item.type = index % 2;
+          });
           dataSource.value = res.data;
         }
       });
@@ -142,10 +156,10 @@
     return {
       //点击 行 进行查看详情
       onClick: () => {
+        // 处理点击事件
         detailed.value = !detailed.value;
         infoObject.value = record;
         tables.value.toggle(record);
-        // 处理点击事件
       },
     };
   };
@@ -220,6 +234,26 @@
         border-radius: 0 8px 8px 0;
       }
     }
+    .door-box {
+      width: 708px;
+      height: 42px;
+      background-color: rgba(245, 154, 35, 0.5);
+      position: absolute;
+      left: 23%;
+      padding: 6px 6px;
+      display: flex;
+      gap: 10px;
+      cursor: pointer;
+      .door-box-item {
+        flex: 1;
+        height: 100%;
+        text-align: center;
+        line-height: 30px;
+        border: 1px solid #ab8757;
+        font-weight: 500;
+        overflow: hidden;
+      }
+    }
     .table-detail {
       width: 380px;
       height: 632px;
diff --git a/hx-ai-intelligent/src/view/equipmentControl/electricDoor/tables.vue b/hx-ai-intelligent/src/view/equipmentControl/electricDoor/tables.vue
index 417db8b..3f63203 100644
--- a/hx-ai-intelligent/src/view/equipmentControl/electricDoor/tables.vue
+++ b/hx-ai-intelligent/src/view/equipmentControl/electricDoor/tables.vue
@@ -41,8 +41,9 @@
         // showQuickJumper: true,
         // showLessItems: true,
         showSizeChanger: false,
-        showTotal: (total: number, range: any) =>
-          total && range ? `显示第${range[0]}到${range[1]}条记录,共 ${total} 条记录` : '',
+        // showTotal: (total: number, range: any) =>
+        //   total && range ? `显示第${range[0]}到${range[1]}条记录,共 ${total} 条记录` : '',
+        showTotal: (total: number, range: any) => (total && range ? '' : ''),
         onChange: handleChangePage,
       });
 
@@ -116,7 +117,7 @@
     padding: 4px !important;
   }
   :deep(.ant-table-row:hover td) {
-    background-color: rgba(0, 0, 0, 1) !important;
+    background: rgba(0, 0, 0, 1) !important;
     cursor: default !important;
   }
   //分页样式
@@ -142,7 +143,7 @@
     color: #fff !important;
   }
   //分页 在右边 取消
-  :deep(.ant-table-pagination-right) {
-    justify-content: normal !important;
-  }
+  // :deep(.ant-table-pagination-right) {
+  //   justify-content: normal !important;
+  // }
 </style>