From 25d4c60362bed60b04a97f671e51e41a57d851b4 Mon Sep 17 00:00:00 2001
From: "gao.zhiyuan" <gao.zhiyuan@free-sun.com.cn>
Date: Fri, 4 Aug 2023 20:05:05 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=90=E8=90=A5=E5=A4=A7=E5=B1=8F-=E5=85=AC?=
 =?UTF-8?q?=E4=BA=A4=E8=BF=90=E8=90=A5=E4=BF=A1=E6=81=AF=E5=85=B3=E9=94=AE?=
 =?UTF-8?q?=E5=AD=97=E6=90=9C=E7=B4=A2=E4=BC=9A=E5=B1=95=E7=A4=BA=E9=87=8D?=
 =?UTF-8?q?=E5=A4=8D=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../containers/footer/operation/right.js      | 151 ++++++++++--------
 1 file changed, 86 insertions(+), 65 deletions(-)

diff --git a/web/client/src/sections/quanju/containers/footer/operation/right.js b/web/client/src/sections/quanju/containers/footer/operation/right.js
index f1ce70d2..4bbd5c84 100644
--- a/web/client/src/sections/quanju/containers/footer/operation/right.js
+++ b/web/client/src/sections/quanju/containers/footer/operation/right.js
@@ -30,16 +30,55 @@ const Right = ({ busRunTime }) => {
     const [queryStr, setQueryStr] = useState('')
 
     useEffect(() => {
-        setBusRunTimeList(
-            queryStr ?
-                busRunTime.filter(b => {
-                    return b?.busNoChar?.indexOf(queryStr) > -1
-                })
-                : busRunTime
-        )
+        let repeatCarNo = []
+        let nextBusRunList = queryStr ?
+            busRunTime.filter(b => {
+                let queryMatch = b?.busNoChar?.indexOf(queryStr) > -1
+                if (repeatCarNo.some(c => c == b.busNoChar.trim())) {
+                    return false
+                } else {
+                    repeatCarNo.push(b.busNoChar.trim())
+                    return queryMatch && true
+                }
+            })
+            : busRunTime.filter(b => {
+                if (repeatCarNo.some(c => c == b.busNoChar.trim())) {
+                    return false
+                } else {
+                    repeatCarNo.push(b.busNoChar.trim())
+                    return true
+                }
+            })
+        console.log(nextBusRunList);
+        setBusRunTimeList(nextBusRunList)
     }, [queryStr, busRunTime])
 
     const style = { height: "97%", marginTop: "3%" }
+    const carouselContent = busRunTimeList.map((d, index) => {
+        return (
+            <div key={index} style={{ width: '100%', height: '40%' }}>
+                <div className='busInformation'>
+                    <img src='/assets/images/quanju/theBus.png' style={{ width: '15%', display: 'block', float: 'left' }} />
+                    <span>
+                        <h3>车辆牌照</h3>
+                        <h5>{d.busNoChar}</h5>
+                        <h3>调度状态</h3>
+                        <h4>{busWillRun.find(w => w.value == d.willRun)?.text || '--'}</h4>
+                    </span>
+                    <span>
+                        <h3>发车时间</h3>
+                        <h5>{d.lastDepTime}</h5>
+                    </span>
+                    <span style={{ position: 'relative', left: '21%' }}>
+                        <h3>司机</h3>
+                        <h5>{d.employeeName}</h5>
+                        <h3>工号</h3>
+                        <h4>{d.opNo}</h4>
+                    </span>
+                </div>
+            </div>
+        )
+    })
     return (
         <div style={{ position: 'absolute', right: 0, width: "23%", height: "100%", marginRight: "1%", }}>
             <Module style={style} customize={true}
@@ -70,71 +109,53 @@ const Right = ({ busRunTime }) => {
                         />
                     </div>
 
-                    <Carousel
-                        autoplay
-                        infinite
-                        // autoplaySpeed={300000}
-                        autoplaySpeed={1000 * 3}
-                        vertical={true}
-                        slidesToShow={4}
-                    >
-                        {
-                            busRunTimeList.map((d, index) => {
-                                return (
+                    {
+                        carouselContent.length > 3 ?
+                            <Carousel
+                                autoplay
+                                infinite
+                                // autoplaySpeed={300000}
+                                autoplaySpeed={1000 * 3}
+                                vertical={true}
+                                slidesToShow={4}
+                            >
+                                {
+                                    carouselContent
+                                }
+                                {/* {
+                                dataLists.map((data, index) => (
                                     <div key={index} style={{ width: '100%', height: '40%' }}>
                                         <div className='busInformation'>
                                             <img src='/assets/images/quanju/theBus.png' style={{ width: '15%', display: 'block', float: 'left' }} />
                                             <span>
-                                                <h3>车辆牌照</h3>
-                                                <h5>{d.busNoChar}</h5>
-                                                <h3>调度状态</h3>
-                                                <h4>{busWillRun.find(w => w.value == d.willRun)?.text || '--'}</h4>
-                                            </span>
-                                            <span>
-                                                <h3>发车时间</h3>
-                                                <h5>{d.lastDepTime}</h5>
-                                            </span>
-                                            <span style={{ position: 'relative', left: '21%' }}>
-                                                <h3>司机</h3>
-                                                <h5>{d.employeeName}</h5>
-                                                <h3>工号</h3>
-                                                <h4>{d.opNo}</h4>
+                                                <h3>所属线路</h3>
+                                                <h4>{data.route}</h4>
+                                                <h3>车辆牌照号</h3>
+                                                <h5>{data.plate}</h5>
                                             </span>
                                         </div>
+                                        <div className='busVideo'>
+                                            <div style={{
+                                                width: '98%', margin: '1% 1%', height: 152, display: 'block', float: 'left', boxShadow: '0px 1px 5px 0px #1C60FE',
+                                                border: '1px solid #1C60FE'
+                                            }}><img src='/assets/images/quanju/fake/gj1.png' style={{ width: '100%', height: '100%' }} /></div>
+                                            <div style={{
+                                                width: '48%', margin: '1% 1%', height: 100, display: 'block', float: 'left', boxShadow: '0px 1px 5px 0px #1C60FE',
+                                                border: '1px solid #1C60FE'
+                                            }}><img src='/assets/images/quanju/fake/gj2.png' style={{ width: '100%', height: '100%' }} /></div>
+                                            <div style={{
+                                                width: '48%', margin: '1% 1%', height: 100, display: 'block', float: 'left', boxShadow: '0px 1px 5px 0px #1C60FE',
+                                                border: '1px solid #1C60FE'
+                                            }}><img src='/assets/images/quanju/fake/gj3.png' style={{ width: '100%', height: '100%' }} /></div>
+                                        </div>
                                     </div>
-                                )
-                            })
-                        }
-                        {/* {
-                            dataLists.map((data, index) => (
-                                <div key={index} style={{ width: '100%', height: '40%' }}>
-                                    <div className='busInformation'>
-                                        <img src='/assets/images/quanju/theBus.png' style={{ width: '15%', display: 'block', float: 'left' }} />
-                                        <span>
-                                            <h3>所属线路</h3>
-                                            <h4>{data.route}</h4>
-                                            <h3>车辆牌照号</h3>
-                                            <h5>{data.plate}</h5>
-                                        </span>
-                                    </div>
-                                    <div className='busVideo'>
-                                        <div style={{
-                                            width: '98%', margin: '1% 1%', height: 152, display: 'block', float: 'left', boxShadow: '0px 1px 5px 0px #1C60FE',
-                                            border: '1px solid #1C60FE'
-                                        }}><img src='/assets/images/quanju/fake/gj1.png' style={{ width: '100%', height: '100%' }} /></div>
-                                        <div style={{
-                                            width: '48%', margin: '1% 1%', height: 100, display: 'block', float: 'left', boxShadow: '0px 1px 5px 0px #1C60FE',
-                                            border: '1px solid #1C60FE'
-                                        }}><img src='/assets/images/quanju/fake/gj2.png' style={{ width: '100%', height: '100%' }} /></div>
-                                        <div style={{
-                                            width: '48%', margin: '1% 1%', height: 100, display: 'block', float: 'left', boxShadow: '0px 1px 5px 0px #1C60FE',
-                                            border: '1px solid #1C60FE'
-                                        }}><img src='/assets/images/quanju/fake/gj3.png' style={{ width: '100%', height: '100%' }} /></div>
-                                    </div>
-                                </div>
-                            ))
-                        } */}
-                    </Carousel>
+                                ))
+                            } */}
+                            </Carousel>
+                            :
+                            carouselContent
+                    }
+
                 </div>
             </Module>
         </div>