级联摄像头的修改，表格项目信息

code/VideoAccess-VCMP/web/client/src/components/reminderBox.jsx

@@ -12,7 +12,7 @@ const ReminderBox = ({title, wait, toadd,visible,onOk}) => {
             icon={
                 <img
                     src="../../assets/images/logo/figure.png"
-          style={{ width: 50, height: 50 }}
+                    style={{ width: 40, height: 40 }}
                 />
             }
             footer={
@@ -32,11 +32,13 @@ const ReminderBox = ({title, wait, toadd,visible,onOk}) => {
                     </Checkbox>
                     <div>
                         <Button>{wait}</Button>
-            <Button theme="solid" onClick={onOk()}>{toadd}</Button>
+                        <Button theme="solid" onClick={() => {
+                            onOk()
+                        }}>{toadd}</Button>
                     </div>
                 </div>
             }
-    //   visible={false}
+            // visible={true}
           visible={visible}
         ></Modal>
     );

code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/actions/camera.js

@@ -149,3 +149,15 @@ export function postAddCascade(data) {
       msg: { option: "" }, //添加级联摄像头
     });
 }
+
+export function getParentCamera(query) {
+    return (dispatch) =>
+      basicAction({
+        type: "get",
+        dispatch: dispatch,
+        query,
+        actionType: "GET_PARENT_CASCADE",
+        url: `${ApiTable.getParentCamera}`,
+        msg: { option: "" }, //获取级联摄像头父级设备
+      });
+  }

code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/cameraModal.jsx

@@ -19,6 +19,8 @@ function cameraModal(props) {
         CameraKind,
         CameraAbility,
         cameraData, //修改时传来的值
+        modify,
+        parentCamera
     } = props;
     const { equipmentWarehouse } = actions;
     const fluoriteRef = useRef();
@@ -29,6 +31,7 @@ function cameraModal(props) {
     const [loadingTip, setloadingTip] = useState("获取中...请稍后..."); //loading tip的值
     const [okText, setokText] = useState("确定"); //ok弹框text  右边
     const [cancelText, setcancelText] = useState("取消"); //取消弹框text  左边
+   
     const [clickNum, setclickNum] = useState(
         cameraData.type == "yingshi"
             ? 1
@@ -146,16 +149,23 @@ function cameraModal(props) {
     }
     function handleChoose (id) {
         //选择摄像头接入类型
+        if (!modify) {
             setclickNum(id);
         }
+
+    }
     function turnLift () {
         //轮播图向左
+        if (!modify) {
             setcameraList(cameraList.slice(0, 3));
         }
+    }
     function turnRight () {
         //轮播图向右
+        if (!modify) {
             setcameraList(cameraList.slice(1, 4));
         }
+    }
     function onReset () {
         if (clickNum == 1) {
             fluoriteRef.current.resetFluoriteCamera();
@@ -327,6 +337,14 @@ function cameraModal(props) {
                                         }}
                                         onClick={() => handleChoose(item.id)}
                                     >
+                                        {modify ? item.id == clickNum ? "" : <div style={{
+                                            width: 266,
+                                            height: 146,
+                                            borderRadius: 3,
+                                            backgroundColor: "rgba(151, 151, 151, 0.1)",
+                                            position: "absolute",
+                                            top: 0,
+                                        }}></div> : ""}
                                         <div
                                             style={{
                                                 marginTop: 5,
@@ -377,7 +395,9 @@ function cameraModal(props) {
                                             ""
                                         )}
                                     </div>
+
                                 ))}
+
                             </div>
                             <IconChevronRight
                                 style={{
@@ -480,7 +500,7 @@ function cameraModal(props) {
                                 cameraData={cameraData}
                             />
                         ) : (
-              <CascadeCamera dRef={cascadeRef} cameraData={cameraData} />
+                            <CascadeCamera dRef={cascadeRef} cameraData={cameraData} parentCamera={parentCamera} />
                         )}
                     </div>
                 </Spin>

code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/cascadeCamera.jsx

@@ -3,16 +3,16 @@ import { connect } from "react-redux";
 import { Form, Row, Col } from "@douyinfe/semi-ui";
 
 import "./cameraModal.less";
-function cascadeCamera({ dRef, dispatch, actions ,cameraData}) {
+function cascadeCamera ({ dRef, dispatch, actions, cameraData ,parentCamera}) {
     const form = useRef();
     const { equipmentWarehouse } = actions;
     const [sip, setSip] = useState([]);
 
     useEffect(() => {
         dispatch(equipmentWarehouse.getCascadeSIP()).then((res) => {
-      console.log(res)
             setSip(res.payload.data);
         });
+         
     }, []);
 
     //内存卡列表
@@ -94,7 +94,7 @@ function cascadeCamera({ dRef, dispatch, actions ,cameraData}) {
                         <Form.Select
                             label="SIP编号:"
                             field="sip"
-              initValue={cameraData.cascadeType||""}
+                            initValue={parentCamera || ""}
                             placeholder="请选择SIP编号"
                             style={{ width: 307 }}
                             rules={[{ required: true, message: "请选择SIP编号" }]}

code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/containers/camera.jsx

@@ -35,6 +35,8 @@ const CameraHeader = (props) => {
     const [search, setearch] = useState({}); //搜索条件
     const [rowId, setRowId] = useState(); //表格数据id
     const [cameraData, setCameraData] = useState({}); //表格数据
+    const [modify, setModify] = useState(false); //修改
+    const [parentCamera, setParentCamera] = useState(""); //级联摄像头父级设备
     const { equipmentWarehouse } = actions;
     const api = useRef();
     const searchb = useRef(search)
@@ -42,6 +44,8 @@ const CameraHeader = (props) => {
     const CAMERAS = "cameras";
 
     useEffect(() => {
+
+        console.log(props)
         dispatch(actions.equipmentWarehouse.getVender()).then((res) => {
             setvenderList(res.payload.data);
             attribute(res.payload.data);
@@ -53,7 +57,6 @@ const CameraHeader = (props) => {
                 JSON.stringify(["state", "type", "manufactor"])
             )
             : "";
-        console.log(equipmentWarehouseCamera);
     }, []);
 
     useEffect(() => {
@@ -118,8 +121,19 @@ const CameraHeader = (props) => {
                         <Button
                             theme="borderless"
                             onClick={() => {
-                                setCameraModal(true);
                                 setCameraData(row);
+                                if (row.type == "cascade") {
+                                    dispatch(equipmentWarehouse.getParentCamera({ cameraSerialNo: row.serialNo })).then((res) => {
+                                        setParentCamera(res.payload.data.sipip)
+                                        if (res.success) {
+                                            setCameraModal(true);
+                                            setModify(true)
+                                        }
+                                    })
+                                } else {
+                                    setCameraModal(true);
+                                    setModify(true)
+                                }
                             }}
                         >
                             修改
@@ -290,15 +304,7 @@ const CameraHeader = (props) => {
                 render: (_, r, index) => {
                     return r.station.length == 0
                         ? ""
-                        : r.station.map((item, index) => {
+                        : station(r, "name", _, "projects")
-                            return item.structure.projects.length == 0
-                                ? ""
-                                : station(
-                                    r.station[0].structure.projects[0].name,
-                                    item.structure.projects,
-                                    "name"
-                                );
-                        });
                 },
             },
             {
@@ -308,15 +314,7 @@ const CameraHeader = (props) => {
                 render: (_, r, index) => {
                     return r.station.length == 0
                         ? ""
-                        : r.station.map((item, index) => {
+                        : station(r, "url", _, "projects")
-                            return item.structure.projects.length == 0
-                                ? ""
-                                : station(
-                                    r.station[0].structure.projects[0].url,
-                                    item.structure.projects,
-                                    "url"
-                                );
-                        });
                 },
             },
             {
@@ -326,7 +324,7 @@ const CameraHeader = (props) => {
                 render: (_, r, index) => {
                     return r.station.length == 0
                         ? ""
-                        : station(r.station[0].structure.name, r.station, "structure.name");
+                        : station(r, "name", r.station[0].structure.name, _, "structure")
                 },
             },
             {
@@ -336,7 +334,7 @@ const CameraHeader = (props) => {
                 render: (_, r, index) => {
                     return r.station.length == 0
                         ? ""
-                        : station(r.station[0].name, r.station, "name");
+                        : station(r, "name", r.station[0].name, _, "point")
                 },
             },
             {
@@ -346,7 +344,7 @@ const CameraHeader = (props) => {
                 render: (_, r, index) => {
                     return r.station.length == 0
                         ? ""
-                        : station(r.station[0].factor.name, r.station, "factor.name");
+                        : station(r, "name", r.station[0].factor.name)
                 },
             },
         ];
@@ -360,39 +358,22 @@ const CameraHeader = (props) => {
     }
 
     //表格请求数据中station属性数据的展示
-    function station (first, whole, name) {
+    function station (r, name, data, projects, exhibition) {
-        return (
+        return <Popover
-            <Popover
             key="updateTime"
             position="top"
             content={
                 <article style={{ padding: 12 }}>
-                        {whole.map((v, index) => {
+                    {projects == "projects" ?
-                            let names = "";
+                        r.station.map((v) => v.structure.projects.length == 0 ? "" : v.structure.projects.map((item, index) => <div key={index}>{item[name]}</div>))
-                            switch (name) {
+                        : r.station.map((v, index) => <div key={index}>{exhibition == "structure" ? v.structure.name : exhibition == "point" ? v.name : v.factor.name}</div>)
-                                case "name":
-                                    names = v[name];
-                                    break;
-                                case "url":
-                                    names = v[name];
-                                    break;
-                                case "structure.name":
-                                    names = v.structure.name;
-                                    break;
-                                case "factor.name":
-                                    names = v.factor.name;
-                                    break;
-                                default:
-                                    break;
                     }
-                            return <div key={index}>{names}</div>;
-                        })}
                 </article>
             }
         >
-                <Tag>{first}...</Tag>
+            <Tag>{projects == "projects" && r.station[0].structure.projects.length > 0 ? r.station[0].structure.projects[0][name] : data}...</Tag>
         </Popover>
-        );
+
     }
     //条件赛选样式
     const screen = {
@@ -724,10 +705,15 @@ const CameraHeader = (props) => {
                     visible={true}
                     venderList={venderList}
                     cameraData={cameraData}
+                    modify={modify}
+                    parentCamera={parentCamera}
                     close={() => {
                         setCameraModal(false);
                         setCameraData({});
+                        setModify(false)
+                        setParentCamera("")
                         equipmentGetCamera();
+
                     }}
                     modalName={modalName}
                 />
@@ -735,7 +721,7 @@ const CameraHeader = (props) => {
                 ""
             )}
             {
-                <VideoPlayModal visible={true} />
+                // <VideoPlayModal visible={true} />
             }
         </>
     );

code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/containers/nvr.jsx

@@ -40,7 +40,7 @@ const NvrHeader = (props) => {
     const [search, setearch] = useState({}); //搜索条件
     const [rowId, setRowId] = useState(); //表格数据id
 
-    const [reminder, setReminder] = useState(true); //提醒弹框
+    const [reminder, setReminder] = useState(false); //提醒弹框
     const api = useRef();
     const SETUPS = "setups";
 
@@ -56,7 +56,6 @@ const NvrHeader = (props) => {
                 JSON.stringify(["manufactor", "passageway", "port", "state"])
             )
             : "";
-        // ;
     }, []);
 
     useEffect(() => {
@@ -218,18 +217,9 @@ const NvrHeader = (props) => {
                 dataIndex: "",
                 key: "name",
                 render: (_, r, index) => {
-                    console.log(r)
                     return r.station.length == 0
                         ? ""
-                        : r.station.map((item, index) => {
+                        : station(r, "name", "projects")
-                            return item.structure.projects.length == 0
-                                ? ""
-                                : station(
-                                    r.station[0].structure.projects[0].name,
-                                    item.structure.projects,
-                                    "name"
-                                );
-                        });
                 },
             },
             {
@@ -239,15 +229,7 @@ const NvrHeader = (props) => {
                 render: (_, r, index) => {
                     return r.station.length == 0
                         ? ""
-                        : r.station.map((item, index) => {
+                        : station(r, "url", "projects")
-                            return item.structure.projects.length == 0
-                                ? ""
-                                : station(
-                                    r.station[0].structure.projects[0].url,
-                                    item.structure.projects,
-                                    "url"
-                                );
-                        });
                 },
             },
             {
@@ -257,7 +239,7 @@ const NvrHeader = (props) => {
                 render: (_, r, index) => {
                     return r.station.length == 0
                         ? ""
-                        : station(r.station[0].structure.name, r.station, "structure.name");
+                        : station(r, "name")
                 },
             },
         ];
@@ -271,39 +253,22 @@ const NvrHeader = (props) => {
     }
 
     //表格请求数据中station属性数据的展示
-    function station (first, whole, name) {
+    function station (r, name, projects) {
-        return (
+        return <Popover
-            <Popover
             key="updateTime"
             position="top"
             content={
                 <article style={{ padding: 12 }}>
-                        {whole.map((v, index) => {
+                    {projects == "projects" ?
-                            let names = "";
+                        r.station.map((v) => v.structure.projects.length == 0 ? "" : v.structure.projects.map((item, index) => <div key={index}>{item[name]}</div>))
-                            switch (name) {
+                        : r.station.map((v, index) => <div key={index}>{v.structure[name]}</div>)
-                                case "name":
-                                    names = v[name];
-                                    break;
-                                case "url":
-                                    names = v[name];
-                                    break;
-                                case "structure.name":
-                                    names = v.structure.name;
-                                    break;
-                                case "factor.name":
-                                    names = v.factor.name;
-                                    break;
-                                default:
-                                    break;
                     }
-                            return <div key={index}>{names}</div>;
-                        })}
                 </article>
             }
         >
-                <Tag>{first}...</Tag>
+            <Tag>{projects == "projects" ? r.station[0].structure.projects[0][name] : r.station[0].structure[name]}...</Tag>
         </Popover>
-        );
+
     }
 
     //条件赛选样式
@@ -621,16 +586,16 @@ const NvrHeader = (props) => {
                 ) : (
                     []
                 )}
-                {/* <ReminderBox
+                <ReminderBox
                     title="是否继续添加NVR摄像头？"
                     wait="再等等"
                     toadd="去添加"
                     visible={reminder}
                     onOk={() => {
-            // dispatch(push('/equipmentWarehouse/camera'));
+                        dispatch(push('/equipmentWarehouse/camera/:addNvr=true'));
                         setReminder(false)
                     }}
-        /> */}
+                />
             </div>
         </>
     );

code/VideoAccess-VCMP/web/client/src/utils/webapi.js

@@ -30,6 +30,7 @@ export const ApiTable = {
    postCameraNvr: "camera/create/nvr",  //记录NVR摄像头
    getCascadeSIP: "camera/sip_list/cascade",  //获取级联摄像头sip列表
    postAddCascade: "camera/create/cascade",  //添加级联摄像头
+   getParentCamera:"camera/cascade_device",    //获取级联摄像头父级设备
 
 };