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 }}
>
- 不在提醒
+ 不再提醒
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 }) => {
: ""}
-
{videoObj?.label}
+
{videoObj?.label}
)
}
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
{v.screen.map((item) => {
- return
flipScreens(item.value)}>
+ return
{ flipScreens(item.value); setMultiScreen(item.value) }}>
{item.value}
@@ -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)
}}
/>
>