From f32f04c3f8c84a77345dc503ad5441e8428ed4cc Mon Sep 17 00:00:00 2001
From: "gao.zhiyuan" <gao.zhiyuan@free-sun.com.cn>
Date: Mon, 14 Nov 2022 10:09:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E8=81=94=E9=A1=B9=E7=9B=AE=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=85=A8=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/app/lib/controllers/alarm/data.js             |  2 +-
 .../sections/install/components/memberModal.jsx   | 15 +++++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/api/app/lib/controllers/alarm/data.js b/api/app/lib/controllers/alarm/data.js
index a2cd793..046b671 100644
--- a/api/app/lib/controllers/alarm/data.js
+++ b/api/app/lib/controllers/alarm/data.js
@@ -12,7 +12,7 @@ async function groupList (ctx) {
 
       for (let g of groupRes) {
          g.unit = await await clickHouse.anxinyun.query(`
-         SELECT * FROM t_alarm_group_unit WHERE group_id = ${g.id}
+            SELECT * FROM t_alarm_group_unit WHERE group_id = ${g.id}
          `).toPromise();
       }
 
diff --git a/web/client/src/sections/install/components/memberModal.jsx b/web/client/src/sections/install/components/memberModal.jsx
index 72fb389..eeab3a4 100644
--- a/web/client/src/sections/install/components/memberModal.jsx
+++ b/web/client/src/sections/install/components/memberModal.jsx
@@ -1,6 +1,6 @@
 import React, { useState, useRef, useEffect } from "react";
 import { connect } from "react-redux";
-import { Modal, Form, CheckboxGroup, Checkbox } from "@douyinfe/semi-ui";
+import { Modal, Form, CheckboxGroup, Checkbox,Button } from "@douyinfe/semi-ui";
 import { IconAlertCircle } from '@douyinfe/semi-icons';
 
 
@@ -42,6 +42,7 @@ function memberModal (props) {
             text: '拥有服务、工单、资料相关的权限'
         },
     ]); //权限配置
+    const [pomsList_, setPomsList_] = useState([])
     //初始化
     useEffect(() => {
         if (editObj.id) {
@@ -54,6 +55,7 @@ function memberModal (props) {
             setDepartmentId(editObj.departments[0].id)
             setPeopleList(departmentList)
         }
+        setPomsList_(pomsList.filter(p=>p.pepProjectIsDelete != -1))
     }, []);
 
     function handleOk () {
@@ -212,15 +214,20 @@ function memberModal (props) {
                                 style={{ width: 417 }}
                                 filter
                                 showClear
+                                outerBottomSlot={
+                                 <p style={{ margin:"6px 26px",}}>
+                                      <Button  theme='borderless' onClick={()=>{
+                                       form.current.setValue('correlationProject',pomsList_.map(p=> p.id))
+                                      }}>全选</Button>
+                                 </p>
+                                }
                             >
                                 {
-                                    pomsList.map((item, index) => {
+                                    pomsList_.map((item, index) => {
                                         return (
-                                            item.pepProjectIsDelete !== 1 ? (
                                                 <Form.Select.Option key={index} value={item.id}>
                                                     {item.pepProjectName || item.name}
                                                 </Form.Select.Option>
-                                            ) : ('')
                                         )
                                     })
                                 }