From f1952d7621c168bcbbbaec36278f66233f48f4a2 Mon Sep 17 00:00:00 2001
From: zhaohy <1695786511@qq.com>
Date: Tue, 13 Aug 2024 14:16:36 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E8=81=94=E7=B3=BB?=
 =?UTF-8?q?=E4=BA=BA=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../notificationManagement/index.vue          |  3 +-
 .../linkPeople/index.vue                      | 84 +++++++++++--------
 2 files changed, 52 insertions(+), 35 deletions(-)

diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/notificationManagement/index.vue b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/notificationManagement/index.vue
index 8c4c7c8..d667e1e 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/notificationManagement/index.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/notificationManagement/index.vue
@@ -76,7 +76,7 @@
         <a-table
           :dataSource="dataSource"
           :columns="columns"
-          :scroll="{ x: 800, y: 700 }"
+          :scroll="{ x: 1000, y: 700 }"
           :pagination="pagination">
           <template #bodyCell="{ record, column }">
             <template v-if="column.dataIndex === 'address'">
@@ -138,7 +138,6 @@
       title: '部门',
       dataIndex: 'address',
       key: 'address',
-      width: 200,
       textEllipsis: true,
     },
     {
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 7c63264..2609424 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
@@ -2,26 +2,18 @@
   <ns-modal
     v-model:visible="show"
     width="1100px"
-    style="overflow-y: hidden"
     title="添加联系人"
+    class="ns-modal-boxs"
     @ok="handleOk"
     @cancel="handleCancel">
+    <div class="ns-title-extra-box" style="position: absolute; top: 28px"></div>
     <div class="box">
       <div class="box-left">
-        <div style="width: 100%; display: flex; position: relative" class="ns-title-extra-box">
-          <span style="margin-left: 12px; color: #333333">联系人名单</span>
-        </div>
-        <img
-          style="width: 100%; height: 2px"
-          src="https://files.axshare.com/gsc/4T0UQR/7e/5d/a2/7e5da2a277344db8af30521cefeb70cc/images/告警设置/u150.svg?pageId=1f58c1ba-b461-4fe8-a2b3-295f1e7b0aa0" />
-        <a-input-search
+        <a-input
           v-model:value="searchValue"
-          style="margin-bottom: 8px"
+          style="margin-bottom: 8px; width: 194px"
           placeholder="请输入关键字" />
-        <img
-          style="width: 100%; height: 2px"
-          src="https://files.axshare.com/gsc/4T0UQR/7e/5d/a2/7e5da2a277344db8af30521cefeb70cc/images/告警设置/u150.svg?pageId=1f58c1ba-b461-4fe8-a2b3-295f1e7b0aa0" />
-        <div style="width: 100%; height: 370px; overflow-y: auto">
+        <div style="width: 100%; height: 420px; overflow-y: auto">
           <a-tree
             v-model:selectedKeys="selectedKeys"
             v-model:expandedKeys="expandedKeys"
@@ -30,19 +22,19 @@
         /></div>
       </div>
       <div class="box-right">
-        <div style="width: 100%; display: flex; position: relative" class="ns-title-extra-box">
-          <span style="margin-left: 12px; color: #333333">人员列表 </span>
+        <div style="width: 100%; display: flex; position: relative">
+          <span style="color: rgba(51, 51, 51, 1); font-size: 16px; font-weight: 700"
+            >人员列表
+          </span>
           <a-input-search
             v-model:value="realName"
-            style="margin-bottom: 8px; width: 280px; position: absolute; right: 20px"
-            placeholder="请输入"
+            style="margin-bottom: 2px; width: 210px; margin-left: 12px"
+            placeholder="请输入关键字"
             allowClear="true"
-            @search="onSearch" />
+            @search="onSearch"
+            @pressEnter="onSearch" />
         </div>
-        <img
-          style="width: 100%; height: 2px"
-          src="https://files.axshare.com/gsc/4T0UQR/7e/5d/a2/7e5da2a277344db8af30521cefeb70cc/images/告警设置/u150.svg?pageId=1f58c1ba-b461-4fe8-a2b3-295f1e7b0aa0" />
-        <div style="width: 100%; height: 450px; overflow-y: auto; padding: 12px 0">
+        <div style="width: 100%; height: 455px; overflow-y: hidden; padding: 12px 0">
           <a-table
             :row-selection="{
               selectedRowKeys: selectedRowKey,
@@ -55,6 +47,7 @@
             :rowKey="(record: any) => record.userId"
             :pagination="pagination"
             :bordered="true"
+            :scroll="{ x: 1000, y: 355 }"
             :size="'middle'">
             <template #bodyCell="{ record, column }">
               <template v-if="column.dataIndex === 'address'">
@@ -214,8 +207,7 @@
         showQuickJumper: true,
         showLessItems: true,
         // showSizeChanger: true,
-        showTotal: (total: number, range: any) =>
-          total && range ? `显示第${range[0]}到${range[1]}条记录,共 ${total} 条记录` : '',
+        showTotal: (total: number, range: any) => (total && range ? '' : ''),
         onChange: handleChangePage,
       });
       const onSelectChange = (selectedRowKeys: any, selectedRows: any) => {
@@ -248,20 +240,24 @@
           customRender: (text: any) => {
             return text.index + 1;
           },
+          fixed: 'left',
         },
         {
           title: '姓名',
           dataIndex: 'realName',
-          width: 100,
+          width: 120,
           ellipsis: true,
+          fixed: 'left',
         },
         {
           title: '性别',
           dataIndex: 'sex',
+          width: 80,
         },
         {
           title: '组织关系',
           dataIndex: 'orgName',
+          width: 220,
         },
         {
           title: '部门  ',
@@ -345,22 +341,44 @@
     },
   });
 </script>
-<style scoped lang="less">
+<style lang="less">
+  .ns-modal-boxs {
+    overflow-y: hidden;
+    position: relative;
+    height: 650px;
+    .ant-modal-title {
+      font-size: 16px !important;
+      font-weight: 700 !important;
+      letter-spacing: 0 !important;
+      line-height: 24px !important;
+      color: rgba(51, 51, 51, 1) !important;
+      margin: 0 16px !important;
+    }
+    .ant-pagination-prev {
+      border: 1px solid rgba(207, 212, 219, 1) !important;
+      margin-right: 6px !important;
+    }
+    .ant-pagination-next {
+      border: 1px solid rgba(207, 212, 219, 1) !important;
+      margin-left: 6px !important;
+    }
+  }
   .box {
     width: 100%;
-    height: 500px;
+    height: 490px;
     display: flex;
+    overflow: hidden;
     .box-left {
-      width: 300px;
-      height: 100%;
-      overflow-y: auto;
-      padding: 0, 12px;
+      border: 1px solid rgba(235, 238, 245, 1);
+      padding: 16px;
+      width: 226px;
+      height: 490px;
       gap: 5px;
     }
     .box-right {
-      width: calc(100% - 200px);
+      width: calc(100% - 226px);
       height: 100%;
-      padding: 0 12px;
+      padding: 0 20px;
       overflow-y: auto;
     }
   }