From b1cc8f09033e3c1cf63f2b1cd8be461d5a1518dd Mon Sep 17 00:00:00 2001
From: wenlele <wen.lele@free-sun.com.cn>
Date: Wed, 31 Aug 2022 15:46:48 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E5=88=86bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/client/src/components/reminderBox.jsx |  2 +-
 .../openness/components/container.jsx         |  2 +-
 .../openness/components/videoScreen.jsx       | 29 ++++++++++++++-----
 3 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/code/VideoAccess-VCMP/web/client/src/components/reminderBox.jsx b/code/VideoAccess-VCMP/web/client/src/components/reminderBox.jsx
index 0d3eeac..f10ea7e 100644
--- a/code/VideoAccess-VCMP/web/client/src/components/reminderBox.jsx
+++ b/code/VideoAccess-VCMP/web/client/src/components/reminderBox.jsx
@@ -35,7 +35,7 @@ const ReminderBox = ({ title, wait, toadd, visible, onOk, close, USER}) => {
                         aria-label="Checkbox 示例"
                         style={{ width: 100 }}
                     >
-                        不在提醒
+                        不再提醒
                     </Checkbox>
                     <div>
                         <Button onClick={() => close()}>{wait}</Button>
diff --git a/code/VideoAccess-VCMP/web/client/src/sections/openness/components/container.jsx b/code/VideoAccess-VCMP/web/client/src/sections/openness/components/container.jsx
index ab6a1ac..4d13600 100644
--- a/code/VideoAccess-VCMP/web/client/src/sections/openness/components/container.jsx
+++ b/code/VideoAccess-VCMP/web/client/src/sections/openness/components/container.jsx
@@ -44,7 +44,7 @@ const Container = ({ videoObj, pageSize, showHeader, videoPlay, mould }) => {
             <img src={`/assets/images/openness/${pageSize == 1 || pageSize == 4 ? mould('blue2', 'white2', 'black2') : mould('blue1.5', 'white1.5', 'black1.5')}.png`} style={{
                display: 'inline-block', width: videoWidth - 10, height: videoHeight - 30,
             }} /> : ""}
-         <div style={{ lineHeight: '30px', paddingLeft: 6 }}>{videoObj?.label}</div>
+         <div style={{ lineHeight: '30px', paddingLeft: 6, color: mould('#FFFFFF', '#615E5E', '#FFFFFF') }}>{videoObj?.label}</div>
       </div>
    )
 }
diff --git a/code/VideoAccess-VCMP/web/client/src/sections/openness/components/videoScreen.jsx b/code/VideoAccess-VCMP/web/client/src/sections/openness/components/videoScreen.jsx
index 1856371..e47e922 100644
--- a/code/VideoAccess-VCMP/web/client/src/sections/openness/components/videoScreen.jsx
+++ b/code/VideoAccess-VCMP/web/client/src/sections/openness/components/videoScreen.jsx
@@ -116,6 +116,8 @@ const VideoScreen = ({ treeData, filterGroup, videoPlay, template, headerName, s
    const [pollingTime, setPollingTime] = useState(1) //轮询时间
    const [reminder, setReminder] = useState(false); //提醒弹框
    const [formWidth, setFormWidth] = useState(840);
+   const [multiScreen, setMultiScreen] = useState('');
+
 
    const api = useRef();
    const pageRef = useRef(page);
@@ -158,6 +160,7 @@ const VideoScreen = ({ treeData, filterGroup, videoPlay, template, headerName, s
       api.current?.reset()
    }, [treeData, filterGroup])
 
+
    useEffect(() => {
       console.log(queryValue);
       if (treeData && queryValue.includes('全部')) {
@@ -293,11 +296,12 @@ const VideoScreen = ({ treeData, filterGroup, videoPlay, template, headerName, s
 
    //确定查询条件下视频总数
    const videoData = (d, v) => {
+      console.log(d, v);
       let playVideo = []
-      let videos = v.map(item => d.find(vv => vv.value == item))
+      let videos = d.filter(item => v.some(vv => vv == item.value))
       const playVideoData = (data) => {
          data.map(c => {
-            if (c.videoData) playVideo.push(c)
+            if (c.camera) playVideo.push(c)
             if (c.children) playVideoData(c.children)
          })
 
@@ -322,12 +326,18 @@ const VideoScreen = ({ treeData, filterGroup, videoPlay, template, headerName, s
             setPageSize(4)
             break;
          case "6分屏":
-            setPageSize(6)
-            if (remind == 'false') setReminder(true)
+            if (remind == 'false') {
+               setReminder(true)
+            } else {
+               setPageSize(6)
+            }
             break;
          case "12分屏":
-            setPageSize(12)
-            if (remind == 'false') setReminder(true)
+            if (remind == 'false') {
+               setReminder(true)
+            } else {
+               setPageSize(12)
+            }
             break;
          default:
             break
@@ -517,6 +527,8 @@ const VideoScreen = ({ treeData, filterGroup, videoPlay, template, headerName, s
                               api.current.validate().then((v) => {
                                  let aa = JSON.stringify(v);
                                  setSearchs(JSON.parse(aa))
+                                 setPage(1)
+                                 pageRef.current = 1
                                  // setQuery({ limit: 10, page: 0 })
                               });
                            }}
@@ -591,7 +603,7 @@ const VideoScreen = ({ treeData, filterGroup, videoPlay, template, headerName, s
                                        case '宫格设置':
                                           return <div style={{ height: 69, background: mould('#01185F', 'linear-gradient(245deg, #FFFFFF 0%, #EAEBEC 100%)', 'linear-gradient(197deg, rgba(38,38,38,0.65) 0%, #101010 100%)'), boxShadow: `inset 0px 0px 5px 1px ${mould('rgba(28,96,254,0.2500)', 'rgba(97,94,94,0.39)', 'rgba(132,132,132,0.5)')}`, display: 'flex', justifyContent: 'space-evenly', alignItems: 'center' }}>
                                              {v.screen.map((item) => {
-                                                return <div key={item.img} onClick={() => flipScreens(item.value)}>
+                                                return <div key={item.img} onClick={() => { flipScreens(item.value); setMultiScreen(item.value) }}>
                                                    <img src={`/assets/images/application/${item.img}.png`} alt="" style={{ width: 40, height: 40, }} />
                                                    <div style={{ width: 40, fontWeight: 400, color: mould('#D9D9D9', '#615E5E', '#D9D9D9'), fontSize: 12, textAlign: 'center' }}>{item.value}</div>
                                                 </div>
@@ -641,9 +653,12 @@ const VideoScreen = ({ treeData, filterGroup, videoPlay, template, headerName, s
             USER={GONGGESCREEN}
             onOk={() => {
                setReminder(false)
+               if (multiScreen == "6分屏") setPageSize(6)
+               if (multiScreen == "12分屏") setPageSize(12)
             }}
             close={() => {
                setReminder(false)
+               setPageSize(pageSize)
             }}
          />
       </>