From d51d58967ffecafffa8bff8039d92d67324833b0 Mon Sep 17 00:00:00 2001
From: jl-zhoujl2 <jl-zhoujl2@chinaunicom.cn>
Date: Mon, 8 May 2023 13:31:05 +0800
Subject: [PATCH] =?UTF-8?q?5.8=20=E9=AB=98=E8=B4=A8=E9=87=8F=E8=BF=90?=
 =?UTF-8?q?=E8=90=A5=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../HighQualityOperation/Home/index.less      |  3 +
 src/pages/HighQualityOperation/Home/index.tsx | 66 ++++++++++---------
 2 files changed, 38 insertions(+), 31 deletions(-)

diff --git a/src/pages/HighQualityOperation/Home/index.less b/src/pages/HighQualityOperation/Home/index.less
index 510f8b3..f4a4473 100644
--- a/src/pages/HighQualityOperation/Home/index.less
+++ b/src/pages/HighQualityOperation/Home/index.less
@@ -353,6 +353,9 @@
                                     &>p {
                                         color: #494949;
                                         margin-bottom: 2px;
+                                        overflow: hidden;
+                                        white-space: nowrap;
+                                        text-overflow: ellipsis;
                                     }
                                 }
                             }
diff --git a/src/pages/HighQualityOperation/Home/index.tsx b/src/pages/HighQualityOperation/Home/index.tsx
index 8d4f746..be32b54 100644
--- a/src/pages/HighQualityOperation/Home/index.tsx
+++ b/src/pages/HighQualityOperation/Home/index.tsx
@@ -109,21 +109,26 @@ const RightCardContent = (props: any) => {
 const BottomCardContent = (props: any) => {
     return (
         <Col span={6}>
-            <div className='bottom-card'>
-                <div className='bottom-card-title'>
-                    <span>{props.data.contactName}</span>
-                    <div>
-                        <img src={bottom_button} onClick={() => props.onClick()} />
+            <div>
+                <div className='bottom-title'>{props.data.contactUnit}</div>
+                <div className='bottom-content'>
+                    <div className='bottom-card'>
+                        <div className='bottom-card-title'>
+                            <span>{props.data.contactName}</span>
+                            <div>
+                                <img src={bottom_button} onClick={() => props.onClick()} />
+                            </div>
+                        </div>
+                        {/* <div className='bottom-card-remark'>
+                            <span className='bottom-card-remark-text'>{props.data.remark}</span>
+                        </div> */}
+                        <div className='bottom-card-content'>
+                            <p>邮箱：{props.data.contactEmail}</p>
+                            <p>电话：{props.data.contactMobiphone}</p>
+                            <p>部门：<span title={props.data.contactDepartment}>{props.data.contactDepartment}</span></p>
+                        </div>
                     </div>
                 </div>
-                {/* <div className='bottom-card-remark'>
-                    <span className='bottom-card-remark-text'>{props.data.remark}</span>
-                </div> */}
-                <div className='bottom-card-content'>
-                    <p>邮箱：{props.data.contactEmail}</p>
-                    <p>电话：{props.data.contactMobiphone}</p>
-                    <p>部门：{props.data.contactDepartment}</p>
-                </div>
             </div>
         </Col>
     )
@@ -382,11 +387,15 @@ const Home: React.FC<{}> = () => {
         getHomeContact({ param }).then(res => {
             if (res?.code == 200) {
                 const data = Object.entries(res?.data);
-                if (data.length > 3) {
-                    setContactData(data.slice(0, 3));
+                // if (data.length > 3) {
+                //     setContactData(data.slice(0, 3));
+                //     setTotalContactData(data);
+                // } else {
+                //     setContactData(data);
+                // }
+                setContactData(data);
+                if (param == '') {
                     setTotalContactData(data);
-                } else {
-                    setContactData(data);
                 }
             }
         })
@@ -542,26 +551,21 @@ const Home: React.FC<{}> = () => {
                                         ))}
                                     </div>
                                 </div>
-                                {contactData.length > 0 && contactData.map(([name, value], index) => (
-                                    <div key={index}>
-                                        <div className='bottom-title'>{name}</div>
-                                        <div className='bottom-content'>
-                                            <Row gutter={[14, 12]}>
-                                                {value.map((item: any) => (
-                                                    <BottomCardContent data={item} key={item.id} onClick={() => openModal(item)} />
-                                                ))}
-                                            </Row>
-                                        </div>
-                                    </div>
-                                ))}
-                                {contactData.length != 0 && contactData.length > 2 && (
+                                <Row gutter={[14, 0]}>{/**[14, 12] */}
+                                    {contactData.length > 0 && contactData.map(([name, value], index) => (
+                                        value.map((item: any) => (
+                                            <BottomCardContent data={item} key={item.id} onClick={() => openModal(item)} />
+                                        ))
+                                    ))}
+                                </Row>
+                                {/* {contactData.length != 0 && contactData.length > 2 && (
                                     <div className='bottom-other'>
                                         <div>
                                             <span className='bottom-other-text' onClick={() => bottomOtherClick(contactData.length > 3 ? '1' : '0')}>{contactData.length > 3 ? '收起' : '更多'}</span>
                                             <span className='bottom-other-icon'>{contactData.length > 3 ? <>&lt;&lt;&lt;</> : <>&gt;&gt;&gt;</>}</span>
                                         </div>
                                     </div>
-                                )}
+                                )} */}
                             </div>
                         </div>
                     </div>