diff --git a/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/cascadeCamera.jsx b/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/cascadeCamera.jsx
index f3603d8..471e7a3 100644
--- a/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/cascadeCamera.jsx
+++ b/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/cascadeCamera.jsx
@@ -91,7 +91,7 @@ function cascadeCamera ({ dRef, dispatch, actions, cameraData ,parentCamera}) {
-
+
{
{
if (deviceClickb.current) {
-
if (row.type == "nvr") {
setearch({ ...searchb.current, nvrId: row.nvr.id })
} else {
@@ -145,7 +144,6 @@ const CameraHeader = (props) => {
);
},
},
-
{
title: "操作",
width: "20%",
@@ -406,27 +404,27 @@ const CameraHeader = (props) => {
r.station.map((v) => {
if (exhibition == "structure") {
datas.push(v.structure.name)
- }else{
- if(exhibition == "point"){
+ } else {
+ if (exhibition == "point") {
datas.push(v.name)
- }else{
+ } else {
datas.push(v.factor.name)
}
}
})
}
- let dataSet =[...(new Set(datas))]
- return dataSet.length>0? 0 ?
- {dataSet.length>0?dataSet.map((v,index)=>{v}
):""}
+ {dataSet.length > 0 ? dataSet.map((v, index) => {v}
) : ""}
}
>
- {dataSet.length>0?`${dataSet[0]}...`:""}
- :""
+ {dataSet.length > 0 ? `${dataSet[0]}...` : ""}
+ : ""
}
//条件赛选样式
@@ -610,8 +608,8 @@ const CameraHeader = (props) => {
}}
onClick={() => {
api.current.validate().then((v) => {
- setearch(v);
- searchb.current = v
+ setearch({ ...v, limit: 10, page: 0 });
+ searchb.current = { ...v, limit: 10, page: 0 }
});
equipmentGetCamera();
}}
@@ -684,7 +682,7 @@ const CameraHeader = (props) => {
style={{ width: 18, height: 18 }}
/>
-
+
{
}}
onClick={() => {
api.current.validate().then((v) => {
- setearch(v);
+ setearch({ ...v, limit: 10, page: 0 });
});
equipmentGetNvr();
}}
@@ -523,19 +524,7 @@ const NvrHeader = (props) => {
style={{ width: 18, height: 18 }}
/>
-
-
-
+