From c4f890fd2c03c4b3d9f18c54524cc5bed93d0276 Mon Sep 17 00:00:00 2001
From: renpy <peiyu_ren@163.com>
Date: Tue, 25 Jul 2023 12:13:10 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=9F=A5=E8=AF=A2=E6=8A=A5=E8=AD=A6=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E7=9A=84=E5=8F=82=E6=95=B0=E8=B0=83=E6=95=B4=202.?=
 =?UTF-8?q?=E6=8A=A5=E8=AD=A6=E8=81=94=E7=B3=BB=E4=BA=BA=E7=BB=84=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=89=AF=E6=A0=87=E9=A2=98=E5=8F=8A=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?icon?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../alarmCenter/alarmContactGroup/index.vue     | 17 ++++++++++++++++-
 .../alarmCenter/alarmHistory/index.vue          | 11 ++++++-----
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/src/views/abnormalAlarm/alarmCenter/alarmContactGroup/index.vue b/src/views/abnormalAlarm/alarmCenter/alarmContactGroup/index.vue
index 897e80e..237f7c2 100644
--- a/src/views/abnormalAlarm/alarmCenter/alarmContactGroup/index.vue
+++ b/src/views/abnormalAlarm/alarmCenter/alarmContactGroup/index.vue
@@ -13,6 +13,7 @@
         <a-collapse-panel :key="item.id" :style="customStyle" v-for="item in contactGroups" >
           <template slot="header">
             {{ item.name }}
+            <span class="header-sub">Create Date: {{ item.updateTime }} , Number of people: {{ item.personNumber }}</span>
           </template>
           <template slot="extra">
             <a-button class="actions" shape="circle" @click.stop="editGroup(item.id)">
@@ -31,9 +32,13 @@
             :canSelect="false"
             :scroll="{ y: 200 }"
           >
+            <template slot="name" slot-scope="{text}">
+              <img src="@/assets/images/abnormalAlarm/user.png" alt=""><span style="margin-left: 8px;padding-top: 2px;">{{ text }}</span>
+            </template>
             <template slot="role" slot-scope="{record}">
               <span v-for="(role,index) in record.roles" :key="role.id">{{ role.roleName }}<i v-if="index!=record.roles.length-1">,</i></span>
             </template>
+            
             <template slot="action" slot-scope="{record}">
               <a-button class="actions" style="margin-right: 15px;" shape="circle" @click="deleteUser(item.id,record.id)">
                 <img class="icon-delete" src="@/assets/images/abnormalAlarm/delete.png" alt="" />
@@ -109,7 +114,10 @@ const columns = [
   {
     title: 'NAME',
     align: 'left',
-    dataIndex: 'username'
+    dataIndex: 'username',
+    scopedSlots: {
+      customRender: 'name',
+    }
   },
   {
     title: 'ROLE',
@@ -363,6 +371,12 @@ export default {
   height: calc(100% - 65px);
   margin-left: 20px;
   position: relative;
+  .header-sub{
+    margin-left: 20px;
+    font-family: MicrosoftYaHei;
+    font-size: 16px;
+    color: #ade6ee;
+  }
   .ant-collapse{
     height: calc(100% - 30px);
     overflow: auto;
@@ -390,6 +404,7 @@ export default {
     color: #fff !important;
     line-height: 50px !important;
     padding-left: 35px !important;
+    font-size: 18px;
   }
   .ant-collapse-content-box{
     padding: 15px !important;
diff --git a/src/views/abnormalAlarm/alarmCenter/alarmHistory/index.vue b/src/views/abnormalAlarm/alarmCenter/alarmHistory/index.vue
index d3cd355..47fc4ef 100644
--- a/src/views/abnormalAlarm/alarmCenter/alarmHistory/index.vue
+++ b/src/views/abnormalAlarm/alarmCenter/alarmHistory/index.vue
@@ -138,10 +138,10 @@ export default {
     getUid() {
       return (Math.random()+new Date().getTime()).toString(32).slice(0,8)
     },
-    handleSearch({ startDate, endDate }) {
+    handleSearch({ startDate, endDate,types }) {
       this.getAlarmLogBar({ startDate, endDate })
       this.getTypeAlarmPie({ startDate, endDate })
-      this.getAlarmLogTable()
+      this.getAlarmLogTable({ startDate, endDate, types })
       this.getAlarmTop({ startDate, endDate })
     },
     getAlarmLogBar(obj) {
@@ -159,12 +159,13 @@ export default {
         }
       })
     },
-    getAlarmLogTable() {
+    getAlarmLogTable(obj) {
       let params = {
         pageNo: this.ipagination.current,
         pageSize: this.ipagination.pageSize,
-        // pageSize: 2,
-        // type: "Database"
+        type:obj.types,
+        startDate:obj.startDate,
+        endDate:obj.endDate
       }
       postAction("/alarmLog/findPage", params).then(res => {
         if (res.success) {